@cadenza.io/service 1.9.13 → 1.9.15

package/dist/index.js

@@ -2443,45 +2443,16 @@ var DatabaseController = class _DatabaseController {
                 this.splitTables.bind(this),
                 "Generates DDL for database schema"
               ).then(
-                CadenzaService.createMetaTask(
-                  "Generate tasks",
-                  (ctx) => {
-                    const { table, tableName, options } = ctx;
-                    console.log(tableName, options);
-                    this.createDatabaseTask(
-                      "query",
-                      tableName,
-                      table,
-                      this.queryFunction.bind(this),
-                      options
-                    );
-                    this.createDatabaseTask(
-                      "insert",
-                      tableName,
-                      table,
-                      this.insertFunction.bind(this),
-                      options
-                    );
-                    this.createDatabaseTask(
-                      "update",
-                      tableName,
-                      table,
-                      this.updateFunction.bind(this),
-                      options
-                    );
-                    this.createDatabaseTask(
-                      "delete",
-                      tableName,
-                      table,
-                      this.deleteFunction.bind(this),
-                      options
-                    );
-                  },
-                  "Generates auto-tasks for database schema"
-                ),
                 CadenzaService.createMetaTask("Generate DDL from table", (ctx) => {
                   var _a2;
-                  const { ddl, table, tableName, schema, options } = ctx;
+                  const {
+                    ddl,
+                    table,
+                    tableName,
+                    schema,
+                    options,
+                    sortedTables
+                  } = ctx;
                   const fieldDefs = Object.entries(table.fields).map((value) => {
                     var _a3, _b2, _c2, _d2, _e, _f, _g;
                     const [fieldName, field] = value;
@@ -2513,10 +2484,24 @@ var DatabaseController = class _DatabaseController {
                   }
                   sql = `CREATE TABLE IF NOT EXISTS ${tableName} (${fieldDefs})`;
                   ddl.push(sql);
-                  return { ddl, table, tableName, schema, options };
+                  return {
+                    ddl,
+                    table,
+                    tableName,
+                    schema,
+                    options,
+                    sortedTables
+                  };
                 }).then(
                   CadenzaService.createMetaTask("Generate index DDL", (ctx) => {
-                    const { ddl, table, tableName, schema, options } = ctx;
+                    const {
+                      ddl,
+                      table,
+                      tableName,
+                      schema,
+                      options,
+                      sortedTables
+                    } = ctx;
                     if (table.indexes) {
                       table.indexes.forEach((fields) => {
                         ddl.push(
@@ -2524,12 +2509,26 @@ var DatabaseController = class _DatabaseController {
                         );
                       });
                     }
-                    return { ddl, table, tableName, schema, options };
+                    return {
+                      ddl,
+                      table,
+                      tableName,
+                      schema,
+                      options,
+                      sortedTables
+                    };
                   }).then(
                     CadenzaService.createMetaTask(
                       "Generate primary key ddl",
                       (ctx) => {
-                        const { ddl, table, tableName, schema, options } = ctx;
+                        const {
+                          ddl,
+                          table,
+                          tableName,
+                          schema,
+                          options,
+                          sortedTables
+                        } = ctx;
                         if (table.primaryKey) {
                           ddl.push(
                             `ALTER TABLE ${tableName} DROP CONSTRAINT IF EXISTS unique_${tableName}_${table.primaryKey.join("_")};`,
@@ -2537,13 +2536,27 @@ var DatabaseController = class _DatabaseController {
                             `ALTER TABLE ${tableName} ADD CONSTRAINT unique_${tableName}_${table.primaryKey.join("_")} PRIMARY KEY (${table.primaryKey.join(", ")});`
                           );
                         }
-                        return { ddl, table, tableName, schema, options };
+                        return {
+                          ddl,
+                          table,
+                          tableName,
+                          schema,
+                          options,
+                          sortedTables
+                        };
                       }
                     ).then(
                       CadenzaService.createMetaTask(
                         "Generate unique index DDL",
                         (ctx) => {
-                          const { ddl, table, tableName, schema, options } = ctx;
+                          const {
+                            ddl,
+                            table,
+                            tableName,
+                            schema,
+                            options,
+                            sortedTables
+                          } = ctx;
                           if (table.uniqueConstraints) {
                             table.uniqueConstraints.forEach(
                               (fields) => {
@@ -2555,13 +2568,27 @@ var DatabaseController = class _DatabaseController {
                               }
                             );
                           }
-                          return { ddl, table, tableName, schema, options };
+                          return {
+                            ddl,
+                            table,
+                            tableName,
+                            schema,
+                            options,
+                            sortedTables
+                          };
                         }
                       ).then(
                         CadenzaService.createMetaTask(
                           "Generate foreign key DDL",
                           (ctx) => {
-                            const { ddl, table, tableName, schema, options } = ctx;
+                            const {
+                              ddl,
+                              table,
+                              tableName,
+                              schema,
+                              options,
+                              sortedTables
+                            } = ctx;
                             if (table.foreignKeys) {
                               for (const foreignKey of table.foreignKeys) {
                                 const foreignKeyName = `fk_${tableName}_${foreignKey.fields.join("_")}`;
@@ -2576,13 +2603,27 @@ var DatabaseController = class _DatabaseController {
                                 );
                               }
                             }
-                            return { ddl, table, tableName, schema, options };
+                            return {
+                              ddl,
+                              table,
+                              tableName,
+                              schema,
+                              options,
+                              sortedTables
+                            };
                           }
                         ).then(
                           CadenzaService.createMetaTask(
                             "Generate trigger DDL",
                             (ctx) => {
-                              const { ddl, table, tableName, schema, options } = ctx;
+                              const {
+                                ddl,
+                                table,
+                                tableName,
+                                schema,
+                                options,
+                                sortedTables
+                              } = ctx;
                               if (table.triggers) {
                                 for (const [
                                   triggerName,
@@ -2593,7 +2634,14 @@ var DatabaseController = class _DatabaseController {
                                   );
                                 }
                               }
-                              return { ddl, table, tableName, schema, options };
+                              return {
+                                ddl,
+                                table,
+                                tableName,
+                                schema,
+                                options,
+                                sortedTables
+                              };
                             }
                           ).then(
                             CadenzaService.createMetaTask(
@@ -2604,7 +2652,8 @@ var DatabaseController = class _DatabaseController {
                                   table,
                                   tableName,
                                   schema,
-                                  options
+                                  options,
+                                  sortedTables
                                 } = ctx;
                                 if (table.initialData) {
                                   ddl.push(
@@ -2621,7 +2670,8 @@ var DatabaseController = class _DatabaseController {
                                   table,
                                   tableName,
                                   schema,
-                                  options
+                                  options,
+                                  sortedTables
                                 };
                               }
                             ).then(
@@ -2639,7 +2689,8 @@ var DatabaseController = class _DatabaseController {
                                     schema: joinedContexts[0].schema,
                                     options: joinedContexts[0].options,
                                     table: joinedContexts[0].table,
-                                    tableName: joinedContexts[0].tableName
+                                    tableName: joinedContexts[0].tableName,
+                                    sortedTables: joinedContexts[0].sortedTables
                                   };
                                 }
                               ).then(
@@ -2664,7 +2715,54 @@ var DatabaseController = class _DatabaseController {
                                     return true;
                                   }),
                                   "Applies generated DDL to the database"
-                                ).emits("meta.database.setup_done")
+                                ).then(
+                                  CadenzaService.createMetaTask(
+                                    "Split schema into tables for task creation",
+                                    this.splitTables.bind(this),
+                                    "Splits schema into tables for task creation"
+                                  ).then(
+                                    CadenzaService.createMetaTask(
+                                      "Generate tasks",
+                                      (ctx) => {
+                                        const { table, tableName, options } = ctx;
+                                        this.createDatabaseTask(
+                                          "query",
+                                          tableName,
+                                          table,
+                                          this.queryFunction.bind(this),
+                                          options
+                                        );
+                                        this.createDatabaseTask(
+                                          "insert",
+                                          tableName,
+                                          table,
+                                          this.insertFunction.bind(this),
+                                          options
+                                        );
+                                        this.createDatabaseTask(
+                                          "update",
+                                          tableName,
+                                          table,
+                                          this.updateFunction.bind(this),
+                                          options
+                                        );
+                                        this.createDatabaseTask(
+                                          "delete",
+                                          tableName,
+                                          table,
+                                          this.deleteFunction.bind(this),
+                                          options
+                                        );
+                                      },
+                                      "Generates auto-tasks for database schema"
+                                    ).then(
+                                      CadenzaService.createUniqueMetaTask(
+                                        "Join table tasks",
+                                        () => true
+                                      ).emits("meta.database.setup_done")
+                                    )
+                                  )
+                                )
                               )
                             )
                           )
@@ -2791,7 +2889,7 @@ var DatabaseController = class _DatabaseController {
       const { sortedTables, schema, options = {} } = ctx;
       for (const tableName of sortedTables) {
         const table = schema.tables[tableName];
-        yield { ddl: [], table, tableName, schema, options };
+        yield { ddl: [], table, tableName, schema, options, sortedTables };
       }
     });
   }
@@ -3069,7 +3167,7 @@ var DatabaseController = class _DatabaseController {
             };
           }
         }
-        context = yield queryFunction(tableName, (_d3 = context.querydata) != null ? _d3 : context);
+        context = yield queryFunction(tableName, (_d3 = context.queryData) != null ? _d3 : context);
         for (const signal of (_g = (_f = (_e = table.customSignals) == null ? void 0 : _e.emissions) == null ? void 0 : _f[op]) != null ? _g : []) {
           if (signal.condition && !signal.condition(context)) {
             continue;