zero-com 1.14.2 → 1.14.4

package/lib/common.d.ts

@@ -41,6 +41,7 @@ export declare const updateRegistryForFile: (filePath: string, contextDir: strin
 export declare const getImportedServerFunctions: (sourceFile: SourceFile, registry: ServerFuncRegistry) => Map<string, ServerFuncInfo>;
 export declare const collectCallSiteReplacements: (sourceFile: SourceFile, importedFuncs: Map<string, ServerFuncInfo>) => Replacement[];
 export declare const hasHandleCall: (sourceFile: SourceFile) => boolean;
+export declare const generateContextStorageInit: () => string;
 export declare const generateRegistryRequires: (registry: ServerFuncRegistry) => string;
 export declare const collectHandleCallReplacements: (sourceFile: SourceFile) => Replacement[];
 export declare const collectContextCallReplacements: (sourceFile: SourceFile) => Replacement[];

package/lib/common.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyReplacements = exports.emitToJs = exports.transformSourceFile = exports.generateClientStubs = exports.appendRegistryCode = exports.applyReplacementsWithMap = exports.collectFuncCallReplacements = exports.collectSendCallReplacements = exports.collectRunWithContextCallReplacements = exports.collectContextCallReplacements = exports.collectHandleCallReplacements = exports.generateRegistryRequires = exports.hasHandleCall = exports.collectCallSiteReplacements = exports.getImportedServerFunctions = exports.updateRegistryForFile = exports.buildRegistry = exports.mightNeedTransform = exports.createProject = exports.resolveFilePath = exports.isFromLibrary = exports.getReplacements = exports.generateCompilationId = exports.formatFuncIdName = exports.FILE_EXTENSIONS = exports.LIBRARY_NAME = exports.RUN_WITH_CONTEXT_NAME = exports.CONTEXT_NAME = exports.CALL_NAME = exports.HANDLE_NAME = exports.SERVER_FUNCTION_WRAPPER_NAME = exports.ZERO_COM_CONTEXT_STORAGE = exports.ZERO_COM_SERVER_REGISTRY = exports.ZERO_COM_CLIENT_CALL = void 0;
+exports.applyReplacements = exports.emitToJs = exports.transformSourceFile = exports.generateClientStubs = exports.appendRegistryCode = exports.applyReplacementsWithMap = exports.collectFuncCallReplacements = exports.collectSendCallReplacements = exports.collectRunWithContextCallReplacements = exports.collectContextCallReplacements = exports.collectHandleCallReplacements = exports.generateRegistryRequires = exports.generateContextStorageInit = exports.hasHandleCall = exports.collectCallSiteReplacements = exports.getImportedServerFunctions = exports.updateRegistryForFile = exports.buildRegistry = exports.mightNeedTransform = exports.createProject = exports.resolveFilePath = exports.isFromLibrary = exports.getReplacements = exports.generateCompilationId = exports.formatFuncIdName = exports.FILE_EXTENSIONS = exports.LIBRARY_NAME = exports.RUN_WITH_CONTEXT_NAME = exports.CONTEXT_NAME = exports.CALL_NAME = exports.HANDLE_NAME = exports.SERVER_FUNCTION_WRAPPER_NAME = exports.ZERO_COM_CONTEXT_STORAGE = exports.ZERO_COM_SERVER_REGISTRY = exports.ZERO_COM_CLIENT_CALL = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const magic_string_1 = __importDefault(require("magic-string"));
@@ -230,16 +230,19 @@ const hasHandleCall = (sourceFile) => {
     return found;
 };
 exports.hasHandleCall = hasHandleCall;
+// Initialize ZERO_COM_CONTEXT_STORAGE inline so it lives inside the bundle
+// and gets mangled together with all references. Without this, the runtime
+// module may be externalized (loaded via Node.js require) and set the
+// un-mangled name while the bundle references the mangled name.
+const generateContextStorageInit = () => {
+    return `if (!globalThis.${exports.ZERO_COM_CONTEXT_STORAGE}) { globalThis.${exports.ZERO_COM_CONTEXT_STORAGE} = new (require('async_hooks').AsyncLocalStorage)(); }`;
+};
+exports.generateContextStorageInit = generateContextStorageInit;
 const generateRegistryRequires = (registry) => {
     const requires = Array.from(registry.keys())
         .map(fp => `require(${JSON.stringify(fp)});`)
         .join('\n');
-    // Initialize ZERO_COM_CONTEXT_STORAGE inline so it lives inside the bundle
-    // and gets mangled together with all references. Without this, the runtime
-    // module may be externalized (loaded via Node.js require) and set the
-    // un-mangled name while the bundle references the mangled name.
-    const initContextStorage = `if (!globalThis.${exports.ZERO_COM_CONTEXT_STORAGE}) { globalThis.${exports.ZERO_COM_CONTEXT_STORAGE} = new (require('async_hooks').AsyncLocalStorage)(); }`;
-    return initContextStorage + '\n' + requires;
+    return (0, exports.generateContextStorageInit)() + '\n' + requires;
 };
 exports.generateRegistryRequires = generateRegistryRequires;
 const collectHandleCallReplacements = (sourceFile) => {
@@ -423,9 +426,18 @@ const transformSourceFile = (filePath, content, registry, options = {}, project)
         return { content: (0, exports.appendRegistryCode)(sourceFile, fileRegistry), transformed: true };
     }
     const isHandleFile = target === 'server' && (0, exports.hasHandleCall)(sourceFile);
+    // Any server file that references ZERO_COM_CONTEXT_STORAGE after transformation
+    // needs the inline init so the global is available even without the handle file.
+    const needsContextStorageInit = target === 'server' && !development && replacements.some(r => r.content.includes(exports.ZERO_COM_CONTEXT_STORAGE));
     if (replacements.length > 0) {
         const { code, map } = (0, exports.applyReplacementsWithMap)(content, replacements, filePath);
-        const finalContent = isHandleFile ? (0, exports.generateRegistryRequires)(registry) + '\n' + code : code;
+        let finalContent = code;
+        if (isHandleFile) {
+            finalContent = (0, exports.generateRegistryRequires)(registry) + '\n' + finalContent;
+        }
+        else if (needsContextStorageInit) {
+            finalContent = (0, exports.generateContextStorageInit)() + '\n' + finalContent;
+        }
         return { content: finalContent, transformed: true, map };
     }
     if (isHandleFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-com",
-  "version": "1.14.2",
+  "version": "1.14.4",
   "main": "index.js",
   "browser": {
     "./lib/async-local-storage.js": "./lib/async-local-storage.browser.js"