@nocobase/database 1.9.0-beta.5 → 1.9.0-beta.7

package/lib/eager-loading/eager-loading-tree.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_append_child_collection_name_after_repository_find = require("../listeners/append-child-collection-name-after-repository-find");
 var import_options_parser = require("../options-parser");
+var import_utils = require("../utils");
 const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
   if (import_lodash.default.isArray(node.attributes) && !node.attributes.includes(attribute)) {
     node.attributes.push(attribute);
@@ -85,25 +86,6 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
       )
       SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
 }, "queryParentSQL");
-const processIncludes = /* @__PURE__ */ __name((includes, model, parentAs = "") => {
-  includes.forEach((include, index) => {
-    const association = model.associations[include.association];
-    if (association == null ? void 0 : association.generateInclude) {
-      includes[index] = {
-        ...include,
-        ...association.generateInclude(parentAs)
-      };
-    }
-    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
-      const nextModel = association == null ? void 0 : association.target;
-      if (!nextModel) {
-        return;
-      }
-      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
-    }
-  });
-  return includes;
-}, "processIncludes");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
   db;
@@ -233,7 +215,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: processIncludes(includeForFilter, node.model)
+            include: (0, import_utils.processIncludes)(includeForFilter, node.model)
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

package/lib/index.d.ts

@@ -42,3 +42,4 @@ export { default as fieldTypeMap } from './view/field-type-map';
 export * from './view/view-inference';
 export * from './update-guard';
 export { default as operators } from './operators';
+export { filterIncludes, mergeIncludes } from './utils/filter-include';

package/lib/index.js

@@ -54,8 +54,10 @@ __export(src_exports, {
   ValidationErrorItem: () => import_sequelize.ValidationErrorItem,
   default: () => import_database.Database,
   fieldTypeMap: () => import_field_type_map.default,
+  filterIncludes: () => import_filter_include.filterIncludes,
   fn: () => import_sequelize.fn,
   literal: () => import_sequelize.literal,
+  mergeIncludes: () => import_filter_include.mergeIncludes,
   operators: () => import_operators.default,
   snakeCase: () => import_utils.snakeCase,
   sqlParser: () => import_sql_parser.default,
@@ -98,6 +100,7 @@ var import_field_type_map = __toESM(require("./view/field-type-map"));
 __reExport(src_exports, require("./view/view-inference"), module.exports);
 __reExport(src_exports, require("./update-guard"), module.exports);
 var import_operators = __toESM(require("./operators"));
+var import_filter_include = require("./utils/filter-include");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -116,8 +119,10 @@ var import_operators = __toESM(require("./operators"));
   ValidationError,
   ValidationErrorItem,
   fieldTypeMap,
+  filterIncludes,
   fn,
   literal,
+  mergeIncludes,
   operators,
   snakeCase,
   sqlParser,

package/lib/interfaces/number-interface.d.ts

@@ -12,4 +12,5 @@ export declare class NumberInterface extends BaseInterface {
     toValue(value: any): Promise<any>;
     parseValue(value: any): any;
     validate(value: any): boolean;
+    toString(value: number, ctx?: any): string | number;
 }

package/lib/interfaces/number-interface.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,12 +26,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var number_interface_exports = {};
 __export(number_interface_exports, {
   NumberInterface: () => NumberInterface
 });
 module.exports = __toCommonJS(number_interface_exports);
+var import_lodash = __toESM(require("lodash"));
 var import_base_interface = require("./base-interface");
 const _NumberInterface = class _NumberInterface extends import_base_interface.BaseInterface {
   sanitizeValue(value) {
@@ -63,6 +74,23 @@ const _NumberInterface = class _NumberInterface extends import_base_interface.Ba
   validate(value) {
     return !isNaN(value);
   }
+  toString(value, ctx) {
+    var _a, _b, _c, _d;
+    value = super.toString(value, ctx);
+    const step = (_c = (_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component-props"]) == null ? void 0 : _c.step;
+    if (value != null && !import_lodash.default.isUndefined(step)) {
+      const s = step.toString();
+      const precision = ((_d = s.split(".")[1]) == null ? void 0 : _d.length) || 0;
+      const num = Number(value);
+      if (precision > 0) {
+        const factor = Math.pow(10, precision);
+        const rounded = Math.round(num * factor) / factor;
+        return rounded.toFixed(precision);
+      }
+      return num.toFixed(0);
+    }
+    return value;
+  }
 };
 __name(_NumberInterface, "NumberInterface");
 let NumberInterface = _NumberInterface;

package/lib/query-interface/postgres-query-interface.d.ts

@@ -27,7 +27,9 @@ export default class PostgresQueryInterface extends QueryInterface {
         currentVal: number;
     }>;
     collectionTableExists(collection: Collection, options?: any): Promise<any>;
-    listViews(): Promise<[unknown[], unknown]>;
+    listViews(options?: {
+        schema?: string;
+    }): Promise<[unknown[], unknown]>;
     viewDef(viewName: string): Promise<string>;
     parseSQL(sql: string): any;
     viewColumnUsage(options: any): Promise<{

package/lib/query-interface/postgres-query-interface.js

@@ -110,8 +110,15 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
     const results = await this.db.sequelize.query(sql, { type: "SELECT", transaction });
     return results[0]["exists"];
   }
-  async listViews() {
-    const sql = `
+  async listViews(options) {
+    var _a;
+    const targetSchema = (options == null ? void 0 : options.schema) || ((_a = this.db.options) == null ? void 0 : _a.schema) || "public";
+    const sql = targetSchema ? `
+      SELECT viewname as name, definition, schemaname as schema
+      FROM pg_views
+      WHERE schemaname = '${targetSchema}'
+      ORDER BY viewname;
+    ` : `
       SELECT viewname as name, definition, schemaname as schema
       FROM pg_views
       WHERE schemaname NOT IN ('pg_catalog', 'information_schema')

package/lib/query-interface/query-interface.d.ts

@@ -18,7 +18,9 @@ export default abstract class QueryInterface {
     sequelizeQueryInterface: SequelizeQueryInterface;
     protected constructor(db: Database);
     abstract collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
-    abstract listViews(): any;
+    abstract listViews(options?: {
+        schema?: string;
+    }): any;
     abstract viewDef(viewName: string): Promise<string>;
     abstract viewColumnUsage(options: {
         viewName: string;

package/lib/repository.js

@@ -72,6 +72,7 @@ var import_hasone_repository = require("./relation-repository/hasone-repository"
 var import_update_associations = require("./update-associations");
 var import_update_guard = require("./update-guard");
 var import_filter_utils = require("./utils/filter-utils");
+var import_utils2 = require("./utils");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
@@ -134,7 +135,6 @@ const _Repository = class _Repository {
    * return count by filter
    */
   async count(countOptions) {
-    var _a;
     let options = countOptions ? import_lodash.default.clone(countOptions) : {};
     const transaction2 = await this.getTransaction(options);
     if (countOptions == null ? void 0 : countOptions.filter) {
@@ -155,7 +155,9 @@ const _Repository = class _Repository {
       ...options,
       distinct: Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey()
     };
-    if (((_a = queryOptions.include) == null ? void 0 : _a.length) === 0) {
+    if (Array.isArray(queryOptions.include) && queryOptions.include.length > 0) {
+      queryOptions.include = (0, import_utils2.processIncludes)(queryOptions.include, this.collection.model);
+    } else {
       delete queryOptions.include;
     }
     return await this.collection.model.count({
@@ -174,7 +176,6 @@ const _Repository = class _Repository {
     const tableName = this.collection.tableName();
     try {
       if (this.database.isMySQLCompatibleDialect()) {
-        await this.database.sequelize.query(`ANALYZE TABLE ${this.collection.getTableNameWithSchema()}`);
         const results = await this.database.sequelize.query(
           `
         SELECT table_rows FROM information_schema.tables
@@ -183,17 +184,16 @@ const _Repository = class _Repository {
       `,
           { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
         );
-        return Number(((_a = results == null ? void 0 : results[0]) == null ? void 0 : _a.table_rows) ?? 0);
+        return Number(((_a = results == null ? void 0 : results[0]) == null ? void 0 : _a[this.database.inDialect("mysql") ? "TABLE_ROWS" : "table_rows"]) ?? 0);
       }
       if (this.database.isPostgresCompatibleDialect()) {
-        await this.database.sequelize.query(`ANALYZE ${this.collection.getTableNameWithSchema()}`);
         const results = await this.database.sequelize.query(
           `
         SELECT reltuples::BIGINT AS estimate
         FROM pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid
-        WHERE c.relname = ? AND n.nspname = current_schema();
+        WHERE c.relname = ? AND n.nspname = ?;
       `,
-          { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
+          { replacements: [tableName, this.collection.collectionSchema()], type: import_sequelize.QueryTypes.SELECT, logging: true }
         );
         return Number(((_b = results == null ? void 0 : results[0]) == null ? void 0 : _b.estimate) ?? 0);
       }
@@ -345,6 +345,9 @@ const _Repository = class _Repository {
       subQuery: false,
       ...this.buildQueryOptions(options)
     };
+    if (!import_lodash2.default.isUndefined(opts.limit)) {
+      opts.limit = Number(opts.limit);
+    }
     let rows;
     if (opts.include && opts.include.length > 0) {
       const eagerLoadingTree = import_eager_loading_tree.EagerLoadingTree.buildFromSequelizeOptions({

package/lib/utils/filter-include.d.ts

@@ -0,0 +1,55 @@
+/**
+ * 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.
+ */
+/**
+ * Merge a flat list of include descriptors by association (alias) key.
+ * - Nodes with the same association are merged into one.
+ * - `required` is OR-ed (true if any source is true).
+ * - Child includes are recursively merged with the same rules.
+ * - Empty `include` arrays are removed to keep the payload minimal.
+ *
+ * Notes:
+ * - Association keys are normalized via snake_case to ensure consistent merging.
+ * - This function is idempotent and order-insensitive for equivalent input sets.
+ *
+ * Usage example (input and output):
+ *
+ *   const includesA = [
+ *     { association: 'posts', required: true, include: [{ association: 'comments' }] },
+ *     { association: 'profile' },
+ *   ];
+ *
+ *   const includesB = [
+ *     { association: 'posts', include: [
+ *         { association: 'comments', required: true },
+ *         { association: 'tags' },
+ *       ]
+ *     },
+ *     { association: 'roles', required: true },
+ *   ];
+ *
+ *   const merged = mergeIncludes([...includesA, ...includesB]);
+ *
+ *   Result:
+ *   [
+ *     {
+ *       association: 'posts',
+ *       required: true,
+ *       include: [
+ *         { association: 'comments', required: true },
+ *         { association: 'tags' },
+ *       ],
+ *     },
+ *     { association: 'profile' },
+ *     { association: 'roles', required: true },
+ *   ]
+ */
+export declare const mergeIncludes: (includes?: any[]) => any[];
+export declare const filterIncludes: (where: any, includes: any, options: {
+    underscored: boolean;
+}) => any[];

package/lib/utils/filter-include.js

@@ -0,0 +1,118 @@
+/**
+ * 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 filter_include_exports = {};
+__export(filter_include_exports, {
+  filterIncludes: () => filterIncludes,
+  mergeIncludes: () => mergeIncludes
+});
+module.exports = __toCommonJS(filter_include_exports);
+var import_utils = require("../utils");
+const collectAssociationPathsFromWhere = /* @__PURE__ */ __name((where) => {
+  const aliasPaths = /* @__PURE__ */ new Set();
+  const traverse = /* @__PURE__ */ __name((value) => {
+    if (value == null) return;
+    if (Array.isArray(value)) {
+      for (const item of value) traverse(item);
+      return;
+    }
+    if (typeof value === "object") {
+      for (const [rawKey, child] of Object.entries(value)) {
+        if (typeof rawKey === "string" && rawKey.startsWith("$") && rawKey.endsWith("$")) {
+          const inner = rawKey.slice(1, -1);
+          const segments = inner.split(".");
+          if (segments.length > 1) {
+            aliasPaths.add(segments.slice(0, -1).join("."));
+          }
+        }
+        traverse(child);
+      }
+      for (const sym of Object.getOwnPropertySymbols(value)) {
+        traverse(value[sym]);
+      }
+    }
+  }, "traverse");
+  traverse(where);
+  return Array.from(aliasPaths);
+}, "collectAssociationPathsFromWhere");
+const pruneIncludeTreeByPaths = /* @__PURE__ */ __name((includes = [], requiredPathsRaw, options) => {
+  const normalizedPaths = options.underscored ? requiredPathsRaw.map(
+    (p) => p.split(".").map((s) => (0, import_utils.snakeCase)(s)).join(".")
+  ) : requiredPathsRaw;
+  if (!(includes == null ? void 0 : includes.length) || !(normalizedPaths == null ? void 0 : normalizedPaths.length)) return [];
+  const pruned = [];
+  for (const inc of includes) {
+    const association = inc == null ? void 0 : inc.association;
+    if (!association) continue;
+    const assocKey = options.underscored ? (0, import_utils.snakeCase)(String(association)) : String(association);
+    const matched = normalizedPaths.filter((p) => p === assocKey || p.startsWith(assocKey + "."));
+    if (!matched.length) continue;
+    const childRemainders = matched.map((p) => p === assocKey ? null : p.slice(assocKey.length + 1)).filter(Boolean);
+    const children = pruneIncludeTreeByPaths(inc.include ?? [], childRemainders, options);
+    const copy = { ...inc };
+    if (children.length) {
+      copy.include = children;
+    } else if ("include" in copy) {
+      delete copy.include;
+    }
+    pruned.push(copy);
+  }
+  return pruned;
+}, "pruneIncludeTreeByPaths");
+const mergeIncludes = /* @__PURE__ */ __name((includes = []) => {
+  const byAssociation = /* @__PURE__ */ new Map();
+  const mergeAll = /* @__PURE__ */ __name((list = []) => {
+    for (const inc of list) {
+      const association = inc == null ? void 0 : inc.association;
+      if (!association) continue;
+      const key = (0, import_utils.snakeCase)(String(association));
+      if (!byAssociation.has(key)) {
+        byAssociation.set(key, { ...inc, include: void 0 });
+      }
+      const target = byAssociation.get(key);
+      if (inc.required) target.required = true;
+      const mergedChildren = mergeIncludes([...target.include ?? [], ...inc.include ?? []]);
+      if (mergedChildren.length) {
+        target.include = mergedChildren;
+      } else if ("include" in target) {
+        delete target.include;
+      }
+    }
+  }, "mergeAll");
+  mergeAll(includes);
+  return Array.from(byAssociation.values());
+}, "mergeIncludes");
+const filterIncludes = /* @__PURE__ */ __name((where, includes, options) => {
+  const path = collectAssociationPathsFromWhere(where);
+  const result = pruneIncludeTreeByPaths(includes, path, options);
+  return result;
+}, "filterIncludes");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  filterIncludes,
+  mergeIncludes
+});

package/lib/utils.d.ts

@@ -16,3 +16,4 @@ export declare function percent2float(value: string): number;
 export declare function isUndefinedOrNull(value: any): boolean;
 export declare function isStringOrNumber(value: any): boolean;
 export declare function getKeysByPrefix(keys: string[], prefix: string): string[];
+export declare function processIncludes(includes: any[], model: any, parentAs?: string): any[];

package/lib/utils.js

@@ -45,6 +45,7 @@ __export(utils_exports, {
   md5: () => md5,
   patchSequelizeQueryInterface: () => patchSequelizeQueryInterface,
   percent2float: () => percent2float,
+  processIncludes: () => processIncludes,
   snakeCase: () => snakeCase
 });
 module.exports = __toCommonJS(utils_exports);
@@ -140,6 +141,26 @@ function getKeysByPrefix(keys, prefix) {
   return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
 }
 __name(getKeysByPrefix, "getKeysByPrefix");
+function processIncludes(includes, model, parentAs = "") {
+  includes.forEach((include, index) => {
+    const association = model.associations[include.association];
+    if (association == null ? void 0 : association.generateInclude) {
+      includes[index] = {
+        ...include,
+        ...association.generateInclude(parentAs)
+      };
+    }
+    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
+      const nextModel = association == null ? void 0 : association.target;
+      if (!nextModel) {
+        return;
+      }
+      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
+    }
+  });
+  return includes;
+}
+__name(processIncludes, "processIncludes");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIdentifier,
@@ -150,5 +171,6 @@ __name(getKeysByPrefix, "getKeysByPrefix");
   md5,
   patchSequelizeQueryInterface,
   percent2float,
+  processIncludes,
   snakeCase
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.7",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.0-beta.5",
-    "@nocobase/utils": "1.9.0-beta.5",
+    "@nocobase/logger": "1.9.0-beta.7",
+    "@nocobase/utils": "1.9.0-beta.7",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6"
+  "gitHead": "4a5055c973b51611d5db1604aaaf6c1b73b4733c"
 }