@salesforce/packaging 1.4.15 → 1.4.17

package/lib/package/packageAncestry.js

@@ -1,16 +1,4 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _PackageAncestry_requestedPackageId, _PackageAncestryNode_version, _PackageAncestryNode_MajorVersion, _PackageAncestryNode_MinorVersion, _PackageAncestryNode_PatchVersion, _PackageAncestryNode_BuildNumber, _PackageAncestryNode_AncestorId, _PackageAncestryNode_SubscriberPackageVersionId, _PackageAncestryNode_depthCounter;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageAncestryNode = exports.AncestryDotProducer = exports.AncestryJsonProducer = exports.AncestryTreeProducer = exports.PackageAncestry = void 0;
 /*
@@ -35,9 +23,21 @@ const SELECT_PACKAGE_VERSION = 'SELECT AncestorId, SubscriberPackageVersionId, M
 // Add this to query calls to only show released package versions in the output
 const releasedOnlyFilter = ' AND IsReleased = true';
 const sortAncestryNodeData = (a, b) => {
-    const aVersion = new versionNumber_1.VersionNumber(a.options.node.MajorVersion, a.options.node.MinorVersion, a.options.node.PatchVersion, a.options.node.BuildNumber);
-    const bVersion = new versionNumber_1.VersionNumber(b.options.node.MajorVersion, b.options.node.MinorVersion, b.options.node.PatchVersion, b.options.node.BuildNumber);
-    return aVersion.compareTo(bVersion);
+    if (!a.options || !b.options) {
+        return 0;
+    }
+    if (!a.options.packageNode && b.options.packageNode) {
+        return -1;
+    }
+    if (a.options.packageNode && !b.options.packageNode) {
+        return 1;
+    }
+    if (a.options.packageNode && b.options.packageNode) {
+        const aVersion = new versionNumber_1.VersionNumber(a.options.packageNode.MajorVersion, a.options.packageNode.MinorVersion, a.options.packageNode.PatchVersion, a.options.packageNode.BuildNumber);
+        const bVersion = new versionNumber_1.VersionNumber(b.options.packageNode.MajorVersion, b.options.packageNode.MinorVersion, b.options.packageNode.PatchVersion, b.options.packageNode.BuildNumber);
+        return aVersion.compareTo(bVersion);
+    }
+    return 0;
 };
 /**
  * A class that represents the package ancestry graph.
@@ -47,11 +47,24 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     constructor(options) {
         super(options);
         this.options = options;
-        _PackageAncestry_requestedPackageId.set(this, void 0);
+        this.roots = [];
         this.graph = new graphology_1.DirectedGraph();
+        this.packageId = options.packageId;
     }
     get requestedPackageId() {
-        return __classPrivateFieldGet(this, _PackageAncestry_requestedPackageId, "f");
+        return this.packageId;
+    }
+    static createAttributes(node) {
+        return {
+            AncestorId: node.AncestorId,
+            BuildNumber: node.BuildNumber,
+            MajorVersion: node.MajorVersion,
+            MinorVersion: node.MinorVersion,
+            PatchVersion: node.PatchVersion,
+            SubscriberPackageVersionId: node.SubscriberPackageVersionId,
+            depthCounter: node.depthCounter,
+            node,
+        };
     }
     async init() {
         await this.buildAncestryTree();
@@ -72,7 +85,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
      * Convenience method to get the CliUx.Tree representation of the package ancestry graph.
      */
     getTreeProducer(verbose) {
-        return this.getRepresentationProducer((opts) => new AncestryTreeProducer({ ...opts, verbose: !!verbose }), this.requestedPackageId);
+        return this.getRepresentationProducer((opts) => new AncestryTreeProducer({ ...opts, verbose }), this.requestedPackageId);
     }
     /**
      * Convenience method to get the dot representation of the package ancestry graph.
@@ -84,13 +97,14 @@ class PackageAncestry extends kit_1.AsyncCreatable {
      * Returns the producer representation of the package ancestry graph.
      *
      * @param producerCtor - function that returns a new instance of the producer
-     * @param root - the subscriber package version id of the root node
+     * @param rootPackageId - the subscriber package version id of the root node
      */
-    getRepresentationProducer(producerCtor, root) {
-        const treeRoot = root
-            ? this.graph.findNode((node, attributes) => attributes.node.SubscriberPackageVersionId === root)
+    getRepresentationProducer(producerCtor, rootPackageId) {
+        const treeRootKey = rootPackageId
+            ? this.graph.findNode((node, attributes) => attributes.SubscriberPackageVersionId === rootPackageId)
             : undefined;
-        const tree = producerCtor();
+        const treeRoot = treeRootKey ? this.graph.getNodeAttributes(treeRootKey).node : undefined;
+        const tree = producerCtor({ packageNode: treeRoot, depth: 0 });
         const treeStack = [];
         function handleNode(node, attr, depth) {
             if (treeStack.length > depth) {
@@ -98,7 +112,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
             }
             let t = treeStack[depth];
             if (!t) {
-                t = producerCtor({ node: attr.node, depth });
+                t = producerCtor({ packageNode: attr.node, depth });
                 treeStack.push(t);
             }
             if (depth === 0) {
@@ -109,7 +123,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
             }
         }
         if (treeRoot) {
-            (0, graphology_traversal_1.dfsFromNode)(this.graph, treeRoot, handleNode);
+            (0, graphology_traversal_1.dfsFromNode)(this.graph, treeRoot.getVersion(), handleNode);
         }
         else {
             (0, graphology_traversal_1.dfs)(this.graph, handleNode);
@@ -123,7 +137,7 @@ class PackageAncestry extends kit_1.AsyncCreatable {
      * @param subscriberPackageVersionId
      */
     getLeafPathToRoot(subscriberPackageVersionId) {
-        const root = this.graph.findNode((node, attributes) => attributes.node.AncestorId === null);
+        const root = this.graph.findNode((node, attributes) => attributes.AncestorId === null);
         const paths = [];
         let path = [];
         let previousDepth = 0;
@@ -141,28 +155,24 @@ class PackageAncestry extends kit_1.AsyncCreatable {
         });
         // push remaining path
         paths.push(path);
-        return (paths
-            .filter(
-        // eslint-disable-next-line @typescript-eslint/no-shadow
-        (path) => path.length > 0 && // don't care about zero length paths
+        const filteredPaths = paths.filter((nodePath) => nodePath.length > 0 && // don't care about zero length paths
             (!subscriberPackageVersionId ||
-                path.some((node) => node.SubscriberPackageVersionId === subscriberPackageVersionId)))
-            // eslint-disable-next-line @typescript-eslint/no-shadow
-            .map((path) => path.reverse())
-            // eslint-disable-next-line @typescript-eslint/no-shadow
-            .map((path) => {
-            const subscriberPackageVersionIdIndex = path.findIndex((node) => node.SubscriberPackageVersionId === subscriberPackageVersionId);
-            return path.slice(subscriberPackageVersionIdIndex === -1 ? 0 : subscriberPackageVersionIdIndex);
-        }));
+                nodePath.some((node) => node.SubscriberPackageVersionId === subscriberPackageVersionId)));
+        return filteredPaths
+            .map((nodePath) => nodePath.reverse())
+            .map((nodePath) => {
+            const subscriberPackageVersionIdIndex = nodePath.findIndex((node) => node.SubscriberPackageVersionId === subscriberPackageVersionId);
+            return nodePath.slice(subscriberPackageVersionIdIndex === -1 ? 0 : subscriberPackageVersionIdIndex);
+        });
     }
     async buildAncestryTree() {
-        this.roots = await this.getRoots();
+        this.roots = await this.getRootsFromRequestedId();
         await this.buildAncestryTreeFromRoots(this.roots);
     }
-    async getRoots() {
+    async getRootsFromRequestedId() {
         let roots = [];
-        __classPrivateFieldSet(this, _PackageAncestry_requestedPackageId, this.options.project.getPackageIdFromAlias(this.options.packageId) ?? this.options.packageId, "f");
-        switch (this.requestedPackageId.slice(0, 3)) {
+        this.packageId = this.options.project.getPackageIdFromAlias(this.options.packageId) ?? this.options.packageId;
+        switch (this.requestedPackageId?.slice(0, 3)) {
             case '0Ho':
                 pkgUtils.validateId(pkgUtils.BY_LABEL.PACKAGE_ID, this.requestedPackageId);
                 roots = await this.findRootsForPackage();
@@ -192,31 +202,42 @@ class PackageAncestry extends kit_1.AsyncCreatable {
         // Check to see if the package version is part of an unlocked package
         // if so, throw an error since ancestry only applies to managed packages
         let packageType;
-        switch (this.requestedPackageId.slice(0, 3)) {
-            case '04t':
-                // eslint-disable-next-line no-case-declarations
-                const packageVersion = new packageVersion_1.PackageVersion({
-                    idOrAlias: this.requestedPackageId,
-                    project: this.options.project,
-                    connection: this.options.connection,
-                });
-                packageType = await packageVersion.getPackageType();
-                break;
-            case '0Ho':
-                // eslint-disable-next-line no-case-declarations
-                const pkg = new package_1.Package({
-                    packageAliasOrId: this.requestedPackageId,
-                    project: this.options.project,
-                    connection: this.options.connection,
-                });
-                packageType = await pkg.getType();
-                break;
+        if (this.requestedPackageId) {
+            const prefix = this.requestedPackageId?.slice(0, 3);
+            switch (prefix) {
+                case '04t':
+                    // eslint-disable-next-line no-case-declarations
+                    const packageVersion = new packageVersion_1.PackageVersion({
+                        idOrAlias: this.requestedPackageId,
+                        project: this.options.project,
+                        connection: this.options.connection,
+                    });
+                    packageType = await packageVersion.getPackageType();
+                    break;
+                case '0Ho':
+                    // eslint-disable-next-line no-case-declarations
+                    const pkg = new package_1.Package({
+                        packageAliasOrId: this.requestedPackageId,
+                        project: this.options.project,
+                        connection: this.options.connection,
+                    });
+                    packageType = await pkg.getType();
+                    break;
+                default:
+                    throw new Error(`Not implemented yet: ${prefix} case`);
+            }
+        }
+        else {
+            throw new Error('Not implemented yet: undefined case');
         }
         if (packageType !== 'Managed') {
             throw messages.createError('unlockedPackageError');
         }
     }
     async getPackageVersion(nodeId) {
+        if (!nodeId) {
+            throw new Error('nodeId is undefined');
+        }
         const query = `${SELECT_PACKAGE_VERSION} WHERE SubscriberPackageVersionId = '${nodeId}'`;
         try {
             const results = await this.options.connection.singleRecordQuery(query, {
@@ -224,11 +245,11 @@ class PackageAncestry extends kit_1.AsyncCreatable {
             });
             return new PackageAncestryNode(results);
         }
-        catch (e) {
-            if (e.message.includes('No record found for')) {
+        catch (err) {
+            if (err instanceof Error && err.message.includes('No record found for')) {
                 throw messages.createError('versionNotFound', [nodeId]);
             }
-            throw e;
+            throw err;
         }
     }
     async findRootsForPackage() {
@@ -247,8 +268,11 @@ class PackageAncestry extends kit_1.AsyncCreatable {
         while (roots.length > 0) {
             const subscriberPackageVersion = roots.shift();
             // eslint-disable-next-line no-await-in-loop
-            const descendants = await this.addDescendantsFromPackageVersion(subscriberPackageVersion);
-            roots.push(...descendants);
+            if (subscriberPackageVersion) {
+                // eslint-disable-next-line no-await-in-loop
+                const descendants = await this.addDescendantsFromPackageVersion(subscriberPackageVersion);
+                roots.push(...descendants);
+            }
         }
     }
     async addDescendantsFromPackageVersion(subscriberPackageVersion) {
@@ -258,10 +282,10 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     }
     addToGraph(ancestor, descendant) {
         if (!this.graph.hasNode(ancestor.getVersion())) {
-            this.graph.addNode(ancestor.getVersion(), { node: ancestor });
+            this.graph.addNode(ancestor.getVersion(), PackageAncestry.createAttributes(ancestor));
         }
         if (!this.graph.hasNode(descendant.getVersion())) {
-            this.graph.addNode(descendant.getVersion(), { node: descendant });
+            this.graph.addNode(descendant.getVersion(), PackageAncestry.createAttributes(descendant));
         }
         if (!this.graph.hasEdge(ancestor.getVersion(), descendant.getVersion())) {
             this.graph.addDirectedEdgeWithKey(`${ancestor.getVersion()}->${descendant.getVersion()}`, ancestor.getVersion(), descendant.getVersion(), {
@@ -277,37 +301,45 @@ class PackageAncestry extends kit_1.AsyncCreatable {
     }
 }
 exports.PackageAncestry = PackageAncestry;
-_PackageAncestry_requestedPackageId = new WeakMap();
 class AncestryTreeProducer extends tree_1.Tree {
     constructor(options) {
         super();
-        this.verbose = false;
         this.options = options;
-        this.label = this.options?.node?.getVersion() || 'root';
-        this.verbose = this.options?.verbose || false;
+        this.label = this.options?.packageNode?.getVersion() ?? 'root';
+        this.verbose = this.options?.verbose ?? false;
     }
     addNode(node) {
         const label = this.createLabel(node);
         this.insert(label, node);
     }
     produce() {
+        const sortAncestors = (a, b) => {
+            if (a.options?.packageNode?.version && b.options?.packageNode?.version) {
+                return a.options?.packageNode.version?.compareTo(b.options?.packageNode.version);
+            }
+            return 0;
+        };
         const producers = [];
         producers.push(this);
         while (producers.length > 0) {
             const producer = producers.shift();
-            Object.values(producer.nodes)
-                .sort((a, b) => a.options.node.version.compareTo(b.options.node.version))
-                .forEach((child) => {
-                delete producer.nodes[this.createLabel(child)];
-                producer.addNode(child);
-                producers.push(child);
-            });
+            if (producer) {
+                Object.values(producer.nodes ?? {})
+                    // as AncestryTreeProducer is needed to sort and gain access producer functions. oclif Tree does not support generic for nodes
+                    .map((node) => node)
+                    .sort(sortAncestors)
+                    .forEach((child) => {
+                    delete producer.nodes[this.createLabel(child)];
+                    producer.addNode(child);
+                    producers.push(child);
+                });
+            }
         }
         this.display(this.options ? this.options['logger'] : undefined);
     }
     createLabel(node) {
-        const subscriberId = this.verbose && node?.options?.node?.SubscriberPackageVersionId
-            ? ` (${node.options.node.SubscriberPackageVersionId})`
+        const subscriberId = this.verbose && node?.options?.packageNode?.SubscriberPackageVersionId
+            ? ` (${node.options.packageNode.SubscriberPackageVersionId})`
             : '';
         return node?.label ? `${node.label}${subscriberId}` : 'root';
     }
@@ -317,16 +349,16 @@ class AncestryJsonProducer {
     constructor(options) {
         this.children = [];
         this.options = options;
-        this.label = this.options?.node?.getVersion() || 'root';
+        this.label = this.options?.packageNode?.getVersion() ?? 'root';
         this.data = {
             children: [],
             data: {
-                SubscriberPackageVersionId: this.options?.node?.SubscriberPackageVersionId,
-                MajorVersion: this.options?.node?.MajorVersion,
-                MinorVersion: this.options?.node?.MinorVersion,
-                PatchVersion: this.options?.node?.PatchVersion,
-                BuildNumber: this.options?.node?.BuildNumber,
-                depthCounter: this.options?.depth,
+                SubscriberPackageVersionId: this.options.packageNode?.SubscriberPackageVersionId ?? 'unknown',
+                MajorVersion: this.options.packageNode?.MajorVersion ?? 0,
+                MinorVersion: this.options.packageNode?.MinorVersion ?? 0,
+                PatchVersion: this.options.packageNode?.PatchVersion ?? 0,
+                BuildNumber: this.options.packageNode?.BuildNumber ?? 0,
+                depthCounter: this.options.depth,
             },
         };
     }
@@ -339,8 +371,10 @@ class AncestryJsonProducer {
         producers.push(this);
         while (producers.length > 0) {
             const producer = producers.shift();
-            producer.children.sort(sortAncestryNodeData);
-            producers.push(...producer.children);
+            if (producer) {
+                producer.children.sort(sortAncestryNodeData);
+                producers.push(...producer.children);
+            }
         }
         return this.data.children[0];
     }
@@ -350,7 +384,7 @@ class AncestryDotProducer {
     constructor(options) {
         this.children = [];
         this.options = options;
-        this.label = this.options?.node?.getVersion() || 'root';
+        this.label = this.options?.packageNode?.getVersion() ?? 'root';
     }
     /**
      * Builds a node line in DOT, of the form nodeID [label="MAJOR.MINOR.PATCH"]
@@ -358,7 +392,8 @@ class AncestryDotProducer {
      * @param currentNode
      */
     static buildDotNode(currentNode) {
-        return `\t node${currentNode.options.node.SubscriberPackageVersionId} [label="${currentNode.label}"]`;
+        const subscriberId = currentNode.options?.packageNode?.SubscriberPackageVersionId ?? 'unknown';
+        return `\t node${subscriberId} [label="${currentNode.label}"]`;
     }
     /**
      * Builds an edge line in DOT, of the form fromNode -- toNode
@@ -367,7 +402,9 @@ class AncestryDotProducer {
      * @param toNode
      */
     static buildDotEdge(fromNode, toNode) {
-        return `\t node${fromNode.options.node.SubscriberPackageVersionId} -- node${toNode.options.node.SubscriberPackageVersionId}`;
+        const fromSubscriberId = fromNode.options?.packageNode?.SubscriberPackageVersionId ?? 'unknown';
+        const toSubscriberId = toNode.options?.packageNode?.SubscriberPackageVersionId ?? 'unknown';
+        return `\t node${fromSubscriberId} -- node${toSubscriberId}`;
     }
     addNode(node) {
         this.children.push(node);
@@ -378,19 +415,23 @@ class AncestryDotProducer {
         const dotLines = [];
         while (producers.length > 0) {
             const producer = producers.shift();
-            if (producer.options) {
-                dotLines.push(AncestryDotProducer.buildDotNode(producer));
+            if (producer) {
+                if (producer.options) {
+                    dotLines.push(AncestryDotProducer.buildDotNode(producer));
+                }
+                producer?.children.sort(sortAncestryNodeData);
+                producers.push(...producer.children);
             }
-            producer.children.sort(sortAncestryNodeData);
-            producers.push(...producer.children);
         }
         producers.push(this);
         while (producers.length > 0) {
             const producer = producers.shift();
-            if (producer.options) {
-                producer.children.forEach((child) => dotLines.push(AncestryDotProducer.buildDotEdge(producer, child)));
+            if (producer) {
+                if (producer.options) {
+                    producer.children.forEach((child) => dotLines.push(AncestryDotProducer.buildDotEdge(producer, child)));
+                }
+                producers.push(...producer.children);
             }
-            producers.push(...producer.children);
         }
         return `strict graph G {${os_1.EOL}${dotLines.join(os_1.EOL)}${os_1.EOL}}`;
     }
@@ -400,54 +441,26 @@ class PackageAncestryNode extends kit_1.AsyncCreatable {
     constructor(options) {
         super(options);
         this.options = options;
-        _PackageAncestryNode_version.set(this, void 0);
-        _PackageAncestryNode_MajorVersion.set(this, void 0);
-        _PackageAncestryNode_MinorVersion.set(this, void 0);
-        _PackageAncestryNode_PatchVersion.set(this, void 0);
-        _PackageAncestryNode_BuildNumber.set(this, void 0);
-        _PackageAncestryNode_AncestorId.set(this, void 0);
-        _PackageAncestryNode_SubscriberPackageVersionId.set(this, void 0);
-        _PackageAncestryNode_depthCounter.set(this, void 0);
-        __classPrivateFieldSet(this, _PackageAncestryNode_version, new versionNumber_1.VersionNumber(this.options.MajorVersion, this.options.MinorVersion, this.options.PatchVersion, this.options.BuildNumber), "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_AncestorId, this.options.AncestorId, "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_SubscriberPackageVersionId, this.options.SubscriberPackageVersionId, "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_MajorVersion, typeof this.options.MajorVersion === 'number'
-            ? this.options.MajorVersion
-            : parseInt(this.options.MajorVersion, 10), "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_MinorVersion, typeof this.options.MinorVersion === 'number'
-            ? this.options.MinorVersion
-            : parseInt(this.options.MinorVersion, 10), "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_PatchVersion, typeof this.options.PatchVersion === 'number'
-            ? this.options.PatchVersion
-            : parseInt(this.options.PatchVersion, 10), "f");
-        __classPrivateFieldSet(this, _PackageAncestryNode_BuildNumber, this.options.BuildNumber, "f");
-    }
-    get AncestorId() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_AncestorId, "f");
-    }
-    get SubscriberPackageVersionId() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_SubscriberPackageVersionId, "f");
-    }
-    get version() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_version, "f");
-    }
-    get MinorVersion() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_MinorVersion, "f");
-    }
-    get PatchVersion() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_PatchVersion, "f");
-    }
-    get BuildNumber() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_BuildNumber, "f");
-    }
-    get MajorVersion() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_MajorVersion, "f");
-    }
-    get depthCounter() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_depthCounter, "f");
+        this.depthCounter = 0;
+        this.version = new versionNumber_1.VersionNumber(this.options.MajorVersion, this.options.MinorVersion, this.options.PatchVersion, this.options.BuildNumber);
+        this.AncestorId = this.options.AncestorId;
+        this.SubscriberPackageVersionId = this.options.SubscriberPackageVersionId;
+        this.MajorVersion =
+            typeof this.options.MajorVersion === 'number'
+                ? this.options.MajorVersion
+                : parseInt(this.options.MajorVersion, 10);
+        this.MinorVersion =
+            typeof this.options.MinorVersion === 'number'
+                ? this.options.MinorVersion
+                : parseInt(this.options.MinorVersion, 10);
+        this.PatchVersion =
+            typeof this.options.PatchVersion === 'number'
+                ? this.options.PatchVersion
+                : parseInt(this.options?.PatchVersion, 10);
+        this.BuildNumber = this.options?.BuildNumber;
     }
     getVersion() {
-        return __classPrivateFieldGet(this, _PackageAncestryNode_version, "f").toString();
+        return this.version.toString();
     }
     // eslint-disable-next-line class-methods-use-this
     init() {
@@ -455,5 +468,4 @@ class PackageAncestryNode extends kit_1.AsyncCreatable {
     }
 }
 exports.PackageAncestryNode = PackageAncestryNode;
-_PackageAncestryNode_version = new WeakMap(), _PackageAncestryNode_MajorVersion = new WeakMap(), _PackageAncestryNode_MinorVersion = new WeakMap(), _PackageAncestryNode_PatchVersion = new WeakMap(), _PackageAncestryNode_BuildNumber = new WeakMap(), _PackageAncestryNode_AncestorId = new WeakMap(), _PackageAncestryNode_SubscriberPackageVersionId = new WeakMap(), _PackageAncestryNode_depthCounter = new WeakMap();
 //# sourceMappingURL=packageAncestry.js.map

package/lib/package/packageConvert.d.ts

@@ -1,5 +1,5 @@
 import { Connection, SfProject } from '@salesforce/core';
-import { PackagingSObjects, PackageVersionCreateRequestResult, ConvertPackageOptions } from '../interfaces';
+import { ConvertPackageOptions, PackageVersionCreateRequestResult, PackagingSObjects } from '../interfaces';
 export declare function findOrCreatePackage2(seedPackage: string, connection: Connection): Promise<string>;
 export declare function convertPackage(pkg: string, connection: Connection, options: ConvertPackageOptions, project?: SfProject): Promise<PackageVersionCreateRequestResult>;
 /**

package/lib/package/packageConvert.js

@@ -14,10 +14,10 @@ const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const scratchOrgSettingsGenerator_1 = require("@salesforce/core/lib/org/scratchOrgSettingsGenerator");
 const pkgUtils = require("../utils/packageUtils");
-const interfaces_1 = require("../interfaces");
 const packageUtils_1 = require("../utils/packageUtils");
-const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
+const interfaces_1 = require("../interfaces");
 const pvcr = require("./packageVersionCreateRequest");
+const packageVersionCreateRequest_1 = require("./packageVersionCreateRequest");
 const packageVersionCreate_1 = require("./packageVersionCreate");
 var Package2VersionStatus = interfaces_1.PackagingSObjects.Package2VersionStatus;
 core_1.Messages.importMessagesDirectory(__dirname);
@@ -83,10 +83,8 @@ async function convertPackage(pkg, connection, options, project) {
     const createResult = await connection.tooling.create('Package2VersionCreateRequest', request);
     if (!createResult.success) {
         const errStr = createResult?.errors.length ? createResult.errors.join(', ') : createResult.errors;
-        throw messages.createError('failedToCreatePVCRequest', [
-            createResult.id ? ` [${createResult.id}]` : '',
-            errStr.toString(),
-        ]);
+        const id = createResult.id ?? '';
+        throw messages.createError('failedToCreatePVCRequest', [id, errStr.toString()]);
     }
     let results;
     if (options.wait) {
@@ -116,32 +114,25 @@ async function createPackageVersionCreateRequest(context, packageId, apiVersion)
     const settingsZipFile = path.join(packageVersBlobDirectory, 'settings.zip');
     const metadataZipFile = path.join(packageVersBlobDirectory, 'package.zip');
     const packageVersBlobZipFile = path.join(packageVersTmpRoot, 'package-version-info.zip');
-    const packageDescriptorJson = {
+    let packageDescriptorJson = {
         id: packageId,
     };
     const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
     const definitionFile = context.definitionfile;
     let definitionFileJson;
     if (definitionFile) {
-        try {
-            const definitionFilePayload = await fs.promises.readFile(definitionFile, 'utf8');
-            definitionFileJson = JSON.parse(definitionFilePayload);
-        }
-        catch (err) {
-            throw messages.createError('errorReadingDefintionFile', [err]);
+        if (!fs.existsSync(definitionFile)) {
+            throw messages.createError('errorReadingDefintionFile', [definitionFile]);
         }
+        const definitionFilePayload = await fs.promises.readFile(definitionFile, 'utf8');
+        definitionFileJson = JSON.parse(definitionFilePayload);
         // Load any settings from the definition
         await settingsGenerator.extract(definitionFileJson);
         if (settingsGenerator.hasSettings() && definitionFileJson.orgPreferences) {
             // this is not allowed, exit with an error
             throw messages.createError('signupDuplicateSettingsSpecified');
         }
-        ['country', 'edition', 'language', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].forEach((prop) => {
-            const propValue = definitionFileJson[prop];
-            if (propValue) {
-                packageDescriptorJson[prop] = propValue;
-            }
-        });
+        packageDescriptorJson = (0, packageUtils_1.copyDescriptorProperties)(packageDescriptorJson, definitionFileJson);
     }
     await fs.promises.mkdir(packageVersTmpRoot, { recursive: true });
     await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
@@ -197,6 +188,9 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, project
                             const record = pkgQueryResult.records[0];
                             return `${record.MajorVersion}.${record.MinorVersion}.${record.PatchVersion}-${record.BuildNumber}`;
                         });
+                        if (!results[0]?.SubscriberPackageVersionId) {
+                            throw new core_1.SfError('No SubscriberPackageVersionId found');
+                        }
                         const [alias, writtenId] = await (0, packageUtils_1.generatePackageAliasEntry)(connection, project, results[0].SubscriberPackageVersionId, packageVersionVersionString, branch, packageId);
                         project.getSfProjectJson().addPackageAlias(alias, writtenId);
                         await project.getSfProjectJson().write();
@@ -251,7 +245,7 @@ async function pollForStatusWithInterval(id, retries, packageId, branch, project
  * @param statuses array of statuses to look for
  * @returns {boolean} if one of the values in status is found.
  */
-function isStatusEqualTo(results, statuses) {
-    return results?.length <= 0 ? false : statuses?.some((status) => results[0].Status === status);
+function isStatusEqualTo(results, statuses = []) {
+    return !results?.length ? false : statuses.some((status) => results[0].Status === status);
 }
 //# sourceMappingURL=packageConvert.js.map

package/lib/package/packageCreate.d.ts

@@ -6,7 +6,7 @@ export declare function createPackageRequestFromContext(project: SfProject, opti
  * Create packageDirectory json entry for this package that can be written to sfdx-project.json
  *
  * @param project
- * @param packageId the 0Ho id of the package to create the entry for
+ * @param options - package create options
  * @private
  */
 export declare function createPackageDirEntry(project: SfProject, options: PackageCreateOptions): PackageDir | NamedPackageDir;