Updating coincident to its latest

Author: WebReflection

cjs/package.json

@@ -5,7 +5,7 @@
 //    bigger than it used to be before any changes is applied to this file.
 
 import * as JSON from '@ungap/structured-clone/json';
-import coincident from 'coincident/window';
+import coincident from 'coincident/window/worker';
 
 import { assign, create, createFunction, createOverload, createResolved, dispatch, registerJSModules } from '../utils.js';
 import createJSModules from './js_modules.js';
@@ -32,19 +32,23 @@ const add = (type, fn) => {
 
 const { parse, stringify } = JSON;
 
-const { proxy: sync, window, isWindowProxy } = coincident(self, {
+const { proxy: sync, sync: syncMainAndWorker, polyfill, window, isWindowProxy } = await coincident({
     parse,
     stringify,
     transform: value => transform ? transform(value) : value
 });
 
 const xworker = {
+    // propagate the fact SharedArrayBuffer is polyfilled
+    polyfill,
     // allows synchronous utilities between this worker and the main thread
     sync,
     // allow access to the main thread world
     window,
     // allow introspection for foreign (main thread) refrences
     isWindowProxy,
+    // propagate the fact `window` can be used
+    hasWindow: syncMainAndWorker,
     // standard worker related events / features
     onmessage: console.info,
     onerror: console.error,
@@ -61,38 +65,10 @@ add('message', ({ data: { options, config: baseURL, configURL, code, hooks } })
 
             const interpreter = await getRuntime(runtimeID, baseURL, configURL, config);
 
-            const { js_modules, sync_main_only } = configs.get(runtimeID);
+            const { js_modules } = configs.get(runtimeID);
 
             const mainModules = js_modules?.main;
 
-            // this flag allows interacting with the xworker.sync exposed
-            // *only in the worker* and eventually invoked *only from main*.
-            // If that flag is `false` or not present, then SharedArrayBuffer
-            // must be available or not much can work in here.
-            let syncMainAndWorker = !sync_main_only;
-
-            // bails out out of the box with a native/meaningful error
-            // in case the SharedArrayBuffer is not available
-            try {
-                new SharedArrayBuffer(4);
-                // if this does not throw there's no reason to
-                // branch out of all the features ... but ...
-                syncMainAndWorker = true;
-            }
-            // eslint-disable-next-line no-unused-vars
-            catch (_) {
-                // if it does throw and `sync_main_only` was not `true`
-                // then there's no way to go further
-                if (syncMainAndWorker) {
-                    throw new Error(
-                        [
-                            'Unable to use SharedArrayBuffer due insecure environment.',
-                            'Please read requirements in MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements',
-                        ].join('\n'),
-                    );
-                }
-            }
-
             const details = create(registry.get(type));
 
             const resolved = createResolved(

docs/index.js

@@ -1,6 +1,4 @@
-import * as JSON from '@ungap/structured-clone/json';
 import fetch from '@webreflection/fetch';
-import coincident from 'coincident/window';
 import xworker from './xworker.js';
 import { getConfigURLAndType } from '../loader.js';
 import { assign, create, defineProperties, importCSS, importJS } from '../utils.js';
@@ -45,7 +43,7 @@ export default (...args) =>
             });
 
         const sync = assign(
-            coincident(worker, JSON).proxy,
+            worker.proxy,
             { importJS, importCSS },
         );
 

docs/index.js.map

@@ -2,14 +2,13 @@
     "name": "polyscript",
     "version": "0.13.10",
     "description": "PyScript single core to rule them all",
-    "main": "./cjs/index.js",
+    "main": "./esm/index.js",
     "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 ts && npm run cjs && 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 && eslint esm/ && npm run ts && npm run rollup:integrations && npm run build:docs",
         "build:3rd-party": "node rollup/3rd-party.cjs",
         "build:docs": "mv docs/coi.js ./; rm docs/*.{js,map}; cp dist/* docs/; rm -f docs/_template.js; mv coi.js docs/",
-        "cjs": "ascjs --no-default esm cjs",
         "dev": "node dev.cjs",
         "rollup:core": "rollup --config rollup/core.config.js",
         "rollup:integrations": "node rollup/build_integrations.cjs",
@@ -40,18 +39,17 @@
     "license": "APACHE-2.0",
     "devDependencies": {
         "@node-loader/import-maps": "^1.1.0",
-        "@playwright/test": "^1.45.2",
+        "@playwright/test": "^1.45.3",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
         "@zip.js/zip.js": "^2.7.47",
-        "ascjs": "^6.0.3",
         "c8": "^10.1.2",
         "chokidar": "^3.6.0",
         "eslint": "^9.7.0",
         "linkedom": "^0.18.4",
-        "rollup": "^4.18.1",
+        "rollup": "^4.19.0",
         "static-handler": "^0.4.3",
-        "typescript": "^5.5.3"
+        "typescript": "^5.5.4"
     },
     "type": "module",
     "module": "./dist/index.js",
@@ -61,18 +59,15 @@
     "exports": {
         ".": {
             "types": "./types/index.d.ts",
-            "import": "./esm/index.js",
-            "default": "./cjs/index.js"
+            "import": "./esm/index.js"
         },
         "./exports": {
             "types": "./types/exports.d.ts",
-            "import": "./esm/exports.js",
-            "default": "./cjs/exports.js"
+            "import": "./esm/exports.js"
         },
         "./xworker": {
             "types": "./types/xworker.d.ts",
-            "import": "./esm/xworker.js",
-            "default": "./cjs/xworker.js"
+            "import": "./esm/xworker.js"
         },
         "./package.json": "./package.json"
     },
@@ -83,14 +78,14 @@
         "@webreflection/idb-map": "^0.3.1",
         "basic-devtools": "^0.1.6",
         "codedent": "^0.1.2",
-        "coincident": "^1.2.3",
+        "coincident": "^2.0.0-rc3",
         "gc-hook": "^0.3.1",
         "html-escaper": "^3.0.3",
         "proxy-target": "^3.0.2",
         "sticky-module": "^0.1.1",
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-1GVYWvaeoNZQWMkVaV243TH9CjdQ95JPuNGGAj3OrDI="
+        "blob": "sha256-/7mU0W9+r+gE4w81wkQG4lOLZZuastawu03Ln1AMXK4="
     }
 }

docs/zip-CGWtiqjJ.js

@@ -12,12 +12,24 @@ const DIST_DIR = resolve(join(__dirname, "..", "dist"));
 const WORKERS_DIR = resolve(join(__dirname, "..", "esm", "worker"));
 const PACKAGE_JSON = resolve(join(__dirname, "..", "package.json"));
 
+const coincident = [
+    "import * as JSON from '@ungap/structured-clone/json';",
+    "import coincident from 'coincident/window/main';",
+    'const { Worker } = coincident(JSON);',
+];
+
 for (const file of readdirSync(DIST_DIR)) {
     if (file.startsWith("_")) {
         if (process.env.NO_MIN) {
             writeFileSync(
                 join(WORKERS_DIR, "xworker.js"),
-                `/* c8 ignore next */\nexport default () => new Worker('/dist/_template.js',{type:'module'});`,
+                [
+                    '/* c8 ignore start */',
+                    ...coincident,
+                    `export default () => new Worker('/dist/_template.js');`,
+                    '/* c8 ignore stop */',
+                    ''
+                ].join("\n")
             );
         } else {
             const js = JSON.stringify(
@@ -39,7 +51,8 @@ for (const file of readdirSync(DIST_DIR)) {
                     'const {url} = import.meta;',
                     `const re = ${/import\((['"])([^)]+?\.js)\1\)/}g;`,
                     `const place = ${(_,q,f) => `import(${q}${new URL(f,url).href}${q})`};`,
-                    `export default () => new Worker(URL.createObjectURL(new Blob([${js}.replace(re,place)],{type:'application/javascript'})),{type:'module'})`,
+                    ...coincident,
+                    `export default () => new Worker(URL.createObjectURL(new Blob([${js}.replace(re,place)],{type:'application/javascript'})))`,
                     '/* c8 ignore stop */',
                     ''
                 ].join("\n")

docs/zip-gl8b5xR3.js

@@ -1,12 +1,12 @@
-const { writeFileShim } = require("../cjs/interpreter/_utils.js");
-
-const assert = require("./assert.js");
+import { writeFileShim } from "../esm/interpreter/_utils.js";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 
 const FS = {
     mkdir(...args) {
         this.mkdir_args = args;
     },
-    cwd: () => __dirname,
+    cwd: () => dirname(fileURLToPath(import.meta.url)),
     writeFile(...args) {
         this.writeFile_args = args;
     },

docs/zip-CGWtiqjJ.js.map renamed to docs/zip-gl8b5xR3.js.map

@@ -1,10 +1,8 @@
-const assert = (current, expected, message = "Unexpected Error") => {
+export default (current, expected, message = "Unexpected Error") => {
     if (!Object.is(current, expected)) {
         console.error(`\x1b[1m${message}\x1b[0m`);
         console.error("  expected", expected);
         console.error("  got", current);
         process.exit(1);
     }
 };
-
-module.exports = assert;

esm/worker/_template.js

@@ -1,6 +1,6 @@
-const dedent = require("codedent");
-const assert = require("./assert.js");
-require("./_utils.js");
+import dedent from "codedent";
+import assert from "./assert.js";
+import "./_utils.js";
 
 const { fetch } = globalThis;
 
@@ -26,14 +26,15 @@ const patchFetch = (callback) => {
     });
 };
 
-const { parseHTML } = require("linkedom");
+import { parseHTML } from "linkedom";
 const { document, window, CustomEvent } = parseHTML("...");
 
 globalThis.indexedDB = { open: () => ({}) };
 globalThis.document = document;
 globalThis.Element = window.Element;
 globalThis.CustomEvent = CustomEvent;
 globalThis.MutationObserver = window.MutationObserver;
+globalThis.Worker = class {};
 globalThis.XPathResult = {};
 globalThis.XPathEvaluator =
     window.XPathEvaluator ||
@@ -43,9 +44,8 @@ globalThis.XPathEvaluator =
         }
     };
 
-const polyscript = require("../cjs");
 
-(async () => {
+import("../esm/index.js").then(async polyscript => {
     // shared 3rd party mocks
     const {
         python: pyodide,
@@ -212,4 +212,4 @@ const polyscript = require("../cjs");
     }
 
     globalThis.URL = URL;
-})();
+});

esm/worker/class.js

@@ -1,6 +1,9 @@
-const { existsSync, readdirSync } = require('node:fs');
-const { join } = require('node:path');
-const playwright = require('@playwright/test');
+import { existsSync, readdirSync } from 'node:fs';
+import { join }  from 'node:path';
+import playwright from '@playwright/test';
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // integration tests for interpreters
 const TEST_INTERPRETER = join(__dirname, 'integration');
@@ -11,7 +14,8 @@ const CORE_INTERPRETER = join(__dirname, '..', 'esm', 'interpreter');
 for (const file of readdirSync(TEST_INTERPRETER)) {
   // filter only JS files that match their counter-part interpreter
   if (/\.js$/.test(file) && existsSync(join(CORE_INTERPRETER, file))) {
-    require(join(TEST_INTERPRETER, file))(
+    const { default: test } = await import(join(TEST_INTERPRETER, file));
+    test(
       playwright,
       `http://localhost:8080/test/integration/interpreter/${file.slice(0, -3)}`
     );

package-lock.json

@@ -1,6 +1,6 @@
 'use strict';
 
-exports.shared = {
+export const shared = {
     bootstrap: ({ expect }, baseURL) => async ({ page }) => {
         await page.goto(`${baseURL}/bootstrap.html`);
         await page.waitForSelector('html.ready');
@@ -37,7 +37,7 @@ exports.shared = {
     },
 };
 
-exports.python = {
+export const python = {
     bootstrap: ({ expect }, baseURL) => async ({ page }) => {
         await page.goto(`${baseURL}/bootstrap.html`);
         await page.waitForSelector('html.ready');

package.json

@@ -1,8 +1,8 @@
 'use strict';
 
-const { shared, python } = require('./_shared.js');
+import { shared, python } from './_shared.js';
 
-module.exports = (playwright, baseURL) => {
+export default (playwright, baseURL) => {
     const { expect, test } = playwright;
 
     test('MicroPython bootstrap', python.bootstrap(playwright, baseURL));

rollup/build_xworker.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-const { shared, python } = require('./_shared.js');
+import { shared, python } from './_shared.js';
 
-module.exports = (playwright, baseURL) => {
+export default (playwright, baseURL) => {
     const { expect, test } = playwright;
 
     test('Pyodide bootstrap', python.bootstrap(playwright, baseURL));

test/_utils.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { shared } = require('./_shared.js');
+import { shared } from './_shared.js';
 
-module.exports = (playwright, baseURL) => {
+export default (playwright, baseURL) => {
     const { test } = playwright;
 
     test('Ruby WASM WASI bootstrap', shared.bootstrap(playwright, baseURL));

test/assert.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { shared } = require('./_shared.js');
+import { shared } from './_shared.js';
 
-module.exports = (playwright, baseURL) => {
+export default (playwright, baseURL) => {
     const { test } = playwright;
 
     test('Wasmoon bootstrap', shared.bootstrap(playwright, baseURL));

test/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { shared } = require('./_shared.js');
+import { shared } from './_shared.js';
 
-module.exports = (playwright, baseURL) => {
+export default (playwright, baseURL) => {
     const { test } = playwright;
 
     test('WebR just click', shared.justClick(playwright, baseURL));