@nocobase/database 1.3.0-alpha.20240819011229 → 1.4.0-alpha.20240825165425

package/lib/collection.d.ts

@@ -53,6 +53,7 @@ export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'>
     magicAttribute?: string;
     tree?: string;
     template?: string;
+    simplePaginate?: boolean;
     /**
      * where is the collection from
      *

package/lib/collection.js

@@ -53,7 +53,6 @@ var import_events = require("events");
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_model = require("./model");
-var import_adjacency_list_repository = require("./repositories/tree-repository/adjacency-list-repository");
 var import_repository = require("./repository");
 var import_utils = require("./utils");
 var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
@@ -189,9 +188,6 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     if (typeof repository === "string") {
       repo = this.context.database.repositories.get(repository) || import_repository.Repository;
     }
-    if (this.options.tree == "adjacency-list" || this.options.tree == "adjacencyList") {
-      repo = import_adjacency_list_repository.AdjacencyListRepository;
-    }
     this.repository = new repo(this);
   }
   forEachField(callback) {

package/lib/database.js

@@ -64,6 +64,7 @@ var import_database_utils = __toESM(require("./database-utils"));
 var import_references_map = __toESM(require("./features/references-map"));
 var import_referential_integrity_check = require("./features/referential-integrity-check");
 var FieldTypes = __toESM(require("./fields"));
+var import_helpers = require("./helpers");
 var import_inherited_collection = require("./inherited-collection");
 var import_inherited_map = __toESM(require("./inherited-map"));
 var import_interface_manager = require("./interface-manager");
@@ -158,7 +159,6 @@ const _Database = class _Database extends import_events.EventEmitter {
         opts.storage = (0, import_path.resolve)(process.cwd(), options.storage);
       }
     }
-    opts.rawTimezone = opts.timezone;
     if (options.dialect === "sqlite") {
       delete opts.timezone;
     } else if (!opts.timezone) {
@@ -367,6 +367,9 @@ const _Database = class _Database extends import_events.EventEmitter {
           options.indexes = options.indexes.map((index) => {
             if (index.fields) {
               index.fields = index.fields.map((field) => {
+                if (field.name) {
+                  return { name: (0, import_utils3.snakeCase)(field.name), ...field };
+                }
                 return (0, import_utils3.snakeCase)(field);
               });
             }
@@ -658,7 +661,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    * @internal
    */
   async checkVersion() {
-    return true;
+    return await (0, import_helpers.checkDatabaseVersion)(this);
   }
   /**
    * @internal

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

@@ -44,7 +44,6 @@ 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_adjacency_list_repository = require("../repositories/tree-repository/adjacency-list-repository");
 const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
   if (import_lodash.default.isArray(node.attributes) && !node.attributes.includes(attribute)) {
     node.attributes.push(attribute);
@@ -67,6 +66,25 @@ const EagerLoadingNodeProto = {
     }
   }
 };
+const queryParentSQL = /* @__PURE__ */ __name((options) => {
+  const { collection, db, nodeIds } = options;
+  const tableName = collection.quotedTableName();
+  const { foreignKey, targetKey } = options;
+  const foreignKeyField = collection.model.rawAttributes[foreignKey].field;
+  const targetKeyField = collection.model.rawAttributes[targetKey].field;
+  const queryInterface = db.sequelize.getQueryInterface();
+  const q = queryInterface.quoteIdentifier.bind(queryInterface);
+  return `WITH RECURSIVE cte AS (
+      SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
+      FROM ${tableName}
+      WHERE ${q(targetKeyField)} IN (${nodeIds.join(",")})
+      UNION ALL
+      SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
+      FROM ${tableName} AS t
+      INNER JOIN cte ON t.${q(targetKeyField)} = cte.${q(foreignKeyField)}
+      )
+      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
+}, "queryParentSQL");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
   db;
@@ -289,7 +307,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           });
           if (node.includeOption.recursively && instances.length > 0) {
             const targetKey = association.targetKey;
-            const sql = import_adjacency_list_repository.AdjacencyListRepository.queryParentSQL({
+            const sql = queryParentSQL({
               db: this.db,
               collection: collection2,
               foreignKey,

package/lib/fields/date-field.d.ts

@@ -6,17 +6,15 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class DateField extends Field {
-    get dataType(): any;
+    get dataType(): DataTypes.DateDataType;
     get timezone(): string;
     getProps(): any;
     isDateOnly(): boolean;
     isGMT(): any;
-    init(): void;
-    setter(value: any, options: any): any;
     bind(): void;
-    unbind(): void;
 }
 export interface DateFieldOptions extends BaseColumnFieldOptions {
     type: 'date';

package/lib/fields/date-field.js

@@ -32,11 +32,6 @@ __export(date_field_exports, {
 module.exports = __toCommonJS(date_field_exports);
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
-const datetimeRegex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
-function isValidDatetime(str) {
-  return datetimeRegex.test(str);
-}
-__name(isValidDatetime, "isValidDatetime");
 const _DateField = class _DateField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.DATE(3);
@@ -56,47 +51,6 @@ const _DateField = class _DateField extends import_field.Field {
     const props = this.getProps();
     return props.gmt;
   }
-  init() {
-    const { name, defaultToCurrentTime, onUpdateToCurrentTime, timezone } = this.options;
-    this.resolveTimeZone = (context) => {
-      const serverTimeZone = this.database.options.rawTimezone;
-      if (timezone === "server") {
-        return serverTimeZone;
-      }
-      if (timezone === "client") {
-        return (context == null ? void 0 : context.timezone) || serverTimeZone;
-      }
-      if (timezone) {
-        return timezone;
-      }
-      return serverTimeZone;
-    };
-    this.beforeSave = async (instance, options) => {
-      const value = instance.get(name);
-      if (!value && instance.isNewRecord && defaultToCurrentTime) {
-        instance.set(name, /* @__PURE__ */ new Date());
-        return;
-      }
-      if (onUpdateToCurrentTime) {
-        instance.set(name, /* @__PURE__ */ new Date());
-        return;
-      }
-    };
-  }
-  setter(value, options) {
-    if (value === null) {
-      return value;
-    }
-    if (value instanceof Date) {
-      return value;
-    }
-    if (typeof value === "string" && isValidDatetime(value)) {
-      const dateTimezone = this.resolveTimeZone(options == null ? void 0 : options.context);
-      const dateString = `${value} ${dateTimezone}`;
-      return new Date(dateString);
-    }
-    return value;
-  }
   bind() {
     super.bind();
     if (this.options.interface === "createdAt") {
@@ -109,11 +63,6 @@ const _DateField = class _DateField extends import_field.Field {
       model._timestampAttributes.updatedAt = this.name;
       model.refreshAttributes();
     }
-    this.on("beforeSave", this.beforeSave);
-  }
-  unbind() {
-    super.unbind();
-    this.off("beforeSave", this.beforeSave);
   }
 };
 __name(_DateField, "DateField");

package/lib/fields/field.d.ts

@@ -47,6 +47,6 @@ export declare abstract class Field {
     bind(): void;
     unbind(): void;
     toSequelize(): any;
-    additionalSequelizeOptions(): {};
+    isSqlite(): boolean;
     typeToString(): any;
 }

package/lib/fields/field.js

@@ -151,11 +151,10 @@ const _Field = class _Field {
     if (this.dataType) {
       Object.assign(opts, { type: this.database.sequelize.normalizeDataType(this.dataType) });
     }
-    Object.assign(opts, this.additionalSequelizeOptions());
     return opts;
   }
-  additionalSequelizeOptions() {
-    return {};
+  isSqlite() {
+    return this.database.sequelize.getDialect() === "sqlite";
   }
   typeToString() {
     return this.dataType.toString();

package/lib/fields/index.d.ts

@@ -29,15 +29,12 @@ import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
 import { NanoidFieldOptions } from './nanoid-field';
 import { EncryptionField } from './encryption-field';
-import { UnixTimestampFieldOptions } from './unix-timestamp-field';
-import { DateOnlyFieldOptions } from './date-only-field';
 export * from './array-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
 export * from './boolean-field';
 export * from './context-field';
 export * from './date-field';
-export * from './date-only-field';
 export * from './field';
 export * from './has-many-field';
 export * from './has-one-field';
@@ -56,5 +53,4 @@ export * from './uuid-field';
 export * from './virtual-field';
 export * from './nanoid-field';
 export * from './encryption-field';
-export * from './unix-timestamp-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField;
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField;

package/lib/fields/index.js

@@ -29,7 +29,6 @@ __reExport(fields_exports, require("./belongs-to-many-field"), module.exports);
 __reExport(fields_exports, require("./boolean-field"), module.exports);
 __reExport(fields_exports, require("./context-field"), module.exports);
 __reExport(fields_exports, require("./date-field"), module.exports);
-__reExport(fields_exports, require("./date-only-field"), module.exports);
 __reExport(fields_exports, require("./field"), module.exports);
 __reExport(fields_exports, require("./has-many-field"), module.exports);
 __reExport(fields_exports, require("./has-one-field"), module.exports);
@@ -48,7 +47,6 @@ __reExport(fields_exports, require("./uuid-field"), module.exports);
 __reExport(fields_exports, require("./virtual-field"), module.exports);
 __reExport(fields_exports, require("./nanoid-field"), module.exports);
 __reExport(fields_exports, require("./encryption-field"), module.exports);
-__reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./array-field"),
@@ -57,7 +55,6 @@ __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
   ...require("./boolean-field"),
   ...require("./context-field"),
   ...require("./date-field"),
-  ...require("./date-only-field"),
   ...require("./field"),
   ...require("./has-many-field"),
   ...require("./has-one-field"),
@@ -75,6 +72,5 @@ __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
   ...require("./uuid-field"),
   ...require("./virtual-field"),
   ...require("./nanoid-field"),
-  ...require("./encryption-field"),
-  ...require("./unix-timestamp-field")
+  ...require("./encryption-field")
 });

package/lib/fields/string-field.d.ts

@@ -9,8 +9,9 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class StringField extends Field {
-    get dataType(): DataTypes.StringDataTypeConstructor;
+    get dataType(): DataTypes.StringDataTypeConstructor | DataTypes.StringDataType;
 }
 export interface StringFieldOptions extends BaseColumnFieldOptions {
     type: 'string';
+    length?: number;
 }

package/lib/fields/string-field.js

@@ -34,6 +34,9 @@ var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _StringField = class _StringField extends import_field.Field {
   get dataType() {
+    if (this.options.length) {
+      return import_sequelize.DataTypes.STRING(this.options.length);
+    }
     return import_sequelize.DataTypes.STRING;
   }
 };

package/lib/model.d.ts

@@ -20,7 +20,6 @@ export declare class Model<TModelAttributes extends {} = any, TCreationAttribute
     protected _previousDataValuesWithAssociations: {};
     get db(): Database;
     static sync(options: any): Promise<any>;
-    static callSetters(values: any, options: any): {};
     toChangedWithAssociations(): void;
     changedWithAssociations(key?: string, value?: any): boolean | unknown[] | this;
     clearChangedWithAssociations(): void;

package/lib/model.js

@@ -56,18 +56,6 @@ const _Model = class _Model extends import_sequelize.Model {
     const runner = new import_sync_runner.SyncRunner(this);
     return await runner.runSync(options);
   }
-  static callSetters(values, options) {
-    const result = {};
-    for (const key of Object.keys(values)) {
-      const field = this.collection.getField(key);
-      if (field && field.setter) {
-        result[key] = field.setter.call(field, values[key], options, values, key);
-      } else {
-        result[key] = values[key];
-      }
-    }
-    return result;
-  }
   // TODO
   toChangedWithAssociations() {
     this._changedWithAssociations = /* @__PURE__ */ new Set([...this._changedWithAssociations, ...this._changed]);

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -9,7 +9,7 @@
 import { MultiAssociationAccessors, Transaction, Transactionable } from 'sequelize';
 import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FindOneOptions, FindOptions, TargetKey, TK, UpdateOptions } from '../repository';
 import { RelationRepository } from './relation-repository';
-export type FindAndCountOptions = CommonFindOptions;
+type FindAndCountOptions = CommonFindOptions;
 export interface AssociatedOptions extends Transactionable {
     tk?: TK;
 }
@@ -25,3 +25,4 @@ export declare abstract class MultipleRelationRepository extends RelationReposit
     protected filterHasInclude(filter: Filter, options?: any): boolean;
     protected accessors(): MultiAssociationAccessors;
 }
+export {};

package/lib/repository.d.ts

@@ -80,7 +80,7 @@ export interface DestroyOptions extends SequelizeDestroyOptions {
     truncate?: boolean;
     context?: any;
 }
-type FindAndCountOptions = Omit<SequelizeAndCountOptions, 'where' | 'include' | 'order'> & CommonFindOptions;
+export type FindAndCountOptions = Omit<SequelizeAndCountOptions, 'where' | 'include' | 'order'> & CommonFindOptions;
 export interface CreateOptions extends SequelizeCreateOptions {
     values?: Values | Values[];
     whitelist?: WhiteList;

package/lib/repository.js

@@ -374,7 +374,7 @@ const _Repository = class _Repository {
       action: "create",
       underscored: this.collection.options.underscored
     });
-    const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
+    const values = guard.sanitize(options.values || {});
     const instance = await this.model.create(values, {
       ...options,
       transaction: transaction2
@@ -418,7 +418,7 @@ const _Repository = class _Repository {
     }
     const transaction2 = await this.getTransaction(options);
     const guard = import_update_guard.UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored });
-    const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
+    const values = guard.sanitize(options.values);
     if (options.individualHooks === false) {
       const { model: Model2 } = this.collection;
       const primaryKeyField = Model2.primaryKeyField || Model2.primaryKeyAttribute;

package/lib/view/field-type-map.js

@@ -38,8 +38,8 @@ const postgres = {
   oid: "string",
   name: "string",
   smallint: ["integer", "sort"],
-  integer: ["integer", "unixTimestamp", "sort"],
-  bigint: ["bigInt", "unixTimestamp", "sort"],
+  integer: ["integer", "sort"],
+  bigint: ["bigInt", "sort"],
   decimal: "decimal",
   numeric: "float",
   real: "float",
@@ -74,11 +74,11 @@ const mysql = {
   text: "text",
   mediumtext: "text",
   longtext: "text",
-  int: ["integer", "unixTimestamp", "sort"],
-  "int unsigned": ["integer", "unixTimestamp", "sort"],
-  integer: ["integer", "unixTimestamp", "sort"],
-  bigint: ["bigInt", "unixTimestamp", "sort"],
-  "bigint unsigned": ["bigInt", "unixTimestamp", "sort"],
+  int: ["integer", "sort"],
+  "int unsigned": ["integer", "sort"],
+  integer: ["integer", "sort"],
+  bigint: ["bigInt", "sort"],
+  "bigint unsigned": ["bigInt", "sort"],
   float: "float",
   double: "float",
   boolean: "boolean",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.3.0-alpha.20240819011229",
+  "version": "1.4.0-alpha.20240825165425",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.3.0-alpha.20240819011229",
-    "@nocobase/utils": "1.3.0-alpha.20240819011229",
+    "@nocobase/logger": "1.4.0-alpha.20240825165425",
+    "@nocobase/utils": "1.4.0-alpha.20240825165425",
     "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": "76365630f8f7129a9308da4aaa1661c08603d04b"
+  "gitHead": "dc1bd67309135a872818a919855b45ef7544f689"
 }

package/lib/fields/date-only-field.d.ts

@@ -1,15 +0,0 @@
-/**
- * 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.
- */
-import { BaseColumnFieldOptions, Field } from './field';
-export declare class DateOnlyField extends Field {
-    get dataType(): any;
-}
-export interface DateOnlyFieldOptions extends BaseColumnFieldOptions {
-    type: 'dateOnly';
-}

package/lib/fields/date-only-field.js

@@ -1,45 +0,0 @@
-/**
- * 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 date_only_field_exports = {};
-__export(date_only_field_exports, {
-  DateOnlyField: () => DateOnlyField
-});
-module.exports = __toCommonJS(date_only_field_exports);
-var import_field = require("./field");
-var import_sequelize = require("sequelize");
-const _DateOnlyField = class _DateOnlyField extends import_field.Field {
-  get dataType() {
-    return import_sequelize.DataTypes.DATEONLY;
-  }
-};
-__name(_DateOnlyField, "DateOnlyField");
-let DateOnlyField = _DateOnlyField;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DateOnlyField
-});

package/lib/fields/unix-timestamp-field.d.ts

@@ -1,18 +0,0 @@
-/**
- * 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.
- */
-import { DataTypes } from 'sequelize';
-import { DateField } from './date-field';
-import { BaseColumnFieldOptions } from './field';
-export declare class UnixTimestampField extends DateField {
-    get dataType(): DataTypes.BigIntDataTypeConstructor;
-    additionalSequelizeOptions(): {};
-}
-export interface UnixTimestampFieldOptions extends BaseColumnFieldOptions {
-    type: 'unix-timestamp';
-}

package/lib/fields/unix-timestamp-field.js

@@ -1,76 +0,0 @@
-/**
- * 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 unix_timestamp_field_exports = {};
-__export(unix_timestamp_field_exports, {
-  UnixTimestampField: () => UnixTimestampField
-});
-module.exports = __toCommonJS(unix_timestamp_field_exports);
-var import_sequelize = require("sequelize");
-var import_date_field = require("./date-field");
-const _UnixTimestampField = class _UnixTimestampField extends import_date_field.DateField {
-  get dataType() {
-    return import_sequelize.DataTypes.BIGINT;
-  }
-  additionalSequelizeOptions() {
-    var _a, _b, _c, _d;
-    const { name } = this.options;
-    let { accuracy } = this.options;
-    if ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema["x-component-props"]) == null ? void 0 : _b.accuracy) {
-      accuracy = (_d = (_c = this.options) == null ? void 0 : _c.uiSchema["x-component-props"]) == null ? void 0 : _d.accuracy;
-    }
-    if (!accuracy) {
-      accuracy = "second";
-    }
-    let rationalNumber = 1e3;
-    if (accuracy === "millisecond") {
-      rationalNumber = 1;
-    }
-    return {
-      get() {
-        const value = this.getDataValue(name);
-        if (value === null || value === void 0) {
-          return value;
-        }
-        return new Date(value * rationalNumber);
-      },
-      set(value) {
-        if (value === null || value === void 0) {
-          this.setDataValue(name, value);
-        } else {
-          this.setDataValue(name, Math.floor(new Date(value).getTime() / rationalNumber));
-        }
-      }
-    };
-  }
-};
-__name(_UnixTimestampField, "UnixTimestampField");
-let UnixTimestampField = _UnixTimestampField;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  UnixTimestampField
-});

package/lib/repositories/tree-repository/adjacency-list-repository.d.ts

@@ -1,26 +0,0 @@
-/**
- * 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.
- */
-import { FindOptions, Repository } from '../../repository';
-import Database from '../../database';
-import { Collection } from '../../collection';
-export declare class AdjacencyListRepository extends Repository {
-    static queryParentSQL(options: {
-        db: Database;
-        nodeIds: any[];
-        collection: Collection;
-        foreignKey: string;
-        targetKey: string;
-    }): string;
-    update(options: any): Promise<any>;
-    find(options?: FindOptions & {
-        addIndex?: boolean;
-    }): Promise<any>;
-    private addIndex;
-    private querySQL;
-}

package/lib/repositories/tree-repository/adjacency-list-repository.js

@@ -1,192 +0,0 @@
-/**
- * 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 __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) => {
-  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 __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 adjacency_list_repository_exports = {};
-__export(adjacency_list_repository_exports, {
-  AdjacencyListRepository: () => AdjacencyListRepository
-});
-module.exports = __toCommonJS(adjacency_list_repository_exports);
-var import_lodash = __toESM(require("lodash"));
-var import_repository = require("../../repository");
-const _AdjacencyListRepository = class _AdjacencyListRepository extends import_repository.Repository {
-  static queryParentSQL(options) {
-    const { collection, db, nodeIds } = options;
-    const tableName = collection.quotedTableName();
-    const { foreignKey, targetKey } = options;
-    const foreignKeyField = collection.model.rawAttributes[foreignKey].field;
-    const targetKeyField = collection.model.rawAttributes[targetKey].field;
-    const queryInterface = db.sequelize.getQueryInterface();
-    const q = queryInterface.quoteIdentifier.bind(queryInterface);
-    return `WITH RECURSIVE cte AS (
-      SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
-      FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN (${nodeIds.join(",")})
-      UNION ALL
-      SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
-      FROM ${tableName} AS t
-      INNER JOIN cte ON t.${q(targetKeyField)} = cte.${q(foreignKeyField)}
-      )
-      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
-  }
-  async update(options) {
-    return super.update({
-      ...options || {},
-      addIndex: false
-    });
-  }
-  async find(options = {}) {
-    var _a;
-    if (options.raw || !options.tree) {
-      return await super.find(options);
-    }
-    const collection = this.collection;
-    const primaryKey = collection.model.primaryKeyAttribute;
-    if (options.fields && !options.fields.includes(primaryKey)) {
-      options.fields.push(primaryKey);
-    }
-    const parentNodes = await super.find(options);
-    if (parentNodes.length === 0) {
-      return [];
-    }
-    const { treeParentField } = collection;
-    const foreignKey = treeParentField.options.foreignKey;
-    const childrenKey = ((_a = collection.treeChildrenField) == null ? void 0 : _a.name) ?? "children";
-    const parentIds = parentNodes.map((node) => node[primaryKey]);
-    if (parentIds.length == 0) {
-      this.database.logger.warn("parentIds is empty");
-      return parentNodes;
-    }
-    const sql = this.querySQL(parentIds, collection);
-    const childNodes = await this.database.sequelize.query(sql, {
-      type: "SELECT",
-      transaction: options.transaction
-    });
-    const childIds = childNodes.map((node) => node[primaryKey]);
-    const findChildrenOptions = {
-      ...import_lodash.default.omit(options, ["limit", "offset", "filterByTk"]),
-      filter: {
-        [primaryKey]: childIds
-      }
-    };
-    if (findChildrenOptions.fields) {
-      [primaryKey, foreignKey].forEach((field) => {
-        if (!findChildrenOptions.fields.includes(field)) {
-          findChildrenOptions.fields.push(field);
-        }
-      });
-    }
-    const childInstances = await super.find(findChildrenOptions);
-    const nodeMap = {};
-    childInstances.forEach((node) => {
-      if (!nodeMap[`${node[foreignKey]}`]) {
-        nodeMap[`${node[foreignKey]}`] = [];
-      }
-      nodeMap[`${node[foreignKey]}`].push(node);
-    });
-    function buildTree(parentId) {
-      const children = nodeMap[parentId];
-      if (!children) {
-        return [];
-      }
-      return children.map((child) => {
-        const childrenValues = buildTree(child.id);
-        if (childrenValues.length > 0) {
-          child.setDataValue(childrenKey, childrenValues);
-        }
-        return child;
-      });
-    }
-    __name(buildTree, "buildTree");
-    for (const parent of parentNodes) {
-      const parentId = parent[primaryKey];
-      const children = buildTree(parentId);
-      if (children.length > 0) {
-        parent.setDataValue(childrenKey, children);
-      }
-    }
-    this.addIndex(parentNodes, childrenKey, options);
-    return parentNodes;
-  }
-  addIndex(treeArray, childrenKey, options) {
-    function traverse(node, index) {
-      if (node._options.includeNames && !node._options.includeNames.includes(childrenKey)) {
-        node._options.includeNames.push(childrenKey);
-      }
-      if (options.addIndex !== false) {
-        node.setDataValue("__index", `${index}`);
-      }
-      const children = node.getDataValue(childrenKey);
-      if (children && children.length === 0) {
-        node.setDataValue(childrenKey, void 0);
-      }
-      if (children && children.length > 0) {
-        children.forEach((child, i) => {
-          traverse(child, `${index}.${childrenKey}.${i}`);
-        });
-      }
-    }
-    __name(traverse, "traverse");
-    treeArray.forEach((tree, i) => {
-      traverse(tree, i);
-    });
-  }
-  querySQL(rootIds, collection) {
-    const { treeParentField } = collection;
-    const foreignKey = treeParentField.options.foreignKey;
-    const foreignKeyField = collection.model.rawAttributes[foreignKey].field;
-    const primaryKey = collection.model.primaryKeyAttribute;
-    const queryInterface = this.database.sequelize.getQueryInterface();
-    const q = queryInterface.quoteIdentifier.bind(queryInterface);
-    return `
-      WITH RECURSIVE cte AS (SELECT ${q(primaryKey)}, ${q(foreignKeyField)}, 1 AS level
-                             FROM ${collection.quotedTableName()}
-                             WHERE ${q(foreignKeyField)} IN (${rootIds.join(",")})
-                             UNION ALL
-                             SELECT t.${q(primaryKey)}, t.${q(foreignKeyField)}, cte.level + 1 AS level
-                             FROM ${collection.quotedTableName()} t
-                                    JOIN cte ON t.${q(foreignKeyField)} = cte.${q(primaryKey)})
-      SELECT ${q(primaryKey)}, ${q(foreignKeyField)} as ${q(foreignKey)}, level
-      FROM cte
-    `;
-  }
-};
-__name(_AdjacencyListRepository, "AdjacencyListRepository");
-let AdjacencyListRepository = _AdjacencyListRepository;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  AdjacencyListRepository
-});