zero-com 1.0.0 → 1.3.0

package/README.md

@@ -72,30 +72,15 @@ import { getPhones } '../server/phones'
 
 Zero-com does not define any transport layer, it is up to you to create one or reuse your own. This means you have complete control over how data is sent between the client and server.
 
-### Communication Flow
-
-The following diagram illustrates the communication flow between the client and server:
-
-```
-+--------+      +----------------------------------+      +-------------+
-| Client |----->| globalThis.ZERO_COM_CLIENT_SEND  |----->| Your Server |
-+--------+      +----------------------------------+      +-------------+
-                                                                |
-                                                                v
-+--------+      +-------------------------+      +--------------------------------------+
-| Client |<-----| (Your custom transport) |<-----| globalThis.ZERO_COM_SERVER_REGISTRY  |
-+--------+      +-------------------------+      +--------------------------------------+
-```
-
 ### Client-side
 
-All messages from the client-side will be sent using the transport function you define. Import `send` from `zero-com` and pass your transport function.
+All messages from the client-side will be sent using the transport function you define. Import `call` from `zero-com` and pass your transport function.
 
 ```javascript
 // client/transport.js
-import { send } from 'zero-com';
+import { call } from 'zero-com';
 
-send(async (funcId, params) => {
+call(async (funcId, params) => {
   const response = await fetch('http://localhost:8000/api', {
     method: 'POST',
     headers: {
@@ -152,7 +137,7 @@ To pass context to a server function, you need to wrap the function in `func` an
 import { func, context } from 'zero-com';
 
 type MyContext = {
-    request: any
+  request: any
 }
 
 export const getPhones = func(async (ctx: context<MyContext>, name: string) => {
@@ -219,9 +204,9 @@ main();
 
 ```typescript
 // src/client/transport.ts
-import { send } from 'zero-com';
+import { call } from 'zero-com';
 
-send(async (funcId, params) => {
+call(async (funcId, params) => {
   const response = await fetch('http://localhost:8000/api', {
     method: 'POST',
     headers: {
@@ -240,8 +225,8 @@ send(async (funcId, params) => {
 import { func, context } from 'zero-com';
 
 type Context = {
-    req: any,
-    res: any
+  req: any,
+  res: any
 }
 
 export const getPhones = func(async (ctx: context<Context>, name: string) => {

package/lib/common.d.ts

@@ -9,11 +9,11 @@ export type ServerFuncInfo = {
     requireContext: boolean;
 };
 export type ServerFuncRegistry = Map<string, Map<string, ServerFuncInfo>>;
-export declare const ZERO_COM_CLIENT_SEND = "ZERO_COM_CLIENT_SEND";
+export declare const ZERO_COM_CLIENT_CALL = "ZERO_COM_CLIENT_CALL";
 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 SEND_NAME = "send";
+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";

package/lib/common.js

@@ -3,16 +3,16 @@ 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.SEND_NAME = exports.HANDLE_NAME = exports.SERVER_FUNCTION_WRAPPER_NAME = exports.ZERO_COM_SERVER_REGISTRY = exports.ZERO_COM_CLIENT_SEND = void 0;
+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;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const ts_morph_1 = require("ts-morph");
 // Constants
-exports.ZERO_COM_CLIENT_SEND = 'ZERO_COM_CLIENT_SEND';
+exports.ZERO_COM_CLIENT_CALL = 'ZERO_COM_CLIENT_CALL';
 exports.ZERO_COM_SERVER_REGISTRY = 'ZERO_COM_SERVER_REGISTRY';
 exports.SERVER_FUNCTION_WRAPPER_NAME = 'func';
 exports.HANDLE_NAME = 'handle';
-exports.SEND_NAME = 'send';
+exports.CALL_NAME = 'call';
 exports.EXEC_FUNC_NAME = 'execFunc';
 exports.CONTEXT_TYPE_NAME = 'context';
 exports.LIBRARY_NAME = 'zero-com';
@@ -24,7 +24,7 @@ exports.formatFuncIdName = formatFuncIdName;
 const generateCompilationId = () => String(Math.floor(Math.random() * 1000000));
 exports.generateCompilationId = generateCompilationId;
 const getReplacements = (compilationId) => [
-    { target: exports.ZERO_COM_CLIENT_SEND, replacement: `__ZERO_COM_CLIENT_SEND_${compilationId}` },
+    { target: exports.ZERO_COM_CLIENT_CALL, replacement: `__ZERO_COM_CLIENT_CALL_${compilationId}` },
     { target: exports.ZERO_COM_SERVER_REGISTRY, replacement: `__ZERO_COM_SERVER_REGISTRY_${compilationId}` }
 ];
 exports.getReplacements = getReplacements;
@@ -168,7 +168,7 @@ const transformCallSites = (sourceFile, importedFuncs) => {
         if (!funcInfo)
             return;
         const args = callExpr.getArguments().map(a => a.getText()).join(', ');
-        callExpr.replaceWithText(`globalThis.${exports.ZERO_COM_CLIENT_SEND}('${funcInfo.funcId}', [${args}])`);
+        callExpr.replaceWithText(`globalThis.${exports.ZERO_COM_CLIENT_CALL}('${funcInfo.funcId}', [${args}])`);
         modified = true;
     });
     return modified;
@@ -197,12 +197,12 @@ const transformSendCalls = (sourceFile) => {
         if (node.getKind() !== ts_morph_1.SyntaxKind.CallExpression)
             return;
         const callExpr = node;
-        if (!(0, exports.isFromLibrary)(callExpr, exports.LIBRARY_NAME) || getCalleeName(callExpr) !== exports.SEND_NAME)
+        if (!(0, exports.isFromLibrary)(callExpr, exports.LIBRARY_NAME) || getCalleeName(callExpr) !== exports.CALL_NAME)
             return;
         const args = callExpr.getArguments();
         if (args.length < 1)
             return;
-        callExpr.replaceWithText(`globalThis.${exports.ZERO_COM_CLIENT_SEND} = ${args[0].getText()}`);
+        callExpr.replaceWithText(`globalThis.${exports.ZERO_COM_CLIENT_CALL} = ${args[0].getText()}`);
         modified = true;
     });
     return modified;

package/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './runtime';

package/{index.js → lib/index.js}

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./lib/runtime"), exports);
+__exportStar(require("./runtime"), exports);

package/lib/runtime.d.ts

@@ -2,7 +2,7 @@ declare global {
     var ZERO_COM_SERVER_REGISTRY: {
         [funcId: string]: (...args: any[]) => any;
     };
-    var ZERO_COM_CLIENT_SEND: (funcId: string, args: any[]) => Promise<any>;
+    var ZERO_COM_CLIENT_CALL: (funcId: string, args: any[]) => Promise<any>;
 }
 declare const contextBrand: unique symbol;
 export type context<T = unknown> = T & {
@@ -12,5 +12,5 @@ type RemoveContextParam<F> = F extends (ctx: infer C, ...args: infer A) => infer
 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 send: (_fn: (funcId: string, args: any[]) => Promise<any>) => void;
+export declare const call: (_fn: (funcId: string, args: any[]) => Promise<any>) => void;
 export {};

package/lib/runtime.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.send = exports.handle = exports.execFunc = void 0;
+exports.call = exports.handle = exports.execFunc = void 0;
 exports.func = func;
 // Implementation
 function func(fn) {
@@ -23,8 +23,8 @@ const handle = (_funcId, _ctx, _args) => {
     throw new Error('handle() was not transformed. Ensure the zero-com plugin is configured.');
 };
 exports.handle = handle;
-// User-facing function - transformed by plugin to globalThis.ZERO_COM_CLIENT_SEND = fn
-const send = (_fn) => {
-    throw new Error('send() was not transformed. Ensure the zero-com plugin is configured.');
+// User-facing function - transformed by plugin to globalThis.ZERO_COM_CLIENT_CALL = fn
+const call = (_fn) => {
+    throw new Error('call() was not transformed. Ensure the zero-com plugin is configured.');
 };
-exports.send = send;
+exports.call = call;

package/lib/webpack-loader.d.ts

@@ -0,0 +1,6 @@
+import type { LoaderContext } from 'webpack';
+import { ServerFuncRegistry } from './common';
+export interface ZeroComLoaderOptions {
+    registry: ServerFuncRegistry;
+}
+export default function zeroComLoader(this: LoaderContext<ZeroComLoaderOptions>, source: string): string;

package/lib/webpack-loader.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = zeroComLoader;
+const common_1 = require("./common");
+function zeroComLoader(source) {
+    const options = this.getOptions();
+    const filePath = this.resourcePath;
+    const result = (0, common_1.transformSourceFile)(filePath, source, options.registry);
+    if (!result.transformed) {
+        return source;
+    }
+    const jsContent = (0, common_1.emitToJs)(filePath, result.content);
+    console.log(`[ZeroComWebpackPlugin] Transformed: ${filePath}`);
+    return jsContent;
+}

package/lib/webpack.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZeroComWebpackPlugin = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const common_1 = require("./common");
 class ZeroComWebpackPlugin {
     constructor(options = {}) {
@@ -21,23 +16,18 @@ class ZeroComWebpackPlugin {
             (0, common_1.buildRegistry)(compiler.context, this.registry);
             console.log(`[ZeroComWebpackPlugin] Found ${this.registry.size} files with server functions`);
         });
-        // Transform files during module resolution
-        compiler.hooks.normalModuleFactory.tap(pluginName, (nmf) => {
-            nmf.hooks.beforeResolve.tap(pluginName, (resolveData) => {
-                if (!resolveData.request.startsWith('.') && !resolveData.request.startsWith('/'))
-                    return;
-                const resolvedPath = (0, common_1.resolveFilePath)(path_1.default.resolve(resolveData.context, resolveData.request));
-                if (!resolvedPath || !fs_1.default.existsSync(resolvedPath))
-                    return;
-                const content = fs_1.default.readFileSync(resolvedPath, 'utf8');
-                const result = (0, common_1.transformSourceFile)(resolvedPath, content, this.registry);
-                if (!result.transformed)
-                    return;
-                const jsContent = (0, common_1.emitToJs)(resolvedPath, result.content);
-                resolveData.request = `data:text/javascript,${encodeURIComponent(jsContent)}`;
-                console.log(`[ZeroComWebpackPlugin] Transformed: ${path_1.default.relative(compiler.context, resolvedPath)}`);
-            });
-        });
+        // Add loader rule for TypeScript/JavaScript files
+        const loaderPath = require.resolve('./webpack-loader');
+        const loaderRule = {
+            test: new RegExp(`\\.(${common_1.FILE_EXTENSIONS.slice(1).map(e => e.slice(1)).join('|')})$`),
+            exclude: /node_modules/,
+            enforce: 'pre',
+            use: [{
+                    loader: loaderPath,
+                    options: { registry: this.registry }
+                }]
+        };
+        compiler.options.module.rules.unshift(loaderRule);
         // Production: minify global names
         if (this.options.development)
             return;

package/package.json

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

package/tsconfig.json

@@ -105,7 +105,7 @@
     "skipLibCheck": true, /* Skip type checking all .d.ts files. */
     "paths": {
       "zero-com": [
-        "./index.ts"
+        "./lib/index.ts"
       ]
     }
   }

package/index.d.ts

@@ -1 +0,0 @@
-export * from './lib/runtime';