zero-com 1.6.2 → 1.6.4

package/README.md

@@ -1,6 +1,6 @@
 # Zero-com
 
-A ~420 Bytes utility for transparently communicating client and server in full-stack projects through compile-time code transformation, with end-to-end static type checking.
+The 0 bytes utility for transparently communicating client and server in full-stack projects through compile-time code transformation, with end-to-end static type checking.
 
 ## Table of Contents
 

package/lib/common.d.ts

@@ -14,7 +14,6 @@ export declare const ZERO_COM_SERVER_REGISTRY = "ZERO_COM_SERVER_REGISTRY";
 export declare const SERVER_FUNCTION_WRAPPER_NAME = "func";
 export declare const HANDLE_NAME = "handle";
 export declare const CALL_NAME = "call";
-export declare const EXEC_FUNC_NAME = "execFunc";
 export declare const CONTEXT_TYPE_NAME = "context";
 export declare const LIBRARY_NAME = "zero-com";
 export declare const FILE_EXTENSIONS: string[];
@@ -32,6 +31,7 @@ export declare const getImportedServerFunctions: (sourceFile: SourceFile, regist
 export declare const transformCallSites: (sourceFile: SourceFile, importedFuncs: Map<string, ServerFuncInfo>) => boolean;
 export declare const transformHandleCalls: (sourceFile: SourceFile) => boolean;
 export declare const transformSendCalls: (sourceFile: SourceFile) => boolean;
+export declare const transformFuncCalls: (sourceFile: SourceFile) => boolean;
 export declare const appendRegistryCode: (sourceFile: SourceFile, fileRegistry: Map<string, ServerFuncInfo>) => string;
 export type TransformResult = {
     content: string;

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.appendRegistryCode = exports.transformSendCalls = exports.transformHandleCalls = exports.transformCallSites = exports.getImportedServerFunctions = exports.buildRegistry = exports.createProject = exports.resolveFilePath = exports.isFromLibrary = exports.getReplacements = exports.generateCompilationId = exports.formatFuncIdName = exports.FILE_EXTENSIONS = exports.LIBRARY_NAME = exports.CONTEXT_TYPE_NAME = exports.EXEC_FUNC_NAME = exports.CALL_NAME = exports.HANDLE_NAME = exports.SERVER_FUNCTION_WRAPPER_NAME = exports.ZERO_COM_SERVER_REGISTRY = exports.ZERO_COM_CLIENT_CALL = void 0;
+exports.applyReplacements = exports.emitToJs = exports.transformSourceFile = exports.appendRegistryCode = exports.transformFuncCalls = exports.transformSendCalls = exports.transformHandleCalls = exports.transformCallSites = exports.getImportedServerFunctions = exports.buildRegistry = exports.createProject = exports.resolveFilePath = exports.isFromLibrary = exports.getReplacements = exports.generateCompilationId = exports.formatFuncIdName = exports.FILE_EXTENSIONS = exports.LIBRARY_NAME = exports.CONTEXT_TYPE_NAME = exports.CALL_NAME = exports.HANDLE_NAME = exports.SERVER_FUNCTION_WRAPPER_NAME = 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 ts_morph_1 = require("ts-morph");
@@ -13,7 +13,6 @@ exports.ZERO_COM_SERVER_REGISTRY = 'ZERO_COM_SERVER_REGISTRY';
 exports.SERVER_FUNCTION_WRAPPER_NAME = 'func';
 exports.HANDLE_NAME = 'handle';
 exports.CALL_NAME = 'call';
-exports.EXEC_FUNC_NAME = 'execFunc';
 exports.CONTEXT_TYPE_NAME = 'context';
 exports.LIBRARY_NAME = 'zero-com';
 exports.FILE_EXTENSIONS = ['', '.ts', '.tsx', '.js', '.jsx', '.mjs'];
@@ -185,7 +184,11 @@ const transformHandleCalls = (sourceFile) => {
         const args = callExpr.getArguments();
         if (args.length < 3)
             return;
-        callExpr.replaceWithText(`${exports.EXEC_FUNC_NAME}(globalThis.${exports.ZERO_COM_SERVER_REGISTRY}[${args[0].getText()}], ${args[1].getText()}, ${args[2].getText()})`);
+        // Inline the logic directly using a named function for better stack traces.
+        const funcId = args[0].getText();
+        const ctx = args[1].getText();
+        const argsArray = args[2].getText();
+        callExpr.replaceWithText(`(function handle(__fn, __ctx, __args) { return __fn.requireContext ? __fn(__ctx, ...__args) : __fn(...__args); })(globalThis.${exports.ZERO_COM_SERVER_REGISTRY}[${funcId}], ${ctx}, ${argsArray})`);
         modified = true;
     });
     return modified;
@@ -208,47 +211,42 @@ const transformSendCalls = (sourceFile) => {
     return modified;
 };
 exports.transformSendCalls = transformSendCalls;
+// Transform func(fn) calls to just fn.
+// The func() wrapper is only needed for type-level transformation (RemoveContextParam).
+// At runtime, we just need the raw function. The registration code (appendRegistryCode)
+// will set requireContext on the function based on compile-time analysis.
+const transformFuncCalls = (sourceFile) => {
+    let modified = false;
+    sourceFile.forEachDescendant((node) => {
+        if (node.getKind() !== ts_morph_1.SyntaxKind.CallExpression)
+            return;
+        const callExpr = node;
+        if (!(0, exports.isFromLibrary)(callExpr, exports.LIBRARY_NAME) || getCalleeName(callExpr) !== exports.SERVER_FUNCTION_WRAPPER_NAME)
+            return;
+        const args = callExpr.getArguments();
+        if (args.length !== 1)
+            return;
+        // Replace func(fn) with just fn
+        callExpr.replaceWithText(args[0].getText());
+        modified = true;
+    });
+    return modified;
+};
+exports.transformFuncCalls = transformFuncCalls;
 const appendRegistryCode = (sourceFile, fileRegistry) => {
+    // Generate registration code for each server function.
+    // We set requireContext based on compile-time analysis of the function's first parameter type.
+    // If the first param is context<T>, requireContext = true, otherwise false.
+    // This allows execFunc() at runtime to know whether to inject the context as the first argument.
     const registrations = Array.from(fileRegistry.values())
-        .map(info => `globalThis.${exports.ZERO_COM_SERVER_REGISTRY}['${info.funcId}'] = ${info.exportName}`)
-        .join(';\n');
+        .map(info => `globalThis.${exports.ZERO_COM_SERVER_REGISTRY}['${info.funcId}'] = ${info.exportName};\n` +
+        `${info.exportName}.requireContext = ${info.requireContext};`)
+        .join('\n');
     return `${sourceFile.getFullText()}
 if (!globalThis.${exports.ZERO_COM_SERVER_REGISTRY}) globalThis.${exports.ZERO_COM_SERVER_REGISTRY} = Object.create(null);
-${registrations};`;
+${registrations}`;
 };
 exports.appendRegistryCode = appendRegistryCode;
-// Helper to ensure a specific named import exists
-const ensureImport = (sourceFile, moduleSpecifier, namedImport) => {
-    const importDecls = sourceFile.getImportDeclarations().filter(d => d.getModuleSpecifierValue() === moduleSpecifier);
-    // 1. Look for an existing import declaration that already has named imports or is empty (not namespace/default only)
-    let targetDecl = importDecls.find(d => !d.getNamespaceImport() && !d.getDefaultImport());
-    if (!targetDecl) {
-        // Fallback: look for any declaration that has named imports (mixed with default is fine)
-        targetDecl = importDecls.find(d => d.getNamedImports().length > 0);
-    }
-    if (targetDecl) {
-        if (!targetDecl.getNamedImports().some(ni => ni.getName() === namedImport)) {
-            targetDecl.addNamedImport(namedImport);
-        }
-    }
-    else {
-        // 2. Check for default import where we can append named import
-        // Avoid namespace imports as we can't add named imports to `import * as ns`
-        const defaultImportDecl = importDecls.find(d => d.getDefaultImport() && !d.getNamespaceImport());
-        if (defaultImportDecl) {
-            if (!defaultImportDecl.getNamedImports().some(ni => ni.getName() === namedImport)) {
-                defaultImportDecl.addNamedImport(namedImport);
-            }
-        }
-        else {
-            // 3. Create new import declaration
-            sourceFile.addImportDeclaration({
-                moduleSpecifier,
-                namedImports: [namedImport]
-            });
-        }
-    }
-};
 const transformSourceFile = (filePath, content, registry) => {
     const project = (0, exports.createProject)();
     const sourceFile = project.createSourceFile(filePath, content, { overwrite: true });
@@ -262,10 +260,10 @@ const transformSourceFile = (filePath, content, registry) => {
     const callsTransformed = (0, exports.transformCallSites)(sourceFile, importedFuncs);
     const handleTransformed = (0, exports.transformHandleCalls)(sourceFile);
     const sendTransformed = (0, exports.transformSendCalls)(sourceFile);
-    if (handleTransformed) {
-        ensureImport(sourceFile, exports.LIBRARY_NAME, exports.EXEC_FUNC_NAME);
-    }
+    // Transform func() calls in files that define server functions.
+    // This strips the func() wrapper since it's only needed for types.
     if (isServerFunctionFile) {
+        (0, exports.transformFuncCalls)(sourceFile);
         return { content: (0, exports.appendRegistryCode)(sourceFile, fileRegistry), transformed: true };
     }
     if (callsTransformed || handleTransformed || sendTransformed) {

package/lib/runtime.d.ts

@@ -10,7 +10,6 @@ export type context<T = unknown> = T & {
 };
 type RemoveContextParam<F> = F extends (ctx: infer C, ...args: infer A) => infer R ? C extends context<unknown> ? (...args: A) => R : F : F;
 export declare function func<F extends (...args: any[]) => any>(fn: F): RemoveContextParam<F>;
-export declare const execFunc: (sfn: ReturnType<typeof func>, ctx: any, args: any[]) => ReturnType<typeof sfn>;
 export declare const handle: (_funcId: string, _ctx: any, _args: any[]) => any;
 export declare const call: (_fn: (funcId: string, args: any[]) => Promise<any>) => void;
 export {};

package/lib/runtime.js

@@ -1,24 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.call = exports.handle = exports.execFunc = void 0;
+exports.call = exports.handle = void 0;
 exports.func = func;
 // Implementation
-function func(fn) {
-    fn.requireContext = true;
-    return fn;
+// User-facing function - transformed by plugin to just the inner function.
+// The plugin also appends code to register the function and set requireContext based on
+// compile-time analysis of whether the first parameter is context<T>.
+function func(_fn) {
+    throw new Error('func() was not transformed. Ensure the zero-com plugin is configured.');
 }
-// Internal implementation - receives the actual function from registry
-const execFunc = (sfn, ctx, args) => {
-    const fn = sfn;
-    if (fn.requireContext) {
-        return fn(ctx, ...args);
-    }
-    else {
-        return fn(...args);
-    }
-};
-exports.execFunc = execFunc;
-// User-facing function - transformed by plugin to execFunc(globalThis.ZERO_COM_SERVER_REGISTRY[funcId], ctx, args)
+// User-facing function - transformed by plugin to inline code that checks requireContext and calls the function
 const handle = (_funcId, _ctx, _args) => {
     throw new Error('handle() was not transformed. Ensure the zero-com plugin is configured.');
 };

package/package.json

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