@salesforce/source-deploy-retrieve 9.7.29 → 9.8.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.
@@ -9,7 +9,7 @@ exports.MetadataApiRetrieve = exports.RetrieveResult = void 0;
9
9
  */
10
10
  const path = require("path");
11
11
  const fs = require("graceful-fs");
12
- const unzipper = require("unzipper");
12
+ const JSZip = require("jszip");
13
13
  const ts_types_1 = require("@salesforce/ts-types");
14
14
  const core_1 = require("@salesforce/core");
15
15
  const kit_1 = require("@salesforce/kit");
@@ -140,9 +140,22 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
140
140
  const zipFilePath = path.join(this.options.output, name);
141
141
  fs.writeFileSync(zipFilePath, zipFileContents);
142
142
  if (this.options.unzip) {
143
- const dir = await unzipper.Open.buffer(zipFileContents);
143
+ const zip = await JSZip.loadAsync(zipFileContents, { base64: true, createFolders: true });
144
144
  const extractPath = path.join(this.options.output, path.parse(name).name);
145
- await dir.extract({ path: extractPath });
145
+ fs.mkdirSync(extractPath, { recursive: true });
146
+ for (const filePath of Object.keys(zip.files)) {
147
+ const zipObj = zip.file(filePath);
148
+ if (!zipObj || zipObj?.dir) {
149
+ fs.mkdirSync(path.join(extractPath, filePath), { recursive: true });
150
+ }
151
+ else {
152
+ // eslint-disable-next-line no-await-in-loop
153
+ const content = await zipObj?.async('nodebuffer');
154
+ if (content) {
155
+ fs.writeFileSync(path.join(extractPath, filePath), content);
156
+ }
157
+ }
158
+ }
146
159
  }
147
160
  }
148
161
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,6 @@ const path_1 = require("path");
11
11
  const stream_1 = require("stream");
12
12
  const JSZip = require("jszip");
13
13
  const mime_1 = require("mime");
14
- const unzipper_1 = require("unzipper");
15
14
  const graceful_fs_1 = require("graceful-fs");
16
15
  const core_1 = require("@salesforce/core");
17
16
  const kit_1 = require("@salesforce/kit");
@@ -93,16 +92,19 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
93
92
  if (shouldUnzipArchive) {
94
93
  // for the bulk of static resource writing we'll start writing ASAP
95
94
  // we'll still defer writing the resource-meta.xml file by pushing it onto the writeInfos
96
- await Promise.all((await openZipFile(component, content)).files
97
- .filter((f) => f.type === 'File')
98
- .map(async (f) => {
99
- const path = (0, path_1.join)(baseContentPath, f.path);
100
- const fullDest = (0, path_1.isAbsolute)(path)
101
- ? path
102
- : (0, path_1.join)(this.defaultDirectory ?? component.getPackageRelativePath('', 'source'), path);
103
- // push onto the pipeline and start writing now
104
- return this.pipeline(f.stream(), fullDest);
105
- }));
95
+ const srZip = await getStaticResourceZip(component, content);
96
+ const pipelinePromises = [];
97
+ for (const filePath of Object.keys(srZip.files)) {
98
+ const zipObj = srZip.file(filePath);
99
+ if (zipObj && !zipObj.dir) {
100
+ const path = (0, path_1.join)(baseContentPath, filePath);
101
+ const fullDest = (0, path_1.isAbsolute)(path)
102
+ ? path
103
+ : (0, path_1.join)(this.defaultDirectory ?? component.getPackageRelativePath('', 'source'), path);
104
+ pipelinePromises.push(this.pipeline(new stream_1.Readable().wrap(zipObj.nodeStream()), fullDest));
105
+ }
106
+ }
107
+ await Promise.all(pipelinePromises);
106
108
  }
107
109
  if (!xml) {
108
110
  throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
@@ -187,10 +189,10 @@ const componentIsExpandedArchive = async (component) => {
187
189
  }
188
190
  return false;
189
191
  };
190
- /** wrapper around the Open command so we can emit a nicer error for bad zip files */
191
- async function openZipFile(component, content) {
192
+ async function getStaticResourceZip(component, content) {
192
193
  try {
193
- return await unzipper_1.Open.buffer(await component.tree.readFile(content));
194
+ const staticResourceZip = await component.tree.readFile(content);
195
+ return await JSZip.loadAsync(staticResourceZip, { createFolders: true });
194
196
  }
195
197
  catch (e) {
196
198
  throw new core_1.SfError(`Unable to open zip file ${content} for ${component.name} (${component.xml})`, 'BadZipFile', [
@@ -1 +1 @@
1
- {"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAqE;AACrE,mCAAkC;AAClC,+BAA+B;AAC/B,+BAAoC;AAEpC,6CAAgD;AAChD,2CAA6D;AAC7D,yCAA0C;AAC1C,uCAAuC;AAIvC,qEAAiE;AACjE,wCAAsC;AACtC,kDAAkE;AAClE,uEAAoE;AAGpE,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,s4JAAC,CAAC;AAEpF,IAAI,MAAc,CAAC;AACnB,MAAM,SAAS,GAAG,GAAW,EAAE;IAC7B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAC;KACpE;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAa,iCAAkC,SAAQ,iDAAuB;IAO5E,0BAA0B;IAC1B,kDAAkD;IAC3C,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACzF;QACD,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5F;QAED,yEAAyE;QACzE,MAAM,KAAK,GAAG,GAAa,EAAE;YAC3B,SAAS,EAAE,CAAC,KAAK,CAAC,4BAA4B,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC;YAEpB,sFAAsF;YACtF,wFAAwF;YACxF,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;gBAC1C,MAAM,iBAAiB,GAAG,IAAA,8CAA+B,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC3E,MAAM,OAAO,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACxC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACjD,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;aAC3C;YAED,mFAAmF;YACnF,mDAAmD;YACnD,IAAI,IAAA,aAAO,EAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACtB,MAAM,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aACzF;YAED,OAAO,IAAI,iBAAQ,EAAE,CAAC,IAAI,CACxB,GAAG;iBACA,kBAAkB,CAAC;gBAClB,WAAW,EAAE,SAAS;gBACtB,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;gBAChC,WAAW,EAAE,IAAI;aAClB,CAAC;iBACD,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACd,SAAS,EAAE,CAAC,KAAK,CAAC,qBAAqB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,CAAC,CAAC,CACL,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL;gBACE,MAAM,EAAE,CAAC,MAAM,0BAA0B,CAAC,SAAS,CAAC,CAAC;oBACnD,CAAC,CAAC,KAAK,EAAE;oBACT,CAAC,CAAC,IAAA,8CAA+B,EAAC,SAAS,EAAE,OAAO,CAAC;gBACvD,MAAM,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;aACxE;YACD;gBACE,MAAM,EAAE,IAAA,8CAA+B,EAAC,SAAS,EAAE,GAAG,CAAC;gBACvD,MAAM,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;aAChD;SACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;QAEnC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,CAAC;SACX;QACD,MAAM,oBAAoB,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,SAAS,EAAE,OAAO,CAAC;QAC5C,MAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEjE,8GAA8G;QAC9G,MAAM,kBAAkB,GACtB,iCAAiC,CAAC,kBAAkB,CAAC,GAAG,CAAC,oBAAoB,CAAC;YAC9E,CAAC,CAAC,SAAS,IAAI,CAAC,gBAAgB,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAErF,IAAI,kBAAkB,EAAE;YACtB,mEAAmE;YACnE,yFAAyF;YAEzF,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC7D,MAAM,gBAAgB,GAAyB,EAAE,CAAC;YAClD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;oBACzB,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;oBAC7C,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,IAAI,CAAC;wBAC/B,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,gBAAgB,IAAI,SAAS,CAAC,sBAAsB,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;oBACxF,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,iBAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;iBAC1F;aACF;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,QAAQ,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5F;QACD,OAAO;YACL;gBACE,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBAClC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,SAAS,CAAC,sBAAsB,CAAC,IAAA,eAAQ,EAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;aACpF;SACF,CAAC,MAAM,CACN,kBAAkB;YAChB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE;oBACE,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;oBACtC,MAAM,EAAE,GAAG,eAAe,IAAI,oBAAoB,CAAC,oBAAoB,CAAC,EAAE;iBAC3E;aACF,CACN,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,kDAAkD;IAC1C,KAAK,CAAC,QAAQ,CAAC,MAAgB,EAAE,WAAmB;QAC1D,IAAA,oCAAgB,EAAC,WAAW,CAAC,CAAC;QAC9B,MAAM,IAAA,kBAAQ,EAAC,MAAM,EAAE,IAAA,+BAAiB,EAAC,WAAW,CAAC,CAAC,CAAC;IACzD,CAAC;;AAnIH,8EAyIC;AAxIwB,oDAAkB,GAAG,IAAI,GAAG,CAAC;IAClD,iBAAiB;IACjB,8BAA8B;IAC9B,iBAAiB;CAClB,CAAC,CAAC;AAsIL,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AACxD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAiB;IAChD,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,CAAC,0BAA0B,EAAE,IAAI,CAAC;IAClC,CAAC,8BAA8B,EAAE,KAAK,CAAC;IACvC,CAAC,aAAa,EAAE,MAAM,CAAC;IACvB,CAAC,aAAa,EAAE,KAAK,CAAC;IACtB,CAAC,UAAU,EAAE,KAAK,CAAC;CACpB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,KAAK,EAAE,SAA0B,EAAmB,EAAE;IAC3E,MAAM,QAAQ,GAAG,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,cAAyB,CAAC;IAExE,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QAC/D,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6CAA6C,EAAE;YACjE,IAAA,WAAI,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;SAChF,CAAC,EACF,cAAc,CACf,CAAC;KACH;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAE5D,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,MAAM,IAAI,cAAO,CACf,wCAAwC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,aAAa,MAAM,EAAE,QAAQ,EAAE,EAAE,CAC1G,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,SAA0B,EAAE,SAA2B,EAAc,EAAE;IACjG,IAAI,SAAS,EAAE,OAAO,EAAE;QACtB,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAA,gBAAQ,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;KACvE;IACD,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ,EAAE;QACzC,MAAM,eAAe,GAAG,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtF,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,eAAe,CAAC,EAAE,IAAA,gBAAQ,EAAC,eAAe,CAAC,CAAC,CAAC;KAClE;IACD,MAAM,IAAI,cAAO,CAAC,+BAA+B,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAU,EAAE;AAC3D,oFAAoF;AACpF,IAAA,mBAAY,EAAC,WAAW,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,IAAA,mBAAY,EAAC,oBAAoB,CAAC,IAAI,KAAK,CAAC;AAEjH,MAAM,0BAA0B,GAAG,KAAK,EAAE,SAA0B,EAAoB,EAAE;IACxF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IACpC,IAAI,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QACxC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,iCAAiC,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACzE,OAAO,IAAI,CAAC;SACb;QACD,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6CAA6C,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,EACjG,cAAc,CACf,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,KAAK,UAAU,oBAAoB,CAAC,SAA0B,EAAE,OAAe;IAC7E,IAAI;QACF,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjE,OAAO,MAAM,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;KAC1E;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,cAAO,CAAC,2BAA2B,OAAO,QAAQ,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,GAAG,EAAE,YAAY,EAAE;YAC7G,oDAAoD;SACrD,CAAC,CAAC;KACJ;AACH,CAAC"}
@@ -74,18 +74,11 @@ export declare class NodeFSTreeContainer extends TreeContainer {
74
74
  stream(fsPath: SourcePath): Readable;
75
75
  }
76
76
  /**
77
- * A {@link TreeContainer} that utilizes the central directory of a zip file
78
- * to perform I/O without unzipping it to the disk first.
77
+ * A {@link TreeContainer} that performs I/O without unzipping it to the disk first.
79
78
  */
80
79
  export declare class ZipTreeContainer extends TreeContainer {
81
- private tree;
80
+ private zip;
82
81
  private constructor();
83
- /**
84
- * Creates a `ZipTreeContainer` from a Buffer of a zip file.
85
- *
86
- * @param buffer - Buffer of the zip file
87
- * @returns A Promise of a `ZipTreeContainer`
88
- */
89
82
  static create(buffer: Buffer): Promise<ZipTreeContainer>;
90
83
  exists(fsPath: string): boolean;
91
84
  isDirectory(fsPath: string): boolean;
@@ -93,8 +86,8 @@ export declare class ZipTreeContainer extends TreeContainer {
93
86
  readFile(fsPath: string): Promise<Buffer>;
94
87
  readFileSync(fsPath: string): Buffer;
95
88
  stream(fsPath: string): Readable;
96
- private populate;
97
- private ensureDirPathExists;
89
+ private match;
90
+ private ensureDirectory;
98
91
  }
99
92
  /**
100
93
  * A {@link TreeContainer} useful for mocking a file system.
@@ -9,8 +9,9 @@ exports.VirtualTreeContainer = exports.ZipTreeContainer = exports.NodeFSTreeCont
9
9
  */
10
10
  /* eslint-disable class-methods-use-this */
11
11
  const path_1 = require("path");
12
+ const stream_1 = require("stream");
12
13
  const graceful_fs_1 = require("graceful-fs");
13
- const unzipper = require("unzipper");
14
+ const JSZip = require("jszip");
14
15
  const core_1 = require("@salesforce/core");
15
16
  const utils_1 = require("../utils");
16
17
  const messages = new core_1.Messages('@salesforce/source-deploy-retrieve', 'sdr', new Map([["md_request_fail", "Metadata API request failed: %s"], ["error_convert_invalid_format", "Invalid conversion format '%s'"], ["error_could_not_infer_type", "%s: Could not infer a metadata type"], ["error_unexpected_child_type", "Unexpected child metadata [%s] found for parent type [%s]"], ["noParent", "Could not find parent type for %s (%s)"], ["error_expected_source_files", "%s: Expected source files for type '%s'"], ["error_failed_convert", "Component conversion failed: %s"], ["error_merge_metadata_target_unsupported", "Merge convert for metadata target format currently unsupported"], ["error_missing_adapter", "Missing adapter '%s' for metadata type '%s'"], ["error_missing_transformer", "Missing transformer '%s' for metadata type '%s'"], ["error_missing_type_definition", "Missing metadata type definition in registry for id '%s'."], ["error_missing_child_type_definition", "Type %s does not have a child type definition %s."], ["noChildTypes", "No child types found in registry for %s (reading %s at %s)"], ["error_no_metadata_xml_ignore", "Metadata xml file %s is forceignored but is required for %s."], ["noSourceIgnore", "%s metadata types require source files, but %s is forceignored."], ["noSourceIgnore.actions", "- Metadata types with content are composed of two files: a content file (ie MyApexClass.cls) and a -meta.xml file (i.e MyApexClass.cls-meta.xml). You must include both files in your .forceignore file. Or try appending \u201C\\*\u201D to your existing .forceignore entry.\n\nSee <https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_exclude_source.htm> for examples"], ["error_path_not_found", "%s: File or folder not found"], ["noContentFound", "SourceComponent %s (metadata type = %s) is missing its content file."], ["noContentFound.actions", ["Ensure the content file exists in the expected location.", "If the content file is in your .forceignore file, ensure the meta-xml file is also ignored to completely exclude it."]], ["error_parsing_xml", "SourceComponent %s (metadata type = %s) does not have an associated metadata xml to parse"], ["error_expected_file_path", "%s: path is to a directory, expected a file"], ["error_expected_directory_path", "%s: path is to a file, expected a directory"], ["error_directory_not_found_or_not_directory", "%s: path is not a directory"], ["error_no_directory_stream", "%s doesn't support readable streams on directories."], ["error_no_source_to_deploy", "No source-backed components present in the package."], ["error_no_components_to_retrieve", "No components in the package to retrieve."], ["error_static_resource_expected_archive_type", "A StaticResource directory must have a content type of application/zip or application/jar - found %s for %s."], ["error_static_resource_missing_resource_file", "A StaticResource must have an associated .resource file, missing %s.resource-meta.xml"], ["error_no_job_id", "The %s operation is missing a job ID. Initialize an operation with an ID, or start a new job."], ["invalid_xml_parsing", "error parsing %s due to:\\n message: %s\\n line: %s\\n code: %s"], ["zipBufferError", "Zip buffer was not created during conversion"], ["undefinedComponentSet", "Unable to construct a componentSet. Check the logs for more information."], ["replacementsFileNotRead", "The file \"%s\" specified in the \"replacements\" property of sfdx-project.json could not be read."], ["unsupportedBundleType", "Unsupported Bundle Type: %s"], ["filePathGeneratorNoTypeSupport", "Type not supported for filepath generation: %s"], ["missingFolderType", "The registry has %s as is inFolder but it does not have a folderType"], ["tooManyFiles", "Multiple files found for path: %s."], ["cantGetName", "Unable to calculate fullName from path: %s (%s)"], ["missingMetaFileSuffix", "The metadata registry is configured incorrectly for %s. Expected a metaFileSuffix."], ["uniqueIdElementNotInRegistry", "No uniqueIdElement found in registry for %s (reading %s at %s)."], ["uniqueIdElementNotInChild", "The uniqueIdElement %s was not found the child (reading %s at %s)."], ["suggest_type_header", "A metadata type lookup for \"%s\" found the following close matches:"], ["suggest_type_did_you_mean", "-- Did you mean \".%s%s\" instead for the \"%s\" metadata type?"], ["suggest_type_more_suggestions", "Additional suggestions:\nConfirm the file name, extension, and directory names are correct. Validate against the registry at:\n<https://github.com/forcedotcom/source-deploy-retrieve/blob/main/src/registry/metadataRegistry.json>\n\nIf the type is not listed in the registry, check that it has Metadata API support via the Metadata Coverage Report:\n<https://developer.salesforce.com/docs/metadata-coverage>\n\nIf the type is available via Metadata API but not in the registry\n\n- Open an issue <https://github.com/forcedotcom/cli/issues>\n- Add the type via PR. Instructions: <https://github.com/forcedotcom/source-deploy-retrieve/blob/main/contributing/metadata.md>"]]));
@@ -71,53 +72,47 @@ class NodeFSTreeContainer extends TreeContainer {
71
72
  }
72
73
  exports.NodeFSTreeContainer = NodeFSTreeContainer;
73
74
  /**
74
- * A {@link TreeContainer} that utilizes the central directory of a zip file
75
- * to perform I/O without unzipping it to the disk first.
75
+ * A {@link TreeContainer} that performs I/O without unzipping it to the disk first.
76
76
  */
77
77
  class ZipTreeContainer extends TreeContainer {
78
- constructor(directory) {
78
+ constructor(zip) {
79
79
  super();
80
- this.tree = new Map();
81
- this.populate(directory);
80
+ this.zip = zip;
82
81
  }
83
- /**
84
- * Creates a `ZipTreeContainer` from a Buffer of a zip file.
85
- *
86
- * @param buffer - Buffer of the zip file
87
- * @returns A Promise of a `ZipTreeContainer`
88
- */
89
82
  static async create(buffer) {
90
- const directory = await unzipper.Open.buffer(buffer);
91
- return new ZipTreeContainer(directory);
83
+ const zip = await JSZip.loadAsync(buffer, { createFolders: true });
84
+ return new ZipTreeContainer(zip);
92
85
  }
93
86
  exists(fsPath) {
94
- return this.tree.has(fsPath);
87
+ return !!this.match(fsPath);
95
88
  }
96
89
  isDirectory(fsPath) {
97
- if (this.exists(fsPath)) {
98
- return Array.isArray(this.tree.get(fsPath));
90
+ const resolvedPath = this.match(fsPath);
91
+ if (resolvedPath) {
92
+ return this.ensureDirectory(resolvedPath);
99
93
  }
100
94
  throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
101
95
  }
102
96
  readDirectory(fsPath) {
103
- if (this.isDirectory(fsPath)) {
104
- return this.tree.get(fsPath).map((entry) => (0, path_1.basename)(entry.path));
97
+ const resolvedPath = this.match(fsPath);
98
+ if (resolvedPath && this.ensureDirectory(resolvedPath)) {
99
+ // Remove trailing path sep if it exists. JSZip always adds them for directories but
100
+ // when comparing we call `dirname()` which does not include them.
101
+ const dirPath = resolvedPath.endsWith('/') ? resolvedPath.slice(0, -1) : resolvedPath;
102
+ return Object.keys(this.zip.files)
103
+ .filter((filePath) => (0, path_1.dirname)(filePath) === dirPath)
104
+ .map((filePath) => (0, path_1.basename)(filePath));
105
105
  }
106
106
  throw new core_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
107
107
  }
108
- readFile(fsPath) {
109
- if (!this.isDirectory(fsPath)) {
110
- const matchingFile = this.tree.get(fsPath);
111
- if (!matchingFile) {
112
- throw new core_1.SfError(messages.getMessage('error_path_not_found', [matchingFile]), 'LibraryError');
113
- }
114
- if (Array.isArray(matchingFile)) {
115
- throw messages.createError('tooManyFiles', [fsPath]);
116
- }
117
- if (matchingFile.buffer) {
118
- return matchingFile.buffer();
108
+ async readFile(fsPath) {
109
+ const resolvedPath = this.match(fsPath);
110
+ if (resolvedPath) {
111
+ const jsZipObj = this.zip.file(resolvedPath);
112
+ if (jsZipObj?.dir === false) {
113
+ return jsZipObj.async('nodebuffer');
119
114
  }
120
- throw new core_1.SfError(`The file at path ${fsPath} does not have a buffer method.`);
115
+ throw new core_1.SfError(`Expected a file at path ${fsPath} but found a directory.`);
121
116
  }
122
117
  throw new core_1.SfError(messages.getMessage('error_expected_file_path', [fsPath]), 'LibraryError');
123
118
  }
@@ -126,43 +121,40 @@ class ZipTreeContainer extends TreeContainer {
126
121
  throw new Error('Method not implemented');
127
122
  }
128
123
  stream(fsPath) {
129
- if (!this.isDirectory(fsPath)) {
130
- const matchingFile = this.tree.get(fsPath);
131
- if (!matchingFile) {
132
- throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
124
+ const resolvedPath = this.match(fsPath);
125
+ if (resolvedPath) {
126
+ const jsZipObj = this.zip.file(resolvedPath);
127
+ if (jsZipObj && !jsZipObj.dir) {
128
+ return new stream_1.Readable().wrap(jsZipObj.nodeStream());
133
129
  }
134
- if (Array.isArray(matchingFile)) {
135
- throw messages.createError('tooManyFiles', [fsPath]);
136
- }
137
- if (matchingFile.stream) {
138
- return matchingFile.stream();
139
- }
140
- throw new core_1.SfError(`The file at path ${fsPath} does not have a stream method.`);
130
+ throw new core_1.SfError(messages.getMessage('error_no_directory_stream', [this.constructor.name]), 'LibraryError');
141
131
  }
142
- throw new core_1.SfError(messages.getMessage('error_no_directory_stream', [this.constructor.name]), 'LibraryError');
132
+ throw new core_1.SfError(messages.getMessage('error_expected_file_path', [fsPath]), 'LibraryError');
143
133
  }
144
- populate(directory) {
145
- for (const { path, type, stream, buffer } of directory.files) {
146
- if (type === 'File') {
147
- // normalize path to use OS separator since zip entries always use forward slash
148
- const entry = { path: (0, path_1.normalize)(path), stream, buffer };
149
- this.tree.set(entry.path, entry);
150
- this.ensureDirPathExists(entry);
151
- }
134
+ // Finds a matching entry in the zip by first comparing basenames, then dirnames.
135
+ // Note that zip files always use forward slash separators, so paths within the
136
+ // zip files are normalized for the OS file system before comparing.
137
+ match(fsPath) {
138
+ // "dot" has a special meaning as a directory name and always matches. Just return it.
139
+ if (fsPath === '.') {
140
+ return fsPath;
152
141
  }
142
+ const fsPathBasename = (0, path_1.basename)(fsPath);
143
+ const fsPathDirname = (0, path_1.dirname)(fsPath);
144
+ return Object.keys(this.zip.files).find((filePath) => {
145
+ const normFilePath = (0, path_1.normalize)(filePath);
146
+ if ((0, path_1.basename)(normFilePath) === fsPathBasename) {
147
+ return (0, path_1.dirname)(normFilePath) === fsPathDirname;
148
+ }
149
+ });
153
150
  }
154
- ensureDirPathExists(entry) {
155
- const dirPath = (0, path_1.dirname)(entry.path);
156
- if (dirPath === entry.path) {
157
- return;
158
- }
159
- else if (!this.exists(dirPath)) {
160
- this.tree.set(dirPath, [entry]);
161
- this.ensureDirPathExists({ path: dirPath });
162
- }
163
- else {
164
- this.tree.get(dirPath).push(entry);
151
+ ensureDirectory(dirPath) {
152
+ if (dirPath) {
153
+ // JSZip can have directory entries or only file entries (with virtual directory entries)
154
+ const zipObj = this.zip.file(dirPath);
155
+ return zipObj?.dir === true || !zipObj;
165
156
  }
157
+ throw new core_1.SfError(messages.getMessage('error_path_not_found', [dirPath]), 'LibraryError');
166
158
  }
167
159
  }
168
160
  exports.ZipTreeContainer = ZipTreeContainer;
@@ -1 +1 @@
1
- {"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/source-deploy-retrieve",
3
- "version": "9.7.29",
3
+ "version": "9.8.0",
4
4
  "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
5
5
  "main": "lib/src/index.js",
6
6
  "author": "Salesforce",
@@ -36,23 +36,21 @@
36
36
  "jszip": "^3.10.1",
37
37
  "mime": "2.6.0",
38
38
  "minimatch": "^5.1.6",
39
- "proxy-agent": "^6.3.1",
40
- "unzipper": "0.10.14"
39
+ "proxy-agent": "^6.3.1"
41
40
  },
42
41
  "devDependencies": {
43
42
  "@salesforce/cli-plugins-testkit": "^4.4.10",
44
- "@salesforce/dev-config": "^4.0.1",
43
+ "@salesforce/dev-config": "^4.1.0",
45
44
  "@salesforce/dev-scripts": "^5.11.0",
46
45
  "@salesforce/prettier-config": "^0.0.3",
47
46
  "@salesforce/ts-sinon": "^1.4.18",
48
47
  "@types/deep-equal-in-any-order": "^1.0.1",
49
- "@types/fast-levenshtein": "^0.0.2",
48
+ "@types/fast-levenshtein": "^0.0.3",
50
49
  "@types/graceful-fs": "^4.1.7",
51
50
  "@types/mime": "2.0.3",
52
51
  "@types/minimatch": "^5.1.2",
53
52
  "@types/proxy-from-env": "^1.0.3",
54
53
  "@types/shelljs": "^0.8.13",
55
- "@types/unzipper": "^0.10.7",
56
54
  "@typescript-eslint/eslint-plugin": "^5.62.0",
57
55
  "@typescript-eslint/parser": "^5.62.0",
58
56
  "chai": "^4.3.8",