taon-typeorm 18.0.19 → 18.0.21

package/lib/typeorm/commands/MigrationRevertCommand.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationRevertCommand = void 0;
-var tslib_1 = require("tslib");
-var PlatformTools_1 = require("../platform/PlatformTools");
-var path = require("path");
-var process = require("process");
-var CommandUtils_1 = require("./CommandUtils");
+const PlatformTools_1 = require("../platform/PlatformTools");
+const path = require("path");
+const process = require("process");
+const CommandUtils_1 = require("./CommandUtils");
 /**
  * Reverts last migration command.
  */
-var MigrationRevertCommand = /** @class */ (function () {
-    function MigrationRevertCommand() {
-        this.command = "migration:revert";
-        this.describe = "Reverts last executed migration.";
-    }
-    MigrationRevertCommand.prototype.builder = function (args) {
+class MigrationRevertCommand {
+    command = "migration:revert";
+    describe = "Reverts last executed migration.";
+    builder(args) {
         return args
             .option("dataSource", {
             alias: "d",
@@ -32,72 +29,47 @@ var MigrationRevertCommand = /** @class */ (function () {
             default: false,
             describe: "Fakes reverting the migration",
         });
-    };
-    MigrationRevertCommand.prototype.handler = function (args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var dataSource, options, err_1;
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        dataSource = undefined;
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 6, , 9]);
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource))];
-                    case 2:
-                        dataSource = _b.sent();
-                        dataSource.setOptions({
-                            subscribers: [],
-                            synchronize: false,
-                            migrationsRun: false,
-                            dropSchema: false,
-                            logging: ["query", "error", "schema"],
-                        });
-                        return [4 /*yield*/, dataSource.initialize()];
-                    case 3:
-                        _b.sent();
-                        options = {
-                            transaction: (_a = dataSource.options.migrationsTransactionMode) !== null && _a !== void 0 ? _a : "all",
-                        };
-                        switch (args.t) {
-                            case "all":
-                                options.transaction = "all";
-                                break;
-                            case "none":
-                            case "false":
-                                options.transaction = "none";
-                                break;
-                            case "each":
-                                options.transaction = "each";
-                                break;
-                            default:
-                            // noop
-                        }
-                        return [4 /*yield*/, dataSource.undoLastMigration(options)];
-                    case 4:
-                        _b.sent();
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 5:
-                        _b.sent();
-                        return [3 /*break*/, 9];
-                    case 6:
-                        err_1 = _b.sent();
-                        PlatformTools_1.PlatformTools.logCmdErr("Error during migration revert:", err_1);
-                        if (!(dataSource && dataSource.isInitialized)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8:
-                        process.exit(1);
-                        return [3 /*break*/, 9];
-                    case 9: return [2 /*return*/];
-                }
+    }
+    async handler(args) {
+        let dataSource = undefined;
+        try {
+            dataSource = await CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource));
+            dataSource.setOptions({
+                subscribers: [],
+                synchronize: false,
+                migrationsRun: false,
+                dropSchema: false,
+                logging: ["query", "error", "schema"],
             });
-        });
-    };
-    return MigrationRevertCommand;
-}());
+            await dataSource.initialize();
+            const options = {
+                transaction: dataSource.options.migrationsTransactionMode ??
+                    "all",
+            };
+            switch (args.t) {
+                case "all":
+                    options.transaction = "all";
+                    break;
+                case "none":
+                case "false":
+                    options.transaction = "none";
+                    break;
+                case "each":
+                    options.transaction = "each";
+                    break;
+                default:
+                // noop
+            }
+            await dataSource.undoLastMigration(options);
+            await dataSource.destroy();
+        }
+        catch (err) {
+            PlatformTools_1.PlatformTools.logCmdErr("Error during migration revert:", err);
+            if (dataSource && dataSource.isInitialized)
+                await dataSource.destroy();
+            process.exit(1);
+        }
+    }
+}
 exports.MigrationRevertCommand = MigrationRevertCommand;
 //# sourceMappingURL=MigrationRevertCommand.js.map

package/lib/typeorm/commands/MigrationRevertCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationRevertCommand.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAEA,2DAAyD;AACzD,2BAA6B;AAC7B,iCAAmC;AACnC,+CAA6C;AAE7C;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,kBAAkB,CAAA;QAC5B,aAAQ,GAAG,kCAAkC,CAAA;IAuEjD,CAAC;IArEG,wCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACnB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EACJ,0FAA0F;SACjG,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,+BAA+B;SAC5C,CAAC,CAAA;IACV,CAAC;IAEK,wCAAO,GAAb,UAAc,IAAqB;;;;;;;wBAC3B,UAAU,GAA2B,SAAS,CAAA;;;;wBAEjC,qBAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,EAAA;;wBAFD,UAAU,GAAG,SAEZ,CAAA;wBACD,UAAU,CAAC,UAAU,CAAC;4BAClB,WAAW,EAAE,EAAE;4BACf,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;yBACxC,CAAC,CAAA;wBACF,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAEvB,OAAO,GAAG;4BACZ,WAAW,EACP,MAAA,UAAU,CAAC,OAAO,CAAC,yBAAyB,mCAC3C,KAAiC;yBACzC,CAAA;wBAED,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;4BACb,KAAK,KAAK;gCACN,OAAO,CAAC,WAAW,GAAG,KAAK,CAAA;gCAC3B,MAAK;4BACT,KAAK,MAAM,CAAC;4BACZ,KAAK,OAAO;gCACR,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;gCAC5B,MAAK;4BACT,KAAK,MAAM;gCACP,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;gCAC5B,MAAK;4BACT,QAAQ;4BACR,OAAO;wBACX,CAAC;wBAED,qBAAM,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAA;;wBAA3C,SAA2C,CAAA;wBAC3C,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;;wBAE1B,6BAAa,CAAC,SAAS,CAAC,gCAAgC,EAAE,KAAG,CAAC,CAAA;6BAE1D,CAAA,UAAU,IAAI,UAAU,CAAC,aAAa,CAAA,EAAtC,wBAAsC;wBACtC,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;wBAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;;;KAEtB;IACL,6BAAC;AAAD,CAAC,AAzED,IAyEC;AAzEY,wDAAsB"}
+{"version":3,"file":"MigrationRevertCommand.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/commands/MigrationRevertCommand.ts"],"names":[],"mappings":";;;AAEA,6DAAyD;AACzD,6BAA6B;AAC7B,mCAAmC;AACnC,iDAA6C;AAE7C;;GAEG;AACH,MAAa,sBAAsB;IAC/B,OAAO,GAAG,kBAAkB,CAAA;IAC5B,QAAQ,GAAG,kCAAkC,CAAA;IAE7C,OAAO,CAAC,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACnB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EACJ,0FAA0F;SACjG,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,+BAA+B;SAC5C,CAAC,CAAA;IACV,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqB;QAC/B,IAAI,UAAU,GAA2B,SAAS,CAAA;QAClD,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,CAAA;YACD,UAAU,CAAC,UAAU,CAAC;gBAClB,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;aACxC,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAE7B,MAAM,OAAO,GAAG;gBACZ,WAAW,EACP,UAAU,CAAC,OAAO,CAAC,yBAAyB;oBAC3C,KAAiC;aACzC,CAAA;YAED,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;gBACb,KAAK,KAAK;oBACN,OAAO,CAAC,WAAW,GAAG,KAAK,CAAA;oBAC3B,MAAK;gBACT,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO;oBACR,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;oBAC5B,MAAK;gBACT,KAAK,MAAM;oBACP,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;oBAC5B,MAAK;gBACT,QAAQ;gBACR,OAAO;YACX,CAAC;YAED,MAAM,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC3C,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;QAC9B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,6BAAa,CAAC,SAAS,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAA;YAE9D,IAAI,UAAU,IAAI,UAAU,CAAC,aAAa;gBACtC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;AAzED,wDAyEC"}

package/lib/typeorm/commands/MigrationRunCommand.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationRunCommand = void 0;
-var tslib_1 = require("tslib");
-var path = require("path");
-var process = require("process");
-var PlatformTools_1 = require("../platform/PlatformTools");
-var CommandUtils_1 = require("./CommandUtils");
+const path = require("path");
+const process = require("process");
+const PlatformTools_1 = require("../platform/PlatformTools");
+const CommandUtils_1 = require("./CommandUtils");
 /**
  * Runs migration command.
  */
-var MigrationRunCommand = /** @class */ (function () {
-    function MigrationRunCommand() {
-        this.command = "migration:run";
-        this.describe = "Runs all pending migrations.";
-    }
-    MigrationRunCommand.prototype.builder = function (args) {
+class MigrationRunCommand {
+    command = "migration:run";
+    describe = "Runs all pending migrations.";
+    builder(args) {
         return args
             .option("dataSource", {
             alias: "d",
@@ -33,77 +30,50 @@ var MigrationRunCommand = /** @class */ (function () {
             describe: "Fakes running the migrations if table schema has already been changed manually or externally " +
                 "(e.g. through another project)",
         });
-    };
-    MigrationRunCommand.prototype.handler = function (args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var dataSource, options, err_1;
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        dataSource = undefined;
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 6, , 9]);
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource))];
-                    case 2:
-                        dataSource = _b.sent();
-                        dataSource.setOptions({
-                            subscribers: [],
-                            synchronize: false,
-                            migrationsRun: false,
-                            dropSchema: false,
-                            logging: ["query", "error", "schema"],
-                        });
-                        return [4 /*yield*/, dataSource.initialize()];
-                    case 3:
-                        _b.sent();
-                        options = {
-                            transaction: (_a = dataSource.options.migrationsTransactionMode) !== null && _a !== void 0 ? _a : "all",
-                            fake: !!args.f,
-                        };
-                        switch (args.t) {
-                            case "all":
-                                options.transaction = "all";
-                                break;
-                            case "none":
-                            case "false":
-                                options.transaction = "none";
-                                break;
-                            case "each":
-                                options.transaction = "each";
-                                break;
-                            default:
-                            // noop
-                        }
-                        return [4 /*yield*/, dataSource.runMigrations(options)];
-                    case 4:
-                        _b.sent();
-                        return [4 /*yield*/, dataSource.destroy()
-                            // exit process if no errors
-                        ];
-                    case 5:
-                        _b.sent();
-                        // exit process if no errors
-                        process.exit(0);
-                        return [3 /*break*/, 9];
-                    case 6:
-                        err_1 = _b.sent();
-                        PlatformTools_1.PlatformTools.logCmdErr("Error during migration run:", err_1);
-                        if (!(dataSource && dataSource.isInitialized)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8:
-                        process.exit(1);
-                        return [3 /*break*/, 9];
-                    case 9: return [2 /*return*/];
-                }
+    }
+    async handler(args) {
+        let dataSource = undefined;
+        try {
+            dataSource = await CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource));
+            dataSource.setOptions({
+                subscribers: [],
+                synchronize: false,
+                migrationsRun: false,
+                dropSchema: false,
+                logging: ["query", "error", "schema"],
             });
-        });
-    };
-    return MigrationRunCommand;
-}());
+            await dataSource.initialize();
+            const options = {
+                transaction: dataSource.options.migrationsTransactionMode ??
+                    "all",
+                fake: !!args.f,
+            };
+            switch (args.t) {
+                case "all":
+                    options.transaction = "all";
+                    break;
+                case "none":
+                case "false":
+                    options.transaction = "none";
+                    break;
+                case "each":
+                    options.transaction = "each";
+                    break;
+                default:
+                // noop
+            }
+            await dataSource.runMigrations(options);
+            await dataSource.destroy();
+            // exit process if no errors
+            process.exit(0);
+        }
+        catch (err) {
+            PlatformTools_1.PlatformTools.logCmdErr("Error during migration run:", err);
+            if (dataSource && dataSource.isInitialized)
+                await dataSource.destroy();
+            process.exit(1);
+        }
+    }
+}
 exports.MigrationRunCommand = MigrationRunCommand;
 //# sourceMappingURL=MigrationRunCommand.js.map

package/lib/typeorm/commands/MigrationRunCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationRunCommand.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,2BAA6B;AAC7B,iCAAkC;AAElC,2DAAyD;AAEzD,+CAA6C;AAE7C;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,eAAe,CAAA;QACzB,aAAQ,GAAG,8BAA8B,CAAA;IA6E7C,CAAC;IA3EG,qCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACnB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EACJ,uFAAuF;SAC9F,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;YACd,QAAQ,EACJ,+FAA+F;gBAC/F,gCAAgC;SACvC,CAAC,CAAA;IACV,CAAC;IAEK,qCAAO,GAAb,UAAc,IAAqB;;;;;;;wBAC3B,UAAU,GAA2B,SAAS,CAAA;;;;wBAEjC,qBAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,EAAA;;wBAFD,UAAU,GAAG,SAEZ,CAAA;wBACD,UAAU,CAAC,UAAU,CAAC;4BAClB,WAAW,EAAE,EAAE;4BACf,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;yBACxC,CAAC,CAAA;wBACF,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAEvB,OAAO,GAAG;4BACZ,WAAW,EACP,MAAA,UAAU,CAAC,OAAO,CAAC,yBAAyB,mCAC3C,KAAiC;4BACtC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;yBACjB,CAAA;wBAED,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;4BACb,KAAK,KAAK;gCACN,OAAO,CAAC,WAAW,GAAG,KAAK,CAAA;gCAC3B,MAAK;4BACT,KAAK,MAAM,CAAC;4BACZ,KAAK,OAAO;gCACR,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;gCAC5B,MAAK;4BACT,KAAK,MAAM;gCACP,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;gCAC5B,MAAK;4BACT,QAAQ;4BACR,OAAO;wBACX,CAAC;wBAED,qBAAM,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,EAAA;;wBAAvC,SAAuC,CAAA;wBACvC,qBAAM,UAAU,CAAC,OAAO,EAAE;4BAE1B,4BAA4B;0BAFF;;wBAA1B,SAA0B,CAAA;wBAE1B,4BAA4B;wBAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;wBAEf,6BAAa,CAAC,SAAS,CAAC,6BAA6B,EAAE,KAAG,CAAC,CAAA;6BAEvD,CAAA,UAAU,IAAI,UAAU,CAAC,aAAa,CAAA,EAAtC,wBAAsC;wBACtC,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;wBAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;;;KAEtB;IACL,0BAAC;AAAD,CAAC,AA/ED,IA+EC;AA/EY,kDAAmB"}
+{"version":3,"file":"MigrationRunCommand.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/commands/MigrationRunCommand.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,mCAAkC;AAElC,6DAAyD;AAEzD,iDAA6C;AAE7C;;GAEG;AACH,MAAa,mBAAmB;IAC5B,OAAO,GAAG,eAAe,CAAA;IACzB,QAAQ,GAAG,8BAA8B,CAAA;IAEzC,OAAO,CAAC,IAAgB;QACpB,OAAO,IAAI;aACN,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACnB,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,QAAQ,EACJ,uFAAuF;SAC9F,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;YACd,QAAQ,EACJ,+FAA+F;gBAC/F,gCAAgC;SACvC,CAAC,CAAA;IACV,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqB;QAC/B,IAAI,UAAU,GAA2B,SAAS,CAAA;QAClD,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,CAAA;YACD,UAAU,CAAC,UAAU,CAAC;gBAClB,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC;aACxC,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAE7B,MAAM,OAAO,GAAG;gBACZ,WAAW,EACP,UAAU,CAAC,OAAO,CAAC,yBAAyB;oBAC3C,KAAiC;gBACtC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACjB,CAAA;YAED,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC;gBACb,KAAK,KAAK;oBACN,OAAO,CAAC,WAAW,GAAG,KAAK,CAAA;oBAC3B,MAAK;gBACT,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO;oBACR,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;oBAC5B,MAAK;gBACT,KAAK,MAAM;oBACP,OAAO,CAAC,WAAW,GAAG,MAAM,CAAA;oBAC5B,MAAK;gBACT,QAAQ;gBACR,OAAO;YACX,CAAC;YAED,MAAM,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACvC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,4BAA4B;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,6BAAa,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;YAE3D,IAAI,UAAU,IAAI,UAAU,CAAC,aAAa;gBACtC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;AA/ED,kDA+EC"}

package/lib/typeorm/commands/MigrationShowCommand.js

@@ -1,74 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationShowCommand = void 0;
-var tslib_1 = require("tslib");
-var process = require("process");
-var PlatformTools_1 = require("../platform/PlatformTools");
-var path = require("path");
-var CommandUtils_1 = require("./CommandUtils");
+const process = require("process");
+const PlatformTools_1 = require("../platform/PlatformTools");
+const path = require("path");
+const CommandUtils_1 = require("./CommandUtils");
 /**
  * Shows all migrations and whether they have been run or not.
  */
-var MigrationShowCommand = /** @class */ (function () {
-    function MigrationShowCommand() {
-        this.command = "migration:show";
-        this.describe = "Show all migrations and whether they have been run or not";
-    }
-    MigrationShowCommand.prototype.builder = function (args) {
+class MigrationShowCommand {
+    command = "migration:show";
+    describe = "Show all migrations and whether they have been run or not";
+    builder(args) {
         return args.option("dataSource", {
             alias: "d",
             describe: "Path to the file where your DataSource instance is defined.",
             demandOption: true,
         });
-    };
-    MigrationShowCommand.prototype.handler = function (args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var dataSource, err_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        dataSource = undefined;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 6, , 9]);
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource))];
-                    case 2:
-                        dataSource = _a.sent();
-                        dataSource.setOptions({
-                            subscribers: [],
-                            synchronize: false,
-                            migrationsRun: false,
-                            dropSchema: false,
-                            logging: ["schema"],
-                        });
-                        return [4 /*yield*/, dataSource.initialize()];
-                    case 3:
-                        _a.sent();
-                        return [4 /*yield*/, dataSource.showMigrations()];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 5:
-                        _a.sent();
-                        process.exit(0);
-                        return [3 /*break*/, 9];
-                    case 6:
-                        err_1 = _a.sent();
-                        PlatformTools_1.PlatformTools.logCmdErr("Error during migration show:", err_1);
-                        if (!(dataSource && dataSource.isInitialized)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 7:
-                        _a.sent();
-                        _a.label = 8;
-                    case 8:
-                        process.exit(1);
-                        return [3 /*break*/, 9];
-                    case 9: return [2 /*return*/];
-                }
+    }
+    async handler(args) {
+        let dataSource = undefined;
+        try {
+            dataSource = await CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource));
+            dataSource.setOptions({
+                subscribers: [],
+                synchronize: false,
+                migrationsRun: false,
+                dropSchema: false,
+                logging: ["schema"],
             });
-        });
-    };
-    return MigrationShowCommand;
-}());
+            await dataSource.initialize();
+            await dataSource.showMigrations();
+            await dataSource.destroy();
+            process.exit(0);
+        }
+        catch (err) {
+            PlatformTools_1.PlatformTools.logCmdErr("Error during migration show:", err);
+            if (dataSource && dataSource.isInitialized)
+                await dataSource.destroy();
+            process.exit(1);
+        }
+    }
+}
 exports.MigrationShowCommand = MigrationShowCommand;
 //# sourceMappingURL=MigrationShowCommand.js.map

package/lib/typeorm/commands/MigrationShowCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationShowCommand.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AACA,iCAAkC;AAElC,2DAAyD;AACzD,2BAA6B;AAC7B,+CAA6C;AAE7C;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,gBAAgB,CAAA;QAC1B,aAAQ,GAAG,2DAA2D,CAAA;IAsC1E,CAAC;IApCG,sCAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YAC7B,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;IACN,CAAC;IAEK,sCAAO,GAAb,UAAc,IAAqB;;;;;;wBAC3B,UAAU,GAA2B,SAAS,CAAA;;;;wBAEjC,qBAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,EAAA;;wBAFD,UAAU,GAAG,SAEZ,CAAA;wBACD,UAAU,CAAC,UAAU,CAAC;4BAClB,WAAW,EAAE,EAAE;4BACf,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,CAAC,QAAQ,CAAC;yBACtB,CAAC,CAAA;wBACF,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wBAA7B,SAA6B,CAAA;wBAC7B,qBAAM,UAAU,CAAC,cAAc,EAAE,EAAA;;wBAAjC,SAAiC,CAAA;wBACjC,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;wBAE1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;wBAEf,6BAAa,CAAC,SAAS,CAAC,8BAA8B,EAAE,KAAG,CAAC,CAAA;6BAExD,CAAA,UAAU,IAAI,UAAU,CAAC,aAAa,CAAA,EAAtC,wBAAsC;wBACtC,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;wBAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;;;KAEtB;IACL,2BAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,oDAAoB"}
+{"version":3,"file":"MigrationShowCommand.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/commands/MigrationShowCommand.ts"],"names":[],"mappings":";;;AACA,mCAAkC;AAElC,6DAAyD;AACzD,6BAA6B;AAC7B,iDAA6C;AAE7C;;GAEG;AACH,MAAa,oBAAoB;IAC7B,OAAO,GAAG,gBAAgB,CAAA;IAC1B,QAAQ,GAAG,2DAA2D,CAAA;IAEtE,OAAO,CAAC,IAAgB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YAC7B,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqB;QAC/B,IAAI,UAAU,GAA2B,SAAS,CAAA;QAClD,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,CAAA;YACD,UAAU,CAAC,UAAU,CAAC;gBAClB,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,CAAC,QAAQ,CAAC;aACtB,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC7B,MAAM,UAAU,CAAC,cAAc,EAAE,CAAA;YACjC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,6BAAa,CAAC,SAAS,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAA;YAE5D,IAAI,UAAU,IAAI,UAAU,CAAC,aAAa;gBACtC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;AAxCD,oDAwCC"}

package/lib/typeorm/commands/QueryCommand.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryCommand = void 0;
-var tslib_1 = require("tslib");
-var PlatformTools_1 = require("../platform/PlatformTools");
-var chalk_1 = require("chalk");
-var path = require("path");
-var process = require("process");
-var CommandUtils_1 = require("./CommandUtils");
+const PlatformTools_1 = require("../platform/PlatformTools");
+const chalk_1 = require("chalk");
+const path = require("path");
+const process = require("process");
+const CommandUtils_1 = require("./CommandUtils");
 /**
  * Executes an SQL query on the given dataSource.
  */
-var QueryCommand = /** @class */ (function () {
-    function QueryCommand() {
-        this.command = "query [query]";
-        this.describe = "Executes given SQL query on a default dataSource. Specify connection name to run query on a specific dataSource.";
-    }
-    QueryCommand.prototype.builder = function (args) {
+class QueryCommand {
+    command = "query [query]";
+    describe = "Executes given SQL query on a default dataSource. Specify connection name to run query on a specific dataSource.";
+    builder(args) {
         return args
             .positional("query", {
             describe: "The SQL Query to run",
@@ -26,77 +23,44 @@ var QueryCommand = /** @class */ (function () {
             describe: "Path to the file where your DataSource instance is defined.",
             demandOption: true,
         });
-    };
-    QueryCommand.prototype.handler = function (args) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var queryRunner, dataSource, query, queryResult, err_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        queryRunner = undefined;
-                        dataSource = undefined;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 7, , 12]);
-                        return [4 /*yield*/, CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource))];
-                    case 2:
-                        dataSource = _a.sent();
-                        dataSource.setOptions({
-                            synchronize: false,
-                            migrationsRun: false,
-                            dropSchema: false,
-                            logging: false,
-                        });
-                        return [4 /*yield*/, dataSource.initialize()
-                            // create a query runner and execute query using it
-                        ];
-                    case 3:
-                        _a.sent();
-                        // create a query runner and execute query using it
-                        queryRunner = dataSource.createQueryRunner();
-                        query = args.query;
-                        console.log(chalk_1.default.green("Running query: ") +
-                            PlatformTools_1.PlatformTools.highlightSql(query));
-                        return [4 /*yield*/, queryRunner.query(query)];
-                    case 4:
-                        queryResult = _a.sent();
-                        if (typeof queryResult === "undefined") {
-                            console.log(chalk_1.default.green("Query has been executed. No result was returned."));
-                        }
-                        else {
-                            console.log(chalk_1.default.green("Query has been executed. Result: "));
-                            console.log(PlatformTools_1.PlatformTools.highlightJson(JSON.stringify(queryResult, undefined, 2)));
-                        }
-                        return [4 /*yield*/, queryRunner.release()];
-                    case 5:
-                        _a.sent();
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 6:
-                        _a.sent();
-                        return [3 /*break*/, 12];
-                    case 7:
-                        err_1 = _a.sent();
-                        PlatformTools_1.PlatformTools.logCmdErr("Error during query execution:", err_1);
-                        if (!queryRunner) return [3 /*break*/, 9];
-                        return [4 /*yield*/, queryRunner.release()];
-                    case 8:
-                        _a.sent();
-                        _a.label = 9;
-                    case 9:
-                        if (!(dataSource && dataSource.isInitialized)) return [3 /*break*/, 11];
-                        return [4 /*yield*/, dataSource.destroy()];
-                    case 10:
-                        _a.sent();
-                        _a.label = 11;
-                    case 11:
-                        process.exit(1);
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
-                }
+    }
+    async handler(args) {
+        let queryRunner = undefined;
+        let dataSource = undefined;
+        try {
+            dataSource = await CommandUtils_1.CommandUtils.loadDataSource(path.resolve(process.cwd(), args.dataSource));
+            dataSource.setOptions({
+                synchronize: false,
+                migrationsRun: false,
+                dropSchema: false,
+                logging: false,
             });
-        });
-    };
-    return QueryCommand;
-}());
+            await dataSource.initialize();
+            // create a query runner and execute query using it
+            queryRunner = dataSource.createQueryRunner();
+            const query = args.query;
+            console.log(chalk_1.default.green("Running query: ") +
+                PlatformTools_1.PlatformTools.highlightSql(query));
+            const queryResult = await queryRunner.query(query);
+            if (typeof queryResult === "undefined") {
+                console.log(chalk_1.default.green("Query has been executed. No result was returned."));
+            }
+            else {
+                console.log(chalk_1.default.green("Query has been executed. Result: "));
+                console.log(PlatformTools_1.PlatformTools.highlightJson(JSON.stringify(queryResult, undefined, 2)));
+            }
+            await queryRunner.release();
+            await dataSource.destroy();
+        }
+        catch (err) {
+            PlatformTools_1.PlatformTools.logCmdErr("Error during query execution:", err);
+            if (queryRunner)
+                await queryRunner.release();
+            if (dataSource && dataSource.isInitialized)
+                await dataSource.destroy();
+            process.exit(1);
+        }
+    }
+}
 exports.QueryCommand = QueryCommand;
 //# sourceMappingURL=QueryCommand.js.map

package/lib/typeorm/commands/QueryCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryCommand.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAEA,2DAAyD;AAEzD,+BAAyB;AACzB,2BAA6B;AAC7B,iCAAmC;AACnC,+CAA6C;AAE7C;;GAEG;AACH;IAAA;QACI,YAAO,GAAG,eAAe,CAAA;QACzB,aAAQ,GACJ,kHAAkH,CAAA;IAmE1H,CAAC;IAjEG,8BAAO,GAAP,UAAQ,IAAgB;QACpB,OAAO,IAAI;aACN,UAAU,CAAC,OAAO,EAAE;YACjB,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,QAAQ;SACjB,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;IACV,CAAC;IAEK,8BAAO,GAAb,UAAc,IAAqB;;;;;;wBAC3B,WAAW,GAA4B,SAAS,CAAA;wBAChD,UAAU,GAA2B,SAAS,CAAA;;;;wBAEjC,qBAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,EAAA;;wBAFD,UAAU,GAAG,SAEZ,CAAA;wBACD,UAAU,CAAC,UAAU,CAAC;4BAClB,WAAW,EAAE,KAAK;4BAClB,aAAa,EAAE,KAAK;4BACpB,UAAU,EAAE,KAAK;4BACjB,OAAO,EAAE,KAAK;yBACjB,CAAC,CAAA;wBACF,qBAAM,UAAU,CAAC,UAAU,EAAE;4BAE7B,mDAAmD;0BAFtB;;wBAA7B,SAA6B,CAAA;wBAE7B,mDAAmD;wBACnD,WAAW,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAA;wBACtC,KAAK,GAAG,IAAI,CAAC,KAAe,CAAA;wBAClC,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC;4BAC1B,6BAAa,CAAC,YAAY,CAAC,KAAK,CAAC,CACxC,CAAA;wBACmB,qBAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,EAAA;;wBAA5C,WAAW,GAAG,SAA8B;wBAElD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;4BACrC,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,KAAK,CACP,kDAAkD,CACrD,CACJ,CAAA;wBACL,CAAC;6BAAM,CAAC;4BACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAA;4BAC7D,OAAO,CAAC,GAAG,CACP,6BAAa,CAAC,aAAa,CACvB,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CACJ,CAAA;wBACL,CAAC;wBAED,qBAAM,WAAW,CAAC,OAAO,EAAE,EAAA;;wBAA3B,SAA2B,CAAA;wBAC3B,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;;wBAE1B,6BAAa,CAAC,SAAS,CAAC,+BAA+B,EAAE,KAAG,CAAC,CAAA;6BAEzD,WAAW,EAAX,wBAAW;wBAAE,qBAAO,WAA2B,CAAC,OAAO,EAAE,EAAA;;wBAA5C,SAA4C,CAAA;;;6BACzD,CAAA,UAAU,IAAI,UAAU,CAAC,aAAa,CAAA,EAAtC,yBAAsC;wBACtC,qBAAM,UAAU,CAAC,OAAO,EAAE,EAAA;;wBAA1B,SAA0B,CAAA;;;wBAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;;;;;;KAEtB;IACL,mBAAC;AAAD,CAAC,AAtED,IAsEC;AAtEY,oCAAY"}
+{"version":3,"file":"QueryCommand.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/commands/QueryCommand.ts"],"names":[],"mappings":";;;AAEA,6DAAyD;AAEzD,iCAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AACnC,iDAA6C;AAE7C;;GAEG;AACH,MAAa,YAAY;IACrB,OAAO,GAAG,eAAe,CAAA;IACzB,QAAQ,GACJ,kHAAkH,CAAA;IAEtH,OAAO,CAAC,IAAgB;QACpB,OAAO,IAAI;aACN,UAAU,CAAC,OAAO,EAAE;YACjB,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,QAAQ;SACjB,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YAClB,KAAK,EAAE,GAAG;YACV,QAAQ,EACJ,6DAA6D;YACjE,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;IACV,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAqB;QAC/B,IAAI,WAAW,GAA4B,SAAS,CAAA;QACpD,IAAI,UAAU,GAA2B,SAAS,CAAA;QAClD,IAAI,CAAC;YACD,UAAU,GAAG,MAAM,2BAAY,CAAC,cAAc,CAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAoB,CAAC,CACzD,CAAA;YACD,UAAU,CAAC,UAAU,CAAC;gBAClB,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;aACjB,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAE7B,mDAAmD;YACnD,WAAW,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAA;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAe,CAAA;YAClC,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC;gBAC1B,6BAAa,CAAC,YAAY,CAAC,KAAK,CAAC,CACxC,CAAA;YACD,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAElD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,KAAK,CACP,kDAAkD,CACrD,CACJ,CAAA;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAA;gBAC7D,OAAO,CAAC,GAAG,CACP,6BAAa,CAAC,aAAa,CACvB,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CACJ,CAAA;YACL,CAAC;YAED,MAAM,WAAW,CAAC,OAAO,EAAE,CAAA;YAC3B,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;QAC9B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,6BAAa,CAAC,SAAS,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;YAE7D,IAAI,WAAW;gBAAE,MAAO,WAA2B,CAAC,OAAO,EAAE,CAAA;YAC7D,IAAI,UAAU,IAAI,UAAU,CAAC,aAAa;gBACtC,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;AAtED,oCAsEC"}