zero-com 0.0.5 → 0.0.7-s

package/index.d.ts

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

package/lib/common.d.ts

@@ -0,0 +1,10 @@
+export type Options = {
+    development?: boolean;
+    patterns: {
+        client: string;
+        server: string;
+    };
+};
+export declare const ZERO_COM_CLIENT_SEND = "ZERO_COM_CLIENT_SEND";
+export declare const ZERO_COM_SERVER_REGISTRY = "ZERO_COM_SERVER_REGISTRY";
+export declare const formatFuncIdName: (funcName: string, path: string, line: number) => string;

package/lib/index.d.ts

@@ -0,0 +1,11 @@
+declare global {
+    var ZERO_COM_SERVER_REGISTRY: {
+        [funcId: string]: (...args: any[]) => any;
+    };
+    var ZERO_COM_CLIENT_SEND: (...args: any[]) => Promise<any>;
+}
+export declare const serverFn: <Ctx, Rest extends any[], R>(sfn: (ctx: Ctx, ...rest: Rest) => R) => {
+    (...rest: Rest): R;
+    serverFn: (ctx: Ctx, ...rest: Rest) => R;
+};
+export declare const execServerFn: (sfn: ReturnType<typeof serverFn>, ctx: any, args: any[]) => ReturnType<typeof sfn>;

package/lib/rollup.d.ts

@@ -0,0 +1,3 @@
+import { Plugin } from 'rollup';
+import { Options } from './common';
+export declare function zeroComRollupPlugin(options: Options): Plugin;

package/lib/rollup.js

@@ -92,14 +92,29 @@ function zeroComRollupPlugin(options) {
                 });
                 sourceFile.getVariableDeclarations().forEach(decl => {
                     const initializer = decl.getInitializer();
-                    if (initializer && initializer instanceof ts_morph_1.ArrowFunction) {
-                        if (decl.isExported() && initializer.isAsync()) {
+                    if (!initializer || !decl.isExported())
+                        return;
+                    if (initializer instanceof ts_morph_1.ArrowFunction && initializer.isAsync()) {
+                        const funcName = decl.getName();
+                        const lineNumber = decl.getStartLineNumber();
+                        const funcParams = initializer.getParameters().map(p => p.getName()).join(', ');
+                        const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(process.cwd(), id), lineNumber);
+                        const newFunctionBody = `return window.${common_1.ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`;
+                        initializer.setBodyText(newFunctionBody);
+                    }
+                    else if (initializer.getKind() === typescript_1.default.SyntaxKind.CallExpression && initializer.getExpression().getText() === 'serverFn') {
+                        const call = initializer;
+                        const arg = call.getArguments()[0];
+                        if (arg && arg instanceof ts_morph_1.ArrowFunction) {
                             const funcName = decl.getName();
                             const lineNumber = decl.getStartLineNumber();
-                            const funcParams = initializer.getParameters().map(p => p.getName()).join(', ');
+                            const funcParams = arg.getParameters().map(p => p.getName()).join(', ');
                             const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(process.cwd(), id), lineNumber);
                             const newFunctionBody = `return window.${common_1.ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`;
-                            initializer.setBodyText(newFunctionBody);
+                            // Create a new arrow function string
+                            const newArrowFunc = `(${funcParams}) => { ${newFunctionBody} }`;
+                            // Replace the serverFn call with the new arrow function
+                            decl.setInitializer(newArrowFunc);
                         }
                     }
                 });
@@ -116,8 +131,10 @@ function zeroComRollupPlugin(options) {
                 });
                 sourceFile.getVariableDeclarations().forEach(decl => {
                     const initializer = decl.getInitializer();
-                    if (initializer && initializer instanceof ts_morph_1.ArrowFunction) {
-                        if (decl.isExported() && initializer.isAsync()) {
+                    if (initializer) {
+                        const isServerFn = initializer.getKind() === typescript_1.default.SyntaxKind.CallExpression && initializer.getExpression().getText() === 'serverFn';
+                        if ((initializer instanceof ts_morph_1.ArrowFunction && decl.isExported() && initializer.isAsync()) ||
+                            (isServerFn && decl.isExported())) {
                             const funcName = decl.getName();
                             const lineNumber = decl.getStartLineNumber();
                             const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(process.cwd(), id), lineNumber);

package/lib/webpack.d.ts

@@ -0,0 +1,15 @@
+import { Compiler } from 'webpack';
+import { Options } from './common';
+export type Message = {
+    funcId: string;
+    params: any[];
+    [key: string]: any;
+};
+export declare class ZeroComWebpackPlugin {
+    private options;
+    private compilationId;
+    private clientPattern;
+    private serverPattern;
+    constructor(options: Options);
+    apply(compiler: Compiler): void;
+}

package/lib/webpack.js

@@ -69,14 +69,31 @@ class ZeroComWebpackPlugin {
                     });
                     sourceFile.getVariableDeclarations().forEach(decl => {
                         const initializer = decl.getInitializer();
-                        if (initializer && initializer instanceof ts_morph_1.ArrowFunction) {
-                            if (decl.isExported() && initializer.isAsync()) {
+                        if (!initializer || !decl.isExported())
+                            return;
+                        if (initializer instanceof ts_morph_1.ArrowFunction && initializer.isAsync()) {
+                            const funcName = decl.getName();
+                            const lineNumber = decl.getStartLineNumber();
+                            const funcParams = initializer.getParameters().map(p => p.getName()).join(', ');
+                            const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(compiler.context, absolutePath), lineNumber);
+                            const newFunctionBody = `return window.${common_1.ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`;
+                            initializer.setBodyText(newFunctionBody);
+                            generatedFunctions.push(decl.getVariableStatementOrThrow().getText());
+                            console.log('client:', funcId);
+                        }
+                        else if (initializer.getKind() === typescript_1.default.SyntaxKind.CallExpression && initializer.getExpression().getText() === 'serverFn') {
+                            const call = initializer;
+                            const arg = call.getArguments()[0];
+                            if (arg && arg instanceof ts_morph_1.ArrowFunction) {
                                 const funcName = decl.getName();
                                 const lineNumber = decl.getStartLineNumber();
-                                const funcParams = initializer.getParameters().map(p => p.getName()).join(', ');
+                                const funcParams = arg.getParameters().map(p => p.getName()).join(', ');
                                 const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(compiler.context, absolutePath), lineNumber);
                                 const newFunctionBody = `return window.${common_1.ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`;
-                                initializer.setBodyText(newFunctionBody);
+                                // Create a new arrow function string
+                                const newArrowFunc = `(${funcParams}) => { ${newFunctionBody} }`;
+                                // Replace the serverFn call with the new arrow function
+                                decl.setInitializer(newArrowFunc);
                                 generatedFunctions.push(decl.getVariableStatementOrThrow().getText());
                                 console.log('client:', funcId);
                             }
@@ -97,8 +114,10 @@ class ZeroComWebpackPlugin {
                     });
                     sourceFile.getVariableDeclarations().forEach(decl => {
                         const initializer = decl.getInitializer();
-                        if (initializer && initializer instanceof ts_morph_1.ArrowFunction) {
-                            if (decl.isExported() && initializer.isAsync()) {
+                        if (initializer) {
+                            const isServerFn = initializer.getKind() === typescript_1.default.SyntaxKind.CallExpression && initializer.getExpression().getText() === 'serverFn';
+                            if ((initializer instanceof ts_morph_1.ArrowFunction && decl.isExported() && initializer.isAsync()) ||
+                                (isServerFn && decl.isExported())) {
                                 const funcName = decl.getName();
                                 const lineNumber = decl.getStartLineNumber();
                                 const funcId = (0, common_1.formatFuncIdName)(funcName, path_1.default.relative(compiler.context, absolutePath), lineNumber);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-com",
-  "version": "0.0.5",
+  "version": "0.0.7s",
   "main": "index.js",
   "repository": "https://github.com/yosbelms/zero-com",
   "keywords": [
@@ -12,8 +12,9 @@
     "client"
   ],
   "scripts": {
-    "build": "npx tsc",
-    "prepublishOnly": "npm run build"
+    "build": "npx tsc -d",
+    "clean": "find . -type f \\( -name \"*.js\" -o -name \"*.js.map\" -o -name \"*.d.ts\" -o -name \"*.d.ts.map\" \\) | grep -v \"./node_modules\" | xargs rm",
+    "prepublishOnly": "npm run clean && npm run build"
   },
   "author": "",
   "license": "MIT",

package/index.ts

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

package/lib/common.ts

@@ -1,14 +0,0 @@
-export type Options = {
-  development?: boolean,
-  patterns: {
-    client: string,
-    server: string,
-  }
-}
-
-export const ZERO_COM_CLIENT_SEND = 'ZERO_COM_CLIENT_SEND'
-export const ZERO_COM_SERVER_REGISTRY = 'ZERO_COM_SERVER_REGISTRY'
-
-export const formatFuncIdName = (funcName: string, path: string, line: number): string => {
-  return `${funcName}@${path}:${line}`
-}

package/lib/index.ts

@@ -1,19 +0,0 @@
-
-declare global {
-  var ZERO_COM_SERVER_REGISTRY: { [funcId: string]: (...args: any[]) => any }
-  var ZERO_COM_CLIENT_SEND: (...args: any[]) => Promise<any>
-}
-
-export const serverFn = <Ctx, Rest extends any[], R>(sfn: (ctx: Ctx, ...rest: Rest) => R) => {
-  const clonedSfn = (...rest: Rest): R => sfn(null as Ctx, ...rest)
-  clonedSfn.serverFn = sfn
-  return clonedSfn
-}
-
-export const execServerFn = (sfn: ReturnType<typeof serverFn>, ctx: any, args: any[]): ReturnType<typeof sfn> => {
-  if (sfn.serverFn) {
-    return sfn.serverFn.call(null, ctx, ...args)
-  } else {
-    return sfn.call(null, ...args)
-  }
-}

package/lib/rollup.ts

@@ -1,155 +0,0 @@
-import fs from 'fs'
-import { minimatch } from 'minimatch'
-import path from 'path'
-import { ArrowFunction, Project } from 'ts-morph'
-import ts from 'typescript'
-import {
-  Plugin,
-  PluginContext,
-  ResolveIdResult,
-  LoadResult,
-  NormalizedOutputOptions,
-  RenderedChunk
-} from 'rollup'
-import { Options, ZERO_COM_CLIENT_SEND, ZERO_COM_SERVER_REGISTRY, formatFuncIdName } from './common'
-
-export function zeroComRollupPlugin(options: Options): Plugin {
-  const { development = true, patterns } = options
-  const compilationId = String(Math.floor(Math.random() * 1000000))
-  const clientPattern = patterns.client
-  const serverPattern = patterns.server
-
-  const replacements = [
-    { target: ZERO_COM_CLIENT_SEND, replacement: `__ZERO_COM_CLIENT_SEND_${compilationId}` },
-    { target: ZERO_COM_SERVER_REGISTRY, replacement: `__ZERO_COM_SERVER_REGISTRY_${compilationId}` }
-  ]
-
-  return {
-    name: 'zero-com-rollup-plugin',
-
-    async resolveId(this: PluginContext, source: string, importer: string | undefined, options: { isEntry: boolean }): Promise<ResolveIdResult> {
-      if (!importer) return null
-
-      const resolveResult = await this.resolve(source, importer, { ...options, skipSelf: true })
-      if (!resolveResult) return null
-
-      const absolutePath = resolveResult.id
-      const isServerFile = minimatch(absolutePath, path.join(process.cwd(), serverPattern))
-      if (!isServerFile) return null
-
-      const requestedFromClient = minimatch(importer, path.join(process.cwd(), clientPattern))
-
-      const tsPath = absolutePath + '.ts'
-      const jsPath = absolutePath + '.js'
-      const mjsPath = absolutePath + '.mjs'
-      let resolvedPath = ''
-
-      if (fs.existsSync(tsPath)) {
-        resolvedPath = tsPath
-      } else if (fs.existsSync(jsPath)) {
-        resolvedPath = jsPath
-      } else if (fs.existsSync(mjsPath)) {
-        resolvedPath = mjsPath
-      } else {
-        return null
-      }
-
-      return {
-        id: resolvedPath,
-        meta: {
-          isClient: requestedFromClient,
-        }
-      }
-    },
-
-    load(this: PluginContext, id: string): LoadResult {
-      const meta = this.getModuleInfo(id)?.meta
-      if (meta === undefined || meta.isClient === undefined) return null
-
-      const originalContent = fs.readFileSync(id, 'utf8')
-      const project = new Project({
-        compilerOptions: {
-          target: ts.ScriptTarget.ES2017,
-          module: ts.ModuleKind.ESNext,
-        },
-      })
-
-      const sourceFile = project.createSourceFile(id, originalContent, { overwrite: true })
-
-      if (meta.isClient) {
-        sourceFile.getFunctions().forEach(func => {
-          if (func.isExported() && func.isAsync()) {
-            const funcName = String(func.getName())
-            const lineNumber = func.getStartLineNumber()
-            const funcParams = func.getParameters().map(p => p.getName()).join(', ')
-            const funcId = formatFuncIdName(funcName, path.relative(process.cwd(), id), lineNumber)
-            const newFunctionBody = `return window.${ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`
-            func.setBodyText(newFunctionBody)
-          }
-        })
-        sourceFile.getVariableDeclarations().forEach(decl => {
-          const initializer = decl.getInitializer()
-          if (initializer && initializer instanceof ArrowFunction) {
-            if (decl.isExported() && initializer.isAsync()) {
-              const funcName = decl.getName()
-              const lineNumber = decl.getStartLineNumber()
-              const funcParams = initializer.getParameters().map(p => p.getName()).join(', ')
-              const funcId = formatFuncIdName(funcName, path.relative(process.cwd(), id), lineNumber)
-              const newFunctionBody = `return window.${ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`
-              initializer.setBodyText(newFunctionBody)
-            }
-          }
-        })
-      } else {
-        const chunks: string[] = []
-        sourceFile.getFunctions().forEach(func => {
-          if (func.isExported() && func.isAsync()) {
-            const funcName = String(func.getName())
-            const lineNumber = func.getStartLineNumber()
-            const funcId = formatFuncIdName(funcName, path.relative(process.cwd(), id), lineNumber)
-            chunks.push(`global.${ZERO_COM_SERVER_REGISTRY}['${funcId}'] = ${funcName}`)
-          }
-        })
-        sourceFile.getVariableDeclarations().forEach(decl => {
-          const initializer = decl.getInitializer()
-          if (initializer && initializer instanceof ArrowFunction) {
-            if (decl.isExported() && initializer.isAsync()) {
-              const funcName = decl.getName()
-              const lineNumber = decl.getStartLineNumber()
-              const funcId = formatFuncIdName(funcName, path.relative(process.cwd(), id), lineNumber)
-              chunks.push(`global.${ZERO_COM_SERVER_REGISTRY}['${funcId}'] = ${funcName}`)
-            }
-          }
-        })
-
-        if (chunks.length > 0) {
-          const textToAdd = `\nif (!global.${ZERO_COM_SERVER_REGISTRY}) global.${ZERO_COM_SERVER_REGISTRY} = Object.create(null); ${chunks.join(',')}`
-          sourceFile.insertText(sourceFile.getEnd(), textToAdd);
-        }
-      }
-
-      const result = project.emitToMemory()
-      const newContent = result.getFiles()[0].text
-      return newContent
-    },
-
-    renderChunk(this: PluginContext, code: string, chunk: RenderedChunk, options: NormalizedOutputOptions) {
-      if (development) return null
-
-      let modified = false
-      let newCode = code
-      replacements.forEach(({ target, replacement }) => {
-        if (newCode.includes(target)) {
-          newCode = newCode.replaceAll(target, replacement)
-          modified = true
-        }
-      })
-
-      if (modified) {
-        return { code: newCode, map: null }
-      }
-
-      return null
-    }
-  }
-}

package/lib/webpack.ts

@@ -1,167 +0,0 @@
-import fs from 'fs'
-import { minimatch } from 'minimatch'
-import path from 'path'
-import { ArrowFunction, Project } from 'ts-morph'
-import ts from 'typescript'
-import { Compiler } from 'webpack'
-import { Options, ZERO_COM_CLIENT_SEND, ZERO_COM_SERVER_REGISTRY, formatFuncIdName } from './common'
-
-export type Message = {
-  funcId: string,
-  params: any[],
-  [key: string]: any
-}
-
-export class ZeroComWebpackPlugin {
-  private options: Options
-  private compilationId: string
-  private clientPattern: string
-  private serverPattern: string
-
-  constructor(options: Options) {
-    this.options = {
-      development: true,
-      ...options,
-      patterns: {
-        ...options.patterns
-      }
-    }
-    this.compilationId = String(Math.floor(Math.random() * 1000000))
-    this.clientPattern = this.options.patterns.client
-    this.serverPattern = this.options.patterns.server
-  }
-
-  apply(compiler: Compiler) {
-    const pluginName = ZeroComWebpackPlugin.name
-    const { webpack } = compiler
-    const { RawSource } = webpack.sources
-
-    compiler.hooks.normalModuleFactory.tap(pluginName, (nmf) => {
-      nmf.hooks.beforeResolve.tap(pluginName, (resolveData) => {
-        const absolutePath = path.resolve(resolveData.context, resolveData.request)
-        const isServerFile = minimatch(absolutePath, path.join(compiler.context, this.serverPattern))
-        if (!isServerFile) return
-
-        const requestedFromClient = minimatch(resolveData.contextInfo.issuer, path.join(compiler.context, this.clientPattern))
-
-        const tsPath = absolutePath + '.ts'
-        const jsPath = absolutePath + '.js'
-        const mjsPath = absolutePath + '.mjs'
-        let resolvedPath = ''
-
-        if (fs.existsSync(tsPath)) {
-          resolvedPath = tsPath
-        } else if (fs.existsSync(jsPath)) {
-          resolvedPath = jsPath
-        } else if (fs.existsSync(mjsPath)) {
-          resolvedPath = mjsPath
-        } else {
-          throw new Error('Unable to resolve: ' + absolutePath)
-        }
-
-        const originalContent = fs.readFileSync(resolvedPath, 'utf8')
-
-        const project = new Project({
-          compilerOptions: {
-            target: ts.ScriptTarget.ES2017,
-            module: ts.ModuleKind.ESNext,
-          },
-        })
-
-        const sourceFile = project.createSourceFile(absolutePath, originalContent, { overwrite: true })
-        let newModuleContent = ''
-
-        if (requestedFromClient) {
-          const generatedFunctions: string[] = []
-          sourceFile.getFunctions().forEach(func => {
-            if (func.isExported() && func.isAsync()) {
-              const funcName = String(func.getName())
-              const lineNumber = func.getStartLineNumber()
-              const funcParams = func.getParameters().map(p => p.getName()).join(', ')
-              const funcId = formatFuncIdName(funcName, path.relative(compiler.context, absolutePath), lineNumber)
-              const newFunctionBody = `return window.${ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`
-              func.setBodyText(newFunctionBody)
-              generatedFunctions.push(func.getText())
-              console.log('client:', funcId)
-            }
-          })
-          sourceFile.getVariableDeclarations().forEach(decl => {
-            const initializer = decl.getInitializer()
-            if (initializer && initializer instanceof ArrowFunction) {
-              if (decl.isExported() && initializer.isAsync()) {
-                const funcName = decl.getName()
-                const lineNumber = decl.getStartLineNumber()
-                const funcParams = initializer.getParameters().map(p => p.getName()).join(', ')
-                const funcId = formatFuncIdName(funcName, path.relative(compiler.context, absolutePath), lineNumber)
-                const newFunctionBody = `return window.${ZERO_COM_CLIENT_SEND}({funcId: '${funcId}', params: [${funcParams}]})`
-                initializer.setBodyText(newFunctionBody)
-                generatedFunctions.push(decl.getVariableStatementOrThrow().getText())
-                console.log('client:', funcId)
-              }
-            }
-          })
-          newModuleContent = generatedFunctions.join('\n\n')
-        } else {
-          const chunks: string[] = []
-          sourceFile.getFunctions().forEach(func => {
-            if (func.isExported() && func.isAsync()) {
-              const funcName = String(func.getName())
-              const lineNumber = func.getStartLineNumber()
-              const funcId = formatFuncIdName(funcName, path.relative(compiler.context, absolutePath), lineNumber)
-              chunks.push(`global.${ZERO_COM_SERVER_REGISTRY}['${funcId}'] = ${funcName}`)
-              console.log('server:', funcId)
-            }
-          })
-          sourceFile.getVariableDeclarations().forEach(decl => {
-            const initializer = decl.getInitializer()
-            if (initializer && initializer instanceof ArrowFunction) {
-              if (decl.isExported() && initializer.isAsync()) {
-                const funcName = decl.getName()
-                const lineNumber = decl.getStartLineNumber()
-                const funcId = formatFuncIdName(funcName, path.relative(compiler.context, absolutePath), lineNumber)
-                chunks.push(`global.${ZERO_COM_SERVER_REGISTRY}['${funcId}'] = ${funcName}`)
-                console.log('server:', funcId)
-              }
-            }
-          })
-          newModuleContent = `${originalContent} if (!global.${ZERO_COM_SERVER_REGISTRY}) global.${ZERO_COM_SERVER_REGISTRY} = Object.create(null); ${chunks.join(',')}`
-        }
-
-        project.createSourceFile(absolutePath + '.ts', newModuleContent, { overwrite: true })
-        const result = project.emitToMemory()
-        const newContent = result.getFiles()[0].text
-        const inlineLoader = `data:text/javascript,${encodeURIComponent(newContent)}`
-        resolveData.request = inlineLoader
-      })
-    })
-
-    if (this.options.development) return
-
-    const replacements = [
-      { target: ZERO_COM_CLIENT_SEND, replacement: `__ZERO_COM_CLIENT_SEND_${this.compilationId}` },
-      { target: ZERO_COM_SERVER_REGISTRY, replacement: `__ZERO_COM_SERVER_REGISTRY_${this.compilationId}` }
-    ]
-
-    compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-      compilation.hooks.processAssets.tap({ name: pluginName, stage: webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_INLINE }, (assets) => {
-        for (const assetName in assets) {
-          if (assetName.endsWith('.js')) {
-            let assetSource = String(assets[assetName].source())
-            let modified = false
-            replacements.forEach(({ target, replacement }) => {
-              if (assetSource.includes(target)) {
-                assetSource = assetSource.replaceAll(target, replacement)
-                modified = true
-              }
-            })
-            if (modified) {
-              compilation.updateAsset(assetName, new RawSource(assetSource))
-            }
-          }
-        }
-
-      })
-    })
-
-  }
-}