@rpcbase/api 0.48.0 → 0.50.0

package/dist/index.js

@@ -17,7 +17,7 @@ import require$$13 from "stream";
 import require$$14 from "util";
 import { initApiClient } from "@rpcbase/client";
 import mongoose from "mongoose";
-import * as frameworkSchemas from "@rpcbase/schema";
+import * as frameworkSchemas from "@rpcbase/db";
 const MOCK_TYPE = "MOCK_TYPE";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
@@ -21163,21 +21163,23 @@ let cachedModels = null;
 const buildModels = () => {
   const externalModelModules = globalThis.__rb_model_modules;
   const modelModules = externalModelModules ?? /* @__PURE__ */ Object.assign({});
-  const appModels = Object.entries(modelModules).map(([key, exports$1]) => {
+  const appModels = Object.entries(modelModules).flatMap(([key, exports$1]) => {
     const modelName = key.split("/").pop()?.replace(/\.(t|j)sx?$/, "");
     assert(modelName, "Model name not found");
-    const schema = Object.entries(exports$1).find(([key2]) => key2 === `${modelName}Schema`);
-    assert(schema, `Schema not found for model ${modelName}`);
-    return {
+    const schemaEntry = Object.entries(exports$1).find(([key2]) => key2 === `${modelName}Schema`);
+    if (!schemaEntry) return [];
+    const schema = schemaEntry[1];
+    if (!(schema instanceof mongoose.Schema)) return [];
+    return [{
       name: modelName,
-      model: mongoose.model(modelName, schema[1])
-    };
+      model: mongoose.models[modelName] ?? mongoose.model(modelName, schema)
+    }];
   });
-  const frameworkModels = Object.entries(frameworkSchemas).filter(([key]) => key.endsWith("Schema")).map(([key, schema]) => {
+  const frameworkModels = Object.entries(frameworkSchemas).filter(([_, schema]) => schema instanceof mongoose.Schema).map(([key, schema]) => {
     const name = key.replace(/Schema$/, "");
     return {
       name,
-      model: mongoose.model(name, schema)
+      model: mongoose.models[name] ?? mongoose.model(name, schema)
     };
   });
   return [...frameworkModels, ...appModels].reduce((acc, { name, model }) => {

package/dist/loadModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AA6C7B,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,GAAG,uDAmD1D,CAAA"}
+{"version":3,"file":"loadModel.d.ts","sourceRoot":"","sources":["../src/loadModel.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAgD7B,eAAO,MAAM,SAAS,GAAU,WAAW,MAAM,EAAE,KAAK,GAAG,uDAmD1D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/api",
-  "version": "0.48.0",
+  "version": "0.50.0",
   "type": "module",
   "files": [
     "dist"
@@ -26,6 +26,13 @@
         "dist/"
       ]
     },
+    "build-watch": {
+      "command": "../../node_modules/.bin/vite build --watch",
+      "service": true,
+      "dependencies": [
+        "build"
+      ]
+    },
     "release": {
       "command": "../../scripts/publish.js",
       "dependencies": [