stepzen 0.44.0 → 0.45.0-beta.0
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/README.md +76 -71
- package/bin/dev.cmd +1 -1
- package/bin/dev.js +6 -0
- package/bin/{run → run.js} +6 -20
- package/lib/commands/delete.d.ts +3 -3
- package/lib/commands/delete.d.ts.map +1 -1
- package/lib/commands/delete.js +32 -33
- package/lib/commands/delete.js.map +1 -1
- package/lib/commands/deploy.d.ts +10 -12
- package/lib/commands/deploy.d.ts.map +1 -1
- package/lib/commands/deploy.js +98 -98
- package/lib/commands/deploy.js.map +1 -1
- package/lib/commands/import/curl.d.ts +17 -24
- package/lib/commands/import/curl.d.ts.map +1 -1
- package/lib/commands/import/curl.js +85 -85
- package/lib/commands/import/curl.js.map +1 -1
- package/lib/commands/import/db2.d.ts +20 -28
- package/lib/commands/import/db2.d.ts.map +1 -1
- package/lib/commands/import/db2.js +59 -62
- package/lib/commands/import/db2.js.map +1 -1
- package/lib/commands/import/flow.d.ts +10 -71
- package/lib/commands/import/flow.d.ts.map +1 -1
- package/lib/commands/import/flow.js +39 -43
- package/lib/commands/import/flow.js.map +1 -1
- package/lib/commands/import/graphql.d.ts +10 -18
- package/lib/commands/import/graphql.d.ts.map +1 -1
- package/lib/commands/import/graphql.js +38 -42
- package/lib/commands/import/graphql.js.map +1 -1
- package/lib/commands/import/index.d.ts +7 -10
- package/lib/commands/import/index.d.ts.map +1 -1
- package/lib/commands/import/index.js +52 -53
- package/lib/commands/import/index.js.map +1 -1
- package/lib/commands/import/mysql.d.ts +14 -22
- package/lib/commands/import/mysql.d.ts.map +1 -1
- package/lib/commands/import/mysql.js +53 -56
- package/lib/commands/import/mysql.js.map +1 -1
- package/lib/commands/import/openapi.d.ts +9 -16
- package/lib/commands/import/openapi.d.ts.map +1 -1
- package/lib/commands/import/openapi.js +38 -41
- package/lib/commands/import/openapi.js.map +1 -1
- package/lib/commands/import/oracle.d.ts +19 -26
- package/lib/commands/import/oracle.d.ts.map +1 -1
- package/lib/commands/import/oracle.js +56 -59
- package/lib/commands/import/oracle.js.map +1 -1
- package/lib/commands/import/postgresql.d.ts +15 -23
- package/lib/commands/import/postgresql.d.ts.map +1 -1
- package/lib/commands/import/postgresql.js +54 -57
- package/lib/commands/import/postgresql.js.map +1 -1
- package/lib/commands/import/presto.d.ts +14 -22
- package/lib/commands/import/presto.d.ts.map +1 -1
- package/lib/commands/import/presto.js +57 -60
- package/lib/commands/import/presto.js.map +1 -1
- package/lib/commands/import/snowflake.d.ts +16 -24
- package/lib/commands/import/snowflake.d.ts.map +1 -1
- package/lib/commands/import/snowflake.js +61 -64
- package/lib/commands/import/snowflake.js.map +1 -1
- package/lib/commands/init.d.ts +5 -7
- package/lib/commands/init.d.ts.map +1 -1
- package/lib/commands/init.js +22 -22
- package/lib/commands/init.js.map +1 -1
- package/lib/commands/lint.d.ts +2 -4
- package/lib/commands/lint.d.ts.map +1 -1
- package/lib/commands/lint.js +15 -18
- package/lib/commands/lint.js.map +1 -1
- package/lib/commands/list.d.ts +4 -6
- package/lib/commands/list.d.ts.map +1 -1
- package/lib/commands/list.js +66 -63
- package/lib/commands/list.js.map +1 -1
- package/lib/commands/login.d.ts +8 -10
- package/lib/commands/login.d.ts.map +1 -1
- package/lib/commands/login.js +94 -92
- package/lib/commands/login.js.map +1 -1
- package/lib/commands/logout.d.ts +2 -3
- package/lib/commands/logout.d.ts.map +1 -1
- package/lib/commands/logout.js +8 -11
- package/lib/commands/logout.js.map +1 -1
- package/lib/commands/request.d.ts +10 -12
- package/lib/commands/request.d.ts.map +1 -1
- package/lib/commands/request.js +127 -129
- package/lib/commands/request.js.map +1 -1
- package/lib/commands/service.d.ts +9 -11
- package/lib/commands/service.d.ts.map +1 -1
- package/lib/commands/service.js +203 -203
- package/lib/commands/service.js.map +1 -1
- package/lib/commands/start.d.ts +13 -15
- package/lib/commands/start.d.ts.map +1 -1
- package/lib/commands/start.js +61 -60
- package/lib/commands/start.js.map +1 -1
- package/lib/commands/transpile.d.ts +8 -10
- package/lib/commands/transpile.d.ts.map +1 -1
- package/lib/commands/transpile.js +31 -34
- package/lib/commands/transpile.js.map +1 -1
- package/lib/commands/upload.d.ts +6 -8
- package/lib/commands/upload.d.ts.map +1 -1
- package/lib/commands/upload.js +41 -44
- package/lib/commands/upload.js.map +1 -1
- package/lib/commands/validate.d.ts +3 -4
- package/lib/commands/validate.d.ts.map +1 -1
- package/lib/commands/validate.js +23 -26
- package/lib/commands/validate.js.map +1 -1
- package/lib/commands/whoami.d.ts +6 -8
- package/lib/commands/whoami.d.ts.map +1 -1
- package/lib/commands/whoami.js +39 -48
- package/lib/commands/whoami.js.map +1 -1
- package/lib/generate/curl2sdl.d.ts +8 -8
- package/lib/generate/curl2sdl.d.ts.map +1 -1
- package/lib/generate/curl2sdl.js +16 -20
- package/lib/generate/curl2sdl.js.map +1 -1
- package/lib/generate/flags.d.ts +11 -11
- package/lib/generate/flags.d.ts.map +1 -1
- package/lib/generate/flags.js +16 -17
- package/lib/generate/flags.js.map +1 -1
- package/lib/generate/flow2sdl.d.ts +5 -5
- package/lib/generate/flow2sdl.d.ts.map +1 -1
- package/lib/generate/flow2sdl.js +13 -19
- package/lib/generate/flow2sdl.js.map +1 -1
- package/lib/generate/graphql2sdl.d.ts +5 -5
- package/lib/generate/graphql2sdl.d.ts.map +1 -1
- package/lib/generate/graphql2sdl.js +22 -28
- package/lib/generate/graphql2sdl.js.map +1 -1
- package/lib/generate/helpers.d.ts +5 -5
- package/lib/generate/helpers.d.ts.map +1 -1
- package/lib/generate/helpers.js +39 -44
- package/lib/generate/helpers.js.map +1 -1
- package/lib/generate/import-command.d.ts +7 -13
- package/lib/generate/import-command.d.ts.map +1 -1
- package/lib/generate/import-command.js +51 -52
- package/lib/generate/import-command.js.map +1 -1
- package/lib/generate/openapi2sdl.d.ts +4 -4
- package/lib/generate/openapi2sdl.d.ts.map +1 -1
- package/lib/generate/openapi2sdl.js +10 -16
- package/lib/generate/openapi2sdl.js.map +1 -1
- package/lib/generate/questions.d.ts.map +1 -1
- package/lib/generate/questions.js +4 -7
- package/lib/generate/questions.js.map +1 -1
- package/lib/generate/sql2sdl.d.ts +13 -13
- package/lib/generate/sql2sdl.d.ts.map +1 -1
- package/lib/generate/sql2sdl.js +13 -16
- package/lib/generate/sql2sdl.js.map +1 -1
- package/lib/hooks/init/version.d.ts +1 -1
- package/lib/hooks/init/version.d.ts.map +1 -1
- package/lib/hooks/init/version.js +11 -9
- package/lib/hooks/init/version.js.map +1 -1
- package/lib/hooks/prerun/check-upgrade.d.ts +1 -1
- package/lib/hooks/prerun/check-upgrade.d.ts.map +1 -1
- package/lib/hooks/prerun/check-upgrade.js +42 -46
- package/lib/hooks/prerun/check-upgrade.js.map +1 -1
- package/lib/hooks/prerun/ensure-config-file.d.ts +1 -1
- package/lib/hooks/prerun/ensure-config-file.d.ts.map +1 -1
- package/lib/hooks/prerun/ensure-config-file.js +9 -11
- package/lib/hooks/prerun/ensure-config-file.js.map +1 -1
- package/lib/hooks/prerun/ensure-permissions.d.ts +1 -1
- package/lib/hooks/prerun/ensure-permissions.d.ts.map +1 -1
- package/lib/hooks/prerun/ensure-permissions.js +15 -11
- package/lib/hooks/prerun/ensure-permissions.js.map +1 -1
- package/lib/index.js +1 -5
- package/lib/index.js.map +1 -1
- package/lib/shared/actions.d.ts +2 -2
- package/lib/shared/actions.d.ts.map +1 -1
- package/lib/shared/actions.js +15 -21
- package/lib/shared/actions.js.map +1 -1
- package/lib/shared/configuration.d.ts +5 -3
- package/lib/shared/configuration.d.ts.map +1 -1
- package/lib/shared/configuration.js +39 -52
- package/lib/shared/configuration.js.map +1 -1
- package/lib/shared/constants.d.ts +7 -4
- package/lib/shared/constants.d.ts.map +1 -1
- package/lib/shared/constants.js +70 -86
- package/lib/shared/constants.js.map +1 -1
- package/lib/shared/curl-parser.d.ts +2 -2
- package/lib/shared/curl-parser.d.ts.map +1 -1
- package/lib/shared/curl-parser.js +9 -13
- package/lib/shared/curl-parser.js.map +1 -1
- package/lib/shared/docker.d.ts +2 -4
- package/lib/shared/docker.d.ts.map +1 -1
- package/lib/shared/docker.js +40 -48
- package/lib/shared/docker.js.map +1 -1
- package/lib/shared/errors.js +7 -11
- package/lib/shared/errors.js.map +1 -1
- package/lib/shared/header-params-parser.d.ts +2 -4
- package/lib/shared/header-params-parser.d.ts.map +1 -1
- package/lib/shared/header-params-parser.js +23 -29
- package/lib/shared/header-params-parser.js.map +1 -1
- package/lib/shared/header.d.ts +7 -7
- package/lib/shared/header.d.ts.map +1 -1
- package/lib/shared/header.js +5 -10
- package/lib/shared/header.js.map +1 -1
- package/lib/shared/inquirer.d.ts +7 -6
- package/lib/shared/inquirer.d.ts.map +1 -1
- package/lib/shared/inquirer.js +29 -37
- package/lib/shared/inquirer.js.map +1 -1
- package/lib/shared/moniker.js +4 -9
- package/lib/shared/moniker.js.map +1 -1
- package/lib/shared/path-params-parser.d.ts +2 -2
- package/lib/shared/path-params-parser.d.ts.map +1 -1
- package/lib/shared/path-params-parser.js +6 -12
- package/lib/shared/path-params-parser.js.map +1 -1
- package/lib/shared/request-variables-parser.d.ts +4 -4
- package/lib/shared/request-variables-parser.d.ts.map +1 -1
- package/lib/shared/request-variables-parser.js +10 -14
- package/lib/shared/request-variables-parser.js.map +1 -1
- package/lib/shared/rmtemp.d.ts +1 -0
- package/lib/shared/rmtemp.d.ts.map +1 -1
- package/lib/shared/rmtemp.js +7 -10
- package/lib/shared/rmtemp.js.map +1 -1
- package/lib/shared/segment.d.ts +10 -0
- package/lib/shared/segment.d.ts.map +1 -0
- package/lib/shared/segment.js +162 -0
- package/lib/shared/segment.js.map +1 -0
- package/lib/shared/stepzen-sdk.d.ts +8 -8
- package/lib/shared/stepzen-sdk.d.ts.map +1 -1
- package/lib/shared/stepzen-sdk.js +27 -36
- package/lib/shared/stepzen-sdk.js.map +1 -1
- package/lib/shared/types.d.ts +13 -11
- package/lib/shared/types.d.ts.map +1 -1
- package/lib/shared/types.js +1 -2
- package/lib/shared/url-helpers.d.ts.map +1 -1
- package/lib/shared/url-helpers.js +7 -14
- package/lib/shared/url-helpers.js.map +1 -1
- package/lib/shared/utils.d.ts +2 -2
- package/lib/shared/utils.d.ts.map +1 -1
- package/lib/shared/utils.js +55 -71
- package/lib/shared/utils.js.map +1 -1
- package/lib/shared/validation.js +12 -17
- package/lib/shared/validation.js.map +1 -1
- package/lib/shared/workspace.d.ts +1 -1
- package/lib/shared/workspace.d.ts.map +1 -1
- package/lib/shared/workspace.js +34 -45
- package/lib/shared/workspace.js.map +1 -1
- package/lib/shared/zen-command.d.ts +5 -10
- package/lib/shared/zen-command.d.ts.map +1 -1
- package/lib/shared/zen-command.js +132 -113
- package/lib/shared/zen-command.js.map +1 -1
- package/oclif.manifest.json +1281 -945
- package/package.json +35 -33
- package/bin/dev +0 -23
package/lib/shared/header.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Copyright IBM Corp. 2020, 2024
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.parseHeader = exports.HEADER_REGEX = void 0;
|
|
5
2
|
// Based on the definition of a `token` at
|
|
6
3
|
// https://datatracker.ietf.org/doc/html/rfc2616#page-17
|
|
7
|
-
|
|
4
|
+
export const HEADER_REGEX = /^(?<name>[a-zA-Z0-9!#$%&'*+,-.^_`|~]+)\s*:(?<value>.*)$/;
|
|
8
5
|
/**
|
|
9
6
|
* Parse a header string according to https://curl.se/docs/manpage.html#-H
|
|
10
7
|
* and https://datatracker.ietf.org/doc/html/rfc2616#section-4.2
|
|
@@ -14,7 +11,7 @@ exports.HEADER_REGEX = /^(?<name>[a-zA-Z0-9!#$%&'*+,-.^_`|~]+)\s*:(?<value>.*)$/
|
|
|
14
11
|
* `null` for the `Header:` notation that means "remove this header" in
|
|
15
12
|
* the curl spec or a error object if cannot parse the string.
|
|
16
13
|
*/
|
|
17
|
-
const parseHeader = (header) => {
|
|
14
|
+
export const parseHeader = (header) => {
|
|
18
15
|
const trimmed = header.trim();
|
|
19
16
|
// Check if it's a `Header:` case
|
|
20
17
|
if (trimmed.indexOf(':') === trimmed.length - 1) {
|
|
@@ -22,16 +19,15 @@ const parseHeader = (header) => {
|
|
|
22
19
|
return { result: null };
|
|
23
20
|
}
|
|
24
21
|
// Check if it's a `Header;` case
|
|
25
|
-
if (trimmed.
|
|
26
|
-
trimmed.indexOf(';') === trimmed.length - 1) {
|
|
22
|
+
if (!trimmed.includes(':') && trimmed.indexOf(';') === trimmed.length - 1) {
|
|
27
23
|
return {
|
|
28
24
|
result: {
|
|
29
|
-
name: trimmed.
|
|
25
|
+
name: trimmed.slice(0, Math.max(0, trimmed.length - 1)).trim(),
|
|
30
26
|
value: '',
|
|
31
27
|
},
|
|
32
28
|
};
|
|
33
29
|
}
|
|
34
|
-
const match = trimmed.match(
|
|
30
|
+
const match = trimmed.match(HEADER_REGEX);
|
|
35
31
|
if (!match || !match.groups || !match.groups.name || !match.groups.value) {
|
|
36
32
|
return {
|
|
37
33
|
error: {
|
|
@@ -47,5 +43,4 @@ const parseHeader = (header) => {
|
|
|
47
43
|
},
|
|
48
44
|
};
|
|
49
45
|
};
|
|
50
|
-
exports.parseHeader = parseHeader;
|
|
51
46
|
//# sourceMappingURL=header.js.map
|
package/lib/shared/header.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":"AAAA,iCAAiC;AA0CjC,0CAA0C;AAC1C,wDAAwD;AACxD,MAAM,CAAC,MAAM,YAAY,GACvB,yDAAyD,CAAA;AAE3D;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAA0B,EAAE;IACpE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC7B,iCAAiC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,8CAA8C;QAC9C,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,CAAA;IACvB,CAAC;IAED,iCAAiC;IACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1E,OAAO;YACL,MAAM,EAAE;gBACN,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;gBAC9D,KAAK,EAAE,EAAE;aACV;SACF,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACzC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACzE,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EACL,gCAAgC,MAAM,KAAK;oBAC3C,oDAAoD;aACvD;SACF,CAAA;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YACvB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;SACjC;KACF,CAAA;AACH,CAAC,CAAA"}
|
package/lib/shared/inquirer.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
|
|
3
|
-
import type { DistinctQuestion } from 'inquirer';
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
+
import type { Answers, DistinctQuestion } from 'inquirer';
|
|
4
|
+
import inquirer from 'inquirer';
|
|
4
5
|
interface HistoryKey {
|
|
5
6
|
historyFile: string;
|
|
6
7
|
key: Buffer;
|
|
@@ -8,8 +9,8 @@ interface HistoryKey {
|
|
|
8
9
|
}
|
|
9
10
|
export declare let historyKey: HistoryKey | undefined;
|
|
10
11
|
export declare const clearHistoryKey: () => void;
|
|
11
|
-
export declare const writeLastAnswers: (answers:
|
|
12
|
-
export declare const prompt: <T extends
|
|
13
|
-
export declare const overrideDefaults: <Options extends
|
|
12
|
+
export declare const writeLastAnswers: (answers: Answers) => Promise<void>;
|
|
13
|
+
export declare const prompt: <T extends Answers>(namespace: string, questions: inquirer.QuestionCollection<T>, initialAnswers?: Partial<T> | undefined) => Promise<T>;
|
|
14
|
+
export declare const overrideDefaults: <Options extends Answers>(questions: DistinctQuestion<Options>[], defaultAnswers: Partial<Options>) => DistinctQuestion<Options>[];
|
|
14
15
|
export {};
|
|
15
16
|
//# sourceMappingURL=inquirer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";;AACA,OAAO,KAAK,EAAC,OAAO,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAGvD,OAAO,QAAQ,MAAM,UAAU,CAAA;AAY/B,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAGD,eAAO,IAAI,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;AA8D7C,eAAO,MAAM,eAAe,YAE3B,CAAA;AAuCD,eAAO,MAAM,gBAAgB,YAAmB,OAAO,KAAG,QAAQ,IAAI,CAqBrE,CAAA;AAED,eAAO,MAAM,MAAM,iCACN,MAAM,mGAsBlB,CAAA;AAED,eAAO,MAAM,gBAAgB,oIAOzB,CAAA"}
|
package/lib/shared/inquirer.js
CHANGED
|
@@ -1,19 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const path = require("path");
|
|
11
|
-
const yaml = require("yaml");
|
|
12
|
-
const configuration_1 = require("./configuration");
|
|
13
|
-
const constants_1 = require("./constants");
|
|
1
|
+
import debug from 'debug';
|
|
2
|
+
import inquirer from 'inquirer';
|
|
3
|
+
import { get } from 'lodash-es';
|
|
4
|
+
import crypto from 'node:crypto';
|
|
5
|
+
import fs from 'node:fs';
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
import yaml from 'yaml';
|
|
8
|
+
import { readConfiguration } from './configuration.js';
|
|
9
|
+
import { STEPZEN_HISTORY_DIRECTORY, STEPZEN_HISTORY_FILE } from './constants.js';
|
|
14
10
|
const CIPHER_ALGORITHM = 'aes-256-cbc';
|
|
11
|
+
// Cache the HistoryKey instance to avoid re-creating the cipher keys on each prompt
|
|
12
|
+
export let historyKey;
|
|
15
13
|
const readHistoryKey = async () => {
|
|
16
|
-
const config = await
|
|
14
|
+
const config = await readConfiguration();
|
|
17
15
|
if (!('adminkey' in config)) {
|
|
18
16
|
debug('stepzen:inquirer')('history not available due to not logged in');
|
|
19
17
|
return undefined;
|
|
@@ -28,7 +26,7 @@ const readHistoryKey = async () => {
|
|
|
28
26
|
return undefined;
|
|
29
27
|
}
|
|
30
28
|
const password = Buffer.from(adminkeyParts[2], 'hex');
|
|
31
|
-
const initVector = Buffer.from(loggedInConfig.uuid.
|
|
29
|
+
const initVector = Buffer.from(loggedInConfig.uuid.replaceAll('-', ''), 'hex');
|
|
32
30
|
const salt = initVector;
|
|
33
31
|
const key = crypto.scryptSync(password, salt, 32);
|
|
34
32
|
// base the file name of the encrypted account name, to not reveal
|
|
@@ -39,9 +37,9 @@ const readHistoryKey = async () => {
|
|
|
39
37
|
cipher.update(config.account),
|
|
40
38
|
cipher.final(),
|
|
41
39
|
]);
|
|
42
|
-
const historyFile = path.join(
|
|
43
|
-
|
|
44
|
-
return
|
|
40
|
+
const historyFile = path.join(STEPZEN_HISTORY_DIRECTORY, STEPZEN_HISTORY_FILE.replace('{accounthash}', encryptedAccountName.toString('hex')));
|
|
41
|
+
historyKey = { historyFile, key, initVector };
|
|
42
|
+
return historyKey;
|
|
45
43
|
}
|
|
46
44
|
catch (error) {
|
|
47
45
|
debug('stepzen:inquirer')(error);
|
|
@@ -49,16 +47,15 @@ const readHistoryKey = async () => {
|
|
|
49
47
|
}
|
|
50
48
|
};
|
|
51
49
|
const getHistoryKey = async () => {
|
|
52
|
-
if (
|
|
53
|
-
return
|
|
50
|
+
if (historyKey) {
|
|
51
|
+
return historyKey;
|
|
54
52
|
}
|
|
55
53
|
return readHistoryKey();
|
|
56
54
|
};
|
|
57
55
|
// for unit tests
|
|
58
|
-
const clearHistoryKey = () => {
|
|
59
|
-
|
|
56
|
+
export const clearHistoryKey = () => {
|
|
57
|
+
historyKey = undefined;
|
|
60
58
|
};
|
|
61
|
-
exports.clearHistoryKey = clearHistoryKey;
|
|
62
59
|
const readLastAnswers = async () => {
|
|
63
60
|
const details = await getHistoryKey();
|
|
64
61
|
if (details === undefined) {
|
|
@@ -87,13 +84,13 @@ const readLastAnswers = async () => {
|
|
|
87
84
|
return {};
|
|
88
85
|
}
|
|
89
86
|
};
|
|
90
|
-
const writeLastAnswers = async (answers) => {
|
|
87
|
+
export const writeLastAnswers = async (answers) => {
|
|
91
88
|
const details = await getHistoryKey();
|
|
92
89
|
if (details === undefined) {
|
|
93
90
|
return;
|
|
94
91
|
}
|
|
95
|
-
if (!fs.existsSync(
|
|
96
|
-
fs.mkdirSync(
|
|
92
|
+
if (!fs.existsSync(STEPZEN_HISTORY_DIRECTORY)) {
|
|
93
|
+
fs.mkdirSync(STEPZEN_HISTORY_DIRECTORY);
|
|
97
94
|
}
|
|
98
95
|
const content = yaml.stringify(answers);
|
|
99
96
|
const cipher = crypto.createCipheriv(CIPHER_ALGORITHM, details.key, details.initVector);
|
|
@@ -103,8 +100,7 @@ const writeLastAnswers = async (answers) => {
|
|
|
103
100
|
]);
|
|
104
101
|
fs.writeFileSync(details.historyFile, encryptedContent, { mode: '600' });
|
|
105
102
|
};
|
|
106
|
-
|
|
107
|
-
const prompt = async (namespace, questions, initialAnswers) => {
|
|
103
|
+
export const prompt = async (namespace, questions, initialAnswers) => {
|
|
108
104
|
const last = await readLastAnswers();
|
|
109
105
|
const questionList = Array.isArray(questions) ? questions : [questions];
|
|
110
106
|
const lastThisNs = namespace in last ? last[namespace] : {};
|
|
@@ -117,15 +113,11 @@ const prompt = async (namespace, questions, initialAnswers) => {
|
|
|
117
113
|
return question;
|
|
118
114
|
});
|
|
119
115
|
const result = await inquirer.prompt(questionsToAsk, initialAnswers);
|
|
120
|
-
|
|
116
|
+
writeLastAnswers({ ...last, [namespace]: { ...lastThisNs, ...result } });
|
|
121
117
|
return result;
|
|
122
118
|
};
|
|
123
|
-
|
|
124
|
-
const
|
|
125
|
-
return
|
|
126
|
-
|
|
127
|
-
return def === undefined ? question : { ...question, default: def };
|
|
128
|
-
});
|
|
129
|
-
};
|
|
130
|
-
exports.overrideDefaults = overrideDefaults;
|
|
119
|
+
export const overrideDefaults = (questions, defaultAnswers) => questions.map(question => {
|
|
120
|
+
const def = get(defaultAnswers, question.name);
|
|
121
|
+
return def === undefined ? question : { ...question, default: def };
|
|
122
|
+
});
|
|
131
123
|
//# sourceMappingURL=inquirer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"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"}
|
package/lib/shared/moniker.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Copyright IBM Corp. 2020, 2024
|
|
3
|
-
|
|
4
|
-
exports.getRandomDescriptor = exports.getRandomAnimal = void 0;
|
|
5
|
-
const lodash_1 = require("lodash");
|
|
2
|
+
import { random } from 'lodash-es';
|
|
6
3
|
const animals = [
|
|
7
4
|
'aardvark',
|
|
8
5
|
'aardwolf',
|
|
@@ -638,9 +635,7 @@ const descriptors = [
|
|
|
638
635
|
'zinc',
|
|
639
636
|
'zooming',
|
|
640
637
|
];
|
|
641
|
-
const getRandomAnimal = () => animals[
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
exports.getRandomDescriptor = getRandomDescriptor;
|
|
645
|
-
exports.default = () => `${(0, exports.getRandomDescriptor)()}-${(0, exports.getRandomAnimal)()}`;
|
|
638
|
+
export const getRandomAnimal = () => animals[random(0, animals.length - 1)];
|
|
639
|
+
export const getRandomDescriptor = () => descriptors[random(0, descriptors.length - 1)];
|
|
640
|
+
export default () => `${getRandomDescriptor()}-${getRandomAnimal()}`;
|
|
646
641
|
//# sourceMappingURL=moniker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moniker.js","sourceRoot":"","sources":["../../src/shared/moniker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"moniker.js","sourceRoot":"","sources":["../../src/shared/moniker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AASvC,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,yBAAyB,oBACnB,SAAS,MAAM,EAAE,gBACpB,SAAS,MAAM,EAAE,KAC9B,MAAM,GAAG,IA8BX,CAAA;AAED,eAAO,MAAM,sBAAsB,QAC5B,MAAM,sBACS,MAAM,KACzB,QAAQ,SAAS,EAAE,CAoDrB,CAAA"}
|
|
@@ -1,23 +1,19 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Copyright IBM Corp. 2020, 2024
|
|
3
|
-
|
|
4
|
-
exports.parsePathParamsPattern = exports.formatPatternDiffWithPath = void 0;
|
|
5
|
-
const chalk = require("chalk");
|
|
2
|
+
import chalk from 'chalk';
|
|
6
3
|
const pathParamRegex = /^\$[_A-Za-z]\w*$/;
|
|
7
4
|
// in a literal segment, $ should be escaped as $$
|
|
8
5
|
const pathSegmentRegex = /^([^$]|\$\$)+$/;
|
|
9
|
-
const formatPatternDiffWithPath = (patternSegments, pathSegments) => {
|
|
6
|
+
export const formatPatternDiffWithPath = (patternSegments, pathSegments) => {
|
|
10
7
|
let hasErrors = false;
|
|
11
8
|
const diff = [];
|
|
12
|
-
for (
|
|
13
|
-
const patternSegment = patternSegments[i];
|
|
9
|
+
for (const [i, patternSegment] of patternSegments.entries()) {
|
|
14
10
|
if (i >= pathSegments.length) {
|
|
15
11
|
diff.push(chalk.red(`< ${patternSegment} >`));
|
|
16
12
|
hasErrors = true;
|
|
17
13
|
}
|
|
18
14
|
else if (pathSegmentRegex.test(patternSegment)) {
|
|
19
15
|
const pathSegment = pathSegments[i];
|
|
20
|
-
if (pathSegment === patternSegment.
|
|
16
|
+
if (pathSegment === patternSegment.replaceAll('$$', '$')) {
|
|
21
17
|
diff.push(pathSegment);
|
|
22
18
|
}
|
|
23
19
|
else {
|
|
@@ -39,8 +35,7 @@ const formatPatternDiffWithPath = (patternSegments, pathSegments) => {
|
|
|
39
35
|
}
|
|
40
36
|
return hasErrors ? diff.join('/') : null;
|
|
41
37
|
};
|
|
42
|
-
|
|
43
|
-
const parsePathParamsPattern = (url, pathParamsPattern) => {
|
|
38
|
+
export const parsePathParamsPattern = (url, pathParamsPattern) => {
|
|
44
39
|
if (!pathParamsPattern) {
|
|
45
40
|
return { result: [] };
|
|
46
41
|
}
|
|
@@ -53,7 +48,7 @@ const parsePathParamsPattern = (url, pathParamsPattern) => {
|
|
|
53
48
|
}
|
|
54
49
|
const pathSegments = pathname.split('/');
|
|
55
50
|
const patternSegments = pathParamsPattern.split('/');
|
|
56
|
-
const maybeDiff =
|
|
51
|
+
const maybeDiff = formatPatternDiffWithPath(patternSegments, pathSegments);
|
|
57
52
|
if (maybeDiff) {
|
|
58
53
|
return {
|
|
59
54
|
error: {
|
|
@@ -84,5 +79,4 @@ const parsePathParamsPattern = (url, pathParamsPattern) => {
|
|
|
84
79
|
}));
|
|
85
80
|
return { result: retval };
|
|
86
81
|
};
|
|
87
|
-
exports.parsePathParamsPattern = parsePathParamsPattern;
|
|
88
82
|
//# sourceMappingURL=path-params-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-params-parser.js","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path-params-parser.js","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAIjC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,cAAc,GAAG,kBAAkB,CAAA;AAEzC,kDAAkD;AAClD,MAAM,gBAAgB,GAAG,gBAAgB,CAAA;AAOzC,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,eAAkC,EAClC,YAA+B,EAChB,EAAE;IACjB,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,MAAM,IAAI,GAAG,EAAE,CAAA;IACf,KAAK,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5D,IAAI,CAAC,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,cAAc,IAAI,CAAC,CAAC,CAAA;YAC7C,SAAS,GAAG,IAAI,CAAA;QAClB,CAAC;aAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YACjD,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;YACnC,IAAI,WAAW,KAAK,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;gBACzD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACxB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,cAAc,IAAI,CAAC,CAAC,CAAA;gBAC7C,SAAS,GAAG,IAAI,CAAA;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,gEAAgE;YAChE,+DAA+D;YAC/D,wDAAwD;YACxD,iCAAiC;YACjC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,SAAS,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,GAAW,EACX,iBAA0B,EACJ,EAAE;IACxB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,EAAC,MAAM,EAAE,EAAE,EAAC,CAAA;IACrB,CAAC;IAED,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QACxC,iBAAiB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;IACpC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAC/B,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,eAAe,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEpD,MAAM,SAAS,GAAG,yBAAyB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;IAC1E,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EAAE,oDAAoD,SAAS,EAAE;aACzE;SACF,CAAA;IACH,CAAC;IAED,MAAM,wBAAwB,GAAG,eAAe,CAAC,MAAM,CACrD,OAAO,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAC5E,CAAA;IACD,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EACL,4BAA4B,wBAAwB,CAAC,CAAC,CAAC,UAAU;oBACjE,oEAAoE;oBACpE,oEAAoE;oBACpE,iBAAiB;aACpB;SACF,CAAA;IACH,CAAC;IAED,MAAM,MAAM,GAAG,eAAe;SAC3B,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACxB,KAAK;QACL,IAAI,EAAE,OAAO;KACd,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7C,GAAG,CAAC,CAAC,EAAC,KAAK,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK;QACL,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KACpB,CAAC,CAAC,CAAA;IACL,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,CAAA;AACzB,CAAC,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { OperationDefinitionNode } from 'graphql';
|
|
2
|
-
import type { ErrorOr } from './types';
|
|
3
|
-
export declare const parseVariableValue: (value: string, typename: string) => ErrorOr<number | boolean | string |
|
|
4
|
-
export declare const parseRequestVariables: (variableFlags: string[], operation: OperationDefinitionNode, varFile?: Record<string,
|
|
5
|
-
variables: Record<string,
|
|
2
|
+
import type { ErrorOr } from './types.js';
|
|
3
|
+
export declare const parseVariableValue: (value: string, typename: string) => ErrorOr<number | boolean | string | unknown>;
|
|
4
|
+
export declare const parseRequestVariables: (variableFlags: string[], operation: OperationDefinitionNode, varFile?: Record<string, unknown>) => {
|
|
5
|
+
variables: Record<string, unknown>;
|
|
6
6
|
errors: string[];
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=request-variables-parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,uBAAuB,EAAW,MAAM,SAAS,CAAA;AAE9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,YAAY,CAAA;AAQvC,eAAO,MAAM,kBAAkB,UACtB,MAAM,YACH,MAAM,KACf,QAAQ,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CA8D7C,CAAA;AAED,eAAO,MAAM,qBAAqB,kBACjB,MAAM,EAAE,aACZ,uBAAuB,YACzB,OAAO,MAAM,EAAE,OAAO,CAAC;eACnB,OAAO,MAAM,EAAE,OAAO,CAAC;YAAU,MAAM,EAAE;CA6EvD,CAAA"}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Copyright IBM Corp. 2020, 2024
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const chalk = require("chalk");
|
|
6
|
-
const debug = require("debug");
|
|
2
|
+
import chalk from 'chalk';
|
|
3
|
+
import debug from 'debug';
|
|
7
4
|
const unNonNull = (type) => type.kind === 'NonNullType' ? type.type : type;
|
|
8
|
-
const parseVariableValue = (value, typename) => {
|
|
5
|
+
export const parseVariableValue = (value, typename) => {
|
|
9
6
|
switch (typename) {
|
|
10
7
|
case 'Int': {
|
|
11
|
-
const parsed = parseInt(value, 10);
|
|
8
|
+
const parsed = Number.parseInt(value, 10);
|
|
12
9
|
if (!Number.isNaN(parsed)) {
|
|
13
10
|
return { result: parsed };
|
|
14
11
|
}
|
|
15
12
|
break;
|
|
16
13
|
}
|
|
17
14
|
case 'Float': {
|
|
18
|
-
const parsed = parseFloat(value);
|
|
15
|
+
const parsed = Number.parseFloat(value);
|
|
19
16
|
if (!Number.isNaN(parsed) && Number.isFinite(parsed)) {
|
|
20
17
|
return { result: parsed };
|
|
21
18
|
}
|
|
@@ -35,6 +32,7 @@ const parseVariableValue = (value, typename) => {
|
|
|
35
32
|
case 'DateTime':
|
|
36
33
|
case 'Secret':
|
|
37
34
|
return { result: value };
|
|
35
|
+
// eslint-disable-next-line unicorn/no-useless-switch-case
|
|
38
36
|
case 'JSON':
|
|
39
37
|
default:
|
|
40
38
|
// enums, custom scalars not listed above, input types
|
|
@@ -55,8 +53,7 @@ const parseVariableValue = (value, typename) => {
|
|
|
55
53
|
},
|
|
56
54
|
};
|
|
57
55
|
};
|
|
58
|
-
|
|
59
|
-
const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
56
|
+
export const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
60
57
|
// errors for duplicate vars
|
|
61
58
|
const errors = [];
|
|
62
59
|
const rawVarValues = new Map();
|
|
@@ -67,8 +64,8 @@ const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
|
67
64
|
chalk ` Please provide a value with {bold --var ${variable}={underline value}}`);
|
|
68
65
|
continue;
|
|
69
66
|
}
|
|
70
|
-
const name = variable.
|
|
71
|
-
const value = variable.
|
|
67
|
+
const name = variable.slice(0, idx);
|
|
68
|
+
const value = variable.slice(idx + 1);
|
|
72
69
|
if (rawVarValues.has(name)) {
|
|
73
70
|
errors.push(chalk `Duplicate value for the variable {bold ${name}}.` +
|
|
74
71
|
chalk ` Please keep only one {bold --var} flag for the {bold ${name}} variable.`);
|
|
@@ -96,7 +93,7 @@ const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
|
96
93
|
else {
|
|
97
94
|
const unNonNullType = unNonNull(varDef.type);
|
|
98
95
|
const isList = unNonNullType.kind === 'ListType';
|
|
99
|
-
const { result, error } =
|
|
96
|
+
const { result, error } = parseVariableValue(rawValue, isList
|
|
100
97
|
? 'JSON' // parse any list as a JSON value
|
|
101
98
|
: unNonNullType.name.value);
|
|
102
99
|
// errors for invalid values
|
|
@@ -114,5 +111,4 @@ const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
|
|
|
114
111
|
}
|
|
115
112
|
return { variables, errors };
|
|
116
113
|
};
|
|
117
|
-
exports.parseRequestVariables = parseRequestVariables;
|
|
118
114
|
//# sourceMappingURL=request-variables-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAMjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,EAAE,CACnC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;AAEhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAa,EACb,QAAgB,EAC8B,EAAE;IAChD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,CAAA;YACzB,CAAC;YAED,MAAK;QACP,CAAC;QAED,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrD,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,CAAA;YACzB,CAAC;YAED,MAAK;QACP,CAAC;QAED,KAAK,SAAS;YACZ,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBACrB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,CAAA;YACvB,CAAC;YAED,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACtB,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,CAAA;YACxB,CAAC;YAED,MAAK;QAEP,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI,CAAC;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,CAAA;QAExB,0DAA0D;QAC1D,KAAK,MAAM,CAAC;QACZ;YACE,sDAAsD;YACtD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBAChC,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,CAAA;YACzB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,KAAK,CAAC,iBAAiB,CAAC,CACtB,8CAA8C,KAAK,IAAI,EACvD,KAAK,CACN,CAAA;YACH,CAAC;YAED,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,CAAA;YACxB,CAAC;IACL,CAAC;IAED,OAAO;QACL,KAAK,EAAE;YACL,OAAO,EAAE,KAAK,CAAA,WAAW,KAAK,0BAA0B,QAAQ,IAAI;SACrE;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,aAAuB,EACvB,SAAkC,EAClC,UAAmC,EAAE,EACmB,EAAE;IAC1D,4BAA4B;IAC5B,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC9C,KAAK,MAAM,QAAQ,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACjC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACZ,MAAM,CAAC,IAAI,CACT,KAAK,CAAA,yCAAyC,QAAQ,IAAI;gBACxD,KAAK,CAAA,4CAA4C,QAAQ,qBAAqB,CACjF,CAAA;YACD,SAAQ;QACV,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QACnC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QACrC,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CACT,KAAK,CAAA,0CAA0C,IAAI,IAAI;gBACrD,KAAK,CAAA,yDAAyD,IAAI,aAAa,CAClF,CAAA;YACD,SAAQ;QACV,CAAC;QAED,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,SAAS,GAA4B,EAAE,CAAA;IAC7C,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,mBAAmB,IAAI,EAAE,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;QACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACvC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEzB,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YAC1D,mCAAmC;YACnC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CACT,KAAK,CAAA,+CAA+C,IAAI,WAAW;oBACjE,KAAK,CAAA,+BAA+B,IAAI,wBAAwB;oBAChE,KAAK,CAAA,2CAA2C,CACnD,CAAA;YACH,CAAC;YAED,SAAQ;QACV,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,KAAK,UAAU,CAAA;YAChD,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,kBAAkB,CACxC,QAAQ,EACR,MAAM;gBACJ,CAAC,CAAC,MAAM,CAAC,iCAAiC;gBAC1C,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAC7B,CAAA;YAED,4BAA4B;YAC5B,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,IAAI,CACT,KAAK,CAAA,wCAAwC,IAAI,KAAK;oBACpD,KAAK,CAAC,OAAO,CAChB,CAAA;gBACD,SAAQ;YACV,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,wBAAwB;IACxB,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAA,yBAAyB,IAAI,sBAAsB,CAAC,CAAA;IACvE,CAAC;IAED,OAAO,EAAC,SAAS,EAAE,MAAM,EAAC,CAAA;AAC5B,CAAC,CAAA"}
|
package/lib/shared/rmtemp.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rmtemp.d.ts","sourceRoot":"","sources":["../../src/shared/rmtemp.ts"],"names":[],"mappings":"AAOA
|
|
1
|
+
{"version":3,"file":"rmtemp.d.ts","sourceRoot":"","sources":["../../src/shared/rmtemp.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,mBAAoB,MAAM,SAyB5C,CAAA;AAED,eAAe,MAAM,CAAA"}
|
package/lib/shared/rmtemp.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Copyright IBM Corp. 2020, 2024
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const os = require("os");
|
|
8
|
-
const debug = require("debug");
|
|
2
|
+
import debug from 'debug';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
|
+
import os from 'node:os';
|
|
5
|
+
import path from 'node:path';
|
|
9
6
|
/**
|
|
10
7
|
* Verify that the given path is indeed inside the tmp folder,
|
|
11
8
|
* and delete it recursively suppressing any errors.
|
|
@@ -13,8 +10,9 @@ const debug = require("debug");
|
|
|
13
10
|
* If the given path is not inside the tmp folder, do nothing.
|
|
14
11
|
*
|
|
15
12
|
* @param {*} fileOrDirPath path to a temp file or folder to delete
|
|
13
|
+
* @returns undefined
|
|
16
14
|
*/
|
|
17
|
-
const rmtemp = (fileOrDirPath) => {
|
|
15
|
+
export const rmtemp = (fileOrDirPath) => {
|
|
18
16
|
if (!fileOrDirPath) {
|
|
19
17
|
return;
|
|
20
18
|
}
|
|
@@ -34,6 +32,5 @@ const rmtemp = (fileOrDirPath) => {
|
|
|
34
32
|
debug('stepzen:rmtemp')(`WARN: got a temp path ${fileOrDirPath} out of the TMP folder -- ignoring`);
|
|
35
33
|
}
|
|
36
34
|
};
|
|
37
|
-
|
|
38
|
-
exports.default = exports.rmtemp;
|
|
35
|
+
export default rmtemp;
|
|
39
36
|
//# sourceMappingURL=rmtemp.js.map
|
package/lib/shared/rmtemp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rmtemp.js","sourceRoot":"","sources":["../../src/shared/rmtemp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rmtemp.js","sourceRoot":"","sources":["../../src/shared/rmtemp.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,aAAsB,EAAE,EAAE;IAC/C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IAED,uCAAuC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAA;IAC1D,MAAM,QAAQ,GACZ,QAAQ,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAEtE,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAA;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gBAAgB;YAChB,KAAK,CAAC,gBAAgB,CAAC,CACrB,4CAA4C,aAAa,IAAI,EAC7D,KAAK,CACN,CAAA;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,gBAAgB,CAAC,CACrB,yBAAyB,aAAa,oCAAoC,CAC3E,CAAA;IACH,CAAC;AACH,CAAC,CAAA;AAED,eAAe,MAAM,CAAA"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const PRODUCT_INFO: {
|
|
2
|
+
code: string;
|
|
3
|
+
codeType: string;
|
|
4
|
+
title: string;
|
|
5
|
+
};
|
|
6
|
+
export declare const trackLoginEvent: () => Promise<boolean>;
|
|
7
|
+
export declare const trackDeployEvent: (endpoint: string) => Promise<boolean>;
|
|
8
|
+
export declare const trackInitCommand: (workspace: string) => Promise<boolean>;
|
|
9
|
+
export declare const trackImportCommand: (source: string) => Promise<boolean>;
|
|
10
|
+
//# sourceMappingURL=segment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../src/shared/segment.ts"],"names":[],"mappings":"AA0EA,eAAO,MAAM,YAAY;;;;CAIxB,CAAA;AAGD,eAAO,MAAM,eAAe,wBAwB3B,CAAA;AAGD,eAAO,MAAM,gBAAgB,aAAoB,MAAM,qBAyBtD,CAAA;AAGD,eAAO,MAAM,gBAAgB,cAAqB,MAAM,qBAyBvD,CAAA;AAGD,eAAO,MAAM,kBAAkB,WAAkB,MAAM,qBAyBtD,CAAA"}
|