stepzen 0.44.0 → 0.45.0-beta.1

package/lib/generate/import-command.js

@@ -1,21 +1,40 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportCommandBase = void 0;
-const core_1 = require("@oclif/core");
-const errors_1 = require("@oclif/core/lib/errors");
-const chalk = require("chalk");
-const fsx = require("fs-extra");
-const path = require("path");
-const constants_1 = require("../shared/constants");
-const inquirer = require("../shared/inquirer");
-const rmtemp_1 = require("../shared/rmtemp");
-const utils_1 = require("../shared/utils");
-const zen_command_1 = require("../shared/zen-command");
-const helpers_1 = require("./helpers");
-class ImportCommandBase extends zen_command_1.default {
+import { Flags, ux } from '@oclif/core';
+import { CLIError } from '@oclif/core/errors';
+import chalk from 'chalk';
+import fsx from 'fs-extra';
+import path from 'node:path';
+import { DETECT_NAME_CONFLICTS } from '../shared/constants.js';
+import * as inquirer from '../shared/inquirer.js';
+import { rmtemp } from '../shared/rmtemp.js';
+import { trackImportCommand } from '../shared/segment.js';
+import { getFeatureFlag, getTimeout } from '../shared/utils.js';
+import ZenCommand from '../shared/zen-command.js';
+import { writeSdlAndConfig } from './helpers.js';
+export class ImportCommandBase extends ZenCommand {
+    static flags = {
+        ...ZenCommand.flags,
+        dir: Flags.string({ description: 'Working directory' }),
+        silent: Flags.boolean({
+            description: 'This is an internal flag passed by the (no-arg) Import command when' +
+                ' it launches a data-source specific import command. The intent is' +
+                ' to avoid showing a welcome message twice (if its already been shown' +
+                ' by the (no-arg) Import command).',
+            hidden: true,
+        }),
+        name: Flags.string({
+            description: 'Subfolder inside the workspace folder to save the imported' +
+                ' schema files to. Defaults to the name of the imported schema.',
+        }),
+        overwrite: Flags.boolean({
+            description: 'Overwrite any existing schema with the same name. Cannot be used' +
+                ' without also providing a --name flag.',
+            dependsOn: ['name'],
+            hidden: true,
+        }),
+    };
     async run() {
-        const { flags } = await this.parse();
+        const { flags } = await this.parse(this.ctor);
         // If using a local StepZen service instance, make sure it's running
         await this.awaitIntrospectionServiceUpIfLocal();
         // Get or create a StepZen workspace (possibly interactive)
@@ -44,7 +63,7 @@ class ImportCommandBase extends zen_command_1.default {
         // the new schema returned by the introspection service and the existing
         // workspace schema. The merged schema is written to a temp folder
         // (outPath).
-        const { outPath } = await (0, helpers_1.writeSdlAndConfig)({
+        const { outPath } = await writeSdlAndConfig({
             name: flags.name || this.source,
             source: workspace.schema,
             // Merging types in the way it's done in @stepzen/transpiler leads to
@@ -61,13 +80,15 @@ class ImportCommandBase extends zen_command_1.default {
             // workspace folder making the result visible to the user.
             fsx.copySync(outPath, workspace.schema);
             this.log(chalk `{green Successfully imported {bold ${this.source}} data source into your GraphQL schema}`);
+            // track stepzen import command
+            trackImportCommand(this.source);
         }
         finally {
-            (0, rmtemp_1.rmtemp)(outPath);
+            rmtemp(outPath);
         }
     }
     async ensureOnConflictBehavior(workspace, flags) {
-        const detectNameConflicts = (0, utils_1.getFeatureFlag)(constants_1.DETECT_NAME_CONFLICTS);
+        const detectNameConflicts = getFeatureFlag(DETECT_NAME_CONFLICTS);
         if (!detectNameConflicts) {
             return 'append';
         }
@@ -95,7 +116,7 @@ class ImportCommandBase extends zen_command_1.default {
         // In an interactive mode the CLI asks them for a confirmation.
         // In a non-interactive mode the CLI throws an error.
         if (flags['non-interactive']) {
-            throw new errors_1.CLIError(`A schema named ${chalk.bold(flags.name)} already exists in this workspace. Add an ${chalk.bold('--overwrite')} flag to overwrite it.`);
+            throw new CLIError(`A schema named ${chalk.bold(flags.name)} already exists in this workspace. Add an ${chalk.bold('--overwrite')} flag to overwrite it.`);
         }
         this.log(`A schema named ${chalk.bold(flags.name)} already exists in this workspace. Would you like to overwrite it?`);
         const answers = await inquirer.prompt('import', [
@@ -112,26 +133,26 @@ class ImportCommandBase extends zen_command_1.default {
         return this.exit();
     }
     async wrapInProgressAndTimeout(importPromise) {
-        core_1.ux.action.start('Starting');
+        ux.action.start('Starting');
         try {
-            let timeoutPromise = (0, utils_1.getTimeout)(5 * 1000);
+            let timeoutPromise = getTimeout(5 * 1000);
             let resultOrError = await Promise.race([importPromise, timeoutPromise]);
             if (!resultOrError) {
                 // 5 sec passed, but no result yet
-                core_1.ux.action.start('Creating a GraphQL schema');
-                timeoutPromise = (0, utils_1.getTimeout)(5 * 1000);
+                ux.action.start('Creating a GraphQL schema');
+                timeoutPromise = getTimeout(5 * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
             if (!resultOrError) {
                 // another 5 sec passed (10 sec total)
-                core_1.ux.action.start('Creating a GraphQL schema (this is taking longer than usual)');
-                timeoutPromise = (0, utils_1.getTimeout)(30 * 1000);
+                ux.action.start('Creating a GraphQL schema (this is taking longer than usual)');
+                timeoutPromise = getTimeout(30 * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
             if (!resultOrError) {
                 // another 30 sec passed (40 sec total)
-                core_1.ux.action.start('Creating a GraphQL schema (it may take up to 10 minutes)');
-                timeoutPromise = (0, utils_1.getTimeout)((8 * 60 + 20) * 1000);
+                ux.action.start('Creating a GraphQL schema (it may take up to 10 minutes)');
+                timeoutPromise = getTimeout((8 * 60 + 20) * 1000);
                 resultOrError = await Promise.race([importPromise, timeoutPromise]);
             }
             if (resultOrError) {
@@ -145,35 +166,13 @@ class ImportCommandBase extends zen_command_1.default {
                     error: { message: 'The StepZen introspection service has timed out.' },
                 };
             }
-            core_1.ux.action.stop(resultOrError.error ? chalk.red('fail') : 'done');
+            ux.action.stop(resultOrError.error ? chalk.red('fail') : 'done');
             return resultOrError;
         }
         catch (error) {
-            core_1.ux.action.stop(chalk.red('fail'));
+            ux.action.stop(chalk.red('fail'));
             throw error;
         }
     }
 }
-exports.ImportCommandBase = ImportCommandBase;
-ImportCommandBase.flags = {
-    ...zen_command_1.default.flags,
-    dir: core_1.Flags.string({ description: 'Working directory' }),
-    silent: core_1.Flags.boolean({
-        description: 'This is an internal flag passed by the (no-arg) Import command when' +
-            ' it launches a data-source specific import command. The intent is' +
-            ' to avoid showing a welcome message twice (if its already been shown' +
-            ' by the (no-arg) Import command).',
-        hidden: true,
-    }),
-    name: core_1.Flags.string({
-        description: 'Subfolder inside the workspace folder to save the imported' +
-            ' schema files to. Defaults to the name of the imported schema.',
-    }),
-    overwrite: core_1.Flags.boolean({
-        description: 'Overwrite any existing schema with the same name. Cannot be used' +
-            ' without also providing a --name flag.',
-        dependsOn: ['name'],
-        hidden: true,
-    }),
-};
 //# sourceMappingURL=import-command.js.map

package/lib/generate/import-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-command.js","sourceRoot":"","sources":["../../src/generate/import-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-command.js","sourceRoot":"","sources":["../../src/generate/import-command.ts"],"names":[],"mappings":"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"}

package/lib/generate/openapi2sdl.d.ts

@@ -1,7 +1,7 @@
-import type { ErrorOr, MachineConfiguration } from '../shared/types';
-import type { IntrospectionServiceResponse } from './helpers';
-import { CommonImportOptions } from './import-command';
-export declare type OpenApi2SdlOptions = CommonImportOptions & {
+import type { ErrorOr, MachineConfiguration } from '../shared/types.js';
+import type { IntrospectionServiceResponse } from './helpers.js';
+import type { CommonImportOptions } from './import-command.js';
+export type OpenApi2SdlOptions = CommonImportOptions & {
     openapi: string;
 };
 export declare const openapi2sdl: ({ openapi }: OpenApi2SdlOptions, configuration: MachineConfiguration) => Promise<ErrorOr<IntrospectionServiceResponse>>;

package/lib/generate/openapi2sdl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openapi2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/openapi2sdl.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,iBAAiB,CAAA;AAClE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,WAAW,CAAA;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAA;AAEpD,oBAAY,kBAAkB,GAAG,mBAAmB,GAAG;IACrD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,gBACX,kBAAkB,iBACd,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CAU/C,CAAA"}
+{"version":3,"file":"openapi2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/openapi2sdl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AACrE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,cAAc,CAAA;AAC9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAA;AAK5D,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG;IACrD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,gBACX,kBAAkB,iBACd,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CAS5C,CAAA"}

package/lib/generate/openapi2sdl.js

@@ -1,19 +1,13 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.openapi2sdl = void 0;
-const constants_1 = require("../shared/constants");
-const helpers_1 = require("./helpers");
-const openapi2sdl = async ({ openapi }, configuration) => {
-    return (0, helpers_1.queryIntrospectionService)((0, constants_1.getIntrospectionUrl)(configuration), {
-        operation: 'getSDLFromOpenAPISchema',
-        variables: {
-            schema: {
-                type: 'String!',
-                value: openapi,
-            },
+import { getIntrospectionUrl } from '../shared/constants.js';
+import { queryIntrospectionService } from './helpers.js';
+export const openapi2sdl = async ({ openapi }, configuration) => queryIntrospectionService(getIntrospectionUrl(configuration), {
+    operation: 'getSDLFromOpenAPISchema',
+    variables: {
+        schema: {
+            type: 'String!',
+            value: openapi,
         },
-    });
-};
-exports.openapi2sdl = openapi2sdl;
+    },
+});
 //# sourceMappingURL=openapi2sdl.js.map

package/lib/generate/openapi2sdl.js.map

@@ -1 +1 @@
-{"version":3,"file":"openapi2sdl.js","sourceRoot":"","sources":["../../src/generate/openapi2sdl.ts"],"names":[],"mappings":";AAAA,iCAAiC;;;AAEjC,mDAAuD;AACvD,uCAAmD;AAU5C,MAAM,WAAW,GAAG,KAAK,EAC9B,EAAC,OAAO,EAAqB,EAC7B,aAAmC,EACa,EAAE;IAClD,OAAO,IAAA,mCAAyB,EAAC,IAAA,+BAAmB,EAAC,aAAa,CAAC,EAAE;QACnE,SAAS,EAAE,yBAAyB;QACpC,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,OAAO;aACf;SACF;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,WAAW,eAavB"}
+{"version":3,"file":"openapi2sdl.js","sourceRoot":"","sources":["../../src/generate/openapi2sdl.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAMjC,OAAO,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAC,yBAAyB,EAAC,MAAM,cAAc,CAAA;AAMtD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,EAAC,OAAO,EAAqB,EAC7B,aAAmC,EACa,EAAE,CAClD,yBAAyB,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAAE;IAC5D,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE;YACN,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,OAAO;SACf;KACF;CACF,CAAC,CAAA"}

package/lib/generate/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;cAaK,MAAM;;;cAMN,MAAM;;;kBAMF,MAAM;;;kBAON,MAAM;;sBACxB;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC;;;;mBAkBD,OAAO;;;uBAOH,OAAO;;CAChD,CAAA"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAM9C;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;cAaK,MAAM;;;cAMN,MAAM;;;kBAMF,MAAM;;;kBAON,MAAM;;sBACxB;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC;;;;mBAkBD,OAAO;;;uBAOH,OAAO;;CAChD,CAAA"}

package/lib/generate/questions.js

@@ -1,13 +1,10 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportQuestions = void 0;
-const chalk = require("chalk");
-const url_helpers_1 = require("../shared/url-helpers");
+import chalk from 'chalk';
+import { parseHost } from '../shared/url-helpers.js';
 /**
  * A helper to share interactive questions between several import commands.
  */
-exports.ImportQuestions = {
+export const ImportQuestions = {
     prefix: () => ({
         name: 'typePrefix',
         message: 'Prefix to add to all generated type names (leave blank for none)',
@@ -15,7 +12,7 @@ exports.ImportQuestions = {
     dbHost: () => ({
         name: 'host',
         message: 'What is your host? (and optional port as host:port)',
-        validate: input => (0, url_helpers_1.parseHost)(input).isValid || `Could not parse "${input}" as a hostname.`,
+        validate: input => parseHost(input).isValid || `Could not parse "${input}" as a hostname.`,
     }),
     dbUser: () => ({
         name: 'user',

package/lib/generate/questions.js.map

@@ -1 +1 @@
-{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":";AAAA,iCAAiC;;;AAEjC,+BAA8B;AAC9B,uDAA+C;AAI/C;;GAEG;AACU,QAAA,eAAe,GAAG;IAC7B,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,YAAY;QAClB,OAAO,EACL,kEAAkE;KACzB,CAAA;IAC/C,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,qDAAqD;QAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,IAAA,uBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,IAAI,oBAAoB,KAAK,kBAAkB;KACrC,CAAA;IACxC,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,uBAAuB;QAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,4BAA4B;KAClC,CAAA;IACxC,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,UAAU;KACwB,CAAA;IAC5C,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,iCAAiC;KAClB,CAAA;IAC5C,QAAQ,EAAE,CAAC,OAA6B,EAAE,EAAE,EAAE,CAC5C,CAAC;QACC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,+BACP,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gCACvB,GAAG;QACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACrB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,0BAA0B;YAC5D,CAAC,CAAC,SAAS;KAC0B,CAAA;IAC3C,WAAW,EAAE,GAAG,EAAE,CAChB,CAAC;QACC,IAAI,EAAE,WAAW;QACjB,OAAO,EACL,iFAAiF;YACjF,MAAM,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KAC4B,CAAA;IAC9C,aAAa,EAAE,GAAG,EAAE,CAClB,CAAC;QACC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACgC,CAAA;CACnD,CAAA"}
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/generate/questions.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAA;AAElD;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,YAAY;QAClB,OAAO,EACL,kEAAkE;KACzB,CAAA;IAC/C,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,qDAAqD;QAC9D,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,IAAI,oBAAoB,KAAK,kBAAkB;KACrC,CAAA;IACxC,MAAM,EAAE,GAAG,EAAE,CACX,CAAC;QACC,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,uBAAuB;QAChC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,4BAA4B;KAClC,CAAA;IACxC,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,uBAAuB;QAChC,IAAI,EAAE,UAAU;KACwB,CAAA;IAC5C,UAAU,EAAE,GAAG,EAAE,CACf,CAAC;QACC,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAChB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,iCAAiC;KAClB,CAAA;IAC5C,QAAQ,EAAE,CAAC,OAA6B,EAAE,EAAE,EAAE,CAC5C,CAAC;QACC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,+BACP,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gCACvB,GAAG;QACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACrB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,0BAA0B;YAC5D,CAAC,CAAC,SAAS;KAC0B,CAAA;IAC3C,WAAW,EAAE,GAAG,EAAE,CAChB,CAAC;QACC,IAAI,EAAE,WAAW;QACjB,OAAO,EACL,iFAAiF;YACjF,MAAM,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,EAAE;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KAC4B,CAAA;IAC9C,aAAa,EAAE,GAAG,EAAE,CAClB,CAAC;QACC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACgC,CAAA;CACnD,CAAA"}

package/lib/generate/sql2sdl.d.ts

@@ -1,11 +1,11 @@
-import type { ErrorOr, MachineConfiguration } from '../shared/types';
-import type { IntrospectionServiceResponse } from './helpers';
-import type { CommonImportOptions } from './import-command';
-export declare type DBType = 'mysql' | 'postgresql' | 'snowflake' | 'presto' | 'db2' | 'oracle';
-export declare type DBIntrospectionOptions = {
+import type { ErrorOr, MachineConfiguration } from '../shared/types.js';
+import type { IntrospectionServiceResponse } from './helpers.js';
+import type { CommonImportOptions } from './import-command.js';
+export type DBType = 'mysql' | 'postgresql' | 'snowflake' | 'presto' | 'db2' | 'oracle';
+export type DBIntrospectionOptions = {
     naming?: '2022' | '2023';
 };
-export declare type CommonSqlImportOptions = CommonImportOptions & {
+export type CommonSqlImportOptions = CommonImportOptions & {
     dbType: DBType;
     host: string;
     database: string;
@@ -15,33 +15,33 @@ export declare type CommonSqlImportOptions = CommonImportOptions & {
     include?: 'tables-only' | 'views-only' | 'tables-and-views';
     introspectionOptions?: DBIntrospectionOptions;
 };
-export declare type MysqlImportOptions = CommonSqlImportOptions & {
+export type MysqlImportOptions = CommonSqlImportOptions & {
     dbType: 'mysql';
 };
-export declare type PostgresqlImportOptions = CommonSqlImportOptions & {
+export type PostgresqlImportOptions = CommonSqlImportOptions & {
     dbType: 'postgresql';
     schema?: string;
 };
-export declare type Db2sqlImportOptions = CommonSqlImportOptions & {
+export type Db2sqlImportOptions = CommonSqlImportOptions & {
     dbType: 'db2';
     schema?: string;
     sslConnection: boolean;
 };
-export declare type SnowflakeImportOptions = Omit<CommonSqlImportOptions, 'host'> & {
+export type SnowflakeImportOptions = Omit<CommonSqlImportOptions, 'host'> & {
     dbType: 'snowflake';
     accountId: string;
     warehouse: string;
     schema?: string;
 };
-export declare type PrestoImportOptions = Omit<CommonSqlImportOptions, 'database'> & {
+export type PrestoImportOptions = Omit<CommonSqlImportOptions, 'database'> & {
     dbType: 'presto';
     catalog: string;
     schema: string;
 };
-export declare type OraclesqlImportOptions = CommonSqlImportOptions & {
+export type OraclesqlImportOptions = CommonSqlImportOptions & {
     dbType: 'oracle';
     schema?: string;
 };
-export declare type SqlImportOptions = MysqlImportOptions | PostgresqlImportOptions | SnowflakeImportOptions | PrestoImportOptions | Db2sqlImportOptions | OraclesqlImportOptions;
+export type SqlImportOptions = MysqlImportOptions | PostgresqlImportOptions | SnowflakeImportOptions | PrestoImportOptions | Db2sqlImportOptions | OraclesqlImportOptions;
 export declare const sql2sdl: (options: SqlImportOptions, configuration: MachineConfiguration) => Promise<ErrorOr<IntrospectionServiceResponse>>;
 //# sourceMappingURL=sql2sdl.d.ts.map

package/lib/generate/sql2sdl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,iBAAiB,CAAA;AAClE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAA;AAEzD,oBAAY,MAAM,GACd,OAAO,GACP,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,KAAK,GACL,QAAQ,CAAA;AACZ,oBAAY,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACzB,CAAA;AAED,oBAAY,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,GAAG,kBAAkB,CAAA;IAC3D,oBAAoB,CAAC,EAAE,sBAAsB,CAAA;CAC9C,CAAA;AAED,oBAAY,kBAAkB,GAAG,sBAAsB,GAAG;IACxD,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,oBAAY,uBAAuB,GAAG,sBAAsB,GAAG;IAC7D,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,oBAAY,mBAAmB,GAAG,sBAAsB,GAAG;IACzD,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,oBAAY,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG;IAC1E,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,oBAAY,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAC3E,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,oBAAY,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,oBAAY,gBAAgB,GACxB,kBAAkB,GAClB,uBAAuB,GACvB,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,sBAAsB,CAAA;AAE1B,eAAO,MAAM,OAAO,YACT,gBAAgB,iBACV,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CA4J/C,CAAA"}
+{"version":3,"file":"sql2sdl.d.ts","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,oBAAoB,CAAA;AACrE,OAAO,KAAK,EAAC,4BAA4B,EAAC,MAAM,cAAc,CAAA;AAC9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAA;AAc5D,MAAM,MAAM,MAAM,GACd,OAAO,GACP,YAAY,GACZ,WAAW,GACX,QAAQ,GACR,KAAK,GACL,QAAQ,CAAA;AACZ,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,GAAG,kBAAkB,CAAA;IAC3D,oBAAoB,CAAC,EAAE,sBAAsB,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GAAG;IACxD,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,sBAAsB,GAAG;IAC7D,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,GAAG;IACzD,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG;IAC1E,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAC3E,MAAM,EAAE,QAAQ,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GACxB,kBAAkB,GAClB,uBAAuB,GACvB,sBAAsB,GACtB,mBAAmB,GACnB,mBAAmB,GACnB,sBAAsB,CAAA;AAE1B,eAAO,MAAM,OAAO,YACT,gBAAgB,iBACV,oBAAoB,KAClC,QAAQ,QAAQ,4BAA4B,CAAC,CAqK/C,CAAA"}

package/lib/generate/sql2sdl.js

@@ -1,12 +1,9 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sql2sdl = void 0;
-const constants_1 = require("../shared/constants");
-const utils_1 = require("../shared/utils");
-const url_helpers_1 = require("../shared/url-helpers");
-const helpers_1 = require("./helpers");
-const sql2sdl = async (options, configuration) => {
+import { ENABLE_PRESTO_IMPORT, getDBIntrospectionUrl, } from '../shared/constants.js';
+import { parseHost } from '../shared/url-helpers.js';
+import { findNextAvailableSubfolder, getFeatureFlag, parseSnowflakeAccountId, } from '../shared/utils.js';
+import { queryIntrospectionService } from './helpers.js';
+export const sql2sdl = async (options, configuration) => {
     let driver;
     switch (options.dbType) {
         case 'mysql':
@@ -48,7 +45,7 @@ const sql2sdl = async (options, configuration) => {
     const naming = options.introspectionOptions?.naming === '2022' ? 'USE_2022' : 'USE_2023';
     let driverProperties;
     if (options.dbType === 'snowflake') {
-        const { result, error } = (0, utils_1.parseSnowflakeAccountId)(options.accountId);
+        const { result, error } = parseSnowflakeAccountId(options.accountId);
         if (error) {
             return { error };
         }
@@ -65,11 +62,11 @@ const sql2sdl = async (options, configuration) => {
     // consider the following: if you import two PostgreSQL databases under a single StepZen API,
     // each database will require a different configuration name in the config.yaml file.
     // This configuration name will be used in index.graphql, based on the folder name.
-    const effectiveName = (0, utils_1.findNextAvailableSubfolder)(options.source, options.name || options.dbType);
+    const effectiveName = findNextAvailableSubfolder(options.source, options.name || options.dbType);
     const hostDetails = options.dbType === 'snowflake'
         ? { host: '', port: undefined }
-        : (0, url_helpers_1.parseHost)(options.host);
-    return (0, helpers_1.queryIntrospectionService)((0, constants_1.getDBIntrospectionUrl)(configuration), {
+        : parseHost(options.host);
+    return queryIntrospectionService(getDBIntrospectionUrl(configuration), {
         operation: 'generateSDL',
         variables: {
             driver: {
@@ -84,9 +81,9 @@ const sql2sdl = async (options, configuration) => {
                 type: 'Int',
                 value: hostDetails.port === undefined
                     ? null
-                    : parseInt(hostDetails.port, 10),
+                    : Number.parseInt(hostDetails.port, 10),
             },
-            ...((0, utils_1.getFeatureFlag)(constants_1.ENABLE_PRESTO_IMPORT)
+            ...(getFeatureFlag(ENABLE_PRESTO_IMPORT)
                 ? {
                     database: {
                         type: 'String',
@@ -100,7 +97,8 @@ const sql2sdl = async (options, configuration) => {
                 : {
                     database: {
                         type: 'String!',
-                        value: options.database,
+                        value: options
+                            .database,
                     },
                 }),
             user: {
@@ -147,5 +145,4 @@ const sql2sdl = async (options, configuration) => {
         },
     });
 };
-exports.sql2sdl = sql2sdl;
 //# sourceMappingURL=sql2sdl.js.map

package/lib/generate/sql2sdl.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sql2sdl.js","sourceRoot":"","sources":["../../src/generate/sql2sdl.ts"],"names":[],"mappings":"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"}

package/lib/hooks/init/version.d.ts

@@ -1,4 +1,4 @@
-import { Hook } from '@oclif/core';
+import type { Hook } from '@oclif/core';
 declare const hook: Hook<'init'>;
 export default hook;
 //# sourceMappingURL=version.d.ts.map

package/lib/hooks/init/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/hooks/init/version.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,IAAI,EAAS,MAAM,aAAa,CAAA;AAMxC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,MAAM,CAiCtB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/hooks/init/version.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,aAAa,CAAA;AASrC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,MAAM,CAsCtB,CAAA;AAED,eAAe,IAAI,CAAA"}

package/lib/hooks/init/version.js

@@ -1,9 +1,7 @@
-"use strict";
 // Copyright IBM Corp. 2020, 2024
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const zen_command_1 = require("../../shared/zen-command");
-const check_upgrade_1 = require("../prerun/check-upgrade");
+import { Parser } from '@oclif/core';
+import ZenCommand from '../../shared/zen-command.js';
+import { checkForNpmUpdate } from '../prerun/check-upgrade.js';
 // Override the oclif's `version` command
 // https://github.com/oclif/oclif/issues/254#issuecomment-591433963
 const hook = async function (options) {
@@ -18,9 +16,9 @@ const hook = async function (options) {
         // default implementation
         this.log(this.config.userAgent);
         // parse the command line to skip the upgrade check if running non-interactive
-        const { flags } = await core_1.Parser.parse(options.argv, zen_command_1.default);
+        const { flags } = await Parser.parse(options.argv, ZenCommand);
         if (!flags['non-interactive']) {
-            const upgradeCheck = await (0, check_upgrade_1.checkForNpmUpdate)(this.config.version);
+            const upgradeCheck = await checkForNpmUpdate(this.config.version);
             if (upgradeCheck.message) {
                 this.log('');
                 this.log(upgradeCheck.message);
@@ -30,10 +28,14 @@ const hook = async function (options) {
             }
         }
         // Exit to prevent the default impl from running
+        //
         // Not using this.exit() because of https://github.com/oclif/oclif/issues/1083
-        // eslint-disable-next-line unicorn/no-process-exit, no-process-exit
+        // It was fixed in https://github.com/oclif/core/pull/617, but in a way that
+        // it actually works only with a non-zero exit code. Here we need to exit
+        // with 0 to make `stepzen -v` usable in a bash pipeline.
+        // eslint-disable-next-line unicorn/no-process-exit, n/no-process-exit
         process.exit(0);
     }
 };
-exports.default = hook;
+export default hook;
 //# sourceMappingURL=version.js.map

package/lib/hooks/init/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/hooks/init/version.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAEjC,sCAAwC;AACxC,0DAAiD;AACjD,2DAAyD;AAEzD,yCAAyC;AACzC,mEAAmE;AACnE,MAAM,IAAI,GAAiB,KAAK,WAAiB,OAAO;IACtD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;QACf,OAAM;KACP;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;IACxC,IACE,OAAO,KAAK,IAAI;QAChB,OAAO,KAAK,WAAW;QACvB,4DAA4D;QAC5D,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,EACpD;QACA,yBAAyB;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAE/B,8EAA8E;QAC9E,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAU,CAAC,CAAA;QAE5D,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;YAC7B,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACjE,IAAI,YAAY,CAAC,OAAO,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACZ,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;aAC/B;iBAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;aAC9C;SACF;QAED,gDAAgD;QAChD,8EAA8E;QAC9E,oEAAoE;QACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;AACH,CAAC,CAAA;AAED,kBAAe,IAAI,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/hooks/init/version.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAElC,OAAO,UAAU,MAAM,6BAA6B,CAAA;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAA;AAE5D,yCAAyC;AACzC,mEAAmE;AACnE,MAAM,IAAI,GAAiB,KAAK,WAAiB,OAAO;IACtD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QAChB,OAAM;IACR,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,CAAA;IACxC,IACE,OAAO,KAAK,IAAI;QAChB,OAAO,KAAK,WAAW;QACvB,4DAA4D;QAC5D,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,EACpD,CAAC;QACD,yBAAyB;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAE/B,8EAA8E;QAC9E,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAE5D,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACjE,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACZ,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;YAChC,CAAC;iBAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;QAED,gDAAgD;QAChD,EAAE;QACF,8EAA8E;QAC9E,4EAA4E;QAC5E,yEAAyE;QACzE,yDAAyD;QAEzD,sEAAsE;QACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAED,eAAe,IAAI,CAAA"}

package/lib/hooks/prerun/check-upgrade.d.ts

@@ -1,4 +1,4 @@
-import { Hook } from '@oclif/core';
+import type { Hook } from '@oclif/core';
 export declare const compareMajorVersions: (v1: string, v2: string) => number | string;
 export declare const shouldCheckForUpdates: (version: string) => boolean;
 export declare const checkForNpmUpdate: (version: string) => Promise<{

package/lib/hooks/prerun/check-upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-upgrade.d.ts","sourceRoot":"","sources":["../../../src/hooks/prerun/check-upgrade.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,IAAI,EAAS,MAAM,aAAa,CAAA;AAWxC,eACA,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAM,GAAG,MAY/D,CAAA;AAED,eACA,MAAM,qBAAqB,YAAa,MAAM,YAS7C,CAAA;AAED,eACA,MAAM,iBAAiB,YAAmB,MAAM;;;;EA8D/C,CAAA;AAED,eACA,MAAM,oBAAoB;;;;;;EA6BzB,CAAA;AAED,eACA,MAAM,oBAAoB;aAKf,MAAM;aACN,MAAM;;;;MAEb,QAAQ;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAC,CAgClD,CAAA;AAED,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,QAAQ,CA4BxB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"check-upgrade.d.ts","sourceRoot":"","sources":["../../../src/hooks/prerun/check-upgrade.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,aAAa,CAAA;AAmBrC,eACA,MAAM,oBAAoB,OAAQ,MAAM,MAAM,MAAM,KAAG,MAAM,GAAG,MAY/D,CAAA;AAED,eACA,MAAM,qBAAqB,YAAa,MAAM,YAS7C,CAAA;AAED,eACA,MAAM,iBAAiB,YAAmB,MAAM;;;;EA+D/C,CAAA;AAED,eACA,MAAM,oBAAoB;;;;;;EA6BzB,CAAA;AAED,eACA,MAAM,oBAAoB;aAKf,MAAM;aACN,MAAM;;;;MAEb,QAAQ;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAC,CAgClD,CAAA;AAED,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,QAAQ,CA0BxB,CAAA;AAED,eAAe,IAAI,CAAA"}