@seam-rpc/server 4.0.0 → 4.1.0

package/dist/bin/gen-client.d.ts

@@ -0,0 +1,8 @@
+export declare function genClient(): Promise<void>;
+interface GenerateOptions {
+    tsPath: string;
+    jsPath: string;
+    outputPath: string;
+}
+export declare function generateClientFile({ tsPath, jsPath, outputPath, }: GenerateOptions): Promise<string>;
+export {};

package/dist/bin/gen-client.js

@@ -2,192 +2,153 @@ import fs from "fs";
 import path from "path";
 import fg from "fast-glob";
 import ts from "typescript";
-import * as z from "zod";
 import { zodToTs, createAuxiliaryTypeStore, printNode } from "zod-to-ts";
 import { existsSync, writeFileSync } from "fs";
 export async function genClient() {
     const args = process.argv;
-    let config;
+    const config = loadConfig(args);
+    if (!config)
+        return;
+    const sourceFiles = await fg(config.source);
+    const compiledFolder = path.resolve(config.compiledFolder);
+    const outputPath = path.resolve(config.outputFolder);
+    const rootPath = path.resolve(".");
+    function removeRootPath(path) {
+        return "." + path.slice(rootPath.length);
+    }
+    try {
+        const outputFiles = [];
+        for (let i = 0; i < sourceFiles.length; i++) {
+            const sourceFile = sourceFiles[i];
+            const path = await generateClientFile({ tsPath: sourceFile, jsPath: compiledFolder, outputPath });
+            const symb = i < sourceFiles.length - 1 ? " ├╴" : " └╴";
+            outputFiles.push(symb + removeRootPath(path));
+        }
+        console.log("\x1b[32m\x1b[1m%s\x1b[0m\n\x1b[94m%s\x1b[0m", `✅ Successfully generated client files at ${config.outputFolder}`, `${outputFiles.join("\n")}`);
+    }
+    catch (err) {
+        console.error("❌ Failed to generate client file:", err.message);
+        process.exit(1);
+    }
+}
+function loadConfig(args) {
     if (args.length == 3) {
         // Use config
         // Check if config exists
-        if (!fs.existsSync("./seam-rpc.config.json"))
-            return console.error("\x1b[31mCommand arguments omitted and no config file found.\x1b[0m\n"
+        if (!fs.existsSync("./seam-rpc.config.json")) {
+            console.error("\x1b[31mCommand arguments omitted and no config file found.\x1b[0m\n"
                 + "Either define a config file with \x1b[36mseam-rpc gen-config\x1b[0m or generate the client files using \x1b[36mseam-rpc gen-client <input-files> <output-folder> [global-types-file]\x1b[0m.");
+            return null;
+        }
         // Load config from config file
-        config = JSON.parse(fs.readFileSync("./seam-rpc.config.json", "utf-8"));
+        return JSON.parse(fs.readFileSync("./seam-rpc.config.json", "utf-8"));
     }
     else if (args.length == 5 || args.length == 6) {
         // Use command args
         // Load config from command args
-        config = {
-            inputFiles: args[3],
-            outputFolder: args[4]
+        return {
+            source: args[3],
+            compiledFolder: args[4],
+            outputFolder: args[5]
         };
     }
     else {
         // Invalid command usage
-        return console.error("Usage: seam-rpc gen-client <input-files> <output-folder>");
+        console.error("Usage: seam-rpc gen-client <input-files> <output-folder>");
+        return null;
     }
-    const inputFiles = await fg(config.inputFiles);
-    const outputPath = path.resolve(config.outputFolder);
-    const rootPath = path.resolve(".");
-    try {
-        const outputFiles = [];
-        for (const inputFile of inputFiles) {
-            // console.log(getProcedureInfo(inputFile));
-            const outputFile = await generateClientFile(inputFile, outputPath);
-            outputFiles.push(removeRootPath(outputFile, rootPath));
+}
+// Extracts comments from TS file.
+function getProcedureComments(filePath) {
+    const sourceText = fs.readFileSync(filePath, "utf8");
+    const sourceFile = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
+    const comments = {};
+    function visit(node) {
+        if (ts.isVariableStatement(node)) {
+            const comment = getFullComment(node, sourceText);
+            for (const decl of node.declarationList.declarations) {
+                if (ts.isIdentifier(decl.name))
+                    comments[decl.name.text] = comment;
+            }
         }
-        console.log("\x1b[32m%s\x1b[0m\n\x1b[36m%s\x1b[0m", `✅ Successfully generated client files at ${removeRootPath(outputPath, rootPath)}`, `${outputFiles.join("\n")}`);
+        ts.forEachChild(node, visit);
     }
-    catch (err) {
-        console.error("❌ Failed to generate client file:", err.message);
-        process.exit(1);
+    visit(sourceFile);
+    return comments;
+}
+function getFullComment(node, sourceText) {
+    const ranges = ts.getLeadingCommentRanges(sourceText, node.pos);
+    if (!ranges)
+        return "";
+    for (const range of ranges) {
+        const comment = sourceText.slice(range.pos, range.end);
+        // Only keep JSDoc-style comments
+        if (comment.startsWith("/**")) {
+            return comment;
+        }
     }
+    return "";
 }
-// interface ProcedureInfo {
-//     name: string;
-//     inputType: string;
-//     outputType: string;
-//     comments: string;
-// }
-// export function getProcedureInfo(filePath: string): ProcedureInfo[] {
-//     const fullPath = path.resolve(filePath);
-//     const sourceText = fs.readFileSync(fullPath, "utf8");
-//     const sourceFile = ts.createSourceFile(
-//         fullPath,
-//         sourceText,
-//         ts.ScriptTarget.Latest,
-//         true,
-//         ts.ScriptKind.TS
-//     );
-//     const procedures: ProcedureInfo[] = [];
-//     function visit(node: ts.Node) {
-//         // Look for const assignments
-//         if (ts.isVariableStatement(node)) {
-//             node.declarationList.declarations.forEach((decl) => {
-//                 if (ts.isIdentifier(decl.name) && decl.initializer) {
-//                     let varName = decl.name.text;
-//                     let inputType = "";
-//                     let outputType = "";
-//                     let comments = "";
-//                     const jsDocs = ts.getJSDocCommentsAndTags(node); // node = VariableStatement
-//                     // Get JSDoc comments
-//                     if (jsDocs.length > 0) {
-//                         comments = jsDocs.map(doc => doc.getText()).join("\n");
-//                     }
-//                     // Check for chain calls: .input(...).output(...)
-//                     if (ts.isCallExpression(decl.initializer) || ts.isPropertyAccessExpression(decl.initializer)) {
-//                         function extractChain(expr: ts.Expression) {
-//                             if (ts.isCallExpression(expr)) {
-//                                 if (ts.isPropertyAccessExpression(expr.expression)) {
-//                                     const propName = expr.expression.name.text;
-//                                     if (propName === "input" && expr.arguments.length > 0) {
-//                                         inputType = expr.arguments[0].getText();
-//                                     } else if (propName === "output" && expr.arguments.length > 0) {
-//                                         outputType = expr.arguments[0].getText();
-//                                     }
-//                                     extractChain(expr.expression.expression);
-//                                 }
-//                             } else if (ts.isPropertyAccessExpression(expr)) {
-//                                 extractChain(expr.expression);
-//                             }
-//                         }
-//                         extractChain(decl.initializer);
-//                     }
-//                     if (inputType || outputType || comments) {
-//                         procedures.push({ name: varName, inputType, outputType, comments });
-//                     }
-//                 }
-//             });
-//         }
-//         ts.forEachChild(node, visit);
-//     }
-//     visit(sourceFile);
-//     return procedures;
-// }
-function removeRootPath(path, rootPath) {
-    return "." + path.slice(rootPath.length);
+function convert(schema) {
+    const store = createAuxiliaryTypeStore();
+    const { node } = zodToTs(schema, { auxiliaryTypeStore: store });
+    return printNode(node);
 }
-async function generateClientFile(sourcePath, outputPath) {
-    const sourceFile = path.resolve(process.cwd(), sourcePath);
-    if (!existsSync(sourceFile)) {
-        console.error(`File ${sourceFile} not found`);
-        process.exit(1);
+export async function generateClientFile({ tsPath, jsPath, outputPath, }) {
+    const tsFile = path.resolve(process.cwd(), tsPath);
+    const tsFileName = path.basename(tsFile).slice(0, -path.extname(tsFile).length);
+    const jsFile = path.resolve(process.cwd(), path.join(jsPath, tsFileName + ".js"));
+    if (!existsSync(tsFile)) {
+        throw new Error(`TS file not found: ${tsFile}`);
     }
-    const module = await import("file://" + sourceFile);
-    const procedures = module.default;
-    const routerName = path.basename(sourceFile, path.extname(sourceFile));
-    let fileContent = `/* Auto-generated by SeamRPC - DO NOT EDIT */
+    if (!existsSync(jsFile)) {
+        throw new Error(`JS file not found: ${jsFile}`);
+    }
+    const mod = await import("file://" + jsFile);
+    const procedures = mod.default;
+    const routerName = path.basename(jsFile, path.extname(jsFile));
+    const comments = getProcedureComments(tsFile);
+    let output = `/**
+ * +===================================+
+ * |  File auto-generated by SeamRPC.  |
+ * |        --- DO NOT EDIT ---        |
+ * +===================================+
+ */
 
-import { callApi } from \"@seam-rpc/client\";
+import { callApi } from "@seam-rpc/client";
 
 `;
-    // Parse the source file using TypeScript API
-    const program = ts.createProgram([sourceFile], {});
-    const tsFile = program.getSourceFile(sourceFile);
-    // Helper to get JSDoc comment for a variable
-    function getJsDocComment(node) {
-        const jsDocs = node.jsDoc;
-        if (!jsDocs || jsDocs.length === 0)
-            return "";
-        return jsDocs.map(doc => doc.comment).filter(Boolean).join("\n");
-    }
     const functions = [];
-    for (const [procName, proc] of Object.entries(procedures)) {
+    for (const [name, proc] of Object.entries(procedures)) {
         // Input
-        const input = [];
+        let inputType = "void";
+        let hasInput = false;
         if (proc._def.input) {
-            for (const [paramName, param] of Object.entries(proc._def.input)) {
-                input.push(`${paramName}${param instanceof z.ZodOptional ? "?" : ""}: ${convert(param)}`);
+            const fields = [];
+            for (const [key, schema] of Object.entries(proc._def.input)) {
+                const isOptional = schema.isOptional?.() ?? false;
+                const tsType = convert(schema);
+                fields.push(`${key}${isOptional ? "?" : ""}: ${tsType}`);
+            }
+            if (fields.length > 0) {
+                inputType = `{ ${fields.join("; ")} }`;
+                hasInput = true;
             }
         }
-        // Output
         const returnType = proc._def.output ? convert(proc._def.output) : "void";
-        // Input
-        const hasInput = input.length != 0;
-        const params = hasInput ? `input: { ${input.join(", ")} }` : "";
-        // Function body
-        const body = `return callApi("${routerName}", "${procName}"${hasInput ? ", input" : ""});`;
-        // Comments
-        let comments = "";
-        ts.forEachChild(tsFile, node => {
-            if (ts.isVariableStatement(node)) {
-                node.declarationList.declarations.forEach(decl => {
-                    console.log(decl.name.getText(), procName);
-                    if (decl.name.getText() === procName) {
-                        const doc = getJsDocComment(decl);
-                        if (doc)
-                            comments = `/** ${doc} */\n`;
-                    }
-                });
-            }
-        });
-        const func = `${comments}export function ${procName}(${params}): Promise<${returnType}> { ${body} }`;
+        const params = hasInput ? `input: ${inputType}` : "";
+        const args = [`"${routerName}"`, `"${name}"`];
+        if (hasInput)
+            args.push("input");
+        const call = `callApi(${args.join(", ")})`;
+        const comment = comments[name] ? comments[name] + "\n" : "";
+        const func = `${comment}export function ${name}(${params}): Promise<${returnType}> {
+    return ${call};
+}`;
         functions.push(func);
     }
-    fileContent += functions.join("\n\n");
-    writeFileSync(`${outputPath}/${routerName}.ts`, fileContent, "utf-8");
-    return sourceFile;
-}
-function convert(schema) {
-    const auxiliaryTypeStore = createAuxiliaryTypeStore();
-    const { node } = zodToTs(schema, { auxiliaryTypeStore });
-    return printNode(node);
+    output += functions.join("\n\n");
+    const outFile = path.join(outputPath, `${routerName}.ts`);
+    writeFileSync(outFile, output, "utf-8");
+    return outFile;
 }
-// function zodToTs(schema: z.ZodType): { value: string, definition?: string } {
-//     if (schema instanceof z.ZodString) {
-//         return { value: "string" };
-//     }
-//     if (schema instanceof z.ZodNumber) {
-//         return { value: "number" };
-//     }
-//     if (schema instanceof z.ZodArray) {
-//         return { value: zodToTs(schema.def.type) + "[]" };
-//     }
-//     if (schema instanceof z.ZodOptional) {
-//         return {value: };
-//     }
-//     return { value: "any" };
-// }

package/dist/bin/gen-config.d.ts

@@ -0,0 +1 @@
+export declare function genConfig(): Promise<void>;

package/dist/bin/gen-config.js

@@ -2,10 +2,11 @@ import fs from "fs";
 import readline from "readline";
 export async function genConfig() {
     const args = process.argv;
-    let inputFiles = "./src/api/*";
+    let source = "./src/api/*";
+    let compiledFolder = "./dist/api";
     let outputFolder = "../client/src/api";
     if (args.length == 5) {
-        inputFiles = args[3];
+        source = args[3];
         outputFolder = args[4];
     }
     else if (args.length > 3) {
@@ -30,7 +31,8 @@ export async function genConfig() {
     }
     function generateConfig() {
         const config = {
-            inputFiles,
+            source,
+            compiledFolder,
             outputFolder
         };
         try {

package/dist/bin/generate.d.ts

@@ -0,0 +1,8 @@
+export declare function generateClient(): Promise<void>;
+interface GenerateOptions {
+    tsPath: string;
+    jsPath: string;
+    outputPath: string;
+}
+export declare function generateClientFile({ tsPath, jsPath, outputPath, }: GenerateOptions): Promise<string>;
+export {};

package/dist/bin/generate.js

@@ -0,0 +1,135 @@
+import fs from "fs";
+import path from "path";
+import fg from "fast-glob";
+import ts from "typescript";
+import { zodToTs, createAuxiliaryTypeStore, printNode } from "zod-to-ts";
+import { existsSync, writeFileSync } from "fs";
+export async function generateClient() {
+    const config = loadConfig();
+    if (!config)
+        return;
+    const sourceFiles = await fg(config.source);
+    const compiledFolder = path.resolve(config.compiledFolder);
+    const outputPath = path.resolve(config.outputFolder);
+    const rootPath = path.resolve(".");
+    function removeRootPath(path) {
+        return "." + path.slice(rootPath.length);
+    }
+    try {
+        const outputFiles = [];
+        for (let i = 0; i < sourceFiles.length; i++) {
+            const sourceFile = sourceFiles[i];
+            const path = await generateClientFile({ tsPath: sourceFile, jsPath: compiledFolder, outputPath });
+            const symb = i < sourceFiles.length - 1 ? " ├╴" : " └╴";
+            outputFiles.push(symb + removeRootPath(path));
+        }
+        console.log("\x1b[32m\x1b[1m%s\x1b[0m\n\x1b[94m%s\x1b[0m", `✅ Successfully generated client files at ${config.outputFolder}`, `${outputFiles.join("\n")}`);
+    }
+    catch (err) {
+        console.error("❌ Failed to generate client file:", err.message);
+        process.exit(1);
+    }
+}
+function loadConfig() {
+    // Check if config exists
+    if (!fs.existsSync("./seam-rpc.config.json")) {
+        console.error("\x1b[31mNo config file found.\x1b[0m\n Create a config file with \x1b[36msrpc init\x1b[0m.");
+        return null;
+    }
+    // Load config from config file
+    return JSON.parse(fs.readFileSync("./seam-rpc.config.json", "utf-8"));
+}
+// Extracts comments from TS file.
+function getProcedureComments(filePath) {
+    const sourceText = fs.readFileSync(filePath, "utf8");
+    const sourceFile = ts.createSourceFile(filePath, sourceText, ts.ScriptTarget.Latest, true);
+    const comments = {};
+    function visit(node) {
+        if (ts.isVariableStatement(node)) {
+            const comment = getFullComment(node, sourceText);
+            for (const decl of node.declarationList.declarations) {
+                if (ts.isIdentifier(decl.name))
+                    comments[decl.name.text] = comment;
+            }
+        }
+        ts.forEachChild(node, visit);
+    }
+    visit(sourceFile);
+    return comments;
+}
+function getFullComment(node, sourceText) {
+    const ranges = ts.getLeadingCommentRanges(sourceText, node.pos);
+    if (!ranges)
+        return "";
+    for (const range of ranges) {
+        const comment = sourceText.slice(range.pos, range.end);
+        // Only keep JSDoc-style comments
+        if (comment.startsWith("/**")) {
+            return comment;
+        }
+    }
+    return "";
+}
+function convert(schema) {
+    const store = createAuxiliaryTypeStore();
+    const { node } = zodToTs(schema, { auxiliaryTypeStore: store });
+    return printNode(node);
+}
+export async function generateClientFile({ tsPath, jsPath, outputPath, }) {
+    const tsFile = path.resolve(process.cwd(), tsPath);
+    const tsFileName = path.basename(tsFile).slice(0, -path.extname(tsFile).length);
+    const jsFile = path.resolve(process.cwd(), path.join(jsPath, tsFileName + ".js"));
+    if (!existsSync(tsFile)) {
+        throw new Error(`TS file not found: ${tsFile}`);
+    }
+    if (!existsSync(jsFile)) {
+        throw new Error(`JS file not found: ${jsFile}`);
+    }
+    const mod = await import("file://" + jsFile);
+    const procedures = mod.default;
+    const routerName = path.basename(jsFile, path.extname(jsFile));
+    const comments = getProcedureComments(tsFile);
+    let output = `/**
+ * +===================================+
+ * |  File auto-generated by SeamRPC.  |
+ * |        --- DO NOT EDIT ---        |
+ * +===================================+
+ */
+
+import { callApi } from "@seam-rpc/client";
+
+`;
+    const functions = [];
+    for (const [name, proc] of Object.entries(procedures)) {
+        // Input
+        let inputType = "void";
+        let hasInput = false;
+        if (proc._def.input) {
+            const fields = [];
+            for (const [key, schema] of Object.entries(proc._def.input)) {
+                const isOptional = schema.isOptional?.() ?? false;
+                const tsType = convert(schema);
+                fields.push(`${key}${isOptional ? "?" : ""}: ${tsType}`);
+            }
+            if (fields.length > 0) {
+                inputType = `{ ${fields.join("; ")} }`;
+                hasInput = true;
+            }
+        }
+        const returnType = proc._def.output ? convert(proc._def.output) : "void";
+        const params = hasInput ? `input: ${inputType}` : "";
+        const args = [`"${routerName}"`, `"${name}"`];
+        if (hasInput)
+            args.push("input");
+        const call = `callApi(${args.join(", ")})`;
+        const comment = comments[name] ? comments[name] + "\n" : "";
+        const func = `${comment}export function ${name}(${params}): Promise<${returnType}> {
+    return ${call};
+}`;
+        functions.push(func);
+    }
+    output += functions.join("\n\n");
+    const outFile = path.join(outputPath, `${routerName}.ts`);
+    writeFileSync(outFile, output, "utf-8");
+    return outFile;
+}

package/dist/bin/index.d.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+export interface SeamConfig {
+    source: string;
+    compiledFolder: string;
+    outputFolder: string;
+}

package/dist/bin/index.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-import { genClient } from "./gen-client.js";
-import { genConfig } from "./gen-config.js";
+import { generateClient } from "./generate.js";
+import { initConfig } from "./init.js";
 main();
 function main() {
     const args = process.argv;
     switch (args[2]) {
-        case "gen-client":
-            genClient();
+        case "generate":
+            generateClient();
             break;
-        case "gen-config":
-            genConfig();
+        case "init":
+            initConfig();
             break;
         default:
-            console.log("Commands:\n- seam-rpc gen-client <input-files> <output-folder>\n- seam-rpc gen-config [input-files] [output-folder]");
+            console.log("Commands:\n- \x1b[36msrpc generate\x1b[0m - Generate client files as defined in the config.\n- \x1b[36msrpc init\x1b[0m - Create config file.");
     }
 }

package/dist/bin/init.d.ts

@@ -0,0 +1 @@
+export declare function initConfig(): Promise<void>;

package/dist/bin/init.js

@@ -0,0 +1,34 @@
+import fs from "fs";
+import readline from "readline";
+export async function initConfig() {
+    let source = "./src/api/*";
+    let compiledFolder = "./dist/api";
+    let outputFolder = "../client/src/api";
+    if (fs.existsSync("./seam-rpc.config.json")) {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        });
+        rl.question("Config file already exists. Do you want to overwrite it? [Y/n] ", answer => {
+            if (answer && answer.toLowerCase() != "y" && answer.toLowerCase() != "yes") {
+                console.log("Operation canceled.");
+                process.exit(0);
+            }
+            rl.close();
+            createConfig();
+        });
+    }
+    else {
+        createConfig();
+    }
+    function createConfig() {
+        const config = { source, compiledFolder, outputFolder };
+        try {
+            fs.writeFileSync("./seam-rpc.config.json", JSON.stringify(config, null, 4), "utf-8");
+        }
+        catch (e) {
+            console.log("\x1b[31mFailed to create config file ./seam-rpc.config.json\x1b[0m\n" + e);
+        }
+        console.log(`\x1b[32mSuccessfully created config file ./seam-rpc.config.json\x1b[0m`);
+    }
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@seam-rpc/server",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "main": "dist/index.js",
   "type": "module",
   "bin": {
-    "seam-rpc": "dist/bin/index.js"
+    "srpc": "dist/bin/index.js"
   },
   "types": "dist/index.d.ts",
   "files": [

package/dist/validation.js

@@ -1,54 +0,0 @@
-export class ValString {
-    constructor(value) {
-        this._isValid = true;
-        this._value = value;
-    }
-    get isValid() {
-        return this._isValid;
-    }
-    min(value) {
-        if (this._isValid)
-            this._isValid = this._value.length >= value;
-        return this;
-    }
-    max(value) {
-        if (this._isValid)
-            this._isValid = this._value.length <= value;
-        return this;
-    }
-    length(value) {
-        if (this._isValid)
-            this._isValid = this._value.length == value;
-        return this;
-    }
-    startsWith(value) {
-        if (this._isValid)
-            this._isValid = this._value.startsWith(value);
-        return this;
-    }
-    endsWith(value) {
-        if (this._isValid)
-            this._isValid = this._value.endsWith(value);
-        return this;
-    }
-    includes(value) {
-        if (this._isValid)
-            this._isValid = this._value.includes(value);
-        return this;
-    }
-    regex(regExpr) {
-        //  if (this._isValid)
-        //     this._isValid = this._value.startsWith(value);
-        return this;
-    }
-    email() {
-        return this;
-    }
-}
-function createUser(name, age, data) {
-    name.min(3).max(50);
-    age.gte(1).lt(150);
-    data.description?.max(250);
-}
-function validate(data) {
-}