@backtickjs/bundler 0.1.10 → 0.2.0

package/src/print/code.ts

@@ -14,10 +14,12 @@ const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 export interface Names {
   readonly imports: Map<string, { from: string; name: string; local: string }>;
   readonly modules: Modules;
+  // whether a script executes another bundle, which `$exec` does
+  exec: boolean;
 }
 
 export function createNames(modules: Modules): Names {
-  return { imports: new Map(), modules };
+  return { imports: new Map(), modules, exec: false };
 }
 
 // A string, as a literal: `<` escaped, so no `</script>` or `<!--` appears
@@ -95,10 +97,11 @@ export function imported(
         `${listed.join(", ") || "no modules"}.`,
     );
   }
-  if (!supports(names.modules, from, version)) {
+  // Typed against one version, it works with a later one of the same major.
+  if (!supports(names.modules, from, `^${version}`)) {
     throw new Error(
-      `Can't import \`${name}\` from "${from}": it needs ${version}, and ` +
-        `the client provides ${from}@${provided}.`,
+      `Can't import \`${name}\` from "${from}": it's typed against ` +
+        `${version}, and the client provides ${from}@${provided}.`,
     );
   }
   const key = `${from}\0${name}`;
@@ -110,12 +113,15 @@ export function imported(
   return entry.local;
 }
 
-/** An import declaration of one export under its local name. */
+/** An import declaration of one export, or the namespace (`*`), by its local name. */
 export function importDeclaration(
   from: string,
   name: string,
   local: string,
 ): string {
+  if (name === "*") {
+    return `import * as ${local} from ${string(from)};`;
+  }
   const exported = IDENTIFIER.test(name) ? name : string(name);
   return `import { ${exported} as ${local} } from ${string(from)};`;
 }
@@ -126,6 +132,9 @@ export function requireDeclaration(
   name: string,
   local: string,
 ): string {
+  if (name === "*") {
+    return `const ${local} = require(${string(from)});`;
+  }
   const exported = IDENTIFIER.test(name) ? name : string(name);
   return `const { ${exported}: ${local} } = require(${string(from)});`;
 }

package/src/print/printBundle.ts

@@ -1,5 +1,5 @@
 import type { BundleTree } from "../bundle/buildBundle.js";
-import type { ClientModule } from "@backtickjs/core";
+import type { ScriptModule } from "@backtickjs/core";
 import { importDeclaration, requireDeclaration, string } from "./code.js";
 
 const MODULE_ID = "bundle.js";
@@ -16,6 +16,22 @@ const RUNTIME = `const $require = (id) => {
   return $exports[id];
 };`;
 
+// Another bundle, executed as this one is, to its value. As CommonJS, handed the
+// `require` this bundle was: inside the module table, `require` is the
+// table's own.
+const EXEC_CJS = `const $exec = async (bundle) => {
+  const module = { exports: {} };
+  new Function("module", "exports", "require", bundle)(module, module.exports, require);
+  return module.exports;
+};`;
+
+// As an ES module, imported whole, the page's import map answering its
+// imports as it answers this bundle's.
+const EXEC_ES = `const $exec = async (bundle) => {
+  const module = await import("data:text/javascript," + encodeURIComponent(bundle));
+  return module.default;
+};`;
+
 /**
  * A bundle tree as a module whose default export is the tree's root: the value
  * bundled, as its scripts wrote it.
@@ -44,6 +60,9 @@ export function printBundle(
   for (const { from, name, local } of names.imports.values()) {
     module.line(declaration(from, name, local));
   }
+  if (names.exec) {
+    module.line(format === "es" ? EXEC_ES : EXEC_CJS);
+  }
   // Each script a module table's entry, as webpack's and Metro's are: its body
   // under its id, run once by `$require`. The modules they require are the
   // client's, each imported whole, once.
@@ -110,7 +129,7 @@ class ModuleWriter {
   }
 
   // A script's code, its map a section of the module's where it starts.
-  script({ code, map }: ClientModule): void {
+  script({ code, map }: ScriptModule): void {
     this.#sections.push({
       offset: { line: this.#line, column: this.#column },
       map: JSON.parse(map) as object,