@nocobase/database 1.4.0-alpha.1 → 1.4.0-alpha.11

package/README.md

@@ -0,0 +1,30 @@
+# NocoBase
+
+<video width="100%" controls>
+      <source src="https://static-docs.nocobase.com/NocoBase0510.mp4" type="video/mp4">
+</video>
+
+
+## What is NocoBase
+
+NocoBase is a scalability-first, open-source no-code development platform.  
+Instead of investing years of time and millions of dollars in research and development, deploy NocoBase in a few minutes and you'll have a private, controllable, and extremely scalable no-code development platform!
+
+Homepage:  
+https://www.nocobase.com/
+
+Online Demo:  
+https://demo.nocobase.com/new
+
+Documents:  
+https://docs.nocobase.com/
+
+Commericial license & plugins:  
+https://www.nocobase.com/en/commercial
+
+License agreement:   
+https://www.nocobase.com/en/agreement
+
+
+## Contact Us:  
+hello@nocobase.com

package/lib/collection.d.ts

@@ -95,6 +95,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     findField(callback: (field: Field) => boolean): any;
     hasField(name: string): boolean;
     getField<F extends Field>(name: string): F;
+    getFieldByField(field: string): Field;
     getFields(): any[];
     addField(name: string, options: FieldOptions): Field;
     checkFieldType(name: string, options: FieldOptions): void;
@@ -138,7 +139,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

@@ -113,6 +113,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     var _a;
     const targetKey = (_a = this.options) == null ? void 0 : _a.filterTargetKey;
     if (Array.isArray(targetKey)) {
+      if (targetKey.length === 1) {
+        return targetKey[0];
+      }
       return targetKey;
     }
     if (targetKey && this.model.getAttributes()[targetKey]) {
@@ -258,6 +261,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   getField(name) {
     return this.fields.get(name);
   }
+  getFieldByField(field) {
+    return this.findField((f) => f.options.field === field);
+  }
   getFields() {
     return [...this.fields.values()];
   }
@@ -684,9 +690,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.d.ts

@@ -78,6 +78,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     repositories: Map<string, typeof Repository>;
     operators: Map<any, any>;
     collections: Map<string, Collection<any, any>>;
+    collectionsSort: Map<string, number>;
     pendingFields: Map<string, FieldTypes.RelationField[]>;
     modelCollection: Map<ModelStatic<any>, Collection<any, any>>;
     modelNameCollectionMap: Map<string, Collection<any, any>>;

package/lib/database.js

@@ -88,6 +88,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   repositories = /* @__PURE__ */ new Map();
   operators = /* @__PURE__ */ new Map();
   collections = /* @__PURE__ */ new Map();
+  collectionsSort = /* @__PURE__ */ new Map();
   pendingFields = /* @__PURE__ */ new Map();
   modelCollection = /* @__PURE__ */ new Map();
   modelNameCollectionMap = /* @__PURE__ */ new Map();

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.toISOString();
+    } 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/to-many-interface.js

@@ -36,6 +36,7 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
     if (!str) {
       return null;
     }
+    str = `${str}`.trim();
     const items = str.split(",");
     const { filterKey, targetCollection, transaction } = ctx;
     const targetInstances = await targetCollection.repository.find({
@@ -45,7 +46,7 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
       transaction
     });
     items.forEach((item) => {
-      if (!targetInstances.find((targetInstance) => targetInstance[filterKey] === item)) {
+      if (!targetInstances.find((targetInstance) => targetInstance[filterKey] == item)) {
         throw new Error(`"${item}" not found in ${targetCollection.model.name} ${filterKey}`);
       }
     });

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/package.json

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