@nocobase/database 1.4.0-alpha.20241105053324 → 1.4.0-alpha.3

package/lib/collection.d.ts

@@ -138,7 +138,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     quotedTableName(): any;
     collectionSchema(): string;
     isView(): boolean;
-    unavailableActions(): string[];
+    unavailableActions(): any[];
     protected sequelizeModelOptions(): {
         modelName: string;
         sequelize: import("sequelize").Sequelize;

package/lib/collection.js

@@ -684,9 +684,6 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     return false;
   }
   unavailableActions() {
-    if (this.options.template === "file") {
-      return ["create", "update", "destroy"];
-    }
     return [];
   }
   sequelizeModelOptions() {

package/lib/database.js

@@ -160,6 +160,9 @@ const _Database = class _Database extends import_events.EventEmitter {
         return val;
       });
     }
+    if (options.logging && process.env["DB_SQL_BENCHMARK"] == "true") {
+      opts.benchmark = true;
+    }
     this.options = opts;
     this.logger.debug(
       `create database instance: ${(0, import_safe_json_stringify.default)(

package/lib/interfaces/boolean-interface.js

@@ -58,7 +58,11 @@ const _BooleanInterface = class _BooleanInterface extends import_base_interface.
       const option = enumConfig.find((item) => item.value === value);
       return option == null ? void 0 : option.label;
     } else {
-      return value ? "\u662F" : value === null || value === void 0 ? "" : "\u5426";
+      const label = value ? "True" : value === null || value === void 0 ? "" : "False";
+      if (ctx == null ? void 0 : ctx.t) {
+        return ctx.t(label, { ns: "action-export" });
+      }
+      return label;
     }
   }
 };

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

@@ -0,0 +1,4 @@
+import { DatetimeInterface } from './datetime-interface';
+export declare class DateInterface extends DatetimeInterface {
+    toString(value: any, ctx?: any): any;
+}

package/lib/interfaces/date-interface.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 date_interface_exports = {};
+__export(date_interface_exports, {
+  DateInterface: () => DateInterface
+});
+module.exports = __toCommonJS(date_interface_exports);
+var import_datetime_interface = require("./datetime-interface");
+const _DateInterface = class _DateInterface extends import_datetime_interface.DatetimeInterface {
+  toString(value, ctx) {
+    return value;
+  }
+};
+__name(_DateInterface, "DateInterface");
+let DateInterface = _DateInterface;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DateInterface
+});

package/lib/interfaces/datetime-interface.js

@@ -63,7 +63,6 @@ function resolveTimeZoneFromCtx(ctx) {
 __name(resolveTimeZoneFromCtx, "resolveTimeZoneFromCtx");
 const _DatetimeInterface = class _DatetimeInterface extends import_base_interface.BaseInterface {
   async toValue(value, ctx = {}) {
-    var _a, _b, _c;
     if (!value) {
       return null;
     }
@@ -81,11 +80,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     } else if (isNumeric(value)) {
       return (0, import_excel_date_to_js.getJsDateFromExcel)(value).toISOString();
     } else if (typeof value === "string") {
-      const props = ((_c = (_b = (_a = ctx.field) == null ? void 0 : _a.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c["x-component-props"]) || {};
-      const m = (0, import_dayjs.default)(value);
-      if (m.isValid()) {
-        return (0, import_utils.moment2str)(m, props);
-      }
+      return value;
     }
     throw new Error(`Invalid date - ${value}`);
   }

package/lib/interfaces/datetime-no-tz-interface.d.ts

@@ -0,0 +1,5 @@
+import { DatetimeInterface } from './datetime-interface';
+export declare class DatetimeNoTzInterface extends DatetimeInterface {
+    toValue(value: any, ctx?: any): Promise<any>;
+    toString(value: any, ctx?: any): any;
+}

package/lib/interfaces/datetime-no-tz-interface.js

@@ -0,0 +1,93 @@
+/**
+ * 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 datetime_no_tz_interface_exports = {};
+__export(datetime_no_tz_interface_exports, {
+  DatetimeNoTzInterface: () => DatetimeNoTzInterface
+});
+module.exports = __toCommonJS(datetime_no_tz_interface_exports);
+var import_datetime_interface = require("./datetime-interface");
+var import_dayjs = __toESM(require("dayjs"));
+var import_excel_date_to_js = require("excel-date-to-js");
+var import_utils = require("@nocobase/utils");
+function isDate(v) {
+  return v instanceof Date;
+}
+__name(isDate, "isDate");
+function isNumeric(str) {
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+__name(isNumeric, "isNumeric");
+const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datetime_interface.DatetimeInterface {
+  async toValue(value, ctx = {}) {
+    if (!value) {
+      return null;
+    }
+    if (typeof value === "string") {
+      const match = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
+      if (match) {
+        return `${match[1]}-${match[2]}-${match[3]}`;
+      }
+    }
+    if (import_dayjs.default.isDayjs(value)) {
+      return value;
+    } else if (isDate(value)) {
+      return value;
+    } else if (isNumeric(value)) {
+      const date = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
+      return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+    } else if (typeof value === "string") {
+      return value;
+    }
+    throw new Error(`Invalid date - ${value}`);
+  }
+  toString(value, ctx) {
+    var _a, _b;
+    const props = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component-props"]) ?? {};
+    const format = (0, import_utils.getDefaultFormat)(props);
+    const m = (0, import_utils.str2moment)(value, { ...props });
+    return m ? m.format(format) : "";
+  }
+};
+__name(_DatetimeNoTzInterface, "DatetimeNoTzInterface");
+let DatetimeNoTzInterface = _DatetimeNoTzInterface;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DatetimeNoTzInterface
+});

package/lib/interfaces/index.d.ts

@@ -11,4 +11,6 @@ export * from './percent-interface';
 export * from './multiple-select-interface';
 export * from './select-interface';
 export * from './datetime-interface';
+export * from './datetime-no-tz-interface';
 export * from './boolean-interface';
+export * from './date-interface';

package/lib/interfaces/index.js

@@ -28,7 +28,9 @@ __reExport(interfaces_exports, require("./percent-interface"), module.exports);
 __reExport(interfaces_exports, require("./multiple-select-interface"), module.exports);
 __reExport(interfaces_exports, require("./select-interface"), module.exports);
 __reExport(interfaces_exports, require("./datetime-interface"), module.exports);
+__reExport(interfaces_exports, require("./datetime-no-tz-interface"), module.exports);
 __reExport(interfaces_exports, require("./boolean-interface"), module.exports);
+__reExport(interfaces_exports, require("./date-interface"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./base-interface"),
@@ -36,5 +38,7 @@ __reExport(interfaces_exports, require("./boolean-interface"), module.exports);
   ...require("./multiple-select-interface"),
   ...require("./select-interface"),
   ...require("./datetime-interface"),
-  ...require("./boolean-interface")
+  ...require("./datetime-no-tz-interface"),
+  ...require("./boolean-interface"),
+  ...require("./date-interface")
 });

package/lib/interfaces/multiple-select-interface.js

@@ -64,7 +64,13 @@ const _MultipleSelectInterface = class _MultipleSelectInterface extends import_b
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     return import_lodash.default.castArray(value).map((value2) => {
       const option = enumConfig.find((item) => item.value === value2);
-      return option ? option.label : value2;
+      if (option) {
+        if (ctx == null ? void 0 : ctx.t) {
+          return ctx.t(option.label, { ns: "lm-collections" });
+        }
+        return option.label;
+      }
+      return value2;
     }).join(",");
   }
 };

package/lib/interfaces/select-interface.js

@@ -52,7 +52,13 @@ const _SelectInterface = class _SelectInterface extends import_base_interface.Ba
     var _a;
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     const option = enumConfig.find((item) => item.value === value);
-    return (option == null ? void 0 : option.label) || value;
+    if (option) {
+      if (ctx == null ? void 0 : ctx.t) {
+        return ctx.t(option.label, { ns: "lm-collections" });
+      }
+      return option.label;
+    }
+    return value;
   }
 };
 __name(_SelectInterface, "SelectInterface");

package/lib/interfaces/to-one-interface.js

@@ -39,7 +39,7 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     if (!str) {
       return null;
     }
-    const { filterKey, targetCollection, transaction } = ctx;
+    const { filterKey, associationField, targetCollection, transaction } = ctx;
     const targetInstance = await targetCollection.repository.findOne({
       filter: {
         [filterKey]: str
@@ -49,8 +49,8 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     if (!targetInstance) {
       throw new Error(`"${str}" not found in ${targetCollection.model.name} ${filterKey}`);
     }
-    const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
-    return targetInstance[primaryKeyAttribute];
+    const targetKey = associationField.targetKey || targetCollection.model.primaryKeyAttribute;
+    return targetInstance[targetKey];
   }
 };
 __name(_ToOneInterface, "ToOneInterface");

package/lib/interfaces/utils.js

@@ -51,6 +51,9 @@ const interfaces = {
   radioGroup: import_index.SelectInterface,
   percent: import_index.PercentInterface,
   datetime: import_index.DatetimeInterface,
+  datetimeNoTz: import_index.DatetimeNoTzInterface,
+  unixTimestamp: import_index.DatetimeInterface,
+  date: import_index.DateInterface,
   createdAt: import_index.DatetimeInterface,
   updatedAt: import_index.DatetimeInterface,
   boolean: import_index.BooleanInterface,

package/lib/options-parser.js

@@ -174,7 +174,10 @@ const _OptionsParser = class _OptionsParser {
       }
       sortField.push(direction);
       if (this.database.isMySQLCompatibleDialect()) {
-        orderParams.push([import_sequelize.Sequelize.fn("ISNULL", import_sequelize.Sequelize.col(`${this.model.name}.${sortField[0]}`))]);
+        const fieldName = sortField[0];
+        if (this.model.fieldRawAttributesMap[fieldName]) {
+          orderParams.push([import_sequelize.Sequelize.fn("ISNULL", import_sequelize.Sequelize.col(`${this.model.name}.${sortField[0]}`))]);
+        }
       }
       orderParams.push(sortField);
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20241105053324",
+  "version": "1.4.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.20241105053324",
-    "@nocobase/utils": "1.4.0-alpha.20241105053324",
+    "@nocobase/logger": "1.4.0-alpha.3",
+    "@nocobase/utils": "1.4.0-alpha.3",
     "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": "a6e647971c02c1ffb443e2dc2c230ca2719e3319"
+  "gitHead": "9268a5b29cbbe9f83255e5cd66fa82f012aab46a"
 }