@tachybase/module-collection 1.6.0 → 1.6.1

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
-  "@tachybase/client": "1.6.0",
-  "@tachybase/module-error-handler": "1.6.0",
-  "@tego/server": "1.3.52",
+  "@tachybase/client": "1.6.1",
+  "@tachybase/module-error-handler": "1.6.1",
+  "@tego/server": "1.6.0-alpha.9",
   "async-mutex": "0.5.0",
   "lodash": "4.17.21",
-  "@tachybase/test": "1.3.52",
+  "@tachybase/test": "1.6.0-alpha.9",
   "sequelize": "6.37.5",
   "dayjs": "1.11.13"
 };

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

@@ -30,7 +30,7 @@ class set_collection_schema_default extends import_server.Migration {
     if (!this.db.inDialect("postgres")) {
       return;
     }
-    if (this.context.app.name !== "main") {
+    if (this.context.tego.name !== "main") {
       return;
     }
     const userCollections = await this.db.getRepository("collections").find({
@@ -43,6 +43,6 @@ class set_collection_schema_default extends import_server.Migration {
       await collection.set("schema", process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || "public");
       await collection.save();
     }
-    await this.context.app.emitAsync("loadCollections");
+    await this.context.tego.emitAsync("loadCollections");
   }
 }

package/dist/server/resourcers/collections.js

@@ -24,13 +24,13 @@ var collections_default = {
   async ["collections:setFields"](ctx, next) {
     var _a;
     const { filterByTk, values } = ctx.action.params;
-    const transaction = await ctx.app.db.sequelize.transaction();
+    const transaction = await ctx.tego.db.sequelize.transaction();
     try {
       const fields = (_a = values.fields) == null ? void 0 : _a.map((f) => {
         delete f.key;
         return f;
       });
-      const db = ctx.app.db;
+      const db = ctx.tego.db;
       const collectionModel = await db.getRepository("collections").findOne({
         filter: {
           name: filterByTk

package/dist/server/resourcers/sql.js

@@ -75,7 +75,7 @@ var sql_default = {
       await next();
     },
     setFields: async (ctx, next) => {
-      const transaction = await ctx.app.db.sequelize.transaction();
+      const transaction = await ctx.tego.db.sequelize.transaction();
       try {
         const {
           upRes: [collection]
@@ -91,7 +91,7 @@ var sql_default = {
       await next();
     },
     update: async (ctx, next) => {
-      const transaction = await ctx.app.db.sequelize.transaction();
+      const transaction = await ctx.tego.db.sequelize.transaction();
       try {
         const { upRes } = await updateCollection(ctx, transaction);
         const [collection] = upRes;

package/dist/server/resourcers/views.js

@@ -26,7 +26,7 @@ var views_default = {
   actions: {
     async get(ctx, next) {
       const { filterByTk, schema } = ctx.action.params;
-      const db = ctx.app.db;
+      const db = ctx.tego.db;
       const fields = await import_server.ViewFieldInference.inferFields({
         db,
         viewName: filterByTk,
@@ -43,7 +43,7 @@ var views_default = {
       await next();
     },
     list: async function(ctx, next) {
-      const db = ctx.app.db;
+      const db = ctx.tego.db;
       const dbViews = await db.queryInterface.listViews();
       const viewCollections = Array.from(db.collections.values()).filter((collection) => collection.isView());
       ctx.body = dbViews.map((dbView) => {
@@ -65,10 +65,10 @@ var views_default = {
       const offset = (page - 1) * pageSize;
       const limit = 1 * pageSize;
       const sql = `SELECT *
-                   FROM ${ctx.app.db.utils.quoteTable(
-        ctx.app.db.utils.addSchema(filterByTk, schema)
+                   FROM ${ctx.tego.db.utils.quoteTable(
+        ctx.tego.db.utils.addSchema(filterByTk, schema)
       )} LIMIT ${limit} OFFSET ${offset}`;
-      const rawValues = await ctx.app.db.sequelize.query(sql, { type: "SELECT" });
+      const rawValues = await ctx.tego.db.sequelize.query(sql, { type: "SELECT" });
       if (fieldTypes) {
         for (const raw of rawValues) {
           const fakeInstance = {
@@ -77,11 +77,11 @@ var views_default = {
           };
           for (const fieldName of Object.keys(fieldTypes)) {
             const fieldType = fieldTypes[fieldName];
-            const FieldClass = ctx.app.db.fieldTypes.get(fieldType);
+            const FieldClass = ctx.tego.db.fieldTypes.get(fieldType);
             const fieldOptions = new FieldClass(
               { name: fieldName },
               {
-                db: ctx.app.db
+                db: ctx.tego.db
               }
             ).options;
             if (fieldOptions.get) {

package/dist/server/server.js

@@ -211,7 +211,7 @@ class CollectionManagerPlugin extends import_server.Plugin {
       });
     });
     const loadCollections = async () => {
-      this.log.debug("loading custom collections", { method: "loadCollections" });
+      this.app.logger.debug("loading custom collections", { method: "loadCollections" });
       this.app.setMaintainingMessage("loading custom collections");
       await this.app.db.getRepository("collections").load({
         filter: this.loadFilter
@@ -240,8 +240,7 @@ class CollectionManagerPlugin extends import_server.Plugin {
     this.app.resourcer.define(import_collectionImportExportMeta.collectionImportExportMeta);
   }
   async load() {
-    await this.importCollections(import_node_path.default.resolve(__dirname, "./collections"));
-    this.db.getRepository("collections").setApp(this.app);
+    this.app.db.getRepository("collections").setApp(this.app);
     const errorHandlerPlugin = this.app.getPlugin("error-handler");
     errorHandlerPlugin.errorHandler.register(
       (err) => {
@@ -262,9 +261,9 @@ class CollectionManagerPlugin extends import_server.Plugin {
       },
       { tag: "setReverseFieldOnFieldChange" }
     );
-    this.app.resource(import_views.default);
-    this.app.resource(import_sql.default);
-    this.app.actions(import_collections.default);
+    this.app.resourcer.define(import_views.default);
+    this.app.resourcer.define(import_sql.default);
+    this.app.resourcer.registerActions(import_collections.default);
     const handleFieldSource = (fields) => {
       var _a;
       for (const field of import_lodash.default.castArray(fields)) {

package/package.json

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