typed-bridge 2.0.7 → 2.0.9

package/context.md

@@ -102,32 +102,32 @@ createMiddleware('user.*', async (req, res) => {
 
 ---
 
-## **How to Validate with `$z` (Zod)**
+## **How to Validate Zod**
 
 ```ts
 // src/bridge/user/types.ts
-import { $z } from 'typed-bridge'
+import { z } from 'zod'
 
 export const fetch = {
-    args: $z.object({ id: $z.number().min(1) }),
-    res: $z.object({
-        id: $z.number(),
-        name: $z.string(),
-        email: $z.string().email(),
-        createdAt: $z.date()
+    args: z.object({ id: z.number().min(1) }),
+    res: z.object({
+        id: z.number(),
+        name: z.string(),
+        email: z.string().email(),
+        createdAt: z.date()
     })
 }
 ```
 
 ```ts
 // src/bridge/user/index.ts (validated version)
-import { $z } from 'typed-bridge'
+import { z } from 'zod'
 import * as types from './types.js'
 
 export const fetch = async (
-    args: $z.infer<typeof types.fetch.args>,
+    args: z.infer<typeof types.fetch.args>,
     context: { userId?: number }
-): Promise<$z.infer<typeof types.fetch.res>> => {
+): Promise<z.infer<typeof types.fetch.res>> => {
     args = types.fetch.args.parse(args)
     const user = users.find(u => u.id === args.id)
     if (!user) throw new Error(`User ${args.id} not found`)

package/dist/demo/bridge/user/index.d.ts

@@ -1,4 +1,4 @@
-import { $z } from '@/index';
+import { z } from 'zod';
 import * as types from './types';
 export interface User {
     id: number;
@@ -6,9 +6,9 @@ export interface User {
     email: string;
     createdAt: Date;
 }
-export declare const fetch: (args: $z.infer<typeof types.fetch.args>, context: {
+export declare const fetch: (args: z.infer<typeof types.fetch.args>, context: {
     id: number;
-}) => Promise<$z.infer<typeof types.fetch.res>>;
+}) => Promise<z.infer<typeof types.fetch.res>>;
 export declare const update: (args: {
     id: number;
     name?: string;

package/dist/demo/bridge/user/types.d.ts

@@ -1,16 +1,16 @@
-import { $z } from '@/index';
+import { z } from 'zod';
 export declare const fetch: {
-    args: $z.ZodObject<{
-        id: $z.ZodNumber;
-    }, "strip", $z.ZodTypeAny, {
+    args: z.ZodObject<{
+        id: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
         id: number;
     }, {
         id: number;
     }>;
-    res: $z.ZodObject<{
-        id: $z.ZodNumber;
-        name: $z.ZodString;
-    }, "strip", $z.ZodTypeAny, {
+    res: z.ZodObject<{
+        id: z.ZodNumber;
+        name: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
         id: number;
         name: string;
     }, {
@@ -18,9 +18,9 @@ export declare const fetch: {
         name: string;
     }>;
 };
-export declare const userContext: $z.ZodObject<{
-    id: $z.ZodNumber;
-}, "strip", $z.ZodTypeAny, {
+export declare const userContext: z.ZodObject<{
+    id: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
     id: number;
 }, {
     id: number;

package/dist/demo/bridge/user/types.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.userContext = exports.fetch = void 0;
-const index_1 = require("@/index");
+const zod_1 = require("zod");
 exports.fetch = {
-    args: index_1.$z.object({
-        id: index_1.$z.number().min(1)
+    args: zod_1.z.object({
+        id: zod_1.z.number().min(1)
     }),
-    res: index_1.$z.object({
-        id: index_1.$z.number(),
-        name: index_1.$z.string()
+    res: zod_1.z.object({
+        id: zod_1.z.number(),
+        name: zod_1.z.string()
     })
 };
-exports.userContext = index_1.$z.object({
-    id: index_1.$z.number()
+exports.userContext = zod_1.z.object({
+    id: zod_1.z.number()
 });

package/dist/helpers/index.d.ts

@@ -1,3 +1,3 @@
-export declare const printStartLogs: (port: number) => Promise<void>;
+export declare const printStartLogs: (port: number) => void;
 export declare const printStopLogs: () => void;
 export declare const matchesPattern: (str: string, pattern: string) => boolean;

package/dist/helpers/index.js

@@ -1,46 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchesPattern = exports.printStopLogs = exports.printStartLogs = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const getLocalIPList = async () => {
-    const os = await Promise.resolve().then(() => __importStar(require('os')));
-    const interfaces = os.networkInterfaces();
+const os_1 = __importDefault(require("os"));
+const getLocalIPList = () => {
+    const interfaces = os_1.default.networkInterfaces();
     const ipList = [];
     Object.values(interfaces).forEach(ifaceArr => {
         ifaceArr?.forEach(iface => {
@@ -57,8 +24,8 @@ const getLocalIPList = async () => {
     return ipList;
 };
 const seperator = '\n-x-x-x-x-x-\n';
-const printStartLogs = async (port) => {
-    const ipList = await getLocalIPList();
+const printStartLogs = (port) => {
+    const ipList = getLocalIPList();
     console.log(ipList);
     console.log(seperator);
     console.log(chalk_1.default.bgWhite.black('  Typed Bridge  '));

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import 'dotenv/config';
 export { Application, default as express, Express, NextFunction, Request, Response, Router } from 'express';
-export { z as $z } from 'zod';
 export { createBridge, createMiddleware, onShutdown } from './bridge';
 export { config as tbConfig } from './config';

package/dist/index.js

@@ -3,13 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tbConfig = exports.onShutdown = exports.createMiddleware = exports.createBridge = exports.$z = exports.Router = exports.express = void 0;
+exports.tbConfig = exports.onShutdown = exports.createMiddleware = exports.createBridge = exports.Router = exports.express = void 0;
 require("dotenv/config");
 var express_1 = require("express");
 Object.defineProperty(exports, "express", { enumerable: true, get: function () { return __importDefault(express_1).default; } });
 Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return express_1.Router; } });
-var zod_1 = require("zod");
-Object.defineProperty(exports, "$z", { enumerable: true, get: function () { return zod_1.z; } });
 var bridge_1 = require("./bridge");
 Object.defineProperty(exports, "createBridge", { enumerable: true, get: function () { return bridge_1.createBridge; } });
 Object.defineProperty(exports, "createMiddleware", { enumerable: true, get: function () { return bridge_1.createMiddleware; } });

package/dist/scripts/typedBridgeCleaner.js

@@ -1,42 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = cleanTsFile;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const ts = __importStar(require("typescript"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const typescript_1 = __importDefault(require("typescript"));
 // Snippet to inject at the end
 const proxySnippet = () => `
 type typedBridgeConfig = {
@@ -90,12 +60,12 @@ export default typedBridge
 const removeSecondParamTransformer = context => {
     return sourceFile => {
         function visitor(node) {
-            if (ts.isFunctionTypeNode(node) && node.parameters.length > 1) {
-                return ts.factory.updateFunctionTypeNode(node, node.typeParameters, ts.factory.createNodeArray([node.parameters[0]]), node.type);
+            if (typescript_1.default.isFunctionTypeNode(node) && node.parameters.length > 1) {
+                return typescript_1.default.factory.updateFunctionTypeNode(node, node.typeParameters, typescript_1.default.factory.createNodeArray([node.parameters[0]]), node.type);
             }
-            return ts.visitEachChild(node, visitor, context);
+            return typescript_1.default.visitEachChild(node, visitor, context);
         }
-        return ts.visitEachChild(sourceFile, visitor, context);
+        return typescript_1.default.visitEachChild(sourceFile, visitor, context);
     };
 };
 /**
@@ -106,7 +76,7 @@ const removeDefaultExportTransformer = context => {
     return sourceFile => {
         function visitor(node) {
             // Look for `export { _default as default }` and drop it
-            if (ts.isExportDeclaration(node) && node.exportClause && ts.isNamedExports(node.exportClause)) {
+            if (typescript_1.default.isExportDeclaration(node) && node.exportClause && typescript_1.default.isNamedExports(node.exportClause)) {
                 const [el] = node.exportClause.elements;
                 if (node.exportClause.elements.length === 1 &&
                     el.propertyName?.text === '_default' &&
@@ -114,15 +84,15 @@ const removeDefaultExportTransformer = context => {
                     return undefined;
                 }
             }
-            return ts.visitEachChild(node, visitor, context);
+            return typescript_1.default.visitEachChild(node, visitor, context);
         }
         const updatedStatements = [];
         for (const stmt of sourceFile.statements) {
-            const newStmt = ts.visitNode(stmt, visitor);
+            const newStmt = typescript_1.default.visitNode(stmt, visitor);
             if (newStmt)
                 updatedStatements.push(newStmt);
         }
-        return ts.factory.updateSourceFile(sourceFile, ts.factory.createNodeArray(updatedStatements));
+        return typescript_1.default.factory.updateSourceFile(sourceFile, typescript_1.default.factory.createNodeArray(updatedStatements));
     };
 };
 /**
@@ -132,20 +102,20 @@ const removeDefaultExportTransformer = context => {
  *  3. Writes the final file output.
  */
 function cleanTsFile(src) {
-    let sourceCode = fs.readFileSync(src, 'utf-8');
+    let sourceCode = fs_1.default.readFileSync(src, 'utf-8');
     const eslintDisable = `/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any */`;
     // Ensure the top comment is present if missing
     if (!sourceCode.startsWith(eslintDisable)) {
         sourceCode = eslintDisable + '\n' + sourceCode;
     }
     // Parse the source
-    const sourceFile = ts.createSourceFile(path.basename(src), sourceCode, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const sourceFile = typescript_1.default.createSourceFile(path_1.default.basename(src), sourceCode, typescript_1.default.ScriptTarget.Latest, true, typescript_1.default.ScriptKind.TS);
     // Run the transformers
-    const result = ts.transform(sourceFile, [removeSecondParamTransformer, removeDefaultExportTransformer]);
+    const result = typescript_1.default.transform(sourceFile, [removeSecondParamTransformer, removeDefaultExportTransformer]);
     // Print final code
-    const printer = ts.createPrinter();
+    const printer = typescript_1.default.createPrinter();
     const transformedCode = printer.printFile(result.transformed[0]).concat(proxySnippet());
     // Write back to the same file
-    fs.writeFileSync(src, transformedCode, 'utf-8');
+    fs_1.default.writeFileSync(src, transformedCode, 'utf-8');
     console.log(`Cleaned file: ${src}`);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "typed-bridge",
     "description": "Strictly typed server functions for typescript apps",
-    "version": "2.0.7",
+    "version": "2.0.9",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "author": "neilveil",
@@ -28,8 +28,7 @@
         "express": "^5.1.0",
         "rollup": "^4.40.0",
         "rollup-plugin-dts": "^6.2.1",
-        "typescript": "^5.8.3",
-        "zod": "^3.24.3"
+        "typescript": "^5.8.3"
     },
     "devDependencies": {
         "@eslint/js": "^9.25.0",
@@ -47,7 +46,8 @@
         "rimraf": "^6.0.1",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
-        "typescript-eslint": "^8.30.1"
+        "typescript-eslint": "^8.30.1",
+        "zod": "^3.24.3"
     },
     "keywords": [
         "api",

package/readme.md

@@ -230,33 +230,33 @@ createMiddleware('user.*', async (req, res) => {
 `types.ts`
 
 ```ts
-import { $z } from 'typed-bridge'
+import { z } from 'zod'
 
 export const fetch = {
-    args: $z.object({
-        id: $z.number().min(1)
+    args: z.object({
+        id: z.number().min(1)
     }),
-    res: $z.object({
-        id: $z.number(),
-        name: $z.string()
+    res: z.object({
+        id: z.number(),
+        name: z.string()
     })
 }
 
-export const userContext = $z.object({
-    id: $z.number()
+export const userContext = z.object({
+    id: z.number()
 })
 ```
 
 #### Use in bridge handler
 
 ```ts
-import { $z } from 'typed-bridge'
+import { z } from 'zod'
 import * as types from './types'
 
 export const fetch = async (
-    args: $z.infer<typeof types.fetch.args>,
+    args: z.infer<typeof types.fetch.args>,
     context: { id: number }
-): Promise<$z.infer<typeof types.fetch.res>> => {
+): Promise<z.infer<typeof types.fetch.res>> => {
     args = types.fetch.args.parse(args)
 
     console.log(context)