@nocobase/plugin-data-source-main 1.5.0-beta.3 → 1.5.0-beta.30

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-data-source-main"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var a=(e,n,o)=>new Promise((u,d)=>{var c=i=>{try{t(o.next(i))}catch(s){d(s)}},l=i=>{try{t(o.throw(i))}catch(s){d(s)}},t=i=>i.done?u(i.value):Promise.resolve(i.value).then(c,l);t((o=o.apply(e,n)).next())});class o extends n.Plugin{load(){return a(this,null,function*(){})}}e.default=o,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-data-source-main",["@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-data-source-main"]=t(require("@nocobase/client")):e["@nocobase/plugin-data-source-main"]=t(e["@nocobase/client"])}(self,function(e){return function(){"use strict";var t={772:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var u=n[e]={exports:{}};return t[e](u,u.exports,r),u.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};r.r(o);var u=r(772);function i(e,t,n,r,o,u,i){try{var c=e[u](i),a=c.value}catch(e){n(e);return}c.done?t(a):Promise.resolve(a).then(r,o)}function c(e,t,n){return(c=s()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var o=new(Function.bind.apply(e,r));return n&&l(o,n.prototype),o}).apply(null,arguments)}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function f(e){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function l(e,t){return(l=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function p(e){var t="function"==typeof Map?new Map:void 0;return(p=function(e){var n;if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return c(e,arguments,f(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),l(r,e)})(e)}function s(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(s=function(){return!!e})()}var b=function(e){var t,n,r;function o(){var e,t,n;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,o),e=this,t=o,n=arguments,t=f(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,s()?Reflect.construct(t,n||[],f(e).constructor):t.apply(e,n))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&l(e,t)}(o,e),t=o,n=[{key:"load",value:function(){var e;return(e=function(){return function(e,t){var n,r,o,u,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return u={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(u[Symbol.iterator]=function(){return this}),u;function c(u){return function(c){return function(u){if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&u[0]?r.return:u[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,u[1])).done)return o;switch(r=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,r=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){i.label=u[1];break}if(6===u[0]&&i.label<o[1]){i.label=o[1],o=u;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(u);break}o[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],r=0}finally{n=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}([u,c])}}}(this,function(e){return[2]})},function(){var t=this,n=arguments;return new Promise(function(r,o){var u=e.apply(t,n);function c(e){i(u,r,o,c,a,"next",e)}function a(e){i(u,r,o,c,a,"throw",e)}c(void 0)})})()}}],a(t.prototype,n),o}(p(u.Plugin));return o.default=b,o}()});

package/dist/externalVersion.js

@@ -8,14 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.5.0-beta.3",
-  "@nocobase/database": "1.5.0-beta.3",
-  "@nocobase/plugin-error-handler": "1.5.0-beta.3",
-  "@nocobase/server": "1.5.0-beta.3",
-  "async-mutex": "0.3.2",
+  "@nocobase/client": "1.5.0-beta.30",
+  "@nocobase/database": "1.5.0-beta.30",
+  "@nocobase/plugin-error-handler": "1.5.0-beta.30",
+  "@nocobase/server": "1.5.0-beta.30",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.5.0-beta.3",
-  "@nocobase/utils": "1.5.0-beta.3",
+  "@nocobase/test": "1.5.0-beta.30",
+  "@nocobase/utils": "1.5.0-beta.30",
   "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.d.ts

@@ -11,7 +11,7 @@ import { Plugin } from '@nocobase/server';
 export declare class PluginDataSourceMainServer extends Plugin {
     private loadFilter;
     setLoadFilter(filter: Filter): void;
-    onSync(message: any): Promise<void>;
+    handleSyncMessage(message: any): Promise<void>;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
     install(): Promise<void>;

package/dist/server/server.js

@@ -42,7 +42,6 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
-var import_async_mutex = require("async-mutex");
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
 var import__ = require(".");
@@ -61,9 +60,9 @@ class PluginDataSourceMainServer extends import_server.Plugin {
   setLoadFilter(filter) {
     this.loadFilter = filter;
   }
-  async onSync(message) {
+  async handleSyncMessage(message) {
     const { type, collectionName } = message;
-    if (type === "newCollection") {
+    if (type === "syncCollection") {
       const collectionModel = await this.app.db.getCollection("collections").repository.findOne({
         filter: {
           name: collectionName
@@ -71,6 +70,22 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       });
       await collectionModel.load();
     }
+    if (type === "removeField") {
+      const { collectionName: collectionName2, fieldName } = message;
+      const collection = this.app.db.getCollection(collectionName2);
+      if (!collection) {
+        return;
+      }
+      return collection.removeFieldFromDb(fieldName);
+    }
+    if (type === "removeCollection") {
+      const { collectionName: collectionName2 } = message;
+      const collection = this.app.db.getCollection(collectionName2);
+      if (!collection) {
+        return;
+      }
+      collection.remove();
+    }
   }
   async beforeLoad() {
     this.app.db.registerRepositories({
@@ -88,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 }) => {
@@ -95,10 +115,15 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           await model.migrate({
             transaction
           });
-          this.app.syncManager.publish(this.name, {
-            type: "newCollection",
-            collectionName: model.get("name")
-          });
+          this.sendSyncMessage(
+            {
+              type: "syncCollection",
+              collectionName: model.get("name")
+            },
+            {
+              transaction
+            }
+          );
         }
       }
     );
@@ -112,6 +137,15 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         removeOptions["cascade"] = true;
       }
       await model.remove(removeOptions);
+      this.sendSyncMessage(
+        {
+          type: "removeCollection",
+          collectionName: model.get("name")
+        },
+        {
+          transaction: options.transaction
+        }
+      );
     });
     this.app.db.on("fields.beforeCreate", (0, import_beforeCreateCheckFieldInMySQL.beforeCreateCheckFieldInMySQL)(this.app.db));
     this.app.db.on("fields.beforeCreate", (0, import_hooks.beforeCreateForReverseField)(this.app.db));
@@ -222,14 +256,33 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           }
         };
         await collection.sync(syncOptions);
+        this.sendSyncMessage(
+          {
+            type: "syncCollection",
+            collectionName: model.get("collectionName")
+          },
+          {
+            transaction
+          }
+        );
       }
     });
     this.app.db.on("fields.beforeDestroy", (0, import_beforeDestoryField.beforeDestoryField)(this.app.db));
     this.app.db.on("fields.beforeDestroy", (0, import_hooks.beforeDestroyForeignKey)(this.app.db));
-    const mutex = new import_async_mutex.Mutex();
     this.app.db.on("fields.beforeDestroy", async (model, options) => {
-      await mutex.runExclusive(async () => {
+      const lockKey = `${this.name}:fields.beforeDestroy:${model.get("collectionName")}`;
+      await this.app.lockManager.runExclusive(lockKey, async () => {
         await model.remove(options);
+        this.sendSyncMessage(
+          {
+            type: "removeField",
+            collectionName: model.get("collectionName"),
+            fieldName: model.get("name")
+          },
+          {
+            transaction: options.transaction
+          }
+        );
       });
     });
     this.app.db.on("fields.afterDestroy", async (model, options) => {

package/package.json

@@ -4,25 +4,25 @@
   "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.3",
+  "version": "1.5.0-beta.30",
   "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",
   "license": "AGPL-3.0",
   "devDependencies": {
     "@hapi/topo": "^6.0.0",
-    "async-mutex": "^0.3.2",
     "toposort": "^2.0.2"
   },
   "peerDependencies": {
     "@nocobase/client": "1.x",
     "@nocobase/database": "1.x",
     "@nocobase/plugin-error-handler": "1.x",
+    "@nocobase/plugin-field-sort": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "81afcf4affdb652faf4636e6d9351828ce8906be",
+  "gitHead": "40c48b2ecf3e2315a76dcb729dbda825b6a1331c",
   "keywords": [
     "Data sources"
   ]