@ruiapp/rapid-core 0.1.13 → 0.1.15

package/dist/index.js

@@ -453,7 +453,9 @@ class PluginManager {
     /** 初始化插件时调用。 */
     async initPlugins() {
         for (const plugin of this.#plugins) {
-            await plugin.initPlugin(this.#server);
+            if (plugin.initPlugin) {
+                await plugin.initPlugin(this.#server);
+            }
         }
     }
     /** 注册中间件 */
@@ -1811,6 +1813,17 @@ async function findEntity(server, dataAccessor, options) {
     const entities = await findEntities(server, dataAccessor, options);
     return ___namespace.first(entities);
 }
+async function findById(server, dataAccessor, id) {
+    return await findEntity(server, dataAccessor, {
+        filters: [
+            {
+                operator: "eq",
+                field: "id",
+                value: id,
+            }
+        ]
+    });
+}
 async function replaceFiltersWithFiltersOperator(server, model, filters) {
     if (!filters || !filters.length) {
         return [];
@@ -2106,7 +2119,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
     if (!id) {
         throw new Error("Id is required when updating an entity.");
     }
-    const entity = await this.findById(id);
+    const entity = await findById(server, dataAccessor, id);
     if (!entity) {
         throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
     }
@@ -2245,15 +2258,7 @@ class EntityManager {
         return await findEntity(this.#server, this.#dataAccessor, options);
     }
     async findById(id) {
-        return await this.findEntity({
-            filters: [
-                {
-                    operator: "eq",
-                    field: "id",
-                    value: id,
-                }
-            ]
-        });
+        return await findById(this.#server, this.#dataAccessor, id);
     }
     async createEntity(options, plugin) {
         const model = this.getModel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],

package/src/core/pluginManager.ts

@@ -20,7 +20,9 @@ class PluginManager {
   /** 初始化插件时调用。 */
   async initPlugins() {
     for (const plugin of this.#plugins) {
-      await plugin.initPlugin(this.#server);
+      if (plugin.initPlugin) {
+        await plugin.initPlugin(this.#server);
+      }
     }
   }
 

package/src/dataAccess/entityManager.ts

@@ -173,6 +173,22 @@ async function findEntity(
   return _.first(entities);
 }
 
+async function findById(
+  server: IRpdServer,
+  dataAccessor: IRpdDataAccessor,
+  id: any,
+): Promise<any> {
+  return await findEntity(server, dataAccessor, {
+    filters: [
+      {
+        operator: "eq",
+        field: "id",
+        value: id,
+      }
+    ]
+  });
+}
+
 async function replaceFiltersWithFiltersOperator(
   server: IRpdServer,
   model: RpdDataModel,
@@ -544,7 +560,7 @@ async function updateEntityById(
     throw new Error("Id is required when updating an entity.")
   }
 
-  const entity = await this.findById(id);
+  const entity = await findById(server, dataAccessor, id);
   if (!entity) {
     throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
   }
@@ -702,15 +718,7 @@ export default class EntityManager<TEntity=any> {
   }
 
   async findById(id: any): Promise<TEntity | null> {
-    return await this.findEntity({
-      filters: [
-        {
-          operator: "eq",
-          field: "id",
-          value: id,
-        }
-      ]
-    });
+    return await findById(this.#server, this.#dataAccessor, id);
   }
 
   async createEntity(options: CreateEntityOptions, plugin: RapidPlugin): Promise<TEntity> {