@tachybase/module-collection 1.3.21 → 1.3.23

package/dist/externalVersion.js

@@ -1,14 +1,10 @@
 module.exports = {
-  "@tachybase/client": "1.3.21",
-  "@tachybase/database": "1.3.21",
-  "@tachybase/module-error-handler": "1.3.21",
-  "@tachybase/server": "1.3.21",
+  "@tachybase/client": "1.3.23",
+  "@tachybase/module-error-handler": "1.3.23",
+  "@tego/server": "1.3.43",
   "async-mutex": "0.5.0",
   "lodash": "4.17.21",
-  "@tachybase/test": "1.3.21",
-  "@tachybase/actions": "1.3.21",
-  "@tachybase/resourcer": "1.3.21",
-  "@tachybase/utils": "1.3.21",
+  "@tachybase/test": "1.3.43",
   "sequelize": "6.37.5",
   "dayjs": "1.11.13"
 };

package/dist/server/actions/collectionImportExportMeta.d.ts

@@ -1,2 +1,2 @@
-import { ResourceOptions } from '@tachybase/resourcer';
+import { ResourceOptions } from '@tego/server';
 export declare const collectionImportExportMeta: ResourceOptions;

package/dist/server/actions/collectionImportExportMeta.js

@@ -32,19 +32,19 @@ __export(collectionImportExportMeta_exports, {
 module.exports = __toCommonJS(collectionImportExportMeta_exports);
 var import_promises = __toESM(require("node:fs/promises"));
 var import_node_os = __toESM(require("node:os"));
-var import_utils = require("@tachybase/utils");
+var import_server = require("@tego/server");
 const collectionImportExportMeta = {
   name: "collections",
   middleware: async (ctx, next) => {
     if (ctx.action.actionName === "importMeta") {
-      const storage = import_utils.koaMulter.diskStorage({
+      const storage = import_server.koaMulter.diskStorage({
         destination: import_node_os.default.tmpdir(),
         filename: function(req, file, cb) {
           const randomName = Date.now().toString() + Math.random().toString().slice(2);
           cb(null, randomName);
         }
       });
-      const upload = (0, import_utils.koaMulter)({ storage }).single("file");
+      const upload = (0, import_server.koaMulter)({ storage }).single("file");
       return upload(ctx, next);
     } else {
       return next();
@@ -150,12 +150,12 @@ const collectionImportExportMeta = {
           return;
         }
         if (collection && collection.name !== meta.name) {
-          meta.key = (0, import_utils.uid)();
+          meta.key = (0, import_server.uid)();
           return;
         } else {
           collection = existCollections.find((v) => v.name === meta.name);
           if (collection) {
-            collection.name = `t_${(0, import_utils.uid)()}`;
+            collection.name = `t_${(0, import_server.uid)()}`;
             collectionNameMap[meta.name] = collection.name;
             meta.name = collection.name;
           }

package/dist/server/collections/collectionCategories.d.ts

@@ -1,3 +1,3 @@
-import { CollectionOptions } from '@tachybase/database';
+import { CollectionOptions } from '@tego/server';
 declare const _default: CollectionOptions;
 export default _default;

package/dist/server/collections/collections.d.ts

@@ -1,3 +1,3 @@
-import { CollectionOptions } from '@tachybase/database';
+import { CollectionOptions } from '@tego/server';
 declare const _default: CollectionOptions;
 export default _default;

package/dist/server/collections/fields.d.ts

@@ -1,3 +1,3 @@
-import { CollectionOptions } from '@tachybase/database';
+import { CollectionOptions } from '@tego/server';
 declare const _default: CollectionOptions;
 export default _default;

package/dist/server/hooks/afterCreateForForeignKeyField.d.ts

@@ -1,2 +1,2 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function afterCreateForForeignKeyField(db: Database): (model: any, options: any) => Promise<void>;

package/dist/server/hooks/afterCreateForForeignKeyField.js

@@ -122,6 +122,7 @@ function afterCreateForForeignKeyField(db) {
       source
     } = model.get();
     if (source) return;
+    if (target === "__temp__") return;
     if (["oho", "o2m"].includes(interfaceType)) {
       const values = generateFkOptions(target, foreignKey);
       await createFieldIfNotExists({

package/dist/server/hooks/afterCreateForReverseField.d.ts

@@ -1,4 +1,4 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function afterCreateForReverseField(db: Database): (model: any, { transaction }: {
     transaction: any;
 }) => Promise<void>;

package/dist/server/hooks/afterDestroyForForeignKeyField.d.ts

@@ -1,2 +1,2 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function afterDestroyForForeignKeyField(db: Database): (model: any, opts: any) => Promise<void>;

package/dist/server/hooks/afterUpdateForForeignKeyField.d.ts

@@ -0,0 +1,2 @@
+import { Database } from '@tego/server';
+export declare function afterUpdateForForeignKeyField(db: Database): (model: any, options: any) => Promise<void>;

package/dist/server/hooks/afterUpdateForForeignKeyField.js

@@ -0,0 +1,249 @@
+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 afterUpdateForForeignKeyField_exports = {};
+__export(afterUpdateForForeignKeyField_exports, {
+  afterUpdateForForeignKeyField: () => afterUpdateForForeignKeyField
+});
+module.exports = __toCommonJS(afterUpdateForForeignKeyField_exports);
+function afterUpdateForForeignKeyField(db) {
+  function generateFkOptions(collectionName, foreignKey) {
+    const collection = db.getCollection(collectionName);
+    if (!collection) {
+      throw new Error("collection not found");
+    }
+    const M = collection.model;
+    const attr = M.rawAttributes[foreignKey];
+    if (!attr) {
+      throw new Error(`${collectionName}.${foreignKey} does not exists`);
+    }
+    return attribute2field(attr);
+  }
+  function attribute2field(attribute) {
+    let type = "bigInt";
+    if (attribute.type.constructor.name === "INTEGER") {
+      type = "integer";
+    } else if (attribute.type.constructor.name === "STRING") {
+      type = "string";
+    }
+    const name = attribute.fieldName;
+    const data = {
+      interface: "integer",
+      name,
+      type,
+      uiSchema: {
+        type: "number",
+        title: name,
+        "x-component": "InputNumber",
+        "x-read-pretty": true
+      }
+    };
+    if (type === "string") {
+      data["interface"] = "input";
+      data["uiSchema"] = {
+        type: "string",
+        title: name,
+        "x-component": "Input",
+        "x-read-pretty": true
+      };
+    }
+    return data;
+  }
+  async function createFieldIfNotExists({ values, transaction }) {
+    const { collectionName, name } = values;
+    if (!collectionName || !name) {
+      throw new Error(`field options invalid`);
+    }
+    const r = db.getRepository("fields");
+    const instance = await r.findOne({
+      filter: {
+        collectionName,
+        name
+      },
+      transaction
+    });
+    if (instance) {
+      if (instance.type !== values.type) {
+        throw new Error(`fk type invalid`);
+      }
+      instance.set("sort", 1);
+      instance.set("isForeignKey", true);
+      await instance.save({ transaction });
+    } else {
+      const creatInstance = await r.create({
+        values: {
+          isForeignKey: true,
+          ...values
+        },
+        transaction
+      });
+      creatInstance.set("sort", 1);
+      await creatInstance.save({ transaction });
+    }
+    await r.update({
+      filter: {
+        collectionName,
+        options: {
+          primaryKey: true
+        }
+      },
+      values: {
+        sort: 0
+      },
+      transaction
+    });
+  }
+  const hook = async (model, { transaction, context }) => {
+    var _a;
+    if (!context) return;
+    const {
+      interface: interfaceType,
+      collectionName,
+      target: newTarget,
+      foreignKey: newForeignKey,
+      otherKey: newOtherKey,
+      through,
+      source,
+      type
+    } = model.get();
+    if (source || !interfaceType) return;
+    if (newTarget === "__temp__") return;
+    const { target: oldTarget, foreignKey: oldForeignKey, otherKey: oldOtherKey } = model.previous("options") || {};
+    const fieldsRepo = db.getRepository("fields");
+    const hasTargetChanged = oldTarget !== void 0 && oldTarget !== newTarget;
+    const hasForeignKeyChanged = oldForeignKey !== void 0 && oldForeignKey !== newForeignKey;
+    const hasOtherKeyChanged = oldOtherKey !== void 0 && oldOtherKey !== newOtherKey;
+    const needUpdate = hasTargetChanged || hasForeignKeyChanged || hasOtherKeyChanged;
+    const collection = db.getCollection(model.get("collectionName"));
+    collection == null ? void 0 : collection.updateField(model.get("name"), model.get());
+    const field = collection == null ? void 0 : collection.getField(model.get("name"));
+    if (!needUpdate) return;
+    try {
+      (_a = field == null ? void 0 : field.unbind) == null ? void 0 : _a.call(field);
+      field.bind();
+    } catch (e) {
+      throw e;
+    }
+    async function removeOldForeignKeyField(collection2, fkName) {
+      if (!collection2 || !fkName) return;
+      const exists = await fieldsRepo.findOne({
+        filter: {
+          collectionName: collection2,
+          name: fkName
+          // isForeignKey: true,
+        },
+        transaction
+      });
+      if (exists) {
+        await fieldsRepo.destroy({
+          filter: {
+            collectionName: collection2,
+            name: fkName
+            // isForeignKey: true,
+          },
+          transaction
+        });
+      }
+    }
+    if (["oho", "o2m"].includes(interfaceType)) {
+      await removeOldForeignKeyField(oldTarget, oldForeignKey);
+      const values = generateFkOptions(newTarget, newForeignKey);
+      await createFieldIfNotExists({
+        values: {
+          collectionName: newTarget,
+          ...values
+        },
+        transaction
+      });
+    } else if (["obo", "m2o"].includes(interfaceType)) {
+      await removeOldForeignKeyField(collectionName, oldForeignKey);
+      const values = generateFkOptions(collectionName, newForeignKey);
+      await createFieldIfNotExists({
+        values: {
+          collectionName,
+          ...values
+        },
+        transaction
+      });
+    } else if (["linkTo", "m2m"].includes(interfaceType)) {
+      if (type !== "belongsToMany") {
+        return;
+      }
+      const collectionsRepo = db.getRepository("collections");
+      const existingThrough = await collectionsRepo.findOne({
+        filter: {
+          name: through
+        },
+        transaction
+      });
+      if (existingThrough) {
+        await collectionsRepo.destroy({
+          filter: {
+            name: through
+          },
+          transaction
+        });
+      }
+      await collectionsRepo.create({
+        values: {
+          name: through,
+          title: through,
+          timestamps: true,
+          autoGenId: false,
+          hidden: true,
+          autoCreate: true,
+          isThrough: true,
+          sortable: false
+        },
+        context,
+        transaction
+      });
+      const opts1 = generateFkOptions(through, newForeignKey);
+      const opts2 = generateFkOptions(through, newOtherKey);
+      await createFieldIfNotExists({
+        values: {
+          collectionName: through,
+          ...opts1
+        },
+        transaction
+      });
+      await createFieldIfNotExists({
+        values: {
+          collectionName: through,
+          ...opts2
+        },
+        transaction
+      });
+    }
+    await model.migrate({
+      isNew: true,
+      transaction
+    });
+  };
+  return async (model, options) => {
+    try {
+      await hook(model, options);
+    } catch (error) {
+      console.error("Failed to update foreign key field:", error);
+      throw error;
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  afterUpdateForForeignKeyField
+});

package/dist/server/hooks/beforeCreateForChildrenCollection.d.ts

@@ -1,4 +1,4 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function beforeCreateForChildrenCollection(db: Database): (model: any, { transaction, context }: {
     transaction: any;
     context: any;

package/dist/server/hooks/beforeCreateForReverseField.d.ts

@@ -1,4 +1,4 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function beforeCreateForReverseField(db: Database): (model: any, { transaction }: {
     transaction: any;
 }) => Promise<void>;

package/dist/server/hooks/beforeCreateForValidateField.d.ts

@@ -1,4 +1,4 @@
-import { Database } from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function beforeCreateForValidateField(db: Database): (model: any, { transaction }: {
     transaction: any;
 }) => Promise<void>;

package/dist/server/hooks/beforeCreateForViewCollection.d.ts

@@ -1,4 +1,4 @@
-import { Database } from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function beforeCreateForViewCollection(db: Database): (model: any, { transaction, context }: {
     transaction: any;
     context: any;

package/dist/server/hooks/beforeDestroyForeignKey.d.ts

@@ -1,2 +1,2 @@
-import Database from '@tachybase/database';
+import { Database } from '@tego/server';
 export declare function beforeDestroyForeignKey(db: Database): (model: any, opts: any) => Promise<void>;

package/dist/server/hooks/beforeInitOptions.d.ts

@@ -1,4 +1,4 @@
-import { Model } from '@tachybase/database';
+import { Model } from '@tego/server';
 export declare const beforeInitOptions: {
     belongsTo(model: Model, { database }: {
         database: any;

package/dist/server/hooks/beforeInitOptions.js

@@ -21,7 +21,7 @@ __export(beforeInitOptions_exports, {
   beforeInitOptions: () => beforeInitOptions
 });
 module.exports = __toCommonJS(beforeInitOptions_exports);
-var import_utils = require("@tachybase/utils");
+var import_server = require("@tego/server");
 var import_sequelize = require("sequelize");
 const setTargetKey = (db, model) => {
   if (model.get("targetKey")) {
@@ -54,7 +54,7 @@ const beforeInitOptions = {
     }
     const defaults = {
       // targetKey: 'id',
-      foreignKey: `f_${(0, import_utils.uid)()}`
+      foreignKey: `f_${(0, import_server.uid)()}`
     };
     for (const key in defaults) {
       if (model.get(key)) {
@@ -71,9 +71,9 @@ const beforeInitOptions = {
     const defaults = {
       // targetKey: 'id',
       // sourceKey: 'id',
-      through: `t_${(0, import_utils.uid)()}`,
-      foreignKey: `f_${(0, import_utils.uid)()}`,
-      otherKey: `f_${(0, import_utils.uid)()}`
+      through: `t_${(0, import_server.uid)()}`,
+      foreignKey: `f_${(0, import_server.uid)()}`,
+      otherKey: `f_${(0, import_server.uid)()}`
     };
     for (const key in defaults) {
       if (model.get(key)) {
@@ -91,8 +91,8 @@ const beforeInitOptions = {
     const defaults = {
       // targetKey: 'id',
       // sourceKey: 'id',
-      foreignKey: `f_${(0, import_utils.uid)()}`,
-      target: `t_${(0, import_utils.uid)()}`
+      foreignKey: `f_${(0, import_server.uid)()}`,
+      target: `t_${(0, import_server.uid)()}`
     };
     for (const key in defaults) {
       if (model.get(key)) {
@@ -112,7 +112,7 @@ const beforeInitOptions = {
     }
     const defaults = {
       // sourceKey: 'id',
-      foreignKey: `f_${(0, import_utils.uid)()}`
+      foreignKey: `f_${(0, import_server.uid)()}`
     };
     for (const key in defaults) {
       if (model.get(key)) {

package/dist/server/migrations/20220613103214-alert-sub-table.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20220613103214-alert-sub-table.js

@@ -20,7 +20,7 @@ __export(alert_sub_table_exports, {
   default: () => alert_sub_table_default
 });
 module.exports = __toCommonJS(alert_sub_table_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class alert_sub_table_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20220704225714-drop-foreign-keys.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20220704225714-drop-foreign-keys.js

@@ -20,7 +20,7 @@ __export(drop_foreign_keys_exports, {
   default: () => drop_foreign_keys_default
 });
 module.exports = __toCommonJS(drop_foreign_keys_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class drop_foreign_keys_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20221101111110-update-foreign-fields.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class DropForeignKeysMigration extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20221101111110-update-foreign-fields.js

@@ -20,7 +20,7 @@ __export(update_foreign_fields_exports, {
   default: () => DropForeignKeysMigration
 });
 module.exports = __toCommonJS(update_foreign_fields_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 var import_afterCreateForForeignKeyField = require("../hooks/afterCreateForForeignKeyField");
 class DropForeignKeysMigration extends import_server.Migration {
   constructor() {

package/dist/server/migrations/20221104151410-update-collections-hidden.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class UpdateCollectionsHiddenMigration extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20221104151410-update-collections-hidden.js

@@ -20,7 +20,7 @@ __export(update_collections_hidden_exports, {
   default: () => UpdateCollectionsHiddenMigration
 });
 module.exports = __toCommonJS(update_collections_hidden_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class UpdateCollectionsHiddenMigration extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20221121111110-update-fk-type.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class UpdateIdToBigIntMigrator extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20221121111110-update-fk-type.js

@@ -20,8 +20,7 @@ __export(update_fk_type_exports, {
   default: () => UpdateIdToBigIntMigrator
 });
 module.exports = __toCommonJS(update_fk_type_exports);
-var import_database = require("@tachybase/database");
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class UpdateIdToBigIntMigrator extends import_server.Migration {
   constructor() {
     super(...arguments);
@@ -51,7 +50,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
     const updateToBigInt = async (model, fieldName) => {
       let sql;
       const tableName = model.tableName;
-      if (model.rawAttributes[fieldName].type instanceof import_database.DataTypes.INTEGER) {
+      if (model.rawAttributes[fieldName].type instanceof import_server.DataTypes.INTEGER) {
         if (db.inDialect("postgres")) {
           sql = `ALTER TABLE "${tableName}" ALTER COLUMN "${fieldName}" SET DATA TYPE BIGINT;`;
         } else if (db.inDialect("mysql", "mariadb")) {
@@ -61,7 +60,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
             {
               [attributeName]: queryInterface.normalizeAttribute({
                 ...dataTypeOrOptions,
-                type: import_database.DataTypes.BIGINT
+                type: import_server.DataTypes.BIGINT
               })
             },
             {
@@ -96,7 +95,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
         if (primaryKeyField && primaryKeyField.primaryKey) {
           await updateToBigInt(model, model.primaryKeyField);
         }
-        if (model.tableAttributes["sort"] && model.tableAttributes["sort"].type instanceof import_database.DataTypes.INTEGER) {
+        if (model.tableAttributes["sort"] && model.tableAttributes["sort"].type instanceof import_server.DataTypes.INTEGER) {
           await updateToBigInt(model, "sort");
         }
         const associations = model.associations;

package/dist/server/migrations/20221121111113-update-id-to-bigint.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class UpdateIdToBigIntMigrator extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20221121111113-update-id-to-bigint.js

@@ -20,8 +20,7 @@ __export(update_id_to_bigint_exports, {
   default: () => UpdateIdToBigIntMigrator
 });
 module.exports = __toCommonJS(update_id_to_bigint_exports);
-var import_database = require("@tachybase/database");
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class UpdateIdToBigIntMigrator extends import_server.Migration {
   constructor() {
     super(...arguments);
@@ -70,7 +69,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
         fieldRecord.set("type", "bigInt");
         await fieldRecord.save();
       }
-      if (model.rawAttributes[fieldName].type instanceof import_database.DataTypes.INTEGER) {
+      if (model.rawAttributes[fieldName].type instanceof import_server.DataTypes.INTEGER) {
         if (db.inDialect("postgres")) {
           sql = `ALTER TABLE ${quoteTableName} ALTER COLUMN "${columnName}" SET DATA TYPE BIGINT;`;
         } else if (db.inDialect("mysql", "mariadb")) {
@@ -80,7 +79,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
             {
               [attributeName]: queryInterface.normalizeAttribute({
                 ...dataTypeOrOptions,
-                type: import_database.DataTypes.BIGINT
+                type: import_server.DataTypes.BIGINT
               })
             },
             {
@@ -138,7 +137,7 @@ class UpdateIdToBigIntMigrator extends import_server.Migration {
         if (primaryKeyField && primaryKeyField.primaryKey) {
           await updateToBigInt(model, model.primaryKeyField);
         }
-        if (model.tableAttributes["sort"] && model.tableAttributes["sort"].type instanceof import_database.DataTypes.INTEGER) {
+        if (model.tableAttributes["sort"] && model.tableAttributes["sort"].type instanceof import_server.DataTypes.INTEGER) {
           await updateToBigInt(model, "sort");
         }
         const associations = model.associations;

package/dist/server/migrations/20221221103220-timestamps.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20221221103220-timestamps.js

@@ -20,7 +20,7 @@ __export(timestamps_exports, {
   default: () => timestamps_default
 });
 module.exports = __toCommonJS(timestamps_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class timestamps_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20230225111112-drop-ui-schema-relation.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20230225111112-drop-ui-schema-relation.js

@@ -20,7 +20,7 @@ __export(drop_ui_schema_relation_exports, {
   default: () => drop_ui_schema_relation_default
 });
 module.exports = __toCommonJS(drop_ui_schema_relation_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class drop_ui_schema_relation_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20230509111114-alert-ui-schema.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20230509111114-alert-ui-schema.js

@@ -20,7 +20,7 @@ __export(alert_ui_schema_exports, {
   default: () => alert_ui_schema_default
 });
 module.exports = __toCommonJS(alert_ui_schema_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class alert_ui_schema_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20230623145414-number-step.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20230623145414-number-step.js

@@ -30,7 +30,7 @@ __export(number_step_exports, {
   default: () => number_step_default
 });
 module.exports = __toCommonJS(number_step_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
 class number_step_default extends import_server.Migration {
   constructor() {

package/dist/server/migrations/20230704222935-tableoid.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20230704222935-tableoid.js

@@ -30,7 +30,7 @@ __export(tableoid_exports, {
   default: () => tableoid_default
 });
 module.exports = __toCommonJS(tableoid_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
 class tableoid_default extends import_server.Migration {
   constructor() {

package/dist/server/migrations/20230918024546-set-collection-schema.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     appVersion: string;
     up(): Promise<void>;

package/dist/server/migrations/20230918024546-set-collection-schema.js

@@ -20,7 +20,7 @@ __export(set_collection_schema_exports, {
   default: () => set_collection_schema_default
 });
 module.exports = __toCommonJS(set_collection_schema_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class set_collection_schema_default extends import_server.Migration {
   constructor() {
     super(...arguments);

package/dist/server/migrations/20240220153103-install-main-datasource.d.ts

@@ -1,4 +1,4 @@
-import { Migration } from '@tachybase/server';
+import { Migration } from '@tego/server';
 export default class extends Migration {
     on: string;
     appVersion: string;

package/dist/server/migrations/20240220153103-install-main-datasource.js

@@ -20,7 +20,7 @@ __export(install_main_datasource_exports, {
   default: () => install_main_datasource_default
 });
 module.exports = __toCommonJS(install_main_datasource_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 class install_main_datasource_default extends import_server.Migration {
   constructor() {
     super(...arguments);

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

@@ -1,4 +1,4 @@
-import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@tachybase/database';
+import { Collection, Database, MagicAttributeModel, SyncOptions, Transactionable } from '@tego/server';
 import { QueryInterfaceDropTableOptions } from 'sequelize';
 interface LoadOptions extends Transactionable {
     skipField?: boolean | Array<string>;

package/dist/server/models/collection.js

@@ -30,9 +30,9 @@ __export(collection_exports, {
   CollectionModel: () => CollectionModel
 });
 module.exports = __toCommonJS(collection_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
-class CollectionModel extends import_database.MagicAttributeModel {
+class CollectionModel extends import_server.MagicAttributeModel {
   get db() {
     return this.constructor.database;
   }

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

@@ -1,4 +1,4 @@
-import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@tachybase/database';
+import { Collection, Database, MagicAttributeModel, SyncOptions, Transactionable } from '@tego/server';
 interface LoadOptions extends Transactionable {
     skipExist?: boolean;
 }
@@ -8,7 +8,7 @@ interface MigrateOptions extends SyncOptions, Transactionable {
 export declare class FieldModel extends MagicAttributeModel {
     get db(): Database;
     isAssociationField(): boolean;
-    load(loadOptions?: LoadOptions): Promise<import("@tachybase/database").Field>;
+    load(loadOptions?: LoadOptions): Promise<import("@tego/server").Field>;
     syncSortByField(options: Transactionable): Promise<void>;
     migrate({ isNew, ...options }?: MigrateOptions): Promise<void>;
     remove(options?: any): Promise<void>;

package/dist/server/models/field.js

@@ -20,8 +20,8 @@ __export(field_exports, {
   FieldModel: () => FieldModel
 });
 module.exports = __toCommonJS(field_exports);
-var import_database = require("@tachybase/database");
-class FieldModel extends import_database.MagicAttributeModel {
+var import_server = require("@tego/server");
+class FieldModel extends import_server.MagicAttributeModel {
   get db() {
     return this.constructor.database;
   }

package/dist/server/repositories/collection-repository.d.ts

@@ -1,4 +1,4 @@
-import { Repository } from '@tachybase/database';
+import { Repository } from '@tego/server';
 interface LoadOptions {
     filter?: any;
     skipExist?: boolean;

package/dist/server/repositories/collection-repository.js

@@ -30,10 +30,9 @@ __export(collection_repository_exports, {
   CollectionRepository: () => CollectionRepository
 });
 module.exports = __toCommonJS(collection_repository_exports);
-var import_database = require("@tachybase/database");
-var import_utils = require("@tachybase/utils");
+var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
-class CollectionRepository extends import_database.Repository {
+class CollectionRepository extends import_server.Repository {
   setApp(app) {
     this.app = app;
   }
@@ -41,7 +40,7 @@ class CollectionRepository extends import_database.Repository {
     var _a, _b, _c;
     const { filter, skipExist } = options;
     const instances = await this.find({ filter, appends: ["fields"] });
-    const graphlib = import_utils.CollectionsGraph.graphlib();
+    const graphlib = import_server.CollectionsGraph.graphlib();
     const graph = new graphlib.Graph();
     const nameMap = {};
     const viewCollections = [];

package/dist/server/resourcers/sql.d.ts

@@ -1,4 +1,4 @@
-import { Context, Next } from '@tachybase/actions';
+import { Context, Next } from '@tego/server';
 declare const _default: {
     name: string;
     actions: {

package/dist/server/resourcers/sql.js

@@ -20,7 +20,7 @@ __export(sql_exports, {
   default: () => sql_default
 });
 module.exports = __toCommonJS(sql_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 const updateCollection = async (ctx, transaction) => {
   const { filterByTk, values } = ctx.action.params;
   const repo = ctx.db.getRepository("collections");
@@ -60,7 +60,7 @@ var sql_default = {
       if (!/^select/i.test(sql) && !/^with([\s\S]+)select([\s\S]+)/i.test(sql)) {
         ctx.throw(400, ctx.t("Only select query allowed"));
       }
-      const tmpCollection = new import_database.SqlCollection({ name: "tmp", sql }, { database: ctx.db });
+      const tmpCollection = new import_server.SqlCollection({ name: "tmp", sql }, { database: ctx.db });
       const model = tmpCollection.model;
       const data = await model.findAll({ attributes: ["*"], limit: 5, raw: true });
       let fields = {};

package/dist/server/resourcers/views.js

@@ -20,14 +20,14 @@ __export(views_exports, {
   default: () => views_default
 });
 module.exports = __toCommonJS(views_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var views_default = {
   name: "dbViews",
   actions: {
     async get(ctx, next) {
       const { filterByTk, schema } = ctx.action.params;
       const db = ctx.app.db;
-      const fields = await import_database.ViewFieldInference.inferFields({
+      const fields = await import_server.ViewFieldInference.inferFields({
         db,
         viewName: filterByTk,
         viewSchema: schema

package/dist/server/server.d.ts

@@ -1,5 +1,4 @@
-import { Filter } from '@tachybase/database';
-import { Plugin } from '@tachybase/server';
+import { Filter, Plugin } from '@tego/server';
 export declare class CollectionManagerPlugin extends Plugin {
     schema: string;
     private loadFilter;

package/dist/server/server.js

@@ -31,16 +31,16 @@ __export(server_exports, {
   default: () => server_default
 });
 module.exports = __toCommonJS(server_exports);
-var import_path = __toESM(require("path"));
-var process = __toESM(require("process"));
-var import_worker_threads = require("worker_threads");
-var import_database = require("@tachybase/database");
-var import_server = require("@tachybase/server");
+var import_node_path = __toESM(require("node:path"));
+var process = __toESM(require("node:process"));
+var import_node_worker_threads = require("node:worker_threads");
+var import_server = require("@tego/server");
 var import_async_mutex = require("async-mutex");
 var import_lodash = __toESM(require("lodash"));
 var import__ = require(".");
 var import_collectionImportExportMeta = require("./actions/collectionImportExportMeta");
 var import_hooks = require("./hooks");
+var import_afterUpdateForForeignKeyField = require("./hooks/afterUpdateForForeignKeyField");
 var import_beforeCreateForValidateField = require("./hooks/beforeCreateForValidateField");
 var import_beforeCreateForViewCollection = require("./hooks/beforeCreateForViewCollection");
 var import_models = require("./models");
@@ -68,7 +68,7 @@ class CollectionManagerPlugin extends import_server.Plugin {
     });
     this.db.addMigrations({
       namespace: "collection-manager",
-      directory: import_path.default.resolve(__dirname, "./migrations"),
+      directory: import_node_path.default.resolve(__dirname, "./migrations"),
       context: {
         plugin: this
       }
@@ -148,6 +148,7 @@ class CollectionManagerPlugin extends import_server.Plugin {
         model.set("sortBy", model.get("foreignKey") + "Sort");
       }
     });
+    this.app.db.on("fields.afterUpdate", (0, import_afterUpdateForForeignKeyField.afterUpdateForForeignKeyField)(this.app.db));
     this.app.db.on("fields.afterUpdate", async (model, { context, transaction }) => {
       const prevOptions = model.previous("options");
       const currentOptions = model.get("options");
@@ -217,7 +218,7 @@ class CollectionManagerPlugin extends import_server.Plugin {
       });
     };
     this.app.on("beforeStart", loadCollections);
-    if (!import_worker_threads.isMainThread) {
+    if (!import_node_worker_threads.isMainThread) {
       return;
     }
     this.app.resourcer.use(
@@ -239,12 +240,12 @@ class CollectionManagerPlugin extends import_server.Plugin {
     this.app.resourcer.define(import_collectionImportExportMeta.collectionImportExportMeta);
   }
   async load() {
-    await this.importCollections(import_path.default.resolve(__dirname, "./collections"));
+    await this.importCollections(import_node_path.default.resolve(__dirname, "./collections"));
     this.db.getRepository("collections").setApp(this.app);
     const errorHandlerPlugin = this.app.getPlugin("error-handler");
     errorHandlerPlugin.errorHandler.register(
       (err) => {
-        return err instanceof import_database.UniqueConstraintError;
+        return err instanceof import_server.UniqueConstraintError;
       },
       (err, ctx) => {
         return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-collection",
   "displayName": "Data source: Main",
-  "version": "1.3.21",
+  "version": "1.3.23",
   "description": "TachyBase main database, supports relational databases such as MySQL, PostgreSQL, SQLite and so on.",
   "keywords": [
     "Data sources"
@@ -11,25 +11,18 @@
   "dependencies": {},
   "devDependencies": {
     "@hapi/topo": "^6.0.2",
-    "@types/lodash": "4.17.20",
+    "@tachybase/test": "^1.3.43",
+    "@tego/client": "^1.3.43",
+    "@tego/server": "^1.3.43",
+    "@types/lodash": "^4.17.20",
     "async-mutex": "^0.5.0",
     "lodash": "4.17.21",
     "sequelize": "^6.37.5",
-    "toposort": "^2.0.2"
-  },
-  "peerDependencies": {
-    "@tachybase/actions": "1.3.21",
-    "@tachybase/database": "1.3.21",
-    "@tachybase/client": "1.3.21",
-    "@tachybase/module-error-handler": "1.3.21",
-    "@tachybase/test": "1.3.21",
-    "@tachybase/resourcer": "1.3.21",
-    "@tachybase/server": "1.3.21",
-    "@tachybase/utils": "1.3.21"
+    "toposort": "^2.0.2",
+    "@tachybase/client": "1.3.23",
+    "@tachybase/module-error-handler": "1.3.23"
   },
   "description.zh-CN": "TachyBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
   "displayName.zh-CN": "数据源：主数据库",
-  "scripts": {
-    "build": "tachybase-build --no-dts @tachybase/module-collection"
-  }
+  "scripts": {}
 }