@re2tools/re2-wasm-esm 1.0.0 → 1.0.2

package/dist/index.node.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Node entry point. Uses loader-node.js (which has import.meta.url) so the
+ * browser build (index.js) stays parseable by Webpack.
+ */
+export { getModule, whenReady, createLoader, setReady, isResolved } from "./loader.js";
+export type { Re2WasmModule, NodeGlueContext, RunNodeGlue } from "./loader.js";
+export type { RE2ExecArray, RE2MatchArray } from "./re2-wasm/re2.js";
+export declare function init(options?: {
+    wasmUrl?: string;
+    glueUrl?: string;
+    baseUrl?: string;
+}): Promise<void>;
+export declare function getRE2(): (new (pattern: string | RegExp, flags?: string) => import("./re2-wasm/re2.js").RE2);
+//# sourceMappingURL=index.node.d.ts.map

package/dist/index.node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.node.d.ts","sourceRoot":"","sources":["../src/index.node.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACvF,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/E,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAcrE,wBAAsB,IAAI,CAAC,OAAO,CAAC,EAAE;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAED,wBAAgB,MAAM,IAAI,CAAC,KACzB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,KAAK,CAAC,EAAE,MAAM,KACX,OAAO,mBAAmB,EAAE,GAAG,CAAC,CAUpC"}

package/dist/index.node.js

@@ -0,0 +1,41 @@
+/**
+ * Node entry point. Uses loader-node.js (which has import.meta.url) so the
+ * browser build (index.js) stays parseable by Webpack.
+ */
+export { getModule, whenReady, createLoader, setReady, isResolved } from "./loader.js";
+import { createLoader, setReady, isResolved, resolvedRE2Class, } from "./loader.js";
+import { getNodeDirname, runNodeGlue } from "./loader-node.js";
+const isNode = typeof process !== "undefined" &&
+    typeof process.versions?.node === "string";
+export async function init(options) {
+    if (isResolved())
+        return;
+    if (isNode) {
+        const path = await import("path");
+        const { readFile } = await import("fs/promises");
+        const __dirname = getNodeDirname();
+        const wasmPath = path.join(__dirname, "re2.wasm");
+        const gluePath = path.join(__dirname, "re2-glue.js");
+        const re2ScriptPath = path.join(__dirname, "re2-wasm", "re2.js");
+        const p = createLoader(() => readFile(wasmPath).then((b) => b.buffer), () => readFile(gluePath, "utf8"), {
+            nodeContext: {
+                __dirname,
+                __filename: gluePath,
+                wasmPath,
+                re2ScriptPath,
+            },
+            runGlue: runNodeGlue,
+        }, undefined);
+        setReady(p);
+        await p;
+        return;
+    }
+    const { init: browserInit } = await import("./loader.js");
+    return browserInit(options);
+}
+export function getRE2() {
+    if (!resolvedRE2Class) {
+        throw new Error("RE2 not ready. Call await init() before using getRE2().");
+    }
+    return resolvedRE2Class;
+}

package/dist/loader-node.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Node-only helpers. This file uses import.meta.url and is only loaded in Node
+ * (via the "node" export). Do not import from bundlers building for browser.
+ */
+export declare function getNodeDirname(): string;
+export declare function runNodeGlue(scriptText: string, ctx: {
+    __dirname: string;
+    __filename: string;
+}): void;
+//# sourceMappingURL=loader-node.d.ts.map

package/dist/loader-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader-node.d.ts","sourceRoot":"","sources":["../src/loader-node.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,wBAAgB,WAAW,CACzB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC7C,IAAI,CAKN"}

package/dist/loader-node.js

@@ -0,0 +1,16 @@
+/**
+ * Node-only helpers. This file uses import.meta.url and is only loaded in Node
+ * (via the "node" export). Do not import from bundlers building for browser.
+ */
+import { fileURLToPath } from "url";
+import * as path from "path";
+import { createRequire } from "module";
+export function getNodeDirname() {
+    return path.dirname(fileURLToPath(import.meta.url));
+}
+export function runNodeGlue(scriptText, ctx) {
+    const req = createRequire(import.meta.url);
+    globalThis.require = req;
+    const fn = new Function("__dirname", "__filename", scriptText);
+    fn(ctx.__dirname, ctx.__filename);
+}

package/dist/loader.d.ts

@@ -9,6 +9,9 @@ declare global {
     }
     var Module: Record<string, unknown> | undefined;
 }
+/** Used by the Node entry to set ready after createLoader. */
+export declare function setReady(p: Promise<Record<string, unknown>> | null): void;
+export declare function isResolved(): boolean;
 /** Set by init(): the RE2 class (vendored from re2-wasm). */
 export declare let resolvedRE2Class: unknown;
 export interface Re2WasmModule {
@@ -30,6 +33,25 @@ export interface Re2WasmModule {
         };
     };
 }
+/**
+ * Load and run the RE2 WASM runtime (vendored wasm + glue from re2-wasm).
+ * In Node we preload wasm into Module.wasmBinary so the Emscripten glue uses sync
+ * instantiation and onRuntimeInitialized runs. In browser we use async instantiateWasm.
+ */
+export interface NodeGlueContext {
+    __dirname: string;
+    __filename: string;
+    wasmPath: string;
+    re2ScriptPath: string;
+}
+export type RunNodeGlue = (scriptText: string, ctx: {
+    __dirname: string;
+    __filename: string;
+}) => void;
+export declare function createLoader(getWasmBuffer: () => Promise<ArrayBuffer>, getGlueScript: () => Promise<string>, nodeOptions?: {
+    nodeContext: NodeGlueContext;
+    runGlue: RunNodeGlue;
+}, re2ScriptUrl?: string): Promise<Record<string, unknown>>;
 /**
  * Initialize the RE2 WASM runtime. Must be called before using RE2.
  *

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAClC;IAED,IAAI,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACjD;AAYD,6DAA6D;AAC7D,eAAO,IAAI,gBAAgB,EAAE,OAAc,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,KACV,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,OAAO,EACnB,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,OAAO,KACZ;QACH,EAAE,IAAI,OAAO,CAAC;QACd,KAAK,IAAI,MAAM,CAAC;QAChB,OAAO,IAAI,MAAM,CAAC;QAClB,KAAK,CACH,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,OAAO,GAC1B;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;SAAE,CAAC;QACpE,mBAAmB,IAAI;YAAE,IAAI,IAAI;gBAAE,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;gBAAC,IAAI,IAAI,MAAM,CAAA;aAAE,CAAC;YAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;KACzG,CAAC;CACH;AAoGD;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,CAAC,EAAE;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChB;AAED,wBAAgB,SAAS,IAAI,aAAa,CAOzC;AAED,wBAAgB,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAMlD"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAClC;IAED,IAAI,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACjD;AAYD,8DAA8D;AAC9D,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAEzE;AAED,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,6DAA6D;AAC7D,eAAO,IAAI,gBAAgB,EAAE,OAAc,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,KACV,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,OAAO,EACnB,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,OAAO,KACZ;QACH,EAAE,IAAI,OAAO,CAAC;QACd,KAAK,IAAI,MAAM,CAAC;QAChB,OAAO,IAAI,MAAM,CAAC;QAClB,KAAK,CACH,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,kBAAkB,EAAE,OAAO,GAC1B;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;SAAE,CAAC;QACpE,mBAAmB,IAAI;YAAE,IAAI,IAAI;gBAAE,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;gBAAC,IAAI,IAAI,MAAM,CAAA;aAAE,CAAC;YAAC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;KACzG,CAAC;CACH;AAkBD;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,WAAW,GAAG,CACxB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,KAC3C,IAAI,CAAC;AAEV,wBAAgB,YAAY,CAC1B,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EACzC,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACpC,WAAW,CAAC,EAAE;IAAE,WAAW,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,EACpE,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAuFlC;AAED;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,CAAC,EAAE;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqChB;AAED,wBAAgB,SAAS,IAAI,aAAa,CAOzC;AAED,wBAAgB,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAMlD"}

package/dist/loader.js

@@ -9,39 +9,58 @@ const isNode = typeof process !== "undefined" &&
     typeof process.versions.node === "string";
 let ready = null;
 let resolvedModule = null;
+/** Used by the Node entry to set ready after createLoader. */
+export function setReady(p) {
+    ready = p;
+}
+export function isResolved() {
+    return resolvedModule != null;
+}
 /** Set by init(): the RE2 class (vendored from re2-wasm). */
 export let resolvedRE2Class = null;
 /**
  * Resolve base URL for WASM and glue script (browser).
+ * Uses document.currentScript so the built file is parseable by Webpack (no import.meta).
  */
 function getBaseUrl() {
-    if (typeof import.meta !== "undefined" && import.meta.url) {
-        const u = import.meta.url;
+    if (typeof document !== "undefined" &&
+        document.currentScript &&
+        "src" in document.currentScript) {
+        const u = document.currentScript.src;
         return u.slice(0, u.lastIndexOf("/") + 1);
     }
     return "";
 }
-/**
- * Load and run the RE2 WASM runtime (vendored wasm + glue from re2-wasm).
- * In Node we preload wasm into Module.wasmBinary so the Emscripten glue uses sync
- * instantiation and onRuntimeInitialized runs. In browser we use async instantiateWasm.
- */
-function createLoader(getWasmBuffer, getGlueScript, nodeGlueContext) {
+export function createLoader(getWasmBuffer, getGlueScript, nodeOptions, re2ScriptUrl) {
+    const nodeGlueContext = nodeOptions != null ? nodeOptions.nodeContext : undefined;
     return new Promise((resolve, rej) => {
         function onReady() {
-            resolvedModule = globalThis.Module ?? Module;
-            // Defer so Emscripten glue stack unwinds (Node). Use queueMicrotask so
-            // the loader's dynamic import runs after the current sync glue stack.
+            const g = globalThis.Module;
+            resolvedModule = g !== undefined && g !== null ? g : Module;
             const doResolve = () => {
-                const re2Url = typeof import.meta.url !== "undefined"
-                    ? new URL("./re2-wasm/re2.js", import.meta.url).href
-                    : "./re2-wasm/re2.js";
-                import(/* @vite-ignore */ re2Url)
-                    .then((m) => {
-                    resolvedRE2Class = m.RE2;
-                    resolve(resolvedModule);
-                })
-                    .catch(rej);
+                const loadRe2 = (urlOrPath, isPath) => {
+                    const href = isPath
+                        ? (async () => {
+                            const { pathToFileURL } = await import("url");
+                            return pathToFileURL(urlOrPath).href;
+                        })()
+                        : Promise.resolve(urlOrPath);
+                    href.then((h) => import(/* @vite-ignore */ h)
+                        .then((m) => {
+                        resolvedRE2Class = m.RE2;
+                        resolve(resolvedModule);
+                    })
+                        .catch(rej));
+                };
+                if (nodeGlueContext != null && nodeGlueContext.re2ScriptPath) {
+                    loadRe2(nodeGlueContext.re2ScriptPath, true);
+                }
+                else if (re2ScriptUrl) {
+                    loadRe2(re2ScriptUrl, false);
+                }
+                else {
+                    loadRe2("./re2-wasm/re2.js", false);
+                }
             };
             queueMicrotask(doResolve);
         }
@@ -66,14 +85,11 @@ function createLoader(getWasmBuffer, getGlueScript, nodeGlueContext) {
         globalThis.Module = Module;
         const runGlue = async (scriptText) => {
             try {
-                if (isNode && nodeGlueContext) {
-                    const { createRequire } = await import("module");
-                    const req = createRequire(import.meta.url);
-                    globalThis.require = req;
-                    const fn = new Function("__dirname", "__filename", scriptText);
-                    fn(nodeGlueContext.__dirname, nodeGlueContext.__filename);
-                    // Emscripten glue can overwrite Module['onRuntimeInitialized'] before doRun();
-                    // invoke our callback now that the runtime is ready.
+                if (nodeOptions != null && nodeOptions.runGlue) {
+                    nodeOptions.runGlue(scriptText, {
+                        __dirname: nodeGlueContext.__dirname,
+                        __filename: nodeGlueContext.__filename,
+                    });
                     onReady();
                 }
                 else {
@@ -85,7 +101,7 @@ function createLoader(getWasmBuffer, getGlueScript, nodeGlueContext) {
                 rej(e);
             }
         };
-        if (isNode && nodeGlueContext) {
+        if (nodeGlueContext) {
             getWasmBuffer()
                 .then((buffer) => {
                 Module.wasmBinary = buffer;
@@ -108,23 +124,21 @@ export async function init(options) {
     if (resolvedModule)
         return;
     if (isNode) {
-        const { readFile } = await import("fs/promises");
-        const { fileURLToPath } = await import("url");
-        const path = await import("path");
-        const __filename = fileURLToPath(import.meta.url);
-        const __dirname = path.dirname(__filename);
-        const wasmPath = path.join(__dirname, "re2.wasm");
-        const gluePath = path.join(__dirname, "re2-glue.js");
-        ready = createLoader(() => readFile(wasmPath).then((b) => b.buffer), () => readFile(gluePath, "utf8"), { __dirname, __filename: gluePath, wasmPath });
-        await ready;
-        return;
+        throw new Error("This is the browser build of @re2tools/re2-wasm-esm. In Node, use the package's 'node' export so your resolver serves dist/index.node.js.");
     }
     if (isBrowser) {
         if (!ready) {
-            const base = options?.baseUrl ?? getBaseUrl();
-            const wasmUrl = options?.wasmUrl ?? base + "re2.wasm";
-            const glueUrl = options?.glueUrl ?? base + "re2-glue.js";
-            ready = createLoader(() => fetch(wasmUrl).then((r) => r.arrayBuffer()), () => fetch(glueUrl).then((r) => r.text()));
+            const base = options != null && options.baseUrl !== undefined
+                ? options.baseUrl
+                : getBaseUrl();
+            const wasmUrl = options != null && options.wasmUrl !== undefined
+                ? options.wasmUrl
+                : base + "re2.wasm";
+            const glueUrl = options != null && options.glueUrl !== undefined
+                ? options.glueUrl
+                : base + "re2-glue.js";
+            const re2ScriptUrl = base ? base + "re2-wasm/re2.js" : undefined;
+            ready = createLoader(() => fetch(wasmUrl).then((r) => r.arrayBuffer()), () => fetch(glueUrl).then((r) => r.text()), undefined, re2ScriptUrl);
         }
         await ready;
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@re2tools/re2-wasm-esm",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Google RE2 as WASM - ESM build with browser support (async init)",
   "type": "module",
   "main": "./dist/index.js",
@@ -8,7 +8,9 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "node": "./dist/index.node.js",
       "import": "./dist/index.js",
+      "default": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
   },