shorter/better

Author: WebReflection

docs/index.js

@@ -1,62 +1,52 @@
 export default () => {
-  const { prototype } = Function;
   const { apply, construct, defineProperty } = Reflect;
 
   const notRegistered = value => value?.shared?.gcRegistered === false;
 
-  const patch = args => {
-    if (known) {
-      for (let i = 0; i < args.length; i++)
-        args[i] = toJS(args[i]);
-    }
-  };
-
-  const toJS = current => {
-    if (known) {
-      switch (typeof current) {
-        case 'object':
-          if (current === null) break;
-          // falls through
-        case 'function':
-          if (notRegistered(current[pyproxy])) {
-            return current.toJs(options);
-          }
-      }
-    }
-    return current;
-  };
-
-  const options = { dict_converter: Object.fromEntries };
-
   const descriptor = {
     configurable: true,
     set(value) {
-      delete this[pyproxy];
-      this[pyproxy] = value;
+      defineProperty(this, pyproxy, { value });
       if (notRegistered(value)) {
         const copy = this.copy();
         queueMicrotask(() => {
-          this[pyproxy] = copy[pyproxy];
+          defineProperty(this, pyproxy, { value: copy[pyproxy] });
         });
       }
     },
   };
 
-  let pyproxy, known = false;
+  const intercept = (handler, name) => {
+    const method = handler[name];
+    defineProperty(handler, name, {
+      value(target, key) {
+        if (known) {
+          if (key === pyproxy) {
+            if (
+              typeof target === 'function' &&
+              notRegistered(target[pyproxy])
+            ) return target.toJs()[key];
+          }
+          else if (
+            pyproxy in target &&
+            name in target &&
+            !(key in target) &&
+            notRegistered(target[pyproxy]) &&
+            typeof target === 'object'
+          ) return target[name](key);
+        }
+        return apply(method, this, arguments);
+      }
+    });
+  };
 
-  defineProperty(prototype, 'apply', {
-    value(context, args) {
-      patch(args);
-      return apply(this, toJS(context), args);
-    }
-  });
+  const pyodidePatch = Symbol.for('pyodide-patch');
+  const patched = new WeakSet;
 
-  defineProperty(prototype, 'call', {
-    value(context, ...args) {
-      patch(args);
-      return apply(this, toJS(context), args);
-    }
-  });
+  let pyproxy, known = false;
+  
+  if (pyodidePatch in globalThis) return;
+  globalThis[pyodidePatch] = true;
 
   // minimalistic Symbol override that
   // won't affect performance or break expectations
@@ -78,11 +68,18 @@ export default () => {
   defineProperty(globalThis, 'Proxy', {
     value: new Proxy(Proxy, {
       construct(target, args, New) {
-        const proxy = construct(target, args, New);
-        if (known && typeof args[0] === 'function') {
-          defineProperty(args[0], pyproxy, descriptor);
+        if (known) {
+          if (typeof args[0] === 'function')
+            defineProperty(args[0], pyproxy, descriptor);
+          const handler = args[1];
+          if (handler?.get && !patched.has(handler)) {
+            patched.add(handler);
+            intercept(handler, 'get');
+            // this is actually not used out there
+            // override(handler, 'has');
+          }
         }
-        return proxy;
+        return construct(target, args, New);
       },
     })
   });

docs/index.js.map

@@ -2,6 +2,7 @@ import { createProgress, writeFile } from './_utils.js';
 import { getFormat, loader, loadProgress, registerJSModule, run, runAsync, runEvent } from './_python.js';
 import { stdio } from './_io.js';
 import { IDBMapSync, isArray, fixedRelative } from '../utils.js';
+import patch from './pyodide-patch.js';
 
 const type = 'pyodide';
 const toJsOptions = { dict_converter: Object.fromEntries };
@@ -25,6 +26,7 @@ export default {
     async engine({ loadPyodide }, config, url, baseURL) {
         if (config.experimental_create_proxy === 'auto') {
             this.transform = (_, value) => value;
+            patch();
         }
         progress('Loading Pyodide');
         let { packages, index_urls } = config;

docs/zip-CAMAhqMX.js

@@ -2,8 +2,6 @@
 //    The :RUNTIMES comment is a delimiter and no code should be written/changed after
 //    See rollup/build_interpreters.cjs to know more
 
-import patch from './interpreter/pyodide-patch.js';
-
 /** @type {Map<string, object>} */
 export const registry = new Map();
 
@@ -27,20 +25,16 @@ export const interpreter = new Proxy(new Map(), {
                 : interpreter.module(...rest);
             map.set(id, {
                 url,
-                module: () => import(/* webpackIgnore: true */url),
+                module: import(/* webpackIgnore: true */url),
                 engine: interpreter.engine.bind(interpreter),
             });
         }
         const { url, module, engine } = map.get(id);
-        return async (config, baseURL) => {
-            if (config.experimental_create_proxy === 'auto') {
-                patch();
-            }
-            return module().then((module) => {
+        return (config, baseURL) =>
+            module.then((module) => {
                 configs.set(id, config);
                 return engine(module, config, url, baseURL);
             });
-        };
     },
 });
 /* c8 ignore stop */

docs/zip-CAMAhqMX.js.map

@@ -6,7 +6,7 @@
     "types": "./types/polyscript/esm/index.d.ts",
     "scripts": {
         "server": "npx static-handler --coi .",
-        "build": "export ESLINT_USE_FLAT_CONFIG=false; npm run build:3rd-party && rm -rf dist && mkdir -p esm/python && node rollup/build_python.cjs && npm run rollup:xworker && npm run rollup:core && eslint esm/ && npm run rollup:integrations && npm run build:docs",
+        "build": "export ESLINT_USE_FLAT_CONFIG=false; npm run build:3rd-party && rm -rf dist && mkdir -p esm/python && node rollup/build_python.cjs && npm run rollup:xworker && npm run rollup:core && npm run rollup:integrations && npm run build:docs",
         "build:3rd-party": "node rollup/3rd-party.cjs",
         "build:docs": "mv docs/coi.js ./; rm -f docs/*.{js,map}; cp dist/* docs/; rm -f docs/_template.js; mv coi.js docs/",
         "dev": "node dev.cjs",
@@ -96,6 +96,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-+sGDLtv2hVsnU+g72b4LNukOBKJ6rACYVNp4kkAAKfQ="
+        "blob": "sha256-F8Q1wRHhjlnJ/rfCwDH9kFnuwL3LgM3tYagFb9HtozQ="
     }
 }

esm/interpreter/pyodide-patch.js

@@ -0,0 +1,10 @@
+{
+  "experimental_create_proxy": "auto",
+  "js_modules": {
+      "main": {
+          "https://unpkg.com/d3?module" : "d3",
+          "https://unpkg.com/dc?module" : "dc",
+          "https://unpkg.com/crossfilter2?module" : "crossfilter"
+      }
+  }
+}

esm/interpreter/pyodide.js

@@ -31,7 +31,7 @@
     </script>
 </head>
 <body>
-    <script type="py" src="./main.py" config="./pyscript.toml"></script>
+    <script type="py" src="./main.py" config="./config.json"></script>
 <div id="test"></div>
 <!-- here's a way to load data from a jsfiddle, to avoid CORS
   problems - see http://stackoverflow.com/a/22896088/676195

esm/interpreters.js

@@ -1,4 +1,9 @@
-import js as window
+try:
+    from polyscript import xworker
+    window = xworker.window
+except:
+    import js as window
+
 from polyscript.js_modules import d3, dc
 from polyscript.js_modules.crossfilter import default as crossfilter