@rpcbase/api 0.27.0 → 0.28.0

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./types";
+export * from "./initApi";
+export * from "./loadModel";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../pkg/api/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA"}

package/dist/index.js

@@ -0,0 +1,3 @@
+export * from "./types";
+export * from "./initApi";
+export * from "./loadModel";

package/dist/initApi.d.ts

@@ -0,0 +1,3 @@
+import { Application } from "express";
+export declare const initApi: (app: Application) => Promise<void>;
+//# sourceMappingURL=initApi.d.ts.map

package/dist/initApi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initApi.d.ts","sourceRoot":"","sources":["../../../../pkg/api/src/initApi.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAS,MAAM,SAAS,CAAA;AAiB5C,eAAO,MAAM,OAAO,GAAU,KAAK,WAAW,kBA4E7C,CAAA"}

package/dist/initApi.js

@@ -0,0 +1,72 @@
+import assert from "assert";
+import env from "@rpcbase/env";
+import BBPromise from "bluebird";
+import { json } from "express";
+import { initApiClient } from "@rpcbase/client";
+// dotenv setup, merge process env with vite process.env file
+process.env = {
+    ...__vite_env__,
+    ...process.env,
+    ...env.config().parsed
+};
+export const initApi = async (app) => {
+    await initApiClient({ app });
+    const registerHandler = (method, path, handler) => {
+        assert(path.startsWith("/api"), "API routes must start with /api");
+        app[method](path, async (req, res, next) => {
+            const payload = req.body || {};
+            try {
+                const result = await handler(payload, { req, res });
+                res.json(result);
+            }
+            catch (e) {
+                next(e);
+            }
+        });
+    };
+    const api = {
+        use: (path, middleware) => {
+            app.use(path, middleware);
+        },
+        get: (path, handler) => {
+            registerHandler("get", path, handler);
+        },
+        post: (path, handler) => {
+            registerHandler("post", path, handler);
+        }
+    };
+    // body parser
+    app.use("/api", json({ limit: "8mb" }));
+    // WARNING:
+    // This is used to mark the start of the api middleware chain
+    // keep this middleware named like this, the serer api client will start calling middlewares starting from here
+    app.use("/api", function __FIRST_API_MIDDLEWARE__(_req, _res, next) {
+        next();
+    });
+    const routes = {
+        // @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
+        ...import.meta.glob("../../auth/src/api/**/handler.ts"),
+        // @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
+        ...import.meta.glob("@/api/**/handler.ts")
+    };
+    const routeEntries = Object.entries(routes);
+    const loadRoute = async ([routePath, loadFn]) => {
+        const routeModule = await loadFn();
+        routeModule.default(api);
+        const loggedPath = routePath.startsWith("../../")
+            ? routePath.replace("../../", "@rpcbase/")
+            : routePath;
+        // Colorize output: gray for @rpcbase paths, default (white) otherwise
+        const GRAY = "\x1b[90m";
+        const RESET = "\x1b[0m";
+        const coloredPath = loggedPath.startsWith("@rpcbase/")
+            ? `${GRAY}${loggedPath}${RESET}`
+            : loggedPath;
+        console.log("loaded api route", coloredPath);
+    };
+    await BBPromise.map(routeEntries, loadRoute);
+    console.log("Done loading routes");
+    app.use("/api", (req, res) => {
+        res.status(404).json({ error: `Not Found: ${req.method}:${req.originalUrl}` });
+    });
+};

package/dist/loadModel.d.ts

@@ -0,0 +1,4 @@
+import mongoose from "mongoose";
+import { Ctx } from "./types";
+export declare const loadModel: (modelName: string, ctx: Ctx) => Promise<mongoose.Model<any, {}, {}, {}, any, any>>;
+//# sourceMappingURL=loadModel.d.ts.map

package/dist/loadModel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../../../../pkg/api/src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAkC7B,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,GAAG,uDAiD1D,CAAA"}

package/dist/loadModel.js

@@ -0,0 +1,64 @@
+import assert from "assert";
+import mongoose from "mongoose";
+const { APP_NAME, DB_PORT } = process.env;
+const connections = {};
+// @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
+const modelModules = import.meta.glob("@/models/**/*.ts", { eager: true });
+const models = Object.entries(modelModules)
+    .map(([key, exports]) => {
+    assert(key.startsWith("/src/models/"), "Expected Model path to start with /src/models/");
+    const modelName = key.replace("/src/models/", "").replace(".ts", "").split("/").pop();
+    assert(modelName, "Model name not found");
+    const schema = Object.entries(exports)
+        .find(([key]) => {
+        return key === `${modelName}Schema`;
+    });
+    assert(schema, `Schema not found for model ${modelName}`);
+    return {
+        name: modelName,
+        model: mongoose.model(modelName, schema[1])
+    };
+})
+    .reduce((acc, { name, model }) => {
+    acc[name] = model;
+    return acc;
+}, {});
+export const loadModel = async (modelName, ctx) => {
+    const tenantId = ctx.req.session.user?.current_tenant_id || "00000000";
+    assert(tenantId, "Tenant ID is missing from session");
+    const dbName = ["User", "Tenant"].includes(modelName)
+        ? `${APP_NAME}-users-db`
+        : `${APP_NAME}-${tenantId}-db`;
+    const connectionString = `mongodb://localhost:${DB_PORT}/${dbName}`;
+    if (!connections[dbName]) {
+        const connection = mongoose.createConnection(connectionString, {
+            sanitizeFilter: true,
+        });
+        await new Promise((resolve, reject) => {
+            connection.once("open", resolve);
+            connection.on("error", reject);
+        });
+        connections[dbName] = connection;
+    }
+    else {
+        const connection = connections[dbName];
+        if (connection.readyState !== 1) {
+            await new Promise((resolve, reject) => {
+                connection.once("open", resolve);
+                connection.on("error", reject);
+            });
+        }
+    }
+    const modelConnection = connections[dbName];
+    // const modelModule = Object.entries(models).find(([_, module]) =>
+    //   (module as { [key: string]: any })[modelName] !== undefined
+    // )?.[1] as { [key: string]: any } | undefined
+    // if (!modelModule) {
+    //   throw new Error(`Model ${modelName} not found in any directory`)
+    // }
+    const model = models[modelName];
+    if (!modelConnection.models[modelName]) {
+        modelConnection.model(modelName, model.schema);
+    }
+    return modelConnection.models[modelName];
+};

package/dist/types.d.ts

@@ -0,0 +1,16 @@
+import type { Request, Response, NextFunction } from "express";
+export declare const MOCK_TYPE = "MOCK_TYPE";
+export type Ctx = {
+    req: Request;
+    res: Response;
+};
+export type Payload = any;
+export type Result = Record<string, unknown>;
+export type ApiHandler = (payload: Payload, ctx: Ctx) => Promise<Result>;
+export type Middleware = (req: Request, res: Response, next: NextFunction) => void;
+export type Api = {
+    use: (path: string, middleware: Middleware) => void;
+    get: (path: string, handler: ApiHandler) => void;
+    post: (path: string, handler: ApiHandler) => void;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../pkg/api/src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,SAAS,CAAA;AAG5D,eAAO,MAAM,SAAS,cAAc,CAAA;AAEpC,MAAM,MAAM,GAAG,GAAG;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf,CAAC;AAIF,MAAM,MAAM,OAAO,GAAG,GAAG,CAAA;AACzB,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAE5C,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAExE,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;AAGnF,MAAM,MAAM,GAAG,GAAG;IAChB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACpD,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;CACnD,CAAA"}

package/dist/types.js

@@ -0,0 +1 @@
+export const MOCK_TYPE = "MOCK_TYPE";

package/package.json

@@ -1,16 +1,34 @@
 {
   "name": "@rpcbase/api",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "type": "module",
-  "main": "./src/index.ts",
+  "files": [
+    "dist"
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc --watch",
+    "build": "wireit",
     "release": "wireit"
   },
   "wireit": {
+    "build": {
+      "command": "node ../../scripts/build-package.js api",
+      "files": [
+        "src/**/*",
+        "../../tsconfig.json",
+        "../../tsconfig.base.json",
+        "../../scripts/build-package.js"
+      ],
+      "output": [
+        "dist/"
+      ]
+    },
     "release": {
       "command": "../../scripts/publish.js",
-      "dependencies": [],
+      "dependencies": [
+        "build"
+      ],
       "files": [
         "package.json",
         "src/**/*"

package/src/index.ts

@@ -1,3 +0,0 @@
-export * from "./types"
-export * from "./initApi"
-export * from "./loadModel"

package/src/initApi.ts

@@ -1,98 +0,0 @@
-import assert from "assert"
-
-import env from "@rpcbase/env"
-import BBPromise from "bluebird"
-import { Application , json } from "express"
-import { initApiClient } from "@rpcbase/client"
-
-import { Api, ApiHandler, Middleware } from "./types"
-
-
-// dotenv setup, merge process env with vite process.env file
-
-process.env = {
-  ...__vite_env__,
-  ...process.env,
-  ...env.config().parsed
-}
-
-
-type RouteModule = [string, () => Promise<{default: (api: Api) => void}>]
-
-export const initApi = async (app: Application) => {
-
-  await initApiClient({app})
-
-  const registerHandler = (method: "get" | "post" | "put" | "delete", path: string, handler: ApiHandler) => {
-    assert(path.startsWith("/api"), "API routes must start with /api")
-
-    app[method](path, async(req, res, next) => {
-      const payload = req.body || {}
-
-      try {
-        const result = await handler(payload, {req, res})
-        res.json(result)
-      } catch (e) {
-        next(e)
-      }
-    })
-  }
-
-  const api = {
-    use: (path: string, middleware: Middleware): void => {
-      app.use(path, middleware)
-    },
-    get: (path: string, handler: ApiHandler): void => {
-      registerHandler("get", path, handler)
-    },
-    post: (path: string, handler: ApiHandler): void => {
-      registerHandler("post", path, handler)
-    }
-  }
-
-  // body parser
-  app.use("/api", json({limit: "8mb"}))
-
-  // WARNING:
-  // This is used to mark the start of the api middleware chain
-  // keep this middleware named like this, the serer api client will start calling middlewares starting from here
-  app.use("/api", function __FIRST_API_MIDDLEWARE__(_req, _res, next) {
-    next()
-  })
-
-  const routes = {
-    // @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
-    ...import.meta.glob("../../auth/src/api/**/handler.ts"),
-    // @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
-    ...import.meta.glob("@/api/**/handler.ts")
-  }
-
-  const routeEntries = Object.entries(routes) as RouteModule[]
-
-  const loadRoute = async ([routePath, loadFn]: RouteModule) => {
-    const routeModule = await loadFn()
-    routeModule.default(api)
-
-    const loggedPath = routePath.startsWith("../../")
-      ? routePath.replace("../../", "@rpcbase/")
-      : routePath
-
-    // Colorize output: gray for @rpcbase paths, default (white) otherwise
-    const GRAY = "\x1b[90m"
-    const RESET = "\x1b[0m"
-    const coloredPath = loggedPath.startsWith("@rpcbase/")
-      ? `${GRAY}${loggedPath}${RESET}`
-      : loggedPath
-
-    console.log("loaded api route", coloredPath)
-  }
-
-  await BBPromise.map(routeEntries, loadRoute)
-  console.log("Done loading routes")
-
-
-  app.use("/api", (req, res) => {
-    res.status(404).json({ error: `Not Found: ${req.method}:${req.originalUrl}` })
-  })
-
-}

package/src/loadModel.ts

@@ -1,88 +0,0 @@
-import assert from "assert"
-
-import mongoose from "mongoose"
-
-import { Ctx } from "./types"
-
-
-const { APP_NAME, DB_PORT } = process.env
-const connections: Record<string, mongoose.Connection> = {}
-
-// @ts-expect-error: Property 'glob' does not exist on type 'ImportMeta'.
-const modelModules = import.meta.glob("@/models/**/*.ts", { eager: true })
-
-const models = Object.entries(modelModules)
-  .map(([key, exports]) => {
-    assert(key.startsWith("/src/models/"), "Expected Model path to start with /src/models/")
-
-    const modelName = key.replace("/src/models/", "").replace(".ts", "").split("/").pop()
-    assert(modelName, "Model name not found")
-
-    const schema = Object.entries(exports as Record<string, unknown>)
-      .find(([key]) => {
-        return key === `${modelName}Schema`
-      })
-
-    assert(schema, `Schema not found for model ${modelName}`)
-
-    return {
-      name: modelName,
-      model: mongoose.model(modelName, schema[1] as mongoose.Schema)
-    }
-  })
-  .reduce((acc, { name, model }) => {
-    acc[name] = model
-    return acc
-  }, {} as Record<string, mongoose.Model<any>>)
-
-
-export const loadModel = async (modelName: string, ctx: Ctx) => {
-
-  const tenantId = ctx.req.session.user?.current_tenant_id || "00000000"
-  assert(tenantId, "Tenant ID is missing from session")
-
-  const dbName = ["User", "Tenant"].includes(modelName)
-    ? `${APP_NAME}-users-db`
-    : `${APP_NAME}-${tenantId}-db`
-
-  const connectionString = `mongodb://localhost:${DB_PORT}/${dbName}`
-
-  if (!connections[dbName]) {
-    const connection = mongoose.createConnection(connectionString, {
-      sanitizeFilter: true,
-    })
-
-    await new Promise((resolve, reject) => {
-      connection.once("open", resolve)
-      connection.on("error", reject)
-    })
-
-    connections[dbName] = connection
-  } else {
-    const connection = connections[dbName]
-    if (connection.readyState !== 1) {
-      await new Promise((resolve, reject) => {
-        connection.once("open", resolve)
-        connection.on("error", reject)
-      })
-    }
-  }
-
-  const modelConnection = connections[dbName]
-
-  // const modelModule = Object.entries(models).find(([_, module]) =>
-  //   (module as { [key: string]: any })[modelName] !== undefined
-  // )?.[1] as { [key: string]: any } | undefined
-
-  // if (!modelModule) {
-  //   throw new Error(`Model ${modelName} not found in any directory`)
-  // }
-
-  const model = models[modelName]
-
-  if (!modelConnection.models[modelName]) {
-    modelConnection.model(modelName, model.schema)
-  }
-
-  return modelConnection.models[modelName]
-}

package/src/types.ts

@@ -1,25 +0,0 @@
-import type {Request, Response, NextFunction} from "express"
-
-
-export const MOCK_TYPE = "MOCK_TYPE"
-
-export type Ctx = {
-  req: Request;
-  res: Response;
-};
-
-
-// export type Payload = Record<string, unknown>
-export type Payload = any
-export type Result = Record<string, unknown>
-
-export type ApiHandler = (payload: Payload, ctx: Ctx) => Promise<Result>
-
-export type Middleware = (req: Request, res: Response, next: NextFunction) => void;
-
-
-export type Api = {
-  use: (path: string, middleware: Middleware) => void;
-  get: (path: string, handler: ApiHandler) => void;
-  post: (path: string, handler: ApiHandler) => void;
-}