@salesforce/packaging 2.1.1 → 2.1.2

package/lib/package/package.js

@@ -175,7 +175,7 @@ class Package {
             throw messages.createError('sourcesDownloadDirectoryNotEmpty');
         }
         // Get the MetadataZip URL from the MetadataPackageVersion record
-        const { subscriberPackageVersionId } = options;
+        const subscriberPackageVersionId = project.getPackageIdFromAlias(options.subscriberPackageVersionId) ?? options.subscriberPackageVersionId;
         const versionInfo = (await connection.tooling
             .sobject('MetadataPackageVersion')
             .retrieve(subscriberPackageVersionId));
@@ -186,15 +186,18 @@ class Package {
             encoding: 'base64',
         });
         const buffer = Buffer.from(responseBase64, 'base64');
-        const converter = new source_deploy_retrieve_1.MetadataConverter();
-        const tree = await source_deploy_retrieve_1.ZipTreeContainer.create(buffer);
+        // 2GP packages have the package.zip wrapped in an outer zip.
+        let tree = await source_deploy_retrieve_1.ZipTreeContainer.create(buffer);
+        if (tree.exists('package.zip')) {
+            tree = await source_deploy_retrieve_1.ZipTreeContainer.create(await tree.readFile('package.zip'));
+        }
         const zipComponents = source_deploy_retrieve_1.ComponentSet.fromSource({
             fsPaths: ['.'],
             tree,
         })
             .getSourceComponents()
             .toArray();
-        return converter.convert(zipComponents, 'source', {
+        return new source_deploy_retrieve_1.MetadataConverter().convert(zipComponents, 'source', {
             type: 'directory',
             outputDirectory: destinationPath,
             genUniqueDir: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",