zero-com 1.12.2 → 1.13.0

package/lib/common.d.ts

@@ -38,6 +38,8 @@ export declare const buildRegistry: (contextDir: string, registry: ServerFuncReg
 export declare const updateRegistryForFile: (filePath: string, contextDir: string, registry: ServerFuncRegistry, project?: Project) => void;
 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 generateRegistryRequires: (registry: ServerFuncRegistry) => string;
 export declare const collectHandleCallReplacements: (sourceFile: SourceFile) => Replacement[];
 export declare const collectSendCallReplacements: (sourceFile: SourceFile) => Replacement[];
 export declare const collectFuncCallReplacements: (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.collectHandleCallReplacements = 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.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.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.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"));
@@ -213,6 +213,27 @@ const collectCallSiteReplacements = (sourceFile, importedFuncs) => {
     return replacements;
 };
 exports.collectCallSiteReplacements = collectCallSiteReplacements;
+const hasHandleCall = (sourceFile) => {
+    let found = false;
+    sourceFile.forEachDescendant((node) => {
+        if (found)
+            return;
+        if (node.getKind() !== ts_morph_1.SyntaxKind.CallExpression)
+            return;
+        const callExpr = node;
+        if ((0, exports.isFromLibrary)(callExpr, exports.LIBRARY_NAME) && getCalleeName(callExpr) === exports.HANDLE_NAME) {
+            found = true;
+        }
+    });
+    return found;
+};
+exports.hasHandleCall = hasHandleCall;
+const generateRegistryRequires = (registry) => {
+    return Array.from(registry.keys())
+        .map(fp => `require(${JSON.stringify(fp)});`)
+        .join('\n');
+};
+exports.generateRegistryRequires = generateRegistryRequires;
 const collectHandleCallReplacements = (sourceFile) => {
     const replacements = [];
     sourceFile.forEachDescendant((node) => {
@@ -352,9 +373,14 @@ const transformSourceFile = (filePath, content, registry, options = {}, project)
         }
         return { content: (0, exports.appendRegistryCode)(sourceFile, fileRegistry), transformed: true };
     }
+    const isHandleFile = target === 'server' && (0, exports.hasHandleCall)(sourceFile);
     if (replacements.length > 0) {
         const { code, map } = (0, exports.applyReplacementsWithMap)(content, replacements, filePath);
-        return { content: code, transformed: true, map };
+        const finalContent = isHandleFile ? (0, exports.generateRegistryRequires)(registry) + '\n' + code : code;
+        return { content: finalContent, transformed: true, map };
+    }
+    if (isHandleFile) {
+        return { content: (0, exports.generateRegistryRequires)(registry) + '\n' + content, transformed: true };
     }
     return { content, transformed: false };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-com",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "main": "index.js",
   "repository": "https://github.com/yosbelms/zero-com",
   "keywords": [