@forge/cli-shared 3.4.1-next.3 → 3.5.0-next.5
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/CHANGELOG.md +19 -0
- package/out/auth/personal/credential-store.d.ts +5 -0
- package/out/auth/personal/credential-store.d.ts.map +1 -1
- package/out/auth/personal/credential-store.js +13 -4
- package/out/config/config-file.d.ts +6 -2
- package/out/config/config-file.d.ts.map +1 -1
- package/out/config/config-file.js +11 -6
- package/out/graphql/graphql-types.d.ts +438 -16
- package/out/graphql/graphql-types.d.ts.map +1 -1
- package/out/graphql/graphql-types.js +7 -3
- package/out/service/feature-flag-service.d.ts +7 -3
- package/out/service/feature-flag-service.d.ts.map +1 -1
- package/out/service/feature-flag-service.js +16 -2
- package/out/shared/error-handling.d.ts +2 -0
- package/out/shared/error-handling.d.ts.map +1 -1
- package/out/shared/error-handling.js +4 -1
- package/out/ui/text.d.ts +1 -1
- package/out/ui/text.d.ts.map +1 -1
- package/out/ui/text.js +4 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @forge/cli-shared
|
|
2
2
|
|
|
3
|
+
## 3.5.0-next.5
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- bbca9bed: Forge CLI error handling and analytics changes
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- b7428f75: Update CLI copy for forge contributors add and remove
|
|
12
|
+
- a36488fc: Bundle Node runtime wrapper using Webpack
|
|
13
|
+
- 8d0dc104: Use a single global to pass information from the runtime
|
|
14
|
+
|
|
15
|
+
## 3.4.1-next.4
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- Updated dependencies [8f01fae]
|
|
20
|
+
- @forge/manifest@4.5.3-next.1
|
|
21
|
+
|
|
3
22
|
## 3.4.1-next.3
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -23,6 +23,11 @@ export declare type PersonalApiCredentialsValidated = t.TypeOf<typeof personalAp
|
|
|
23
23
|
export declare class NoTokenInStoreError extends UserError {
|
|
24
24
|
constructor();
|
|
25
25
|
}
|
|
26
|
+
export declare class NoKeytarError extends UserError {
|
|
27
|
+
constructor();
|
|
28
|
+
}
|
|
29
|
+
export declare class KeytarAccessError extends UserError {
|
|
30
|
+
}
|
|
26
31
|
export interface CredentialGetter {
|
|
27
32
|
getCredentials(): Promise<PersonalApiCredentialsValidated>;
|
|
28
33
|
getInstructionsWhenInvalid(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAC3D,0BAA0B,IAAI,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,aAAa,CAAS;gBAGX,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU;IAK3C,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA6B1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxC,0BAA0B,IAAI,MAAM;CAMrC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAKlE"}
|
|
1
|
+
{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../../src/auth/personal/credential-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAQ,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,SAAS,gBAAgB,CAAC;AACvC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAa/C,MAAM,WAAW,MAAM;IACrB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAUD,eAAO,MAAM,2BAA2B;;;EAGtC,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;EAI/C,CAAC;AAEH,oBAAY,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAClF,oBAAY,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oCAAoC,CAAC,CAAC;AAEpG,qBAAa,mBAAoB,SAAQ,SAAS;;CAIjD;AAED,qBAAa,aAAc,SAAQ,SAAS;;CAI3C;AAED,qBAAa,iBAAkB,SAAQ,SAAS;CAAG;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAC3D,0BAA0B,IAAI,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IAIvD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAN/B,OAAO,CAAC,aAAa,CAAS;gBAGX,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,YAAY,EAAE,UAAU;IAK3C,OAAO,CAAC,eAAe;IAoBvB,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,+BAA+B;IAoB9E,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAehG,+BAA+B,IAAI,+BAA+B,GAAG,SAAS;IAS9E,kCAAkC,IAAI,IAAI;IAIpC,cAAc,IAAI,OAAO,CAAC,+BAA+B,CAAC;IA6B1D,cAAc,CAAC,WAAW,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3E,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxC,0BAA0B,IAAI,MAAM;CAMrC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAKlE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCredentialStore = exports.CredentialStoreImpl = exports.NoTokenInStoreError = exports.personalApiCredentialsValidatedShape = exports.personalApiCredentialsShape = exports.API_TOKEN_KEY = exports.EMAIL_KEY = void 0;
|
|
3
|
+
exports.getCredentialStore = exports.CredentialStoreImpl = exports.KeytarAccessError = exports.NoKeytarError = exports.NoTokenInStoreError = exports.personalApiCredentialsValidatedShape = exports.personalApiCredentialsShape = exports.API_TOKEN_KEY = exports.EMAIL_KEY = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const os_1 = require("os");
|
|
6
6
|
const Either_1 = require("fp-ts/lib/Either");
|
|
@@ -45,6 +45,15 @@ class NoTokenInStoreError extends shared_1.UserError {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.NoTokenInStoreError = NoTokenInStoreError;
|
|
48
|
+
class NoKeytarError extends shared_1.UserError {
|
|
49
|
+
constructor() {
|
|
50
|
+
super(ui_1.Text.error.noKeytar);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.NoKeytarError = NoKeytarError;
|
|
54
|
+
class KeytarAccessError extends shared_1.UserError {
|
|
55
|
+
}
|
|
56
|
+
exports.KeytarAccessError = KeytarAccessError;
|
|
48
57
|
class CredentialStoreImpl {
|
|
49
58
|
constructor(logger, instructionsURL, keytar, cachedConfig) {
|
|
50
59
|
this.logger = logger;
|
|
@@ -70,7 +79,7 @@ class CredentialStoreImpl {
|
|
|
70
79
|
default:
|
|
71
80
|
error = ui_1.Text.error.keytarAccessError.other(message);
|
|
72
81
|
}
|
|
73
|
-
throw new
|
|
82
|
+
throw new KeytarAccessError(error);
|
|
74
83
|
}
|
|
75
84
|
decodeCredentials(credentialsString) {
|
|
76
85
|
if (!credentialsString) {
|
|
@@ -145,11 +154,11 @@ class CredentialStoreImpl {
|
|
|
145
154
|
await this.keytar.setPassword(KEYTAR_SERVICE, this.keytarAccount, JSON.stringify(credentials));
|
|
146
155
|
}
|
|
147
156
|
catch (e) {
|
|
148
|
-
throw new
|
|
157
|
+
throw new NoKeytarError();
|
|
149
158
|
}
|
|
150
159
|
}
|
|
151
160
|
else {
|
|
152
|
-
throw new
|
|
161
|
+
throw new NoKeytarError();
|
|
153
162
|
}
|
|
154
163
|
}
|
|
155
164
|
async deleteCredentials() {
|
|
@@ -6,8 +6,12 @@ import { UserError } from '../shared';
|
|
|
6
6
|
export declare class ResourceDefinitionMissingError extends UserError {
|
|
7
7
|
constructor(resources: string[]);
|
|
8
8
|
}
|
|
9
|
+
export interface Handler {
|
|
10
|
+
module: string;
|
|
11
|
+
func: string;
|
|
12
|
+
}
|
|
9
13
|
export interface ConfigInteractor {
|
|
10
|
-
getAppHandlers(): Promise<Array<
|
|
14
|
+
getAppHandlers(): Promise<Array<Handler>>;
|
|
11
15
|
snapshotsEnabled(): Promise<boolean>;
|
|
12
16
|
}
|
|
13
17
|
export declare type Resource = Resources[0];
|
|
@@ -19,7 +23,7 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
|
|
|
19
23
|
private readonly fileReader;
|
|
20
24
|
private readonly fileWriter;
|
|
21
25
|
constructor(fileReader: FileSystemReader, fileWriter: FileSystemWriter);
|
|
22
|
-
getAppHandlers(): Promise<Array<
|
|
26
|
+
getAppHandlers(): Promise<Array<Handler>>;
|
|
23
27
|
readConfig(): Promise<ManifestSchema>;
|
|
24
28
|
readConfigToDocument(): Promise<Document.Parsed | undefined>;
|
|
25
29
|
snapshotsEnabled(): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAOV,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAmB,MAAM,WAAW,CAAC;AACvD,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAOV,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAmB,MAAM,WAAW,CAAC;AACvD,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AAC/D,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAgBzC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1G,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAoClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAqBxE,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CAcxB"}
|
|
@@ -22,13 +22,18 @@ class ConfigFile {
|
|
|
22
22
|
this.fileWriter = fileWriter;
|
|
23
23
|
}
|
|
24
24
|
async getAppHandlers() {
|
|
25
|
-
var _a;
|
|
25
|
+
var _a, _b;
|
|
26
26
|
const config = await this.readConfig();
|
|
27
|
-
const functions = (_a = config.modules) === null || _a === void 0 ? void 0 : _a.function;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
const functions = (_b = (_a = config.modules) === null || _a === void 0 ? void 0 : _a.function) !== null && _b !== void 0 ? _b : [];
|
|
28
|
+
const handlers = Array.from(new Set(functions.map((f) => f.handler)));
|
|
29
|
+
return handlers.map((handler) => {
|
|
30
|
+
const parts = handler.split('.');
|
|
31
|
+
if (parts.length !== 2) {
|
|
32
|
+
throw new shared_1.ValidationError(ui_1.Text.error.handlerFormat(handler));
|
|
33
|
+
}
|
|
34
|
+
const [module, func] = parts;
|
|
35
|
+
return { module, func };
|
|
36
|
+
});
|
|
32
37
|
}
|
|
33
38
|
async readConfig() {
|
|
34
39
|
const manifestFileContents = this.fileReader.readFile(_1.manifestFileName);
|