@salesforce/b2c-cli 1.21.3 → 1.22.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/dist/commands/auth/client/index.d.ts +3 -4
- package/dist/commands/auth/client/index.js +12 -17
- package/dist/commands/auth/client/index.js.map +1 -1
- package/dist/commands/auth/client/token.d.ts +6 -3
- package/dist/commands/auth/client/token.js +39 -25
- package/dist/commands/auth/client/token.js.map +1 -1
- package/dist/commands/auth/login.d.ts +5 -3
- package/dist/commands/auth/login.js +41 -26
- package/dist/commands/auth/login.js.map +1 -1
- package/dist/commands/auth/logout.d.ts +3 -3
- package/dist/commands/auth/logout.js +5 -5
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/cap/install.d.ts +5 -1
- package/dist/commands/cap/install.js +31 -7
- package/dist/commands/cap/install.js.map +1 -1
- package/dist/commands/content/export.js +14 -6
- package/dist/commands/content/export.js.map +1 -1
- package/dist/commands/content/list.js +42 -26
- package/dist/commands/content/list.js.map +1 -1
- package/dist/commands/job/import-set.d.ts +66 -0
- package/dist/commands/job/import-set.js +276 -0
- package/dist/commands/job/import-set.js.map +1 -0
- package/dist/commands/mrt/bundle/deploy.js +28 -3
- package/dist/commands/mrt/bundle/deploy.js.map +1 -1
- package/dist/commands/mrt/project/get.js +1 -1
- package/dist/commands/mrt/project/get.js.map +1 -1
- package/dist/commands/mrt/project/list.js +1 -1
- package/dist/commands/mrt/project/list.js.map +1 -1
- package/dist/commands/sandbox/clone/create.d.ts +9 -0
- package/dist/commands/sandbox/clone/create.js +130 -52
- package/dist/commands/sandbox/clone/create.js.map +1 -1
- package/dist/commands/sandbox/clone/get.js +2 -0
- package/dist/commands/sandbox/clone/get.js.map +1 -1
- package/dist/commands/sandbox/clone/list.d.ts +1 -0
- package/dist/commands/sandbox/clone/list.js +20 -2
- package/dist/commands/sandbox/clone/list.js.map +1 -1
- package/dist/commands/sandbox/create.js +10 -39
- package/dist/commands/sandbox/create.js.map +1 -1
- package/dist/commands/setup/inspect.js +4 -35
- package/dist/commands/setup/inspect.js.map +1 -1
- package/dist/i18n/locales/en.d.ts +2 -0
- package/dist/i18n/locales/en.js +3 -1
- package/dist/i18n/locales/en.js.map +1 -1
- package/dist/i18n/locales/index.d.ts +2 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/package.json +1 -1
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/catalog/CatalogMgr.d.ts +6 -2
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/catalog/ProductSearchModel.d.ts +35 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/commerceapps/ConnectionHealthStatusCodes.d.ts +27 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/commerceapps/hooks/ConnectionHealthCheckHooks.d.ts +80 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/commerceapps/hooks/index.d.ts +5 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/commerceapps/index.d.ts +5 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/customer/ProductListMgr.d.ts +3 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/customer/consent/ShopperConsentErrorCodes.d.ts +20 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/customer/consent/ShopperConsentException.d.ts +18 -10
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/customer/consent/ShopperConsentMgr.d.ts +1 -1
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/order/LineItemTax.d.ts +2 -1
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/order/ShippingMgr.d.ts +33 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/order/hooks/ShippingHooks.d.ts +159 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/order/hooks/index.d.ts +2 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/sitemap/SitemapMgr.d.ts +9 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/dw/suggest/SuggestModel.d.ts +35 -0
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/global.d.ts +16 -1
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/upstream-package.json +1 -1
- package/dist/script-types/node_modules/@salesforce/b2c-script-types/types/upstream-tsconfig.json +5 -3
- package/dist/utils/bm/user-auth-command.d.ts +5 -4
- package/dist/utils/bm/user-auth-command.js +6 -5
- package/dist/utils/bm/user-auth-command.js.map +1 -1
- package/dist/utils/slas/client.d.ts +1 -1
- package/dist/utils/slas/client.js +5 -3
- package/dist/utils/slas/client.js.map +1 -1
- package/oclif.manifest.json +12283 -11732
- package/package.json +2 -2
- package/dist/commands/auth/client/renew.d.ts +0 -20
- package/dist/commands/auth/client/renew.js +0 -88
- package/dist/commands/auth/client/renew.js.map +0 -1
|
@@ -139,17 +139,18 @@ export default class ContentExport extends JobCommand {
|
|
|
139
139
|
}
|
|
140
140
|
return true;
|
|
141
141
|
});
|
|
142
|
-
// Promote matching components to root level
|
|
142
|
+
// Promote matching components and content blocks to root level
|
|
143
143
|
const allNodes = [...library.nodes({ traverseHidden: true, callbackHidden: true })];
|
|
144
144
|
for (const node of allNodes) {
|
|
145
|
-
if (node.type === 'COMPONENT' && matchesId(node.id)) {
|
|
145
|
+
if ((node.type === 'COMPONENT' || node.type === 'FRAGMENT') && matchesId(node.id)) {
|
|
146
146
|
library.promoteToRoot(node);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
|
-
// Count pages, content, and
|
|
149
|
+
// Count pages, content, components, and content blocks
|
|
150
150
|
let pageCount = 0;
|
|
151
151
|
let contentCount = 0;
|
|
152
152
|
let componentCount = 0;
|
|
153
|
+
let fragmentCount = 0;
|
|
153
154
|
const assetPaths = [];
|
|
154
155
|
library.traverse((node) => {
|
|
155
156
|
switch (node.type) {
|
|
@@ -161,6 +162,10 @@ export default class ContentExport extends JobCommand {
|
|
|
161
162
|
contentCount++;
|
|
162
163
|
break;
|
|
163
164
|
}
|
|
165
|
+
case 'FRAGMENT': {
|
|
166
|
+
fragmentCount++;
|
|
167
|
+
break;
|
|
168
|
+
}
|
|
164
169
|
case 'PAGE': {
|
|
165
170
|
pageCount++;
|
|
166
171
|
break;
|
|
@@ -174,7 +179,7 @@ export default class ContentExport extends JobCommand {
|
|
|
174
179
|
if (flags['show-tree']) {
|
|
175
180
|
ux.stdout(library.getTreeString({ colorize: ux.colorize }));
|
|
176
181
|
}
|
|
177
|
-
this.log(formatSummary('Dry run', pageCount, contentCount, componentCount, assetPaths.length, outputPath));
|
|
182
|
+
this.log(formatSummary('Dry run', pageCount, contentCount, componentCount, fragmentCount, assetPaths.length, outputPath));
|
|
178
183
|
return {
|
|
179
184
|
library,
|
|
180
185
|
outputPath,
|
|
@@ -183,6 +188,7 @@ export default class ContentExport extends JobCommand {
|
|
|
183
188
|
pageCount,
|
|
184
189
|
contentCount,
|
|
185
190
|
componentCount,
|
|
191
|
+
fragmentCount,
|
|
186
192
|
};
|
|
187
193
|
}
|
|
188
194
|
const result = await this.operations.exportContent(this.instance, pageIds, libraryId, outputPath, {
|
|
@@ -201,12 +207,12 @@ export default class ContentExport extends JobCommand {
|
|
|
201
207
|
if (flags['show-tree']) {
|
|
202
208
|
ux.stdout(result.library.getTreeString({ colorize: ux.colorize }));
|
|
203
209
|
}
|
|
204
|
-
this.log(formatSummary('Exported', result.pageCount, result.contentCount, result.componentCount, result.downloadedAssets.length, result.outputPath));
|
|
210
|
+
this.log(formatSummary('Exported', result.pageCount, result.contentCount, result.componentCount, result.fragmentCount, result.downloadedAssets.length, result.outputPath));
|
|
205
211
|
return result;
|
|
206
212
|
}
|
|
207
213
|
}
|
|
208
214
|
const pluralS = (n) => (n === 1 ? '' : 's');
|
|
209
|
-
function formatSummary(prefix, pages, content, components, assets, outputPath) {
|
|
215
|
+
function formatSummary(prefix, pages, content, components, fragments, assets, outputPath) {
|
|
210
216
|
const parts = [];
|
|
211
217
|
if (pages > 0)
|
|
212
218
|
parts.push(`${pages} page${pluralS(pages)}`);
|
|
@@ -214,6 +220,8 @@ function formatSummary(prefix, pages, content, components, assets, outputPath) {
|
|
|
214
220
|
parts.push(`${content} content asset${pluralS(content)}`);
|
|
215
221
|
if (components > 0)
|
|
216
222
|
parts.push(`${components} component${pluralS(components)}`);
|
|
223
|
+
if (fragments > 0)
|
|
224
|
+
parts.push(`${fragments} content block${pluralS(fragments)}`);
|
|
217
225
|
if (assets > 0)
|
|
218
226
|
parts.push(`${assets} static asset${pluralS(assets)}`);
|
|
219
227
|
const suffix = prefix === 'Dry run' ? `would be exported to ${outputPath}` : `to ${outputPath}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/content/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AACzE,OAAO,EACL,WAAW,EACX,aAAa,EACb,mBAAmB,GAEpB,MAAM,gDAAgD,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAgC;IACzE,MAAM,CAAC,IAAI,GAAG;QACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,8DAA8D;YAC3E,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,8EAA8E,CAAC;IAEpG,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,sEAAsE;QACtE,+EAA+E;QAC/E,+EAA+E;QAC/E,2FAA2F;QAC3F,6EAA6E;QAC7E,gFAAgF;KACjF,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,wFAAwF;SACtG,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,kBAAkB;SAChC,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC;YAC5B,WAAW,EAAE,uFAAuF;YACpG,OAAO,EAAE,IAAI;SACd,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,8FAA8F;YAC3G,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uCAAuC;YACpD,OAAO,EAAE,KAAK;SACf,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,iCAAiC;YAC9C,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,sBAAsB;YACnC,OAAO,EAAE,KAAK;SACf,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,gEAAgE;SAC9E,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC;YAC5B,WAAW,EAAE,qCAAqC;YAClD,OAAO,EAAE,KAAK;SACf,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,4CAA4C;YACzD,OAAO,EAAE,IAAI;SACd,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,+BAA+B;SAC7C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,4DAA4D;YACzE,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEF,gCAAgC;IAChC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEZ,UAAU,GAAG;QACrB,aAAa;QACb,mBAAmB;KACpB,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAgB,CAAC;QACjC,MAAM,UAAU,GACd,KAAK,CAAC,MAAM;YACZ,WAAW,IAAI,IAAI,EAAE;iBAClB,WAAW,EAAE;iBACb,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;iBAC1B,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QAEpB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACtG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC7F,CAAC;QAED,MAAM,aAAa,GACjB,KAAK,CAAC,cAAc,CAAC,KAAK,SAAS;YACjC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,WAAW,IAAI,KAAK,CAAC;YACxE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAE5B,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAC,cAAc,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,CAAC;QAEnG,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACrB,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;gBACpF,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;gBAClC,aAAa;gBACb,UAAU;gBACV,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;gBAClC,WAAW;aACZ,CAAC,CAAC;YAEH,kCAAkC;YAClC,MAAM,QAAQ,GAA2B,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAEnG,SAAS,SAAS,CAAC,EAAU;gBAC3B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7E,CAAC;YAED,sEAAsE;YACtE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpD,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC;oBACzB,IAAI,CAAC,OAAO;wBAAE,OAAO,KAAK,CAAC;oBAE3B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAA+C,CAAC;oBAC1F,MAAM,kBAAkB,GAAG,WAAW,EAAE,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,qBAAqB,CAAoC,EAAE,CAAC,CAAC,CAAC,CACzE,CAAC;oBACF,MAAM,MAAM,GACV,kBAAkB,EAAE,CAAC,qBAAqB,CAC3C,EAAE,CAAC,CAAC,CAAwC,CAAC;oBAC9C,MAAM,QAAQ,GAAI,MAAM,EAAE,CAAwC,EAAE,CAAC,WAAW,CAAC,CAAC;oBAElF,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAClD,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YAEH
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/content/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AACzE,OAAO,EACL,WAAW,EACX,aAAa,EACb,mBAAmB,GAEpB,MAAM,gDAAgD,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAgC;IACzE,MAAM,CAAC,IAAI,GAAG;QACZ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,8DAA8D;YAC3E,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,8EAA8E,CAAC;IAEpG,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG;QAChB,sEAAsE;QACtE,+EAA+E;QAC/E,+EAA+E;QAC/E,2FAA2F;QAC3F,6EAA6E;QAC7E,gFAAgF;KACjF,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,wFAAwF;SACtG,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,kBAAkB;SAChC,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC;YAC5B,WAAW,EAAE,uFAAuF;YACpG,OAAO,EAAE,IAAI;SACd,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,8FAA8F;YAC3G,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uCAAuC;YACpD,OAAO,EAAE,KAAK;SACf,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,iCAAiC;YAC9C,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,sBAAsB;YACnC,OAAO,EAAE,KAAK;SACf,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC;YAC3B,WAAW,EAAE,gEAAgE;SAC9E,CAAC;QACF,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC;YAC5B,WAAW,EAAE,qCAAqC;YAClD,OAAO,EAAE,KAAK;SACf,CAAC;QACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,WAAW,EAAE,4CAA4C;YACzD,OAAO,EAAE,IAAI;SACd,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,WAAW,EAAE,+BAA+B;SAC7C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,4DAA4D;YACzE,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEF,gCAAgC;IAChC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAEZ,UAAU,GAAG;QACrB,aAAa;QACb,mBAAmB;KACpB,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAgB,CAAC;QACjC,MAAM,UAAU,GACd,KAAK,CAAC,MAAM;YACZ,WAAW,IAAI,IAAI,EAAE;iBAClB,WAAW,EAAE;iBACb,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;iBAC1B,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QAEpB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,cAAc,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACtG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC7F,CAAC;QAED,MAAM,aAAa,GACjB,KAAK,CAAC,cAAc,CAAC,KAAK,SAAS;YACjC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,WAAW,IAAI,KAAK,CAAC;YACxE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAE5B,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAC,cAAc,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,CAAC;QAEnG,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACrB,MAAM,EAAC,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;gBACpF,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;gBAClC,aAAa;gBACb,UAAU;gBACV,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;gBAClC,WAAW;aACZ,CAAC,CAAC;YAEH,kCAAkC;YAClC,MAAM,QAAQ,GAA2B,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAEnG,SAAS,SAAS,CAAC,EAAU;gBAC3B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7E,CAAC;YAED,sEAAsE;YACtE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpD,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC;oBACzB,IAAI,CAAC,OAAO;wBAAE,OAAO,KAAK,CAAC;oBAE3B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAA+C,CAAC;oBAC1F,MAAM,kBAAkB,GAAG,WAAW,EAAE,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,qBAAqB,CAAoC,EAAE,CAAC,CAAC,CAAC,CACzE,CAAC;oBACF,MAAM,MAAM,GACV,kBAAkB,EAAE,CAAC,qBAAqB,CAC3C,EAAE,CAAC,CAAC,CAAwC,CAAC;oBAC9C,MAAM,QAAQ,GAAI,MAAM,EAAE,CAAwC,EAAE,CAAC,WAAW,CAAC,CAAC;oBAElF,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAClD,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YAEH,+DAA+D;YAC/D,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,EAAC,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;YAClF,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;oBAClF,OAAO,CAAC,aAAa,CAAC,IAAmB,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;YAED,uDAAuD;YACvD,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,IAAI,aAAa,GAAG,CAAC,CAAC;YACtB,MAAM,UAAU,GAAa,EAAE,CAAC;YAEhC,OAAO,CAAC,QAAQ,CACd,CAAC,IAAI,EAAE,EAAE;gBACP,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;oBAClB,KAAK,WAAW,CAAC,CAAC,CAAC;wBACjB,cAAc,EAAE,CAAC;wBACjB,MAAM;oBACR,CAAC;oBACD,KAAK,SAAS,CAAC,CAAC,CAAC;wBACf,YAAY,EAAE,CAAC;wBACf,MAAM;oBACR,CAAC;oBACD,KAAK,UAAU,CAAC,CAAC,CAAC;wBAChB,aAAa,EAAE,CAAC;wBAChB,MAAM;oBACR,CAAC;oBACD,KAAK,MAAM,CAAC,CAAC,CAAC;wBACZ,SAAS,EAAE,CAAC;wBACZ,MAAM;oBACR,CAAC;oBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;wBACzB,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC,EACD,EAAC,cAAc,EAAE,KAAK,EAAC,CACxB,CAAC;YAEF,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,CAAC,GAAG,CACN,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAChH,CAAC;YAEF,OAAO;gBACL,OAAO;gBACP,UAAU;gBACV,gBAAgB,EAAE,EAAE;gBACpB,YAAY,EAAE,EAAE;gBAChB,SAAS;gBACT,YAAY;gBACZ,cAAc;gBACd,aAAa;aACd,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE;YAChG,aAAa;YACb,UAAU;YACV,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAClC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,MAAM;YACrB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAClC,WAAW;YACX,eAAe,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBAChD,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,KAAK,KAAK,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YACxE,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YACvB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,CAAC,GAAG,CACN,aAAa,CACX,UAAU,EACV,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAC9B,MAAM,CAAC,UAAU,CAClB,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;;AAGH,MAAM,OAAO,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD,SAAS,aAAa,CACpB,MAAc,EACd,KAAa,EACb,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,MAAc,EACd,UAAkB;IAElB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5D,IAAI,OAAO,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,iBAAiB,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3E,IAAI,UAAU,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,aAAa,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAChF,IAAI,SAAS,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,iBAAiB,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACjF,IAAI,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,gBAAgB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,UAAU,EAAE,CAAC;IAChG,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,qBAAqB,CAAC;AACxG,CAAC"}
|
|
@@ -32,6 +32,7 @@ const TYPE_MAP = {
|
|
|
32
32
|
page: 'PAGE',
|
|
33
33
|
content: 'CONTENT',
|
|
34
34
|
component: 'COMPONENT',
|
|
35
|
+
fragment: 'FRAGMENT',
|
|
35
36
|
};
|
|
36
37
|
export default class ContentList extends JobCommand {
|
|
37
38
|
static description = 'List pages and content in a content library';
|
|
@@ -40,6 +41,7 @@ export default class ContentList extends JobCommand {
|
|
|
40
41
|
'<%= config.bin %> <%= command.id %> --library SharedLibrary',
|
|
41
42
|
'<%= config.bin %> <%= command.id %> --library SharedLibrary --tree',
|
|
42
43
|
'<%= config.bin %> <%= command.id %> --library RefArch --site-library --type page',
|
|
44
|
+
'<%= config.bin %> <%= command.id %> --library RefArch --site-library --type fragment',
|
|
43
45
|
];
|
|
44
46
|
static flags = {
|
|
45
47
|
...JobCommand.baseFlags,
|
|
@@ -55,7 +57,7 @@ export default class ContentList extends JobCommand {
|
|
|
55
57
|
}),
|
|
56
58
|
type: Flags.string({
|
|
57
59
|
description: 'Filter by node type',
|
|
58
|
-
options: ['page', 'content', 'component'],
|
|
60
|
+
options: ['page', 'content', 'component', 'fragment'],
|
|
59
61
|
}),
|
|
60
62
|
components: Flags.boolean({
|
|
61
63
|
description: 'Include components in output',
|
|
@@ -95,33 +97,47 @@ export default class ContentList extends JobCommand {
|
|
|
95
97
|
});
|
|
96
98
|
const typeFilter = flags.type ? TYPE_MAP[flags.type] : undefined;
|
|
97
99
|
const items = [];
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
// Apply type filter
|
|
109
|
-
const matchesType = !typeFilter || child.type === typeFilter;
|
|
110
|
-
if (matchesType) {
|
|
111
|
-
items.push({
|
|
112
|
-
id: child.id,
|
|
113
|
-
type: child.type,
|
|
114
|
-
typeId: child.typeId ?? '',
|
|
115
|
-
children: child.children.length,
|
|
116
|
-
});
|
|
117
|
-
}
|
|
118
|
-
// Recurse into children when --components is set
|
|
119
|
-
if (includeComponents && child.children.length > 0) {
|
|
120
|
-
collectItems(child.children, true);
|
|
121
|
-
}
|
|
100
|
+
if (typeFilter === 'FRAGMENT') {
|
|
101
|
+
// Content blocks are not root-level tree children; they surface wherever
|
|
102
|
+
// they are linked. List the deduplicated catalog (incl. unlinked blocks).
|
|
103
|
+
for (const block of library.getContentBlocks()) {
|
|
104
|
+
items.push({
|
|
105
|
+
id: block.id,
|
|
106
|
+
type: block.type,
|
|
107
|
+
typeId: block.typeId ?? '',
|
|
108
|
+
children: block.children.length,
|
|
109
|
+
});
|
|
122
110
|
}
|
|
123
111
|
}
|
|
124
|
-
|
|
112
|
+
else {
|
|
113
|
+
const collectItems = (nodes, includeComponents) => {
|
|
114
|
+
for (const child of nodes) {
|
|
115
|
+
// Skip static asset nodes in table view
|
|
116
|
+
if (child.type === 'STATIC') {
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
// Skip components unless --components is set
|
|
120
|
+
if (child.type === 'COMPONENT' && !includeComponents) {
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
// Apply type filter
|
|
124
|
+
const matchesType = !typeFilter || child.type === typeFilter;
|
|
125
|
+
if (matchesType) {
|
|
126
|
+
items.push({
|
|
127
|
+
id: child.id,
|
|
128
|
+
type: child.type,
|
|
129
|
+
typeId: child.typeId ?? '',
|
|
130
|
+
children: child.children.length,
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
// Recurse into children when --components is set
|
|
134
|
+
if (includeComponents && child.children.length > 0) {
|
|
135
|
+
collectItems(child.children, true);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
};
|
|
139
|
+
collectItems(library.tree.children, flags.components);
|
|
140
|
+
}
|
|
125
141
|
if (flags.tree) {
|
|
126
142
|
ux.stdout(library.getTreeString({ colorize: ux.colorize }));
|
|
127
143
|
return { data: items };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/content/list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAC;AAClC,OAAO,EAAC,EAAE,EAAC,MAAM,aAAa,CAAC;AAC/B,OAAO,EACL,UAAU,EACV,aAAa,EACb,cAAc,EACd,aAAa,GAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AASnF,MAAM,OAAO,GAA+C;IAC1D,EAAE,EAAE;QACF,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;KACvB;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;KACzB;IACD,MAAM,EAAE;QACN,MAAM,EAAE,SAAS;QACjB,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM;KAC3B;IACD,QAAQ,EAAE;QACR,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;KACrC;CACF,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAE7D,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;AAEjD,MAAM,QAAQ,GAA2B;IACvC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/content/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
2
|
+
import { siteArchiveImportSet, type ImportSetResult } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
3
|
+
export default class JobImportSet extends JobCommand<typeof JobImportSet> {
|
|
4
|
+
static args: {
|
|
5
|
+
directory: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
|
|
6
|
+
};
|
|
7
|
+
static description: string;
|
|
8
|
+
static enableJsonFlag: boolean;
|
|
9
|
+
static examples: string[];
|
|
10
|
+
static flags: {
|
|
11
|
+
'set-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
|
+
'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
13
|
+
'keep-archive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
14
|
+
'cartridge-metadata': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
15
|
+
'import-set-exclude': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
|
+
'break-lock': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
17
|
+
'stale-lock-seconds': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
18
|
+
'lock-poll-interval': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
19
|
+
timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
20
|
+
'poll-interval': import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
21
|
+
'show-log': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
22
|
+
server: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
23
|
+
'webdav-server': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
24
|
+
'code-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
25
|
+
username: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
26
|
+
password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
27
|
+
certificate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
28
|
+
passphrase: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
29
|
+
selfsigned: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
30
|
+
verify: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
31
|
+
'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
32
|
+
'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
33
|
+
'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
34
|
+
'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
35
|
+
'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
36
|
+
'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
37
|
+
'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
38
|
+
'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
39
|
+
'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
40
|
+
'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
41
|
+
'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
42
|
+
'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
43
|
+
debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
44
|
+
json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
45
|
+
jsonl: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
46
|
+
lang: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
47
|
+
config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
48
|
+
instance: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
49
|
+
'project-directory': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
50
|
+
'extra-query': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
51
|
+
'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
52
|
+
'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
53
|
+
};
|
|
54
|
+
protected operations: {
|
|
55
|
+
siteArchiveImportSet: typeof siteArchiveImportSet;
|
|
56
|
+
};
|
|
57
|
+
run(): Promise<ImportSetResult>;
|
|
58
|
+
private formatItemSource;
|
|
59
|
+
private handleEvent;
|
|
60
|
+
/**
|
|
61
|
+
* Prints post-import notes: the README contents of each item that was just
|
|
62
|
+
* imported (or, during a dry run, each pending item). Notes for items already
|
|
63
|
+
* applied on the instance are omitted so the summary reflects only this run.
|
|
64
|
+
*/
|
|
65
|
+
private logNotes;
|
|
66
|
+
}
|
|
@@ -0,0 +1,276 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2025, Salesforce, Inc.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2
|
|
4
|
+
* For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { Args, Flags } from '@oclif/core';
|
|
7
|
+
import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { siteArchiveImportSet, JobExecutionError, } from '@salesforce/b2c-tooling-sdk/operations/jobs';
|
|
10
|
+
import { t, withDocs } from '../../i18n/index.js';
|
|
11
|
+
const DEFAULT_IMPORT_SET_DIRECTORY = './migrations';
|
|
12
|
+
const DEFAULT_IMPORT_SET_ID = 'migrations';
|
|
13
|
+
export default class JobImportSet extends JobCommand {
|
|
14
|
+
static args = {
|
|
15
|
+
directory: Args.string({
|
|
16
|
+
description: 'Directory whose immediate child directories and zip files form the ordered import set',
|
|
17
|
+
default: DEFAULT_IMPORT_SET_DIRECTORY,
|
|
18
|
+
}),
|
|
19
|
+
};
|
|
20
|
+
static description = withDocs(t('commands.job.importSet.description', 'Apply an ordered set of site import/export archives, skipping archives already recorded on the instance'), '/cli/jobs.html#b2c-job-import-set');
|
|
21
|
+
static enableJsonFlag = true;
|
|
22
|
+
static examples = [
|
|
23
|
+
'<%= config.bin %> <%= command.id %>',
|
|
24
|
+
'<%= config.bin %> <%= command.id %> --dry-run',
|
|
25
|
+
'<%= config.bin %> <%= command.id %> --no-cartridge-metadata',
|
|
26
|
+
'<%= config.bin %> <%= command.id %> ./release-data',
|
|
27
|
+
'<%= config.bin %> <%= command.id %> --break-lock',
|
|
28
|
+
];
|
|
29
|
+
static flags = {
|
|
30
|
+
...JobCommand.baseFlags,
|
|
31
|
+
'set-id': Flags.string({
|
|
32
|
+
description: 'Name for an independent import history',
|
|
33
|
+
}),
|
|
34
|
+
'dry-run': Flags.boolean({
|
|
35
|
+
description: 'Preview pending and applied archives without importing or changing history',
|
|
36
|
+
default: false,
|
|
37
|
+
}),
|
|
38
|
+
'keep-archive': Flags.boolean({
|
|
39
|
+
char: 'k',
|
|
40
|
+
description: 'Keep each uploaded archive on the instance after import',
|
|
41
|
+
default: false,
|
|
42
|
+
}),
|
|
43
|
+
'cartridge-metadata': Flags.boolean({
|
|
44
|
+
description: 'Include archives from metadata directories in discovered cartridges before other imports',
|
|
45
|
+
allowNo: true,
|
|
46
|
+
default: true,
|
|
47
|
+
}),
|
|
48
|
+
'import-set-exclude': Flags.string({
|
|
49
|
+
description: 'Exclude a project-relative directory recursively from import-set source discovery',
|
|
50
|
+
env: 'SFCC_IMPORT_SET_EXCLUDE',
|
|
51
|
+
multiple: true,
|
|
52
|
+
multipleNonGreedy: true,
|
|
53
|
+
delimiter: ',',
|
|
54
|
+
}),
|
|
55
|
+
'break-lock': Flags.boolean({
|
|
56
|
+
description: 'Recover an import set after confirming its previous runner has stopped',
|
|
57
|
+
default: false,
|
|
58
|
+
}),
|
|
59
|
+
'stale-lock-seconds': Flags.integer({
|
|
60
|
+
description: 'Consider an inactive import-set run stale after this many seconds',
|
|
61
|
+
default: 1800,
|
|
62
|
+
min: 1,
|
|
63
|
+
}),
|
|
64
|
+
'lock-poll-interval': Flags.integer({
|
|
65
|
+
description: 'Seconds between checks while waiting for another import-set run',
|
|
66
|
+
default: 3,
|
|
67
|
+
min: 1,
|
|
68
|
+
}),
|
|
69
|
+
timeout: Flags.integer({
|
|
70
|
+
char: 't',
|
|
71
|
+
description: 'Per-import job timeout in seconds (default: no timeout)',
|
|
72
|
+
min: 1,
|
|
73
|
+
}),
|
|
74
|
+
'poll-interval': Flags.integer({
|
|
75
|
+
description: 'Job polling interval in seconds',
|
|
76
|
+
default: 3,
|
|
77
|
+
min: 1,
|
|
78
|
+
}),
|
|
79
|
+
'show-log': Flags.boolean({
|
|
80
|
+
description: 'Show the job log when an import fails',
|
|
81
|
+
default: true,
|
|
82
|
+
}),
|
|
83
|
+
};
|
|
84
|
+
operations = { siteArchiveImportSet };
|
|
85
|
+
async run() {
|
|
86
|
+
this.requireOAuthCredentials();
|
|
87
|
+
this.requireWebDavCredentials();
|
|
88
|
+
const directory = this.args.directory ?? DEFAULT_IMPORT_SET_DIRECTORY;
|
|
89
|
+
const { 'set-id': setId, 'dry-run': dryRun, 'keep-archive': keepArchive, 'cartridge-metadata': includeCartridgeMetadata = true, 'break-lock': breakLock, 'stale-lock-seconds': staleLockSeconds, 'lock-poll-interval': lockPollIntervalSeconds, timeout, 'poll-interval': pollIntervalSeconds, 'show-log': showLog = true, } = this.flags;
|
|
90
|
+
const cartridgeRoot = this.flags['project-directory'];
|
|
91
|
+
const excludeDirectories = this.resolvedConfig.values.importSetExclude;
|
|
92
|
+
if (!dryRun) {
|
|
93
|
+
const jobEvaluation = this.safetyGuard.evaluate({ type: 'job', jobId: 'sfcc-site-archive-import' });
|
|
94
|
+
if (jobEvaluation.action === 'block')
|
|
95
|
+
this.error(jobEvaluation.reason, { exit: 1 });
|
|
96
|
+
if (jobEvaluation.action === 'confirm')
|
|
97
|
+
await this.confirmOrBlock(jobEvaluation);
|
|
98
|
+
}
|
|
99
|
+
const effectiveSetId = setId ?? DEFAULT_IMPORT_SET_ID;
|
|
100
|
+
const context = this.createContext('job:import-set', {
|
|
101
|
+
directory,
|
|
102
|
+
setId: effectiveSetId,
|
|
103
|
+
dryRun,
|
|
104
|
+
keepArchive,
|
|
105
|
+
includeCartridgeMetadata,
|
|
106
|
+
cartridgeRoot,
|
|
107
|
+
excludeDirectories,
|
|
108
|
+
staleLockSeconds,
|
|
109
|
+
});
|
|
110
|
+
const beforeResult = await this.runBeforeHooks(context);
|
|
111
|
+
if (beforeResult.skip) {
|
|
112
|
+
this.log(t('commands.job.importSet.skipped', 'Import set skipped: {{reason}}', {
|
|
113
|
+
reason: beforeResult.skipReason || 'skipped by plugin',
|
|
114
|
+
}));
|
|
115
|
+
return {
|
|
116
|
+
setId: effectiveSetId,
|
|
117
|
+
directory,
|
|
118
|
+
dryRun,
|
|
119
|
+
runId: 'skipped',
|
|
120
|
+
items: [],
|
|
121
|
+
imported: 0,
|
|
122
|
+
skipped: 0,
|
|
123
|
+
pending: 0,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
const cleanupSafetyRule = this.safetyGuard.temporarilyAddRule({
|
|
127
|
+
method: 'DELETE',
|
|
128
|
+
path: '**/Impex/b2c-cli/**',
|
|
129
|
+
action: 'allow',
|
|
130
|
+
});
|
|
131
|
+
const startedAt = Date.now();
|
|
132
|
+
try {
|
|
133
|
+
const result = await this.operations.siteArchiveImportSet(this.instance, directory, {
|
|
134
|
+
setId: effectiveSetId,
|
|
135
|
+
dryRun,
|
|
136
|
+
keepArchive,
|
|
137
|
+
includeCartridgeMetadata,
|
|
138
|
+
cartridgeRoot,
|
|
139
|
+
excludeDirectories,
|
|
140
|
+
breakLock,
|
|
141
|
+
staleLockSeconds,
|
|
142
|
+
lockPollIntervalSeconds,
|
|
143
|
+
waitOptions: {
|
|
144
|
+
timeoutSeconds: timeout,
|
|
145
|
+
pollIntervalSeconds,
|
|
146
|
+
onPoll: ({ status, elapsedSeconds }) => {
|
|
147
|
+
if (!this.jsonEnabled()) {
|
|
148
|
+
this.log(t('commands.job.importSet.progress', ' Status: {{status}} ({{elapsed}}s elapsed)', {
|
|
149
|
+
status,
|
|
150
|
+
elapsed: String(elapsedSeconds),
|
|
151
|
+
}));
|
|
152
|
+
}
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
onEvent: (event) => this.handleEvent(event),
|
|
156
|
+
});
|
|
157
|
+
if (dryRun && !this.jsonEnabled()) {
|
|
158
|
+
for (const item of result.items) {
|
|
159
|
+
this.log(` ${item.status === 'skipped' ? 'applied' : 'pending'} ${this.formatItemSource(item)}`);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
if (!this.jsonEnabled()) {
|
|
163
|
+
this.log(dryRun
|
|
164
|
+
? t('commands.job.importSet.dryRunSummary', 'Dry run: {{pending}} pending, {{skipped}} already applied', {
|
|
165
|
+
pending: String(result.pending),
|
|
166
|
+
skipped: String(result.skipped),
|
|
167
|
+
})
|
|
168
|
+
: t('commands.job.importSet.summary', 'Import set complete: {{imported}} imported, {{skipped}} skipped', {
|
|
169
|
+
imported: String(result.imported),
|
|
170
|
+
skipped: String(result.skipped),
|
|
171
|
+
}));
|
|
172
|
+
this.logNotes(result, dryRun);
|
|
173
|
+
}
|
|
174
|
+
await this.runAfterHooks(context, {
|
|
175
|
+
success: true,
|
|
176
|
+
duration: Date.now() - startedAt,
|
|
177
|
+
data: result,
|
|
178
|
+
});
|
|
179
|
+
return result;
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
await this.runAfterHooks(context, {
|
|
183
|
+
success: false,
|
|
184
|
+
duration: Date.now() - startedAt,
|
|
185
|
+
error: error instanceof Error ? error : new Error(String(error)),
|
|
186
|
+
data: error instanceof JobExecutionError ? error.execution : undefined,
|
|
187
|
+
});
|
|
188
|
+
if (error instanceof JobExecutionError && showLog)
|
|
189
|
+
await this.showJobLog(error.execution);
|
|
190
|
+
this.error(t('commands.job.importSet.error', 'Import set failed: {{message}}', {
|
|
191
|
+
message: error instanceof Error ? error.message : String(error),
|
|
192
|
+
}));
|
|
193
|
+
}
|
|
194
|
+
finally {
|
|
195
|
+
cleanupSafetyRule();
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
formatItemSource(item) {
|
|
199
|
+
const displayRoot = path.resolve(this.flags['project-directory'] ?? process.cwd());
|
|
200
|
+
const relativePath = path.relative(displayRoot, item.target);
|
|
201
|
+
return (relativePath || path.basename(item.target)).split(path.sep).join('/');
|
|
202
|
+
}
|
|
203
|
+
handleEvent(event) {
|
|
204
|
+
if (this.jsonEnabled())
|
|
205
|
+
return;
|
|
206
|
+
switch (event.type) {
|
|
207
|
+
case 'item-imported': {
|
|
208
|
+
this.log(` ${event.index}/${event.total} imported ${this.formatItemSource(event.item)}`);
|
|
209
|
+
break;
|
|
210
|
+
}
|
|
211
|
+
case 'item-importing': {
|
|
212
|
+
this.log(` ${event.index}/${event.total} importing ${this.formatItemSource(event.item)}`);
|
|
213
|
+
break;
|
|
214
|
+
}
|
|
215
|
+
case 'item-skipped': {
|
|
216
|
+
this.log(` ${event.index}/${event.total} skipped ${this.formatItemSource(event.item)}`);
|
|
217
|
+
break;
|
|
218
|
+
}
|
|
219
|
+
case 'lock-acquired': {
|
|
220
|
+
this.log(t('commands.job.importSet.lockAcquired', 'Acquired import-set lock.'));
|
|
221
|
+
break;
|
|
222
|
+
}
|
|
223
|
+
case 'lock-takeover': {
|
|
224
|
+
const age = event.ageSeconds === undefined ? 'unknown' : Math.floor(event.ageSeconds).toString();
|
|
225
|
+
this.warn(event.forced
|
|
226
|
+
? t('commands.job.importSet.lockBreak', 'Breaking the existing import-set lock.')
|
|
227
|
+
: t('commands.job.importSet.lockStale', 'Taking over stale import-set lock (age: {{age}}s).', { age }));
|
|
228
|
+
break;
|
|
229
|
+
}
|
|
230
|
+
case 'lock-wait': {
|
|
231
|
+
this.log(t('commands.job.importSet.lockWait', 'Another runner holds the import-set lock; waiting...'));
|
|
232
|
+
break;
|
|
233
|
+
}
|
|
234
|
+
case 'plan': {
|
|
235
|
+
const archiveCount = t(event.total === 1 ? 'commands.job.importSet.archiveCountOne' : 'commands.job.importSet.archiveCountMany', event.total === 1 ? '{{total}} archive' : '{{total}} archives', { total: String(event.total) });
|
|
236
|
+
this.log(t('commands.job.importSet.plan', 'Import set {{setId}} on {{hostname}}:', {
|
|
237
|
+
setId: event.setId,
|
|
238
|
+
hostname: this.instance.config.hostname,
|
|
239
|
+
}));
|
|
240
|
+
this.log(t('commands.job.importSet.planCounts', ' {{archiveCount}}, {{pending}} pending, {{skipped}} already applied', {
|
|
241
|
+
archiveCount,
|
|
242
|
+
pending: String(event.pending),
|
|
243
|
+
skipped: String(event.skipped),
|
|
244
|
+
}));
|
|
245
|
+
break;
|
|
246
|
+
}
|
|
247
|
+
case 'receipt-invalid': {
|
|
248
|
+
this.warn(t('commands.job.importSet.invalidReceipt', 'The recorded import history for {{archive}} is invalid; the archive will be imported again.', { archive: this.formatItemSource(event.item) }));
|
|
249
|
+
break;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
/**
|
|
254
|
+
* Prints post-import notes: the README contents of each item that was just
|
|
255
|
+
* imported (or, during a dry run, each pending item). Notes for items already
|
|
256
|
+
* applied on the instance are omitted so the summary reflects only this run.
|
|
257
|
+
*/
|
|
258
|
+
logNotes(result, dryRun) {
|
|
259
|
+
const relevantStatus = dryRun ? 'pending' : 'imported';
|
|
260
|
+
const withNotes = result.items.filter((item) => item.status === relevantStatus && item.note);
|
|
261
|
+
if (withNotes.length === 0)
|
|
262
|
+
return;
|
|
263
|
+
this.log('');
|
|
264
|
+
this.log(dryRun
|
|
265
|
+
? t('commands.job.importSet.notesHeadingDryRun', 'Post-import notes (preview):')
|
|
266
|
+
: t('commands.job.importSet.notesHeading', 'Post-import notes:'));
|
|
267
|
+
for (const item of withNotes) {
|
|
268
|
+
this.log('');
|
|
269
|
+
this.log(` ${this.formatItemSource(item)}`);
|
|
270
|
+
for (const line of item.note.split('\n')) {
|
|
271
|
+
this.log(line.length > 0 ? ` ${line}` : '');
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
//# sourceMappingURL=import-set.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"import-set.js","sourceRoot":"","sources":["../../../src/commands/job/import-set.ts"],"names":[],"mappings":"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"}
|