pyscript · hoodmane · Mar 8, 2023 · Mar 8, 2023 · Mar 8, 2023 · Mar 8, 2023
diff --git a/pyscriptjs/.eslintrc.js b/pyscriptjs/.eslintrc.js
@@ -18,16 +18,16 @@ module.exports = {
     plugins: ['@typescript-eslint'],
     ignorePatterns: ['node_modules'],
     rules: {
-        'no-prototype-builtins': 'warn',
-        '@typescript-eslint/no-unused-vars': 'warn',
-        '@typescript-eslint/no-explicit-any': 'warn',
-        '@typescript-eslint/no-unsafe-assignment': 'warn',
-        '@typescript-eslint/no-unsafe-argument': 'warn',
-        '@typescript-eslint/no-unsafe-member-access': 'warn',
-        '@typescript-eslint/no-unsafe-call': 'warn',
-        '@typescript-eslint/no-unsafe-return': 'warn',
-        '@typescript-eslint/no-floating-promises': 'warn',
-        '@typescript-eslint/restrict-plus-operands': 'warn',
-        '@typescript-eslint/no-empty-function': 'warn',
+        'no-prototype-builtins': 'error',
+        '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
+        '@typescript-eslint/no-explicit-any': 'error',
+        '@typescript-eslint/no-unsafe-assignment': 'error',
+        '@typescript-eslint/no-unsafe-argument': 'error',
+        '@typescript-eslint/no-unsafe-member-access': 'error',
+        '@typescript-eslint/no-unsafe-call': 'error',
+        '@typescript-eslint/no-unsafe-return': 'error',
+        '@typescript-eslint/no-floating-promises': 'error',
+        '@typescript-eslint/restrict-plus-operands': 'error',
+        '@typescript-eslint/no-empty-function': 'error',
     },
 };
diff --git a/pyscriptjs/rollup.config.js b/pyscriptjs/rollup.config.js
@@ -4,8 +4,32 @@ import { terser } from 'rollup-plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import css from 'rollup-plugin-css-only';
 import serve from 'rollup-plugin-serve';
-import { string } from 'rollup-plugin-string';
 import copy from 'rollup-plugin-copy';
+import * as fs from 'fs';
+import * as path from 'path';
+
+function directoryManifest(root, dir = '.', result = { dirs: [], files: [] }) {
+    const curdir = path.join(root, dir);
+    const dirObj = fs.opendirSync(curdir);
+    try {
+        let d;
+        while ((d = dirObj.readSync())) {
+            const entry = path.join(dir, d.name);
+            if (d.isDirectory()) {
+                if (d.name === '__pycache__') {
+                    continue;
+                }
+                result.dirs.push(entry);
+                directoryManifest(root, entry, result);
+            } else if (d.isFile()) {
+                    result.files.push([entry, fs.readFileSync(path.join(root, entry), { encoding: 'utf-8' })]);
+            }
+        }
+        return result;
+    } finally {
+        dirObj.close();
+    }
+}
 
 const production = !process.env.ROLLUP_WATCH || process.env.NODE_ENV === 'production';
 
@@ -22,29 +46,30 @@ if (!production) {
 
 export default {
     input: 'src/main.ts',
-    output: [
-        {
-            file: 'build/pyscript.js',
-            format: 'iife',
-            sourcemap: true,
-            inlineDynamicImports: true,
-            name: 'pyscript',
-        },
-        {
-            file: 'build/pyscript.min.js',
-            format: 'iife',
-            sourcemap: true,
-            inlineDynamicImports: true,
-            name: 'pyscript',
-            plugins: [terser()],
-        },
-    ],
+    output: [{ minify: true }, { minify: false }].map(({ minify }) => ({
+        file: `build/pyscript${minify ? '.min' : ''}.js`,
+        format: 'iife',
+        sourcemap: !production,
+        inlineDynamicImports: true,
+        name: 'pyscript',
+        plugins: [
+            terser({
+                compress: {
+                    defaults: minify,
+                    dead_code: true,
+                    global_defs: {
+                        pyscript_package: directoryManifest('./src/python'),
+                    },
+                },
+                mangle: minify,
+                format: {
+                    beautify: !minify,
+                },
+            }),
+        ],
+    })),
     plugins: [
         css({ output: 'pyscript.css' }),
-        // Bundle all the Python files into the output file
-        string({
-            include: './src/**/*.py',
-        }),
         resolve({
             browser: true,
         }),
@@ -55,7 +80,6 @@ export default {
         }),
         // This will make sure that examples will always get the latest build folder
         copy(copy_targets),
-        // production && terser(),
         !production &&
             serve({
                 port: 8080,

diff --git a/pyscriptjs/src/components/pyrepl.ts b/pyscriptjs/src/components/pyrepl.ts
@@ -2,7 +2,7 @@ import { basicSetup, EditorView } from 'codemirror';
 import { python } from '@codemirror/lang-python';
 import { indentUnit } from '@codemirror/language';
 import { Compartment } from '@codemirror/state';
-import { keymap } from '@codemirror/view';
+import { keymap, Command } from '@codemirror/view';
 import { defaultKeymap } from '@codemirror/commands';
 import { oneDarkTheme } from '@codemirror/theme-one-dark';
 
@@ -68,8 +68,8 @@ export function make_PyRepl(interpreter: InterpreterClient) {
                 languageConf.of(python()),
                 keymap.of([
                     ...defaultKeymap,
-                    { key: 'Ctrl-Enter', run: this.execute.bind(this), preventDefault: true },
-                    { key: 'Shift-Enter', run: this.execute.bind(this), preventDefault: true },
+                    { key: 'Ctrl-Enter', run: this.execute.bind(this) as Command, preventDefault: true },
+                    { key: 'Shift-Enter', run: this.execute.bind(this) as Command, preventDefault: true },
                 ]),
             ];
 
@@ -134,7 +134,7 @@ export function make_PyRepl(interpreter: InterpreterClient) {
             runButton.id = 'runButton';
             runButton.className = 'absolute py-repl-run-button';
             runButton.innerHTML = RUNBUTTON;
-            runButton.addEventListener('click', this.execute.bind(this));
+            runButton.addEventListener('click', this.execute.bind(this) as (e: MouseEvent) => void);
             return runButton;
         }
 
@@ -166,6 +166,7 @@ export function make_PyRepl(interpreter: InterpreterClient) {
             outEl.innerHTML = '';
 
             // execute the python code
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const pyResult = (await pyExec(interpreter, pySrc, outEl)).result;
 
             // display the value of the last evaluated expression (REPL-style)

diff --git a/pyscriptjs/src/components/pyscript.ts b/pyscriptjs/src/components/pyscript.ts
@@ -23,7 +23,7 @@ export function make_PyScript(interpreter: InterpreterClient, app: PyScriptApp)
              *
              * Concurrent access to the multiple py-script tags is thus avoided.
              */
-            let releaseLock: any;
+            let releaseLock: () => void;
             try {
                 releaseLock = await app.tagExecutionLock();
                 ensureUniqueId(this);
@@ -35,13 +35,15 @@ export function make_PyScript(interpreter: InterpreterClient, app: PyScriptApp)
                 this.innerHTML = '';
 
                 app.plugins.beforePyScriptExec({ interpreter: interpreter, src: pySrc, pyScriptTag: this });
+                /* eslint-disable @typescript-eslint/no-unsafe-assignment */
                 const result = (await pyExec(interpreter, pySrc, this)).result;
                 app.plugins.afterPyScriptExec({
                     interpreter: interpreter,
                     src: pySrc,
                     pyScriptTag: this,
                     result: result,
                 });
+                /* eslint-enable @typescript-eslint/no-unsafe-assignment */
             } finally {
                 releaseLock();
             }
@@ -53,7 +55,8 @@ export function make_PyScript(interpreter: InterpreterClient, app: PyScriptApp)
                 try {
                     const response = await robustFetch(url);
                     return await response.text();
-                } catch (e) {
+                } catch (err) {
+                    const e = err as Error;
                     _createAlertBanner(e.message);
                     this.innerHTML = '';
                     throw e;
@@ -163,15 +166,15 @@ const pyAttributeToEvent: Map<string, string> = new Map<string, string>([
 ]);
 
 /** Initialize all elements with py-* handlers attributes  */
-export function initHandlers(interpreter: InterpreterClient) {
+export async function initHandlers(interpreter: InterpreterClient) {
     logger.debug('Initializing py-* event handlers...');
     for (const pyAttribute of pyAttributeToEvent.keys()) {
-        createElementsWithEventListeners(interpreter, pyAttribute);
+        await createElementsWithEventListeners(interpreter, pyAttribute);
     }
 }
 
 /** Initializes an element with the given py-on* attribute and its handler */
-function createElementsWithEventListeners(interpreter: InterpreterClient, pyAttribute: string) {
+async function createElementsWithEventListeners(interpreter: InterpreterClient, pyAttribute: string) {
     const matches: NodeListOf<HTMLElement> = document.querySelectorAll(`[${pyAttribute}]`);
     for (const el of matches) {
         // If the element doesn't have an id, let's add one automatically!
@@ -195,7 +198,7 @@ function createElementsWithEventListeners(interpreter: InterpreterClient, pyAttr
             // the source code may contain a syntax error, which will cause
             // the splashscreen to not be removed.
             try {
-                interpreter.run(source);
+                await interpreter.run(source);
             } catch (e) {
                 logger.error((e as Error).message);
             }
@@ -204,7 +207,8 @@ function createElementsWithEventListeners(interpreter: InterpreterClient, pyAttr
                 void (async () => {
                     try {
                         await interpreter.run(handlerCode);
-                    } catch (err) {
+                    } catch (e) {
+                        const err = e as Error;
                         displayPyException(err, el.parentElement);
                     }
                 })();

diff --git a/pyscriptjs/src/components/pywidget.ts b/pyscriptjs/src/components/pywidget.ts
@@ -1,4 +1,4 @@
-import type { PyProxy } from 'pyodide';
+import type { PyProxy, PyProxyCallable } from 'pyodide';
 import { getLogger } from '../logger';
 import { robustFetch } from '../fetch';
 import { InterpreterClient } from '../interpreter_client';
@@ -13,8 +13,8 @@ function createWidget(interpreter: InterpreterClient, name: string, code: string
         name: string = name;
         klass: string = klass;
         code: string = code;
-        proxy: PyProxy;
-        proxyClass: any;
+        proxy: PyProxy & { connect(): void };
+        proxyClass: PyProxyCallable;
 
         constructor() {
             super();
@@ -28,8 +28,8 @@ function createWidget(interpreter: InterpreterClient, name: string, code: string
 
         async connectedCallback() {
             await interpreter.runButDontRaise(this.code);
-            this.proxyClass = interpreter.globals.get(this.klass);
-            this.proxy = this.proxyClass(this);
+            this.proxyClass = interpreter.globals.get(this.klass) as PyProxyCallable;
+            this.proxy = this.proxyClass(this) as PyProxy & { connect(): void };
             this.proxy.connect();
             this.registerWidget();
         }
@@ -39,9 +39,8 @@ function createWidget(interpreter: InterpreterClient, name: string, code: string
             interpreter.globals.set(this.id, this.proxy);
         }
     }
-    /* eslint-disable @typescript-eslint/no-unused-vars */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const xPyWidget = customElements.define(name, CustomWidget);
-    /* eslint-enable @typescript-eslint/no-unused-vars */
 }
 
 export function make_PyWidget(interpreter: InterpreterClient) {

diff --git a/pyscriptjs/src/interpreter_client.ts b/pyscriptjs/src/interpreter_client.ts
@@ -1,6 +1,6 @@
 import type { AppConfig } from './pyconfig';
 import { RemoteInterpreter } from './remote_interpreter';
-import type { PyProxy } from 'pyodide';
+import type { PyProxyDict } from 'pyodide';
 import { getLogger } from './logger';
 import type { Stdio } from './stdio';
 
@@ -16,7 +16,7 @@ export class InterpreterClient extends Object {
     /**
      * global symbols table for the underlying interface.
      * */
-    globals: PyProxy;
+    globals: PyProxyDict;
     stdio: Stdio;
 
     constructor(config: AppConfig, stdio: Stdio) {
@@ -32,14 +32,15 @@ export class InterpreterClient extends Object {
      * */
     async initializeRemote(): Promise<void> {
         await this._remote.loadInterpreter(this.config, this.stdio);
-        this.globals = this._remote.globals;
+        this.globals = this._remote.globals as PyProxyDict;
     }
 
     /**
      * delegates the code to be run to the underlying interface of
      * the remote interpreter.
      * Python exceptions are turned into JS exceptions.
      * */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async run(code: string): Promise<{ result: any }> {
         return await this._remote.run(code);
     }

diff --git a/pyscriptjs/src/logger.ts b/pyscriptjs/src/logger.ts
@@ -27,7 +27,7 @@ interface Logger {
     debug(message: string, ...args: unknown[]): void;
     info(message: string, ...args: unknown[]): void;
     warn(message: string, ...args: unknown[]): void;
-    error(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
 }
 
 const _cache = new Map<string, Logger>();
@@ -44,8 +44,8 @@ function getLogger(prefix: string): Logger {
 function _makeLogger(prefix: string): Logger {
     prefix = `[${prefix}] `;
 
-    function make(level: string) {
-        const out_fn = console[level].bind(console);
+    function make(level: 'info' | 'debug' | 'warn' | 'error') {
+        const out_fn = console[level].bind(console) as typeof console.log;
         function fn(fmt: string, ...args: unknown[]) {
             out_fn(prefix + fmt, ...args);
         }