@onivoro/server-typeorm-postgres 0.1.15 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,17 +1,9 @@
1
1
  {
2
2
  "name": "@onivoro/server-typeorm-postgres",
3
- "version": "0.1.15",
3
+ "version": "0.1.17",
4
4
  "dependencies": {
5
5
  "typeorm-naming-strategies": "^4.1.0"
6
6
  },
7
7
  "main": "./src/index.js",
8
- "types": "./src/index.d.ts",
9
- "peerDependencies": {
10
- "typeorm": "~0.3.10",
11
- "@nestjs/common": "~9.0.0",
12
- "@nestjs/swagger": "~6.1.2",
13
- "@onivoro/isomorphic-common": "0.0.2",
14
- "date-fns-tz": "~1.3.7",
15
- "tslib": "~2.3.0"
16
- }
8
+ "type": "commonjs"
17
9
  }
package/src/index.d.ts CHANGED
@@ -3,6 +3,7 @@ export * from './lib/classes/columns-migration-base.class';
3
3
  export * from './lib/classes/drop-column-migration-base.class';
4
4
  export * from './lib/classes/index-migration-base.class';
5
5
  export * from './lib/classes/sql-writer.class';
6
+ export * from './lib/classes/table-migration-base.class';
6
7
  export * from './lib/classes/type-orm-paging-repository.class';
7
8
  export * from './lib/classes/type-orm-repository.class';
8
9
  export * from './lib/constants/many-to-one-relation-options.constant';
package/src/index.js CHANGED
@@ -6,6 +6,7 @@ tslib_1.__exportStar(require("./lib/classes/columns-migration-base.class"), expo
6
6
  tslib_1.__exportStar(require("./lib/classes/drop-column-migration-base.class"), exports);
7
7
  tslib_1.__exportStar(require("./lib/classes/index-migration-base.class"), exports);
8
8
  tslib_1.__exportStar(require("./lib/classes/sql-writer.class"), exports);
9
+ tslib_1.__exportStar(require("./lib/classes/table-migration-base.class"), exports);
9
10
  tslib_1.__exportStar(require("./lib/classes/type-orm-paging-repository.class"), exports);
10
11
  tslib_1.__exportStar(require("./lib/classes/type-orm-repository.class"), exports);
11
12
  tslib_1.__exportStar(require("./lib/constants/many-to-one-relation-options.constant"), exports);
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/server-typeorm-postgres/src/index.ts"],"names":[],"mappings":";;;AAAA,oFAA0D;AAC1D,qFAA2D;AAC3D,yFAA+D;AAC/D,mFAAyD;AACzD,yEAA+C;AAC/C,yFAA+D;AAC/D,kFAAwD;AAExD,gGAAsE;AAEtE,2FAAiE;AACjE,0FAAgE;AAChE,kFAAwD;AACxD,2EAAiD;AAEjD,8FAAoE;AACpE,uFAA6D;AAC7D,uFAA6D;AAC7D,4FAAkE;AAClE,kFAAwD;AACxD,4EAAkD;AAClD,sFAA4D;AAE5D,oFAA0D;AAC1D,gFAAsD;AACtD,4EAAkD;AAClD,2EAAiD;AAEjD,+EAAqD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/server-typeorm-postgres/src/index.ts"],"names":[],"mappings":";;;AAAA,oFAA0D;AAC1D,qFAA2D;AAC3D,yFAA+D;AAC/D,mFAAyD;AACzD,yEAA+C;AAC/C,mFAAyD;AACzD,yFAA+D;AAC/D,kFAAwD;AAExD,gGAAsE;AAEtE,2FAAiE;AACjE,0FAAgE;AAChE,kFAAwD;AACxD,2EAAiD;AAEjD,8FAAoE;AACpE,uFAA6D;AAC7D,uFAA6D;AAC7D,4FAAkE;AAClE,kFAAwD;AACxD,4EAAkD;AAClD,sFAA4D;AAE5D,oFAA0D;AAC1D,gFAAsD;AACtD,4EAAkD;AAClD,2EAAiD;AAEjD,+EAAqD"}
@@ -1,7 +1,9 @@
1
1
  import { TableColumnOptions } from "typeorm";
2
2
  export declare class SqlWriter {
3
- static addColumn(table: any, option: TableColumnOptions): string;
4
- static addColumns(table: any, options: TableColumnOptions[]): string;
3
+ static addColumn(table: string, option: TableColumnOptions): string;
4
+ static createTable(table: string, options: TableColumnOptions[]): string;
5
+ static dropTable(table: string): string;
6
+ static addColumns(table: string, options: TableColumnOptions[]): string;
5
7
  static dropColumn(table: string, option: TableColumnOptions): string;
6
8
  static dropColumns(table: string, options: TableColumnOptions[]): string;
7
9
  static dropIndex(index: string): string;
@@ -5,7 +5,18 @@ class SqlWriter {
5
5
  static addColumn(table, option) {
6
6
  const notNullExpression = option.isNullable ? '' : ' NOT NULL ';
7
7
  const foreignKey = option.foreignKeyConstraintName ? ` REFERENCES ${option.foreignKeyConstraintName} ` : '';
8
- return `ALTER TABLE "${table}" ADD "${option.name}" ${option.type}${notNullExpression}${SqlWriter.getDefaultValueExpression(option)}${foreignKey}`;
8
+ const primaryKey = option.isPrimary ? ` PRIMARY ` : '';
9
+ return `ALTER TABLE "${table}" ADD "${option.name}" ${primaryKey}${option.type}${notNullExpression}${SqlWriter.getDefaultValueExpression(option)}${foreignKey}`;
10
+ }
11
+ static createTable(table, options) {
12
+ const createTableStatement = `CREATE TABLE "${table};\n"`;
13
+ if (!options?.length) {
14
+ return createTableStatement;
15
+ }
16
+ return `${createTableStatement}${SqlWriter.addColumns(table, options)}`;
17
+ }
18
+ static dropTable(table) {
19
+ return `DROP "${table}";\n`;
9
20
  }
10
21
  static addColumns(table, options) {
11
22
  return options.map(option => SqlWriter.addColumn(table, option)).join('; \n');
@@ -1 +1 @@
1
- {"version":3,"file":"sql-writer.class.js","sourceRoot":"","sources":["../../../../../../libs/server-typeorm-postgres/src/lib/classes/sql-writer.class.ts"],"names":[],"mappings":";;;AAEA,MAAa,SAAS;IAEX,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAA0B;QACrD,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,eAAe,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5G,OAAO,gBAAgB,KAAK,UAAU,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,GAAG,iBAAiB,GAAG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;IACvJ,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAA6B;QACzD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa,EAAE,MAA0B;QAC9D,OAAO,gBAAgB,KAAK,iBAAiB,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa,EAAE,OAA6B;QAClE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnF,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,KAAa;QACjC,OAAO,wBAAwB,KAAK,EAAE,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa,EAAE,MAAc,EAAE,MAAe;QACpE,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,wBAAwB,KAAK,QAAQ,KAAK,KAAK,MAAM,GAAG,CAAC;IACpG,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,KAAa,EAAE,MAAc;QACpD,OAAO,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,KAAa,EAAE,MAAc;QACzD,OAAO,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,MAA0B;QAC9D,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE;YACvC,OAAO,EAAE,CAAC;SACb;QAED,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,IAAI,GAAG,CAAC;SAC1E;QAED,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACpD,OAAO,YAAY,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;SACjE;QAED,OAAO,aAAa,MAAM,CAAC,OAAO,IAAI,CAAC;IAC3C,CAAC;CACJ;AApDD,8BAoDC"}
1
+ {"version":3,"file":"sql-writer.class.js","sourceRoot":"","sources":["../../../../../../libs/server-typeorm-postgres/src/lib/classes/sql-writer.class.ts"],"names":[],"mappings":";;;AAEA,MAAa,SAAS;IAEX,MAAM,CAAC,SAAS,CAAC,KAAa,EAAE,MAA0B;QAC7D,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,eAAe,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5G,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,gBAAgB,KAAK,UAAU,MAAM,CAAC,IAAI,KAAK,UAAU,GAAG,MAAM,CAAC,IAAI,GAAG,iBAAiB,GAAG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;IACpK,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa,EAAE,OAA6B;QAClE,MAAM,oBAAoB,GAAG,iBAAiB,KAAK,MAAM,CAAC;QAE1D,IAAG,CAAC,OAAO,EAAE,MAAM,EAAE;YACjB,OAAO,oBAAoB,CAAC;SAC/B;QAED,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;IAC5E,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,KAAa;QACjC,OAAO,SAAS,KAAK,MAAM,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa,EAAE,OAA6B;QACjE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa,EAAE,MAA0B;QAC9D,OAAO,gBAAgB,KAAK,iBAAiB,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa,EAAE,OAA6B;QAClE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnF,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,KAAa;QACjC,OAAO,wBAAwB,KAAK,EAAE,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa,EAAE,MAAc,EAAE,MAAe;QACpE,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,UAAU,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,wBAAwB,KAAK,QAAQ,KAAK,KAAK,MAAM,GAAG,CAAC;IACpG,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,KAAa,EAAE,MAAc;QACpD,OAAO,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,KAAa,EAAE,MAAc;QACzD,OAAO,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,MAA0B;QAC9D,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE;YACvC,OAAO,EAAE,CAAC;SACb;QAED,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,IAAI,GAAG,CAAC;SAC1E;QAED,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACpD,OAAO,YAAY,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;SACjE;QAED,OAAO,aAAa,MAAM,CAAC,OAAO,IAAI,CAAC;IAC3C,CAAC;CACJ;AAnED,8BAmEC"}
@@ -0,0 +1,8 @@
1
+ import { MigrationInterface, QueryRunner, TableColumnOptions } from "typeorm";
2
+ export declare class TableMigrationBase implements MigrationInterface {
3
+ table: string;
4
+ options: TableColumnOptions[];
5
+ constructor(table: string, options: TableColumnOptions[]);
6
+ up(queryRunner: QueryRunner): Promise<void>;
7
+ down(queryRunner: QueryRunner): Promise<void>;
8
+ }
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.TableMigrationBase = void 0;
4
+ const sql_writer_class_1 = require("./sql-writer.class");
5
+ class TableMigrationBase {
6
+ table;
7
+ options;
8
+ constructor(table, options) {
9
+ this.table = table;
10
+ this.options = options;
11
+ }
12
+ async up(queryRunner) {
13
+ await queryRunner.query(sql_writer_class_1.SqlWriter.createTable(this.table, this.options));
14
+ }
15
+ async down(queryRunner) {
16
+ await queryRunner.query(sql_writer_class_1.SqlWriter.dropTable(this.table));
17
+ }
18
+ }
19
+ exports.TableMigrationBase = TableMigrationBase;
20
+ //# sourceMappingURL=table-migration-base.class.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"table-migration-base.class.js","sourceRoot":"","sources":["../../../../../../libs/server-typeorm-postgres/src/lib/classes/table-migration-base.class.ts"],"names":[],"mappings":";;;AACA,yDAA+C;AAE/C,MAAa,kBAAkB;IAEhB;IACA;IAFX,YACW,KAAa,EACb,OAA6B;QAD7B,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAsB;IACpC,CAAC;IAEE,KAAK,CAAC,EAAE,CAAC,WAAwB;QACpC,MAAM,WAAW,CAAC,KAAK,CAAC,4BAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACtC,MAAM,WAAW,CAAC,KAAK,CAAC,4BAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;CACJ;AAbD,gDAaC"}
@@ -7,7 +7,7 @@ const common_1 = require("@nestjs/common");
7
7
  const typeorm_1 = require("typeorm");
8
8
  const data_source_factory_function_1 = require("./functions/data-source-factory.function");
9
9
  const dataSourceMap = new Map();
10
- let ServerTypeormPostgresModule = ServerTypeormPostgresModule_1 = class ServerTypeormPostgresModule {
10
+ let ServerTypeormPostgresModule = exports.ServerTypeormPostgresModule = ServerTypeormPostgresModule_1 = class ServerTypeormPostgresModule {
11
11
  static configure(injectables, entities, options, name = 'default') {
12
12
  const providers = [
13
13
  {
@@ -38,8 +38,7 @@ let ServerTypeormPostgresModule = ServerTypeormPostgresModule_1 = class ServerTy
38
38
  };
39
39
  }
40
40
  };
41
- ServerTypeormPostgresModule = ServerTypeormPostgresModule_1 = tslib_1.__decorate([
41
+ exports.ServerTypeormPostgresModule = ServerTypeormPostgresModule = ServerTypeormPostgresModule_1 = tslib_1.__decorate([
42
42
  (0, common_1.Module)({})
43
43
  ], ServerTypeormPostgresModule);
44
- exports.ServerTypeormPostgresModule = ServerTypeormPostgresModule;
45
44
  //# sourceMappingURL=server-typeorm-postgres.module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"server-typeorm-postgres.module.js","sourceRoot":"","sources":["../../../../../libs/server-typeorm-postgres/src/lib/server-typeorm-postgres.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AACvD,qCAAoD;AACpD,2FAA6E;AAG7E,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;AAGzB,IAAM,2BAA2B,mCAAjC,MAAM,2BAA2B;IACtC,MAAM,CAAC,SAAS,CACd,WAAkB,EAClB,QAAe,EACf,OAA2B,EAC3B,IAAI,GAAG,SAAS;QAEhB,MAAM,SAAS,GAAG;YAChB;gBACE,OAAO,EAAE,oBAAU;gBACnB,UAAU,EAAE,KAAK,IAAI,EAAE;oBACrB,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,CAAC,gBAAgB,EAAE;wBACrB,MAAM,UAAU,GAAe,IAAA,gDAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC1E,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;wBAC9B,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;qBACrC;oBACD,OAAO,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;aACF;YACD;gBACE,OAAO,EAAE,uBAAa;gBACtB,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,UAAU,CAAC,OAAO,CAAC;gBAC5B,CAAC;gBACD,MAAM,EAAE,CAAC,oBAAU,CAAC;aACrB;YACD,GAAG,WAAW;SACf,CAAC;QACF,OAAO;YACL,MAAM,EAAE,6BAA2B;YACnC,OAAO,EAAE,SAAS;YAClB,SAAS;SACV,CAAC;IACJ,CAAC;CACF,CAAA;AAnCY,2BAA2B;IADvC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,2BAA2B,CAmCvC;AAnCY,kEAA2B"}
1
+ {"version":3,"file":"server-typeorm-postgres.module.js","sourceRoot":"","sources":["../../../../../libs/server-typeorm-postgres/src/lib/server-typeorm-postgres.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AACvD,qCAAoD;AACpD,2FAA6E;AAG7E,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;AAGzB,IAAM,2BAA2B,yEAAjC,MAAM,2BAA2B;IACtC,MAAM,CAAC,SAAS,CACd,WAAkB,EAClB,QAAe,EACf,OAA2B,EAC3B,IAAI,GAAG,SAAS;QAEhB,MAAM,SAAS,GAAG;YAChB;gBACE,OAAO,EAAE,oBAAU;gBACnB,UAAU,EAAE,KAAK,IAAI,EAAE;oBACrB,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,CAAC,gBAAgB,EAAE;wBACrB,MAAM,UAAU,GAAe,IAAA,gDAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC1E,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;wBAC9B,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;qBACrC;oBACD,OAAO,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;aACF;YACD;gBACE,OAAO,EAAE,uBAAa;gBACtB,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,UAAU,CAAC,OAAO,CAAC;gBAC5B,CAAC;gBACD,MAAM,EAAE,CAAC,oBAAU,CAAC;aACrB;YACD,GAAG,WAAW;SACf,CAAC;QACF,OAAO;YACL,MAAM,EAAE,6BAA2B;YACnC,OAAO,EAAE,SAAS;YAClB,SAAS;SACV,CAAC;IACJ,CAAC;CACF,CAAA;sCAnCY,2BAA2B;IADvC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,2BAA2B,CAmCvC"}