wc-compiler 0.11.0 → 0.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wc-compiler",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "description": "Experimental native Web Components compiler.",
   "repository": {
     "type": "git",
@@ -42,18 +42,17 @@
     "prepublishOnly": "npm run clean && npm run dist"
   },
   "dependencies": {
+    "@projectevergreen/acorn-jsx-esm": "~0.1.0",
+    "@projectevergreen/escodegen-esm": "~0.1.0",
     "acorn": "^8.7.0",
-    "acorn-jsx": "^5.3.2",
     "acorn-walk": "^8.2.0",
-    "escodegen": "^2.0.0",
     "parse5": "^6.0.1"
   },
   "devDependencies": {
     "@ls-lint/ls-lint": "^1.10.0",
     "@mapbox/rehype-prism": "^0.8.0",
-    "@rollup/plugin-commonjs": "^22.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "c8": "^7.11.2",
     "chai": "^4.3.6",
     "concurrently": "^7.1.0",
@@ -74,7 +73,7 @@
     "remark-rehype": "^10.1.0",
     "remark-toc": "^8.0.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.75.7",
+    "rollup": "^3.29.3",
     "simple.css": "^0.1.3",
     "unified": "^10.1.2"
   }

package/src/dom-shim.js

@@ -123,21 +123,27 @@ class HTMLTemplateElement extends HTMLElement {
 // https://developer.mozilla.org/en-US/docs/Web/API/CustomElementRegistry
 class CustomElementsRegistry {
   constructor() {
-    this.customElementsRegistry = {};
+    // TODO this should probably be a set or otherwise follow the spec?
+    // https://github.com/ProjectEvergreen/wcc/discussions/145
+    this.customElementsRegistry = new Map();
   }
 
   define(tagName, BaseClass) {
-    this.customElementsRegistry[tagName] = BaseClass;
+    // TODO this should probably fail as per the spec...
+    // e.g. if(this.customElementsRegistry.get(tagName))
+    // https://github.com/ProjectEvergreen/wcc/discussions/145
+    this.customElementsRegistry.set(tagName, BaseClass);
   }
 
   get(tagName) {
-    return this.customElementsRegistry[tagName];
+    return this.customElementsRegistry.get(tagName);
   }
 }
 
 // mock top level aliases (globalThis === window)
 // https://developer.mozilla.org/en-US/docs/Web/API/Window
-globalThis.addEventListener = noop;
-globalThis.document = new Document();
-globalThis.customElements = new CustomElementsRegistry();
-globalThis.HTMLElement = HTMLElement;
+// make this "idempotent" for now until a better idea comes along - https://github.com/ProjectEvergreen/wcc/discussions/145
+globalThis.addEventListener = globalThis.addEventListener ?? noop;
+globalThis.document = globalThis.document ?? new Document();
+globalThis.customElements = globalThis.customElements ?? new CustomElementsRegistry();
+globalThis.HTMLElement = globalThis.HTMLElement ?? HTMLElement;

package/src/jsx-loader.js

@@ -2,9 +2,9 @@
 // https://nodejs.org/api/esm.html#esm_loaders
 import * as acorn from 'acorn';
 import * as walk from 'acorn-walk';
-import escodegen from 'escodegen';
+import { generate } from '@projectevergreen/escodegen-esm';
 import fs from 'fs';
-import jsx from 'acorn-jsx';
+import jsx from '@projectevergreen/acorn-jsx-esm';
 import { parse, parseFragment, serialize } from 'parse5';
 
 const jsxRegex = /\.(jsx)$/;
@@ -323,7 +323,7 @@ export function parseJsx(moduleURL) {
       }
     }
 
-    let newModuleContents = escodegen.generate(tree);
+    let newModuleContents = generate(tree);
 
     // TODO better way to determine value type?
     /* eslint-disable indent */
@@ -391,7 +391,7 @@ export async function load(url, context, defaultLoad) {
 
     return {
       format: 'module',
-      source: escodegen.generate(jsFromJsx),
+      source: generate(jsFromJsx),
       shortCircuit: true
     };
   }

package/src/wcc.js

@@ -4,7 +4,7 @@ import './dom-shim.js';
 
 import * as acorn from 'acorn';
 import * as walk from 'acorn-walk';
-import escodegen from 'escodegen';
+import { generate } from '@projectevergreen/escodegen-esm';
 import { getParser, parseJsx } from './jsx-loader.js';
 import { parse, parseFragment, serialize } from 'parse5';
 import fs from 'fs';
@@ -94,7 +94,7 @@ function registerDependencies(moduleURL, definitions, depth = 0) {
         definitions[tagName] = {
           instanceName: args[1].name,
           moduleURL,
-          source: escodegen.generate(tree),
+          source: generate(tree),
           url: moduleURL,
           isEntry
         };
@@ -134,9 +134,7 @@ async function initializeCustomElement(elementURL, tagName, attrs = [], definiti
 
   // https://github.com/ProjectEvergreen/wcc/pull/67/files#r902061804
   const { pathname } = elementURL;
-  const element = tagName
-    ? customElements.get(tagName)
-    : (await import(pathname)).default;
+  const element = customElements.get(tagName) ?? (await import(pathname)).default;
   const dataLoader = (await import(pathname)).getData;
   const data = props
     ? props