@nocobase/plugin-data-source-main 1.5.0-beta.9 → 1.5.1

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.5.0-beta.9",
-  "@nocobase/database": "1.5.0-beta.9",
-  "@nocobase/plugin-error-handler": "1.5.0-beta.9",
-  "@nocobase/server": "1.5.0-beta.9",
+  "@nocobase/client": "1.5.1",
+  "@nocobase/database": "1.5.1",
+  "@nocobase/plugin-error-handler": "1.5.1",
+  "@nocobase/server": "1.5.1",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.5.0-beta.9",
-  "@nocobase/utils": "1.5.0-beta.9",
+  "@nocobase/test": "1.5.1",
+  "@nocobase/utils": "1.5.1",
   "sequelize": "6.35.2",
   "dayjs": "1.11.10"
 };

package/dist/server/hooks/afterCreateForForeignKeyField.js

@@ -83,7 +83,7 @@ function afterCreateForForeignKeyField(db) {
     }
     return data;
   }
-  async function createFieldIfNotExists({ values, transaction }) {
+  async function createFieldIfNotExists({ values, transaction, interfaceType = null }) {
     const { collectionName, name } = values;
     if (!collectionName || !name) {
       throw new Error(`field options invalid`);
@@ -104,13 +104,17 @@ function afterCreateForForeignKeyField(db) {
       instance.set("isForeignKey", true);
       await instance.save({ transaction });
     } else {
-      const creatInstance = await r.create({
+      const createOptions = {
         values: {
           isForeignKey: true,
           ...values
         },
         transaction
-      });
+      };
+      if (interfaceType === "m2o") {
+        createOptions["context"] = {};
+      }
+      const creatInstance = await r.create(createOptions);
       creatInstance.set("sort", 1);
       await creatInstance.save({ transaction });
     }
@@ -149,13 +153,15 @@ function afterCreateForForeignKeyField(db) {
           collectionName: target,
           ...values
         },
+        interfaceType,
         transaction
       });
     } else if (["obo", "m2o"].includes(interfaceType)) {
       const values = generateFkOptions(collectionName, foreignKey);
       await createFieldIfNotExists({
         values: { collectionName, ...values },
-        transaction
+        transaction,
+        interfaceType
       });
     } else if (["linkTo", "m2m"].includes(interfaceType)) {
       if (type !== "belongsToMany") {

package/dist/server/migrations/20241230000001-update-bigint-to-unixtimestamp.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20241230000001-update-bigint-to-unixtimestamp.js

@@ -0,0 +1,59 @@
+/**
+ * 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 __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 update_bigint_to_unixtimestamp_exports = {};
+__export(update_bigint_to_unixtimestamp_exports, {
+  default: () => update_bigint_to_unixtimestamp_default
+});
+module.exports = __toCommonJS(update_bigint_to_unixtimestamp_exports);
+var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
+class update_bigint_to_unixtimestamp_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    var _a, _b;
+    const Field = this.context.db.getRepository("fields");
+    const fields = await Field.find({
+      filter: {
+        interface: "unixTimestamp",
+        type: "bigInt"
+      }
+    });
+    for (const field of fields) {
+      const uiSchema = field.get("uiSchema");
+      uiSchema["x-component-props"] = {
+        picker: "date",
+        dateFormat: "YYYY-MM-DD",
+        timeFormat: "HH:mm:ss",
+        showTime: ((_a = uiSchema["x-component-props"]) == null ? void 0 : _a.showTime) || true,
+        accuracy: ((_b = uiSchema["x-component-props"]) == null ? void 0 : _b.accuracy) || "second"
+      };
+      field.set("type", "unixTimestamp");
+      field.set("uiSchema", uiSchema);
+      await field.save();
+    }
+  }
+}

package/dist/server/models/field.d.ts

@@ -22,5 +22,6 @@ export declare class FieldModel extends MagicAttributeModel {
     }): Promise<void>;
     syncReferenceCheckOption(options: Transactionable): Promise<void>;
     protected getFieldCollection(): Collection | null;
+    toJSON(): any;
 }
 export {};

package/dist/server/models/field.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 __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ 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 field_exports = {};
 __export(field_exports, {
@@ -30,6 +40,7 @@ __export(field_exports, {
 });
 module.exports = __toCommonJS(field_exports);
 var import_database = require("@nocobase/database");
+var import_lodash = __toESM(require("lodash"));
 class FieldModel extends import_database.MagicAttributeModel {
   get db() {
     return this.constructor.database;
@@ -48,10 +59,13 @@ class FieldModel extends import_database.MagicAttributeModel {
     if (skipExist && collection.hasField(name)) {
       return collection.getField(name);
     }
-    const options = this.get();
+    const options = this.toJSON();
     const field = await (async () => {
       await new Promise((resolve) => setTimeout(resolve, 0));
-      return collection.setField(name, options);
+      return collection.setField(name, {
+        ...options,
+        __sort: this.get("sort")
+      });
     })();
     await this.db.emitAsync("field:loaded", {
       fieldKey: this.get("key"),
@@ -169,6 +183,13 @@ class FieldModel extends import_database.MagicAttributeModel {
     }
     return this.db.getCollection(collectionName);
   }
+  toJSON() {
+    const json = super.toJSON();
+    if (json.interface === "unixTimestamp" && json.accuracy) {
+      import_lodash.default.set(json, "uiSchema.x-component-props.accuracy", json.accuracy);
+    }
+    return json;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/resourcers/collections.js

@@ -61,7 +61,7 @@ var collections_default = {
             ...field.options
           };
         }),
-        "sort"
+        "__sort"
       );
       results.push(obj);
     });

package/dist/server/server.js

@@ -103,6 +103,11 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
     });
     this.app.db.on("collections.beforeCreate", (0, import_beforeCreateForViewCollection.beforeCreateForViewCollection)(this.db));
+    this.app.db.on("collections.beforeCreate", async (model, options) => {
+      if (this.app.db.getCollection(model.get("name")) && model.get("from") !== "db2cm" && !model.get("isThrough")) {
+        throw new Error(`Collection named ${model.get("name")} already exists`);
+      }
+    });
     this.app.db.on(
       "collections.afterSaveWithAssociations",
       async (model, { context, transaction }) => {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.5.0-beta.9",
+  "version": "1.5.1",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -22,7 +22,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "fef0bcb5f95705cd83607f03a6c911550016281b",
+  "gitHead": "b16a0ff226482d0de847656ea26fd621b1d685cf",
   "keywords": [
     "Data sources"
   ]