@nocobase/database 1.9.55 → 1.9.57

package/lib/errors/association-not-found-error.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare class AssociationNotFoundError extends Error {
+    constructor(message: string);
+}

package/lib/errors/association-not-found-error.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var association_not_found_error_exports = {};
+__export(association_not_found_error_exports, {
+  AssociationNotFoundError: () => AssociationNotFoundError
+});
+module.exports = __toCommonJS(association_not_found_error_exports);
+const _AssociationNotFoundError = class _AssociationNotFoundError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AssociationNotFoundError";
+  }
+};
+__name(_AssociationNotFoundError, "AssociationNotFoundError");
+let AssociationNotFoundError = _AssociationNotFoundError;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AssociationNotFoundError
+});

package/lib/options-parser.d.ts

@@ -22,6 +22,7 @@ export declare class OptionsParser {
     model: ModelStatic<any>;
     filterParser: FilterParser;
     context: OptionsParserContext;
+    associationNotFoundWarnings: string[];
     constructor(options: FindOptions, context: OptionsParserContext);
     static appendInheritInspectAttribute(include: any, collection: any): any;
     isAssociation(key: string): boolean;

package/lib/options-parser.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
 var import_qs = __toESM(require("qs"));
+var import_association_not_found_error = require("./errors/association-not-found-error");
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
   options;
@@ -52,6 +53,7 @@ const _OptionsParser = class _OptionsParser {
   model;
   filterParser;
   context;
+  associationNotFoundWarnings = [];
   constructor(options, context) {
     const { collection } = context;
     this.collection = collection;
@@ -294,7 +296,7 @@ const _OptionsParser = class _OptionsParser {
     }
     const sortedAppends = import_lodash.default.sortBy(appendList, (append) => append.split(".").length);
     const setInclude = /* @__PURE__ */ __name((model, queryParams, append, parentAs) => {
-      var _a;
+      var _a, _b;
       const appendWithOptions = this.parseAppendWithOptions(append);
       append = appendWithOptions.name;
       const appendFields = append.split(".");
@@ -307,7 +309,7 @@ const _OptionsParser = class _OptionsParser {
       if (appendFields.length == 2) {
         const association = associations[appendFields[0]];
         if (!association) {
-          throw new Error(`association ${appendFields[0]} in ${model.name} not found`);
+          throw new import_association_not_found_error.AssociationNotFoundError(`association ${appendFields[0]} in ${model.name} not found`);
         }
         const associationModel = associations[appendFields[0]].target;
         if (associationModel.rawAttributes[appendFields[1]]) {
@@ -334,7 +336,13 @@ const _OptionsParser = class _OptionsParser {
       if (existIncludeIndex == -1) {
         const association = associations[appendAssociation];
         if (!association) {
-          throw new Error(`association ${appendAssociation} in ${model.name} not found`);
+          throw new import_association_not_found_error.AssociationNotFoundError(`association ${appendAssociation} in ${model.name} not found`);
+        }
+        const targetCollectionName = (_b = this.database.getCollectionByModelName(association.target.name)) == null ? void 0 : _b.name;
+        if (!targetCollectionName) {
+          throw new import_association_not_found_error.AssociationNotFoundError(
+            `target collection for association ${appendAssociation} in ${model.name} not found`
+          );
         }
         let includeOptions = {
           association: appendAssociation,
@@ -387,7 +395,15 @@ const _OptionsParser = class _OptionsParser {
       }
     }, "setInclude");
     for (const append of sortedAppends) {
-      setInclude(this.model, filterParams, append);
+      try {
+        setInclude(this.model, filterParams, append);
+      } catch (error) {
+        if (error instanceof import_association_not_found_error.AssociationNotFoundError) {
+          this.associationNotFoundWarnings.push(error.message);
+          continue;
+        }
+        throw error;
+      }
     }
     debug("filter params: %o", filterParams);
     return filterParams;

package/lib/repository.js

@@ -647,6 +647,9 @@ const _Repository = class _Repository {
       collection: this.collection
     });
     const params = parser.toSequelizeParams({ parseSort: import_lodash2.default.isBoolean(options == null ? void 0 : options.parseSort) ? options.parseSort : true });
+    if (parser.associationNotFoundWarnings.length > 0) {
+      this.database.logger.warn(parser.associationNotFoundWarnings.join("; "));
+    }
     debug("sequelize query params %o", params);
     if (options.where && params.where) {
       params.where = {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.55",
+  "version": "1.9.57",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.55",
-    "@nocobase/utils": "1.9.55",
+    "@nocobase/logger": "1.9.57",
+    "@nocobase/utils": "1.9.57",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -19,7 +19,7 @@
     "glob": "^7.1.6",
     "graphlib": "^2.1.8",
     "joi": "^17.13.3",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "nanoid": "^3.3.11",
     "node-fetch": "^2.6.7",
     "node-sql-parser": "^4.18.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "d711c7711a473bebc182d80e40e920059e31235e"
+  "gitHead": "741a5ded84d1545022bc43f4aac2b9cb7af81257"
 }