@nocobase/data-source-manager 2.2.45 → 2.2.46

package/lib/data-source.d.ts

@@ -24,6 +24,7 @@ export declare abstract class DataSource extends EventEmitter {
     resourceManager: ResourceManager;
     acl: ACL;
     dataSourceManager: DataSourceManager;
+    private readonly collectionResources;
     logger: Logger;
     constructor(options: DataSourceOptions);
     _sqlLogger: Logger;

package/lib/data-source.js

@@ -56,6 +56,7 @@ const _DataSource = class _DataSource extends import_events.default {
   resourceManager;
   acl;
   dataSourceManager;
+  collectionResources = /* @__PURE__ */ new WeakSet();
   logger;
   _sqlLogger;
   get sqlLogger() {
@@ -144,17 +145,18 @@ const _DataSource = class _DataSource extends import_events.default {
         return next();
       }
       const resourceName = (0, import_resourcer.getNameByParams)(params);
+      const [collectionName] = resourceName.split(".");
       if (self.resourceManager.isDefined(resourceName)) {
-        return next();
-      }
-      const splitResult = resourceName.split(".");
-      const collectionName = splitResult[0];
-      if (!self.collectionManager.hasCollection(collectionName)) {
-        return next();
+        const resource = self.resourceManager.getResource(resourceName);
+        if (!self.collectionResources.has(resource)) return next();
+        if (!self.collectionManager.hasCollection(collectionName)) {
+          self.resourceManager.removeResource(resourceName);
+          return next();
+        }
+      } else {
+        if (!self.collectionManager.hasCollection(collectionName)) return next();
+        self.collectionResources.add(self.resourceManager.define({ name: resourceName }));
       }
-      self.resourceManager.define({
-        name: resourceName
-      });
       return next();
     }, "collectionToResource");
   }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.2.45",
+  "version": "2.2.46",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.2.45",
-    "@nocobase/cache": "2.2.45",
-    "@nocobase/database": "2.2.45",
-    "@nocobase/resourcer": "2.2.45",
-    "@nocobase/utils": "2.2.45",
+    "@nocobase/actions": "2.2.46",
+    "@nocobase/cache": "2.2.46",
+    "@nocobase/database": "2.2.46",
+    "@nocobase/resourcer": "2.2.46",
+    "@nocobase/utils": "2.2.46",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "41365164a6a0551491c07dc01634d8bcd1e2b7b8"
+  "gitHead": "ca2ca462526e39c219a09fa65625f77879ac5249"
 }