@salesforce/b2c-tooling-sdk 0.5.3 → 0.5.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/dist/cjs/cli/mrt-command.d.ts +5 -5
- package/dist/cjs/cli/mrt-command.js +14 -11
- package/dist/cjs/cli/mrt-command.js.map +1 -1
- package/dist/cjs/cli/oauth-command.js +2 -5
- package/dist/cjs/cli/oauth-command.js.map +1 -1
- package/dist/cjs/clients/cdn-zones.d.ts +2 -2
- package/dist/cjs/clients/cdn-zones.js +2 -2
- package/dist/cjs/clients/cdn-zones.js.map +1 -1
- package/dist/cjs/clients/custom-apis.d.ts +14 -6
- package/dist/cjs/clients/custom-apis.js +27 -14
- package/dist/cjs/clients/custom-apis.js.map +1 -1
- package/dist/cjs/clients/index.d.ts +1 -1
- package/dist/cjs/clients/index.js +1 -1
- package/dist/cjs/clients/index.js.map +1 -1
- package/dist/cjs/clients/scapi-schemas.d.ts +2 -2
- package/dist/cjs/clients/scapi-schemas.js +2 -2
- package/dist/cjs/clients/scapi-schemas.js.map +1 -1
- package/dist/cjs/config/config-source-registry.js +2 -0
- package/dist/cjs/config/config-source-registry.js.map +1 -1
- package/dist/cjs/i18n/locales/de.js +1 -1
- package/dist/cjs/i18n/locales/de.js.map +1 -1
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/operations/code/cartridges.js +12 -2
- package/dist/cjs/operations/code/cartridges.js.map +1 -1
- package/dist/cjs/scaffold/parameter-resolver.js +19 -3
- package/dist/cjs/scaffold/parameter-resolver.js.map +1 -1
- package/dist/esm/cli/mrt-command.d.ts +5 -5
- package/dist/esm/cli/mrt-command.js +14 -11
- package/dist/esm/cli/mrt-command.js.map +1 -1
- package/dist/esm/cli/oauth-command.js +2 -5
- package/dist/esm/cli/oauth-command.js.map +1 -1
- package/dist/esm/clients/cdn-zones.d.ts +2 -2
- package/dist/esm/clients/cdn-zones.js +2 -2
- package/dist/esm/clients/cdn-zones.js.map +1 -1
- package/dist/esm/clients/custom-apis.d.ts +14 -6
- package/dist/esm/clients/custom-apis.js +27 -14
- package/dist/esm/clients/custom-apis.js.map +1 -1
- package/dist/esm/clients/index.d.ts +1 -1
- package/dist/esm/clients/index.js +1 -1
- package/dist/esm/clients/index.js.map +1 -1
- package/dist/esm/clients/scapi-schemas.d.ts +2 -2
- package/dist/esm/clients/scapi-schemas.js +2 -2
- package/dist/esm/clients/scapi-schemas.js.map +1 -1
- package/dist/esm/config/config-source-registry.js +2 -0
- package/dist/esm/config/config-source-registry.js.map +1 -1
- package/dist/esm/i18n/locales/de.js +1 -1
- package/dist/esm/i18n/locales/de.js.map +1 -1
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/operations/code/cartridges.js +12 -2
- package/dist/esm/operations/code/cartridges.js.map +1 -1
- package/dist/esm/scaffold/parameter-resolver.js +19 -3
- package/dist/esm/scaffold/parameter-resolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -8,26 +8,26 @@ import type { AuthStrategy } from '../auth/types.js';
|
|
|
8
8
|
*
|
|
9
9
|
* API key resolution order:
|
|
10
10
|
* 1. --api-key flag
|
|
11
|
-
* 2.
|
|
11
|
+
* 2. MRT_API_KEY environment variable (SFCC_MRT_API_KEY also supported)
|
|
12
12
|
* 3. ~/.mobify config file (api_key field), or ~/.mobify--[hostname] if --cloud-origin is set
|
|
13
13
|
*
|
|
14
14
|
* Project/environment resolution order:
|
|
15
15
|
* 1. --project / --environment flags
|
|
16
|
-
* 2.
|
|
16
|
+
* 2. MRT_PROJECT / MRT_ENVIRONMENT environment variables (SFCC_-prefixed and MRT_TARGET also supported)
|
|
17
17
|
* 3. dw.json (mrtProject / mrtEnvironment fields)
|
|
18
18
|
*
|
|
19
19
|
* Cloud origin resolution:
|
|
20
20
|
* 1. --cloud-origin flag
|
|
21
|
-
* 2.
|
|
21
|
+
* 2. MRT_CLOUD_ORIGIN environment variable (SFCC_MRT_CLOUD_ORIGIN also supported)
|
|
22
22
|
* 3. dw.json (mrtOrigin field)
|
|
23
23
|
* 4. Default: https://cloud.mobify.com
|
|
24
24
|
*/
|
|
25
25
|
export declare abstract class MrtCommand<T extends typeof Command> extends BaseCommand<T> {
|
|
26
26
|
static baseFlags: {
|
|
27
|
-
'api-key': import("@oclif/core/interfaces").OptionFlag<string
|
|
27
|
+
'api-key': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
28
28
|
project: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
29
29
|
environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
30
|
-
'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string
|
|
30
|
+
'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
31
31
|
'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
32
32
|
'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
33
33
|
debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
@@ -14,17 +14,17 @@ import { DEFAULT_MRT_ORIGIN } from '../clients/mrt.js';
|
|
|
14
14
|
*
|
|
15
15
|
* API key resolution order:
|
|
16
16
|
* 1. --api-key flag
|
|
17
|
-
* 2.
|
|
17
|
+
* 2. MRT_API_KEY environment variable (SFCC_MRT_API_KEY also supported)
|
|
18
18
|
* 3. ~/.mobify config file (api_key field), or ~/.mobify--[hostname] if --cloud-origin is set
|
|
19
19
|
*
|
|
20
20
|
* Project/environment resolution order:
|
|
21
21
|
* 1. --project / --environment flags
|
|
22
|
-
* 2.
|
|
22
|
+
* 2. MRT_PROJECT / MRT_ENVIRONMENT environment variables (SFCC_-prefixed and MRT_TARGET also supported)
|
|
23
23
|
* 3. dw.json (mrtProject / mrtEnvironment fields)
|
|
24
24
|
*
|
|
25
25
|
* Cloud origin resolution:
|
|
26
26
|
* 1. --cloud-origin flag
|
|
27
|
-
* 2.
|
|
27
|
+
* 2. MRT_CLOUD_ORIGIN environment variable (SFCC_MRT_CLOUD_ORIGIN also supported)
|
|
28
28
|
* 3. dw.json (mrtOrigin field)
|
|
29
29
|
* 4. Default: https://cloud.mobify.com
|
|
30
30
|
*/
|
|
@@ -33,24 +33,27 @@ export class MrtCommand extends BaseCommand {
|
|
|
33
33
|
...BaseCommand.baseFlags,
|
|
34
34
|
'api-key': Flags.string({
|
|
35
35
|
description: 'MRT API key',
|
|
36
|
-
env: '
|
|
36
|
+
env: 'MRT_API_KEY',
|
|
37
|
+
default: async () => process.env.SFCC_MRT_API_KEY || undefined,
|
|
37
38
|
helpGroup: 'AUTH',
|
|
38
39
|
}),
|
|
39
40
|
project: Flags.string({
|
|
40
41
|
char: 'p',
|
|
41
42
|
description: 'MRT project slug (or set mrtProject in dw.json)',
|
|
42
|
-
env: '
|
|
43
|
-
default: async () => process.env.
|
|
43
|
+
env: 'MRT_PROJECT',
|
|
44
|
+
default: async () => process.env.SFCC_MRT_PROJECT || undefined,
|
|
44
45
|
}),
|
|
45
46
|
environment: Flags.string({
|
|
46
47
|
char: 'e',
|
|
48
|
+
aliases: ['target'],
|
|
47
49
|
description: 'MRT environment (e.g., staging, production; or set mrtEnvironment in dw.json)',
|
|
48
|
-
env: '
|
|
49
|
-
default: async () => process.env.MRT_TARGET || undefined,
|
|
50
|
+
env: 'MRT_ENVIRONMENT',
|
|
51
|
+
default: async () => process.env.SFCC_MRT_ENVIRONMENT || process.env.MRT_TARGET || undefined,
|
|
50
52
|
}),
|
|
51
53
|
'cloud-origin': Flags.string({
|
|
52
54
|
description: `MRT cloud origin URL (or set mrtOrigin in dw.json; default: ${DEFAULT_MRT_ORIGIN})`,
|
|
53
|
-
env: '
|
|
55
|
+
env: 'MRT_CLOUD_ORIGIN',
|
|
56
|
+
default: async () => process.env.SFCC_MRT_CLOUD_ORIGIN || undefined,
|
|
54
57
|
}),
|
|
55
58
|
'credentials-file': Flags.string({
|
|
56
59
|
description: 'Path to MRT credentials file (overrides default ~/.mobify)',
|
|
@@ -72,7 +75,7 @@ export class MrtCommand extends BaseCommand {
|
|
|
72
75
|
if (this.resolvedConfig.hasMrtConfig()) {
|
|
73
76
|
return this.resolvedConfig.createMrtAuth();
|
|
74
77
|
}
|
|
75
|
-
throw new Error(t('error.mrtApiKeyRequired', 'MRT API key required. Provide --api-key, set
|
|
78
|
+
throw new Error(t('error.mrtApiKeyRequired', 'MRT API key required. Provide --api-key, set MRT_API_KEY, or configure ~/.mobify'));
|
|
76
79
|
}
|
|
77
80
|
/**
|
|
78
81
|
* Check if MRT credentials are available.
|
|
@@ -85,7 +88,7 @@ export class MrtCommand extends BaseCommand {
|
|
|
85
88
|
*/
|
|
86
89
|
requireMrtCredentials() {
|
|
87
90
|
if (!this.hasMrtCredentials()) {
|
|
88
|
-
this.error(t('error.mrtApiKeyRequired', 'MRT API key required. Provide --api-key, set
|
|
91
|
+
this.error(t('error.mrtApiKeyRequired', 'MRT API key required. Provide --api-key, set MRT_API_KEY, or configure ~/.mobify'));
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mrt-command.js","sourceRoot":"","sources":["../../../src/cli/mrt-command.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAU,KAAK,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAIxD,OAAO,EAAC,CAAC,EAAC,MAAM,kBAAkB,CAAC;AACnC,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,OAAgB,UAAqC,SAAQ,WAAc;IAC/E,MAAM,CAAC,SAAS,GAAG;QACjB,GAAG,WAAW,CAAC,SAAS;QACxB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,aAAa;YAC1B,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"mrt-command.js","sourceRoot":"","sources":["../../../src/cli/mrt-command.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAU,KAAK,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAIxD,OAAO,EAAC,CAAC,EAAC,MAAM,kBAAkB,CAAC;AACnC,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,OAAgB,UAAqC,SAAQ,WAAc;IAC/E,MAAM,CAAC,SAAS,GAAG;QACjB,GAAG,WAAW,CAAC,SAAS;QACxB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,aAAa;YAC1B,GAAG,EAAE,aAAa;YAClB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS;YAC9D,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,iDAAiD;YAC9D,GAAG,EAAE,aAAa;YAClB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS;SAC/D,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACxB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,CAAC,QAAQ,CAAC;YACnB,WAAW,EAAE,+EAA+E;YAC5F,GAAG,EAAE,iBAAiB;YACtB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS;SAC7F,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,+DAA+D,kBAAkB,GAAG;YACjG,GAAG,EAAE,kBAAkB;YACvB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;SACpE,CAAC;QACF,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC;YAC/B,WAAW,EAAE,4DAA4D;YACzE,GAAG,EAAE,sBAAsB;SAC5B,CAAC;KACH,CAAC;IAEiB,iBAAiB;QAClC,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAC;QACnE,MAAM,OAAO,GAAsB;YACjC,GAAG,IAAI,CAAC,oBAAoB,EAAE;YAC9B,GAAG,GAAG,CAAC,OAAO;SACf,CAAC;QAEF,OAAO,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACO,UAAU;QAClB,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,KAAK,CACb,CAAC,CAAC,yBAAyB,EAAE,kFAAkF,CAAC,CACjH,CAAC;IACJ,CAAC;IAED;;OAEG;IACO,iBAAiB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;IAC5C,CAAC;IAED;;OAEG;IACO,qBAAqB;QAC7B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,CACR,CAAC,CACC,yBAAyB,EACzB,kFAAkF,CACnF,CACF,CAAC;QACJ,CAAC;IACH,CAAC"}
|
|
@@ -10,6 +10,7 @@ import { OAuthStrategy } from '../auth/oauth.js';
|
|
|
10
10
|
import { ImplicitOAuthStrategy } from '../auth/oauth-implicit.js';
|
|
11
11
|
import { t } from '../i18n/index.js';
|
|
12
12
|
import { DEFAULT_ACCOUNT_MANAGER_HOST } from '../defaults.js';
|
|
13
|
+
import { normalizeTenantId } from '../clients/custom-apis.js';
|
|
13
14
|
/**
|
|
14
15
|
* Default OAuth authentication methods array used by getOAuthStrategy.
|
|
15
16
|
* Extracted from getOAuthStrategy() to ensure getDefaultAuthMethods() returns the same array.
|
|
@@ -192,11 +193,7 @@ export class OAuthCommand extends BaseCommand {
|
|
|
192
193
|
if (!tenantId) {
|
|
193
194
|
this.error(t('error.tenantIdRequired', 'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.'));
|
|
194
195
|
}
|
|
195
|
-
|
|
196
|
-
if (tenantId.startsWith('f_ecom_')) {
|
|
197
|
-
return tenantId.slice('f_ecom_'.length);
|
|
198
|
-
}
|
|
199
|
-
return tenantId;
|
|
196
|
+
return normalizeTenantId(tenantId);
|
|
200
197
|
}
|
|
201
198
|
}
|
|
202
199
|
//# sourceMappingURL=oauth-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-command.js","sourceRoot":"","sources":["../../../src/cli/oauth-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-command.js","sourceRoot":"","sources":["../../../src/cli/oauth-command.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAU,KAAK,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAG5E,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,CAAC,EAAC,MAAM,kBAAkB,CAAC;AACnC,OAAO,EAAC,4BAA4B,EAAC,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,MAAM,0BAA0B,GAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;AAEpF;;;;;;;;;GASG;AACH,MAAM,OAAgB,YAAuC,SAAQ,WAAc;IACjF,MAAM,CAAC,SAAS,GAAG;QACjB,GAAG,WAAW,CAAC,SAAS;QACxB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACxB,WAAW,EAAE,qBAAqB;YAClC,GAAG,EAAE,gBAAgB;YACrB,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;YAC5B,WAAW,EAAE,yBAAyB;YACtC,GAAG,EAAE,oBAAoB;YACzB,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,2CAA2C;YACxD,GAAG,EAAE,mBAAmB;YACxB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,IAAI;YACvB,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,kBAAkB;YAC/B,GAAG,EAAE,gBAAgB;YACrB,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;YACxB,WAAW,EAAE,wBAAwB;YACrC,GAAG,EAAE,gBAAgB;YACrB,SAAS,EAAE,MAAM;YACjB,OAAO,EAAE,CAAC,QAAQ,CAAC;SACpB,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,0DAA0D;YACvE,GAAG,EAAE,mBAAmB;YACxB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,IAAI;YACvB,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,gBAAgB;YACzB,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,CAAC,WAAW,CAAC;SACzB,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,6DAA6D;YAC1E,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,CAAC,cAAc,CAAC;YAC3B,SAAS,EAAE,MAAM;SAClB,CAAC;QACF,sBAAsB,EAAE,KAAK,CAAC,MAAM,CAAC;YACnC,WAAW,EAAE,gDAAgD,4BAA4B,GAAG;YAC5F,GAAG,EAAE,2BAA2B;YAChC,SAAS,EAAE,MAAM;SAClB,CAAC;KACH,CAAC;IAEiB,iBAAiB;QAClC,OAAO,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAgC,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED;;OAEG;IACH,IAAc,kBAAkB;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,kBAAkB,IAAI,4BAA4B,CAAC;IACvF,CAAC;IAED;;;;;;OAMG;IACO,qBAAqB;QAC7B,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACO,kBAAkB;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;;;OAUG;IACO,gBAAgB;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAC1C,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,oFAAoF;QACpF,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC1E,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAElD,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,QAAQ,MAAM,EAAE,CAAC;gBACf,KAAK,oBAAoB;oBACvB,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;wBAC3C,OAAO,IAAI,aAAa,CAAC;4BACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,YAAY,EAAE,MAAM,CAAC,YAAY;4BACjC,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,kBAAkB;yBACnB,CAAC,CAAC;oBACL,CAAC;oBACD,MAAM;gBAER,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,IAAI,eAAe,CAAC;oBAC7D,IAAI,iBAAiB,EAAE,CAAC;wBACtB,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,eAAe,EAAE,CAAC;4BACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;wBAC9E,CAAC;wBACD,OAAO,IAAI,qBAAqB,CAAC;4BAC/B,QAAQ,EAAE,iBAAiB;4BAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,kBAAkB;yBACnB,CAAC,CAAC;oBACL,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,gEAAgE;gBAChE,uFAAuF;YACzF,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,CAAC,CACC,yBAAyB,EACzB,qDAAqD,UAAU,KAAK;YAClE,qEAAqE,CACxE,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACO,mBAAmB;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC,kBAAkB,EAAE,KAAK,SAAS,CAAC;IACzF,CAAC;IAED;;;OAGG;IACO,uBAAuB;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAC1C,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACO,uBAAuB;QAC/B,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CACR,CAAC,CAAC,6BAA6B,EAAE,sEAAsE,CAAC,CACzG,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,eAAe;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC;QAErD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,CACR,CAAC,CACC,wBAAwB,EACxB,uGAAuG,CACxG,CACF,CAAC;QACJ,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC"}
|
|
@@ -12,7 +12,7 @@ import { type Client } from 'openapi-fetch';
|
|
|
12
12
|
import type { AuthStrategy } from '../auth/types.js';
|
|
13
13
|
import type { paths, components } from './cdn-zones.generated.js';
|
|
14
14
|
import { type MiddlewareRegistry } from './middleware-registry.js';
|
|
15
|
-
import { toOrganizationId,
|
|
15
|
+
import { toOrganizationId, normalizeTenantId, buildTenantScope } from './custom-apis.js';
|
|
16
16
|
/**
|
|
17
17
|
* Re-export generated types for external use.
|
|
18
18
|
*/
|
|
@@ -20,7 +20,7 @@ export type { paths, components };
|
|
|
20
20
|
/**
|
|
21
21
|
* Re-export organization/tenant utilities for convenience.
|
|
22
22
|
*/
|
|
23
|
-
export { toOrganizationId,
|
|
23
|
+
export { toOrganizationId, normalizeTenantId, buildTenantScope };
|
|
24
24
|
/**
|
|
25
25
|
* The typed CDN Zones client for eCDN management.
|
|
26
26
|
*
|
|
@@ -17,11 +17,11 @@ import createClient from 'openapi-fetch';
|
|
|
17
17
|
import { OAuthStrategy } from '../auth/oauth.js';
|
|
18
18
|
import { createAuthMiddleware, createLoggingMiddleware } from './middleware.js';
|
|
19
19
|
import { globalMiddlewareRegistry } from './middleware-registry.js';
|
|
20
|
-
import { toOrganizationId,
|
|
20
|
+
import { toOrganizationId, normalizeTenantId, buildTenantScope } from './custom-apis.js';
|
|
21
21
|
/**
|
|
22
22
|
* Re-export organization/tenant utilities for convenience.
|
|
23
23
|
*/
|
|
24
|
-
export { toOrganizationId,
|
|
24
|
+
export { toOrganizationId, normalizeTenantId, buildTenantScope };
|
|
25
25
|
/** Default OAuth scopes required for CDN Zones (read-only) */
|
|
26
26
|
export const CDN_ZONES_READ_SCOPES = ['sfcc.cdn-zones'];
|
|
27
27
|
/** OAuth scopes required for CDN Zones (read-write) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cdn-zones.js","sourceRoot":"","sources":["../../../src/clients/cdn-zones.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;;GASG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"cdn-zones.js","sourceRoot":"","sources":["../../../src/clients/cdn-zones.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;;GASG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAOvF;;GAEG;AACH,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAC,CAAC;AA4E/D,8DAA8D;AAC9D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAExD,uDAAuD;AACvD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,mBAAmB,CAAC,CAAC;AA4CzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAA4B,EAC5B,IAAkB,EAClB,OAA+B;IAE/B,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,IAAI,wBAAwB,CAAC;IAEvE,MAAM,MAAM,GAAG,YAAY,CAAQ;QACjC,OAAO,EAAE,WAAW,MAAM,CAAC,SAAS,gDAAgD;KACrF,CAAC,CAAC;IAEH,8DAA8D;IAC9D,MAAM,YAAY,GAAG,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACtF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7F,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAI,YAAY,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpG,8BAA8B;IAC9B,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAE7C,kCAAkC;IAClC,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,yEAAyE;IACzE,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,CAAC;IAEjD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -143,16 +143,24 @@ export declare const SCAPI_TENANT_SCOPE_PREFIX = "SALESFORCE_COMMERCE_API:";
|
|
|
143
143
|
*/
|
|
144
144
|
export declare function toOrganizationId(tenantId: string): string;
|
|
145
145
|
/**
|
|
146
|
-
*
|
|
146
|
+
* Normalizes any parseable tenant/organization ID form to the canonical underscore format.
|
|
147
147
|
*
|
|
148
|
-
*
|
|
149
|
-
*
|
|
148
|
+
* Supported input forms (all resolve to `abcd_123`):
|
|
149
|
+
* - `abcd_123` — canonical tenant ID (returned as-is)
|
|
150
|
+
* - `abcd-123` — hyphenated tenant ID
|
|
151
|
+
* - `f_ecom_abcd_123` — organization ID
|
|
152
|
+
* - `f_ecom_abcd-123` — org ID with hyphenated tenant
|
|
153
|
+
* - `abcd-123.dx.commercecloud.salesforce.com` — sandbox hostname
|
|
154
|
+
*
|
|
155
|
+
* @param value - The tenant ID, organization ID, or hostname
|
|
156
|
+
* @returns The normalized tenant ID in canonical underscore format (e.g., "abcd_123")
|
|
150
157
|
*
|
|
151
158
|
* @example
|
|
152
|
-
*
|
|
153
|
-
*
|
|
159
|
+
* normalizeTenantId('f_ecom_zzxy_prd') // Returns 'zzxy_prd'
|
|
160
|
+
* normalizeTenantId('zzxy-prd') // Returns 'zzxy_prd'
|
|
161
|
+
* normalizeTenantId('zzxy-prd.dx.commercecloud.salesforce.com') // Returns 'zzxy_prd'
|
|
154
162
|
*/
|
|
155
|
-
export declare function
|
|
163
|
+
export declare function normalizeTenantId(value: string): string;
|
|
156
164
|
/**
|
|
157
165
|
* Builds the tenant-specific OAuth scope required for SCAPI APIs.
|
|
158
166
|
*
|
|
@@ -87,26 +87,39 @@ export const SCAPI_TENANT_SCOPE_PREFIX = 'SALESFORCE_COMMERCE_API:';
|
|
|
87
87
|
* toOrganizationId('f_ecom_zzxy_prd') // Returns 'f_ecom_zzxy_prd' (unchanged)
|
|
88
88
|
*/
|
|
89
89
|
export function toOrganizationId(tenantId) {
|
|
90
|
-
|
|
91
|
-
return tenantId;
|
|
92
|
-
}
|
|
93
|
-
return `${ORGANIZATION_ID_PREFIX}${tenantId}`;
|
|
90
|
+
return `${ORGANIZATION_ID_PREFIX}${normalizeTenantId(tenantId)}`;
|
|
94
91
|
}
|
|
95
92
|
/**
|
|
96
|
-
*
|
|
93
|
+
* Normalizes any parseable tenant/organization ID form to the canonical underscore format.
|
|
94
|
+
*
|
|
95
|
+
* Supported input forms (all resolve to `abcd_123`):
|
|
96
|
+
* - `abcd_123` — canonical tenant ID (returned as-is)
|
|
97
|
+
* - `abcd-123` — hyphenated tenant ID
|
|
98
|
+
* - `f_ecom_abcd_123` — organization ID
|
|
99
|
+
* - `f_ecom_abcd-123` — org ID with hyphenated tenant
|
|
100
|
+
* - `abcd-123.dx.commercecloud.salesforce.com` — sandbox hostname
|
|
97
101
|
*
|
|
98
|
-
* @param value - The tenant ID
|
|
99
|
-
* @returns The
|
|
102
|
+
* @param value - The tenant ID, organization ID, or hostname
|
|
103
|
+
* @returns The normalized tenant ID in canonical underscore format (e.g., "abcd_123")
|
|
100
104
|
*
|
|
101
105
|
* @example
|
|
102
|
-
*
|
|
103
|
-
*
|
|
106
|
+
* normalizeTenantId('f_ecom_zzxy_prd') // Returns 'zzxy_prd'
|
|
107
|
+
* normalizeTenantId('zzxy-prd') // Returns 'zzxy_prd'
|
|
108
|
+
* normalizeTenantId('zzxy-prd.dx.commercecloud.salesforce.com') // Returns 'zzxy_prd'
|
|
104
109
|
*/
|
|
105
|
-
export function
|
|
106
|
-
|
|
107
|
-
|
|
110
|
+
export function normalizeTenantId(value) {
|
|
111
|
+
let id = value.trim();
|
|
112
|
+
// Extract hostname prefix: "abcd-123.dx.commercecloud.salesforce.com" → "abcd-123"
|
|
113
|
+
if (id.includes('.')) {
|
|
114
|
+
id = id.split('.')[0];
|
|
115
|
+
}
|
|
116
|
+
// Strip f_ecom_ prefix (handles org ID form)
|
|
117
|
+
if (id.startsWith(ORGANIZATION_ID_PREFIX)) {
|
|
118
|
+
id = id.slice(ORGANIZATION_ID_PREFIX.length);
|
|
108
119
|
}
|
|
109
|
-
|
|
120
|
+
// Convert hyphens to underscores
|
|
121
|
+
id = id.replaceAll('-', '_');
|
|
122
|
+
return id;
|
|
110
123
|
}
|
|
111
124
|
/**
|
|
112
125
|
* Builds the tenant-specific OAuth scope required for SCAPI APIs.
|
|
@@ -119,6 +132,6 @@ export function toTenantId(value) {
|
|
|
119
132
|
* buildTenantScope('f_ecom_zzxy_prd') // Returns 'SALESFORCE_COMMERCE_API:zzxy_prd'
|
|
120
133
|
*/
|
|
121
134
|
export function buildTenantScope(tenantId) {
|
|
122
|
-
return `${SCAPI_TENANT_SCOPE_PREFIX}${
|
|
135
|
+
return `${SCAPI_TENANT_SCOPE_PREFIX}${normalizeTenantId(tenantId)}`;
|
|
123
136
|
}
|
|
124
137
|
//# sourceMappingURL=custom-apis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-apis.js","sourceRoot":"","sources":["../../../src/clients/custom-apis.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;GAQG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAqD3F,gEAAgE;AAChE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAiC/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAA8B,EAAE,IAAkB;IACvF,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,IAAI,wBAAwB,CAAC;IAEvE,MAAM,MAAM,GAAG,YAAY,CAAQ;QACjC,OAAO,EAAE,WAAW,MAAM,CAAC,SAAS,qDAAqD;KAC1F,CAAC,CAAC;IAEH,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,0BAA0B,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3G,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAI,YAAY,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpG,8BAA8B;IAC9B,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAE7C,kCAAkC;IAClC,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,yEAAyE;IACzE,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC;IAEnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAC;AAEhD,oDAAoD;AACpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,
|
|
1
|
+
{"version":3,"file":"custom-apis.js","sourceRoot":"","sources":["../../../src/clients/custom-apis.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;GAQG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAqD3F,gEAAgE;AAChE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAiC/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAA8B,EAAE,IAAkB;IACvF,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,IAAI,wBAAwB,CAAC;IAEvE,MAAM,MAAM,GAAG,YAAY,CAAQ;QACjC,OAAO,EAAE,WAAW,MAAM,CAAC,SAAS,qDAAqD;KAC1F,CAAC,CAAC;IAEH,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,0BAA0B,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3G,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAI,YAAY,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpG,8BAA8B;IAC9B,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAE7C,kCAAkC;IAClC,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,yEAAyE;IACzE,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC;IAEnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAC;AAEhD,oDAAoD;AACpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAEpE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,GAAG,sBAAsB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAEtB,mFAAmF;IACnF,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IAED,6CAA6C;IAC7C,IAAI,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAC1C,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,iCAAiC;IACjC,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE7B,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,GAAG,yBAAyB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;AACtE,CAAC"}
|
|
@@ -126,7 +126,7 @@ export { createOdsClient } from './ods.js';
|
|
|
126
126
|
export type { OdsClient, OdsClientConfig, OdsError, OdsResponse, paths as OdsPaths, components as OdsComponents, } from './ods.js';
|
|
127
127
|
export { createMrtClient, DEFAULT_MRT_ORIGIN } from './mrt.js';
|
|
128
128
|
export type { MrtClient, MrtClientConfig, MrtError, MrtResponse, BuildPushResponse, paths as MrtPaths, components as MrtComponents, } from './mrt.js';
|
|
129
|
-
export { createCustomApisClient, toOrganizationId,
|
|
129
|
+
export { createCustomApisClient, toOrganizationId, normalizeTenantId, buildTenantScope, ORGANIZATION_ID_PREFIX, SCAPI_TENANT_SCOPE_PREFIX, CUSTOM_APIS_DEFAULT_SCOPES, } from './custom-apis.js';
|
|
130
130
|
export type { CustomApisClient, CustomApisClientConfig, CustomApisError, CustomApisResponse, paths as CustomApisPaths, components as CustomApisComponents, } from './custom-apis.js';
|
|
131
131
|
export { createScapiSchemasClient, SCAPI_SCHEMAS_DEFAULT_SCOPES } from './scapi-schemas.js';
|
|
132
132
|
export type { ScapiSchemasClient, ScapiSchemasClientConfig, ScapiSchemasError, ScapiSchemasResponse, SchemaListItem, SchemaListResult, OpenApiSchema, paths as ScapiSchemasPaths, components as ScapiSchemasComponents, } from './scapi-schemas.js';
|
|
@@ -125,7 +125,7 @@ export { createOcapiClient } from './ocapi.js';
|
|
|
125
125
|
export { createSlasClient } from './slas-admin.js';
|
|
126
126
|
export { createOdsClient } from './ods.js';
|
|
127
127
|
export { createMrtClient, DEFAULT_MRT_ORIGIN } from './mrt.js';
|
|
128
|
-
export { createCustomApisClient, toOrganizationId,
|
|
128
|
+
export { createCustomApisClient, toOrganizationId, normalizeTenantId, buildTenantScope, ORGANIZATION_ID_PREFIX, SCAPI_TENANT_SCOPE_PREFIX, CUSTOM_APIS_DEFAULT_SCOPES, } from './custom-apis.js';
|
|
129
129
|
export { createScapiSchemasClient, SCAPI_SCHEMAS_DEFAULT_SCOPES } from './scapi-schemas.js';
|
|
130
130
|
export { createAccountManagerClient, createAccountManagerUsersClient, getUser, listUsers, createUser, updateUser, deleteUser, purgeUser, resetUser, findUserByLogin, fetchRoleMapping, resolveToInternalRole, resolveFromInternalRole, createAccountManagerRolesClient, getRole, listRoles, createAccountManagerApiClientsClient, createAccountManagerOrgsClient, isValidRoleTenantFilter, ROLE_TENANT_FILTER_PATTERN, } from './am-api.js';
|
|
131
131
|
export { createCdnZonesClient, CDN_ZONES_READ_SCOPES, CDN_ZONES_RW_SCOPES } from './cdn-zones.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/clients/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;AACH,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAGzC,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AAQzB,iDAAiD;AACjD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAC,kBAAkB,EAAE,wBAAwB,EAAC,MAAM,0BAA0B,CAAC;AAGtF,OAAO,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAU7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAUjD,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAUzC,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAW7D,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/clients/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;AACH,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAGzC,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AAQzB,iDAAiD;AACjD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAC,kBAAkB,EAAE,wBAAwB,EAAC,MAAM,0BAA0B,CAAC;AAGtF,OAAO,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAU7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAUjD,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAUzC,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAW7D,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAU1B,OAAO,EAAC,wBAAwB,EAAE,4BAA4B,EAAC,MAAM,oBAAoB,CAAC;AAa1F,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,UAAU,EACV,SAAS,EACT,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,EACvB,+BAA+B,EAC/B,OAAO,EACP,SAAS,EACT,oCAAoC,EACpC,8BAA8B,EAC9B,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,aAAa,CAAC;AAmCrB,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAgBhG,OAAO,EAAC,kBAAkB,EAAE,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAaxE,OAAO,EAAC,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,wBAAwB,EAAC,MAAM,UAAU,CAAC;AAWhG,OAAO,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAC"}
|
|
@@ -11,7 +11,7 @@ import { type Client } from 'openapi-fetch';
|
|
|
11
11
|
import type { AuthStrategy } from '../auth/types.js';
|
|
12
12
|
import type { paths, components } from './scapi-schemas.generated.js';
|
|
13
13
|
import { type MiddlewareRegistry } from './middleware-registry.js';
|
|
14
|
-
import { toOrganizationId,
|
|
14
|
+
import { toOrganizationId, normalizeTenantId, buildTenantScope } from './custom-apis.js';
|
|
15
15
|
/**
|
|
16
16
|
* Re-export generated types for external use.
|
|
17
17
|
*/
|
|
@@ -19,7 +19,7 @@ export type { paths, components };
|
|
|
19
19
|
/**
|
|
20
20
|
* Re-export organization/tenant utilities for convenience.
|
|
21
21
|
*/
|
|
22
|
-
export { toOrganizationId,
|
|
22
|
+
export { toOrganizationId, normalizeTenantId, buildTenantScope };
|
|
23
23
|
/**
|
|
24
24
|
* The typed SCAPI Schemas client for discovering available SCAPI APIs.
|
|
25
25
|
*
|
|
@@ -16,11 +16,11 @@ import createClient from 'openapi-fetch';
|
|
|
16
16
|
import { OAuthStrategy } from '../auth/oauth.js';
|
|
17
17
|
import { createAuthMiddleware, createLoggingMiddleware } from './middleware.js';
|
|
18
18
|
import { globalMiddlewareRegistry } from './middleware-registry.js';
|
|
19
|
-
import { toOrganizationId,
|
|
19
|
+
import { toOrganizationId, normalizeTenantId, buildTenantScope } from './custom-apis.js';
|
|
20
20
|
/**
|
|
21
21
|
* Re-export organization/tenant utilities for convenience.
|
|
22
22
|
*/
|
|
23
|
-
export { toOrganizationId,
|
|
23
|
+
export { toOrganizationId, normalizeTenantId, buildTenantScope };
|
|
24
24
|
/** Default OAuth scopes required for SCAPI Schemas (read-only) */
|
|
25
25
|
export const SCAPI_SCHEMAS_DEFAULT_SCOPES = ['sfcc.scapi-schemas'];
|
|
26
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scapi-schemas.js","sourceRoot":"","sources":["../../../src/clients/scapi-schemas.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;GAQG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"scapi-schemas.js","sourceRoot":"","sources":["../../../src/clients/scapi-schemas.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;;;;;;;GAQG;AACH,OAAO,YAA2B,MAAM,eAAe,CAAC;AAExD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAOvF;;GAEG;AACH,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAC,CAAC;AA+D/D,kEAAkE;AAClE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAiCnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAAgC,EAAE,IAAkB;IAC3F,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,IAAI,wBAAwB,CAAC;IAEvE,MAAM,MAAM,GAAG,YAAY,CAAQ;QACjC,OAAO,EAAE,WAAW,MAAM,CAAC,SAAS,uDAAuD;KAC5F,CAAC,CAAC;IAEH,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,4BAA4B,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7G,8DAA8D;IAC9D,MAAM,UAAU,GAAG,IAAI,YAAY,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpG,8BAA8B;IAC9B,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;IAE7C,kCAAkC;IAClC,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC;QACjE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,CAAC;IAED,yEAAyE;IACzE,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC,CAAC;IAErD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-source-registry.js","sourceRoot":"","sources":["../../../src/config/config-source-registry.ts"],"names":[],"mappings":"AAsCA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,oBAAoB;IACvB,OAAO,GAAmB,EAAE,CAAC;IAErC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAoB;QAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,IAAY;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC7D,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACH,UAAU;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"config-source-registry.js","sourceRoot":"","sources":["../../../src/config/config-source-registry.ts"],"names":[],"mappings":"AAsCA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,oBAAoB;IACvB,OAAO,GAAmB,EAAE,CAAC;IAErC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAoB;QAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO;QAC7D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,IAAY;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC7D,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACH,UAAU;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,oBAAoB,EAAE,CAAC"}
|
|
@@ -13,7 +13,7 @@ export const de = {
|
|
|
13
13
|
oauthCredentialsRequired: 'OAuth-Anmeldedaten erforderlich. Geben Sie --client-id/--client-secret an oder setzen Sie SFCC_CLIENT_ID/SFCC_CLIENT_SECRET.',
|
|
14
14
|
webdavCredentialsRequired: 'WebDAV-Anmeldedaten erforderlich. Geben Sie --username/--password oder --client-id/--client-secret an, oder setzen Sie SFCC_USERNAME/SFCC_PASSWORD oder SFCC_CLIENT_ID/SFCC_CLIENT_SECRET.',
|
|
15
15
|
webdavCredentialsRequiredShort: 'WebDAV-Anmeldedaten erforderlich. Geben Sie --username/--password oder --client-id/--client-secret an, oder setzen Sie entsprechende SFCC_* Umgebungsvariablen.',
|
|
16
|
-
mrtApiKeyRequired: 'MRT API-Schlüssel erforderlich. Geben Sie --api-key an oder setzen Sie
|
|
16
|
+
mrtApiKeyRequired: 'MRT API-Schlüssel erforderlich. Geben Sie --api-key an oder setzen Sie MRT_API_KEY.',
|
|
17
17
|
},
|
|
18
18
|
};
|
|
19
19
|
//# sourceMappingURL=de.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de.js","sourceRoot":"","sources":["../../../../src/i18n/locales/de.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG;IAChB,KAAK,EAAE;QACL,cAAc,EAAE,4FAA4F;QAC5G,mBAAmB,EACjB,8GAA8G;QAChH,wBAAwB,EACtB,8HAA8H;QAChI,yBAAyB,EACvB,4LAA4L;QAC9L,8BAA8B,EAC5B,iKAAiK;QACnK,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"de.js","sourceRoot":"","sources":["../../../../src/i18n/locales/de.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;;GAEG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG;IAChB,KAAK,EAAE;QACL,cAAc,EAAE,4FAA4F;QAC5G,mBAAmB,EACjB,8GAA8G;QAChH,wBAAwB,EACtB,8HAA8H;QAChI,yBAAyB,EACvB,4LAA4L;QAC9L,8BAA8B,EAC5B,iKAAiK;QACnK,iBAAiB,EAAE,qFAAqF;KACzG;CACF,CAAC"}
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export { BasicAuthStrategy, OAuthStrategy, ImplicitOAuthStrategy, ApiKeyStrategy
|
|
|
8
8
|
export type { AuthStrategy, AccessTokenResponse, DecodedJWT, OAuthConfig, ImplicitOAuthConfig, AuthConfig, BasicAuthConfig, OAuthAuthConfig, ApiKeyAuthConfig, AuthMethod, AuthCredentials, ResolveAuthStrategyOptions, AvailableAuthMethods, } from './auth/index.js';
|
|
9
9
|
export { B2CInstance } from './instance/index.js';
|
|
10
10
|
export type { InstanceConfig } from './instance/index.js';
|
|
11
|
-
export { WebDavClient, createOcapiClient, createAuthMiddleware, createExtraParamsMiddleware, createSlasClient, createOdsClient, createCustomApisClient, createAccountManagerUsersClient, createAccountManagerRolesClient, createAccountManagerApiClientsClient, createAccountManagerOrgsClient, createCdnZonesClient, createCipClient, toOrganizationId,
|
|
11
|
+
export { WebDavClient, createOcapiClient, createAuthMiddleware, createExtraParamsMiddleware, createSlasClient, createOdsClient, createCustomApisClient, createAccountManagerUsersClient, createAccountManagerRolesClient, createAccountManagerApiClientsClient, createAccountManagerOrgsClient, createCdnZonesClient, createCipClient, toOrganizationId, normalizeTenantId, buildTenantScope, getApiErrorMessage, isValidRoleTenantFilter, fetchRoleMapping, resolveToInternalRole, resolveFromInternalRole, ORGANIZATION_ID_PREFIX, ROLE_TENANT_FILTER_PATTERN, SCAPI_TENANT_SCOPE_PREFIX, CUSTOM_APIS_DEFAULT_SCOPES, CDN_ZONES_READ_SCOPES, CDN_ZONES_RW_SCOPES, DEFAULT_CIP_HOST, DEFAULT_CIP_STAGING_HOST, } from './clients/index.js';
|
|
12
12
|
export type { PropfindEntry, ExtraParamsConfig, OcapiClient, OcapiError, OcapiResponse, OcapiPaths, OcapiComponents, SlasClient, SlasClientConfig, SlasError, SlasResponse, SlasPaths, SlasComponents, OdsClient, OdsClientConfig, OdsError, OdsResponse, OdsPaths, OdsComponents, CustomApisClient, CustomApisClientConfig, CustomApisError, CustomApisResponse, CustomApisPaths, CustomApisComponents, AccountManagerUsersClient, AccountManagerClientConfig, AccountManagerUser, AccountManagerResponse, AccountManagerError, UserCreate, UserUpdate, UserCollection, UserState, UserExpandOption, AccountManagerRolesClient, AccountManagerRole, AccountManagerRolesResponse, AccountManagerRolesError, RoleCollection, ListRolesOptions, RoleMapping, OrgMapping, AccountManagerApiClientsClient, AccountManagerApiClient, APIClientCreate, APIClientUpdate, APIClientCollection, ApiClientExpandOption, ListApiClientsOptions, AccountManagerOrgsClient, AccountManagerOrganization, OrganizationCollection, ListOrgsOptions, CdnZonesClient, CdnZonesClientConfig, CdnZonesClientOptions, CdnZonesError, CdnZonesResponse, Zone, ZonesEnvelope, CdnZonesPaths, CdnZonesComponents, CipClient, CipClientConfig, CipColumn, CipExecuteResponse, CipFetchResponse, CipFrame, CipQueryOptions, CipQueryResult, } from './clients/index.js';
|
|
13
13
|
export { findCartridges, listCodeVersions, getActiveCodeVersion, activateCodeVersion, reloadCodeVersion, deleteCodeVersion, createCodeVersion, findAndDeployCartridges, uploadCartridges, deleteCartridges, watchCartridges, } from './operations/code/index.js';
|
|
14
14
|
export type { CartridgeMapping, FindCartridgesOptions, CodeVersion, CodeVersionResult, DeployOptions, DeployResult, WatchOptions, WatchResult, } from './operations/code/index.js';
|
package/dist/cjs/index.js
CHANGED
|
@@ -13,7 +13,7 @@ export { BasicAuthStrategy, OAuthStrategy, ImplicitOAuthStrategy, ApiKeyStrategy
|
|
|
13
13
|
// Context Layer - Instance
|
|
14
14
|
export { B2CInstance } from './instance/index.js';
|
|
15
15
|
// Clients
|
|
16
|
-
export { WebDavClient, createOcapiClient, createAuthMiddleware, createExtraParamsMiddleware, createSlasClient, createOdsClient, createCustomApisClient, createAccountManagerUsersClient, createAccountManagerRolesClient, createAccountManagerApiClientsClient, createAccountManagerOrgsClient, createCdnZonesClient, createCipClient, toOrganizationId,
|
|
16
|
+
export { WebDavClient, createOcapiClient, createAuthMiddleware, createExtraParamsMiddleware, createSlasClient, createOdsClient, createCustomApisClient, createAccountManagerUsersClient, createAccountManagerRolesClient, createAccountManagerApiClientsClient, createAccountManagerOrgsClient, createCdnZonesClient, createCipClient, toOrganizationId, normalizeTenantId, buildTenantScope, getApiErrorMessage, isValidRoleTenantFilter, fetchRoleMapping, resolveToInternalRole, resolveFromInternalRole, ORGANIZATION_ID_PREFIX, ROLE_TENANT_FILTER_PATTERN, SCAPI_TENANT_SCOPE_PREFIX, CUSTOM_APIS_DEFAULT_SCOPES, CDN_ZONES_READ_SCOPES, CDN_ZONES_RW_SCOPES, DEFAULT_CIP_HOST, DEFAULT_CIP_STAGING_HOST, } from './clients/index.js';
|
|
17
17
|
// Operations - Code
|
|
18
18
|
export { findCartridges, listCodeVersions, getActiveCodeVersion, activateCodeVersion, reloadCodeVersion, deleteCodeVersion, createCodeVersion, findAndDeployCartridges, uploadCartridges, deleteCartridges, watchCartridges, } from './operations/code/index.js';
|
|
19
19
|
// Operations - Jobs
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAG7G,OAAO;AACP,OAAO,EAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,oBAAoB,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAGlH,SAAS;AACT,OAAO,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAC,MAAM,mBAAmB,CAAC;AAe9G,yCAAyC;AACzC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAc,EACd,SAAS,EACT,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AAiBzB,2BAA2B;AAC3B,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAGhD,UAAU;AACV,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,2BAA2B,EAC3B,gBAAgB,EAChB,eAAe,EACf,sBAAsB,EACtB,+BAA+B,EAC/B,+BAA+B,EAC/B,oCAAoC,EACpC,8BAA8B,EAC9B,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,10 +32,20 @@ import path from 'node:path';
|
|
|
32
32
|
*/
|
|
33
33
|
export function findCartridges(directory, options = {}) {
|
|
34
34
|
const searchDir = directory ? path.resolve(directory) : process.cwd();
|
|
35
|
-
// Find all .project files (Eclipse project markers)
|
|
35
|
+
// Find all .project files (Eclipse project markers).
|
|
36
|
+
// Ignore common non-cartridge dirs to keep discovery fast when projectRoot is broad (e.g. MCP working directory).
|
|
36
37
|
const projectFiles = globSync('**/.project', {
|
|
37
38
|
cwd: searchDir,
|
|
38
|
-
ignore: [
|
|
39
|
+
ignore: [
|
|
40
|
+
'**/node_modules/**',
|
|
41
|
+
'**/.git/**',
|
|
42
|
+
'**/dist/**',
|
|
43
|
+
'**/build/**',
|
|
44
|
+
'**/coverage/**',
|
|
45
|
+
'**/.cache/**',
|
|
46
|
+
'**/tmp/**',
|
|
47
|
+
'**/temp/**',
|
|
48
|
+
],
|
|
39
49
|
});
|
|
40
50
|
let cartridges = projectFiles.map((f) => {
|
|
41
51
|
const dirname = path.resolve(searchDir, path.dirname(f));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cartridges.js","sourceRoot":"","sources":["../../../../src/operations/code/cartridges.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,QAAQ,EAAC,MAAM,MAAM,CAAC;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAwB7B;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,cAAc,CAAC,SAAkB,EAAE,UAAiC,EAAE;IACpF,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAEtE,
|
|
1
|
+
{"version":3,"file":"cartridges.js","sourceRoot":"","sources":["../../../../src/operations/code/cartridges.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,QAAQ,EAAC,MAAM,MAAM,CAAC;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAwB7B;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,cAAc,CAAC,SAAkB,EAAE,UAAiC,EAAE;IACpF,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAEtE,qDAAqD;IACrD,kHAAkH;IAClH,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,EAAE;QAC3C,GAAG,EAAE,SAAS;QACd,MAAM,EAAE;YACN,oBAAoB;YACpB,YAAY;YACZ,YAAY;YACZ,aAAa;YACb,gBAAgB;YAChB,cAAc;YACd,WAAW;YACX,YAAY;SACb;KACF,CAAC,CAAC;IAEH,IAAI,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,OAAO;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,uBAAuB;IACvB,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,uBAAuB;IACvB,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -3,8 +3,24 @@
|
|
|
3
3
|
* SPDX-License-Identifier: Apache-2
|
|
4
4
|
* For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
|
|
5
5
|
*/
|
|
6
|
+
import path from 'node:path';
|
|
6
7
|
import { evaluateCondition } from './validators.js';
|
|
7
8
|
import { resolveLocalSource, resolveRemoteSource, isRemoteSource, validateAgainstSource } from './sources.js';
|
|
9
|
+
/**
|
|
10
|
+
* Path to use for scaffold destination so files are generated under outputDir (e.g. working directory).
|
|
11
|
+
* Returns a path relative to projectRoot when the cartridge is under projectRoot, so the executor
|
|
12
|
+
* joins with outputDir instead of ignoring it. Otherwise returns the absolute path.
|
|
13
|
+
*/
|
|
14
|
+
function cartridgePathForDestination(absolutePath, projectRoot) {
|
|
15
|
+
const normalizedRoot = path.resolve(projectRoot);
|
|
16
|
+
const normalizedPath = path.resolve(absolutePath);
|
|
17
|
+
const relative = path.relative(normalizedRoot, normalizedPath);
|
|
18
|
+
// Use relative path only when cartridge is under projectRoot (no leading '..')
|
|
19
|
+
if (relative && !relative.startsWith('..') && !path.isAbsolute(relative)) {
|
|
20
|
+
return relative;
|
|
21
|
+
}
|
|
22
|
+
return absolutePath;
|
|
23
|
+
}
|
|
8
24
|
/**
|
|
9
25
|
* Resolve scaffold parameters by:
|
|
10
26
|
* 1. Validating provided variables against sources
|
|
@@ -42,7 +58,7 @@ export async function resolveScaffoldParameters(scaffold, options = {}) {
|
|
|
42
58
|
});
|
|
43
59
|
continue;
|
|
44
60
|
}
|
|
45
|
-
// Set companion path variable for cartridges source
|
|
61
|
+
// Set companion path variable for cartridges source (relative to projectRoot when under it so outputDir is used)
|
|
46
62
|
if (param.source === 'cartridges') {
|
|
47
63
|
if (!cartridgePathMap) {
|
|
48
64
|
const result = resolveLocalSource('cartridges', projectRoot);
|
|
@@ -50,7 +66,7 @@ export async function resolveScaffoldParameters(scaffold, options = {}) {
|
|
|
50
66
|
}
|
|
51
67
|
const cartridgePath = cartridgePathMap?.get(providedValue);
|
|
52
68
|
if (cartridgePath) {
|
|
53
|
-
variables[`${param.name}Path`] = cartridgePath;
|
|
69
|
+
variables[`${param.name}Path`] = cartridgePathForDestination(cartridgePath, projectRoot);
|
|
54
70
|
}
|
|
55
71
|
}
|
|
56
72
|
continue;
|
|
@@ -70,7 +86,7 @@ export async function resolveScaffoldParameters(scaffold, options = {}) {
|
|
|
70
86
|
}
|
|
71
87
|
const cartridgePath = cartridgePathMap?.get(param.default);
|
|
72
88
|
if (cartridgePath) {
|
|
73
|
-
variables[`${param.name}Path`] = cartridgePath;
|
|
89
|
+
variables[`${param.name}Path`] = cartridgePathForDestination(cartridgePath, projectRoot);
|
|
74
90
|
}
|
|
75
91
|
}
|
|
76
92
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-resolver.js","sourceRoot":"","sources":["../../../src/scaffold/parameter-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"parameter-resolver.js","sourceRoot":"","sources":["../../../src/scaffold/parameter-resolver.ts"],"names":[],"mappings":"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"}
|