@salesforce/packaging 5.0.12 → 5.0.14

package/lib/package/packageConvert.js

@@ -72,7 +72,16 @@ const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_
 const POLL_INTERVAL_SECONDS = 30;
 async function findOrCreatePackage2(seedPackage, connection, project) {
     const query = `SELECT Id, Name FROM Package2 WHERE ConvertedFromPackageId = '${seedPackage}'`;
-    const queryResult = (await connection.tooling.query(query)).records;
+    let queryResult;
+    try {
+        queryResult = (await connection.tooling.query(query)).records;
+    }
+    catch (e) {
+        if (isPackage2NotSupportedError(e)) {
+            throw messages.createError('convertPackagingNotEnabledOnOrg');
+        }
+        throw e;
+    }
     if (queryResult?.length > 1) {
         const ids = queryResult.map((r) => r.Id);
         throw messages.createError('errorMoreThanOnePackage2WithSeed', [ids.join(', ')]);
@@ -104,6 +113,9 @@ async function findOrCreatePackage2(seedPackage, connection, project) {
     };
     const createResult = await connection.tooling.create('Package2', request);
     if (!createResult.success) {
+        if (createResult.errors?.some((error) => isPackage2NotSupportedError(error))) {
+            throw messages.createError('convertPackagingNotEnabledOnOrg');
+        }
         throw pkgUtils.combineSaveErrors('Package2', 'create', createResult.errors);
     }
     if (project) {
@@ -366,4 +378,27 @@ async function addPackageAlias(project, packageName, packageId) {
  * @returns {boolean} if one of the values in status is found.
  */
 const isStatusEqualTo = (results, statuses = []) => (!results?.length ? false : statuses.some((status) => results[0].Status === status));
+/**
+ * Detects the tooling-API error thrown when a Dev Hub does not have second-generation
+ * packaging enabled and the Package2 entity is therefore not accessible. The full server
+ * message may append custom-object WSDL boilerplate, so match on a substring (consistent
+ * with the handling in packageVersionRetrieve.ts).
+ *
+ * @param err the error thrown by a Package2 tooling call
+ * @returns true if the error indicates Package2 is not supported on the org
+ */
+const isPackage2NotSupportedError = (err) => {
+    let msg;
+    if (err instanceof Error) {
+        msg = err.message;
+    }
+    else if (typeof err === 'object' && err !== null && 'message' in err) {
+        // jsforce SaveError objects are plain objects that carry a `message` field.
+        msg = String(err.message);
+    }
+    else {
+        msg = String(err);
+    }
+    return msg.includes("sObject type 'Package2' is not supported.");
+};
 //# sourceMappingURL=packageConvert.js.map

package/lib/package/packageCreate.js

@@ -56,6 +56,8 @@ const kit_1 = require("@salesforce/kit");
 const project_1 = require("@salesforce/core/project");
 const pkgUtils = __importStar(require("../utils/packageUtils"));
 const packageUtils_1 = require("../utils/packageUtils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_create');
 function createPackageRequestFromContext(project, options) {
     const namespace = options.noNamespace ? '' : project.getSfProjectJson().getContents().namespace ?? '';
     return {
@@ -97,10 +99,16 @@ async function createPackage(connection, project, options) {
         .sobject('Package2')
         .create(request)
         .catch((err) => {
+        if (isPackagingNotEnabledError(err)) {
+            throw messages.createError('createPackagingNotEnabledOnOrg');
+        }
         const error = err instanceof Error ? err : new Error(typeof err === 'string' ? err : 'Unknown error');
         throw core_1.SfError.wrap((0, packageUtils_1.applyErrorAction)((0, packageUtils_1.massageErrorMessage)(error)));
     });
     if (!createResult.success) {
+        if (createResult.errors?.some((error) => isPackagingNotEnabledError(error))) {
+            throw messages.createError('createPackagingNotEnabledOnOrg');
+        }
         throw pkgUtils.combineSaveErrors('Package2', 'create', createResult.errors);
     }
     if (!kit_1.env.getBoolean('SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE')) {
@@ -116,4 +124,34 @@ const sanitizePackageCreateOptions = (options) => ({
     ...options,
     path: options.path.replace(/\/$/, ''),
 });
+/**
+ * Detects the tooling-API error thrown when a Dev Hub does not have second-generation
+ * packaging enabled and the Package2 entity is therefore not accessible. The Package2
+ * create REST endpoint (connection.tooling.sobject('Package2').create) 404s with a
+ * NOT_FOUND / "The requested resource does not exist" error. (This differs from the SOQL
+ * path used by package convert, which instead reports "sObject type 'Package2' is not
+ * supported" -- but package create never issues a SOQL query, so that form cannot occur
+ * here.)
+ *
+ * @param err the error (or jsforce SaveError) thrown by a Package2 tooling call
+ * @returns true if the error indicates Package2 is not supported on the org
+ */
+const isPackagingNotEnabledError = (err) => {
+    let name = '';
+    let msg;
+    if (err instanceof Error) {
+        name = err.name;
+        msg = err.message;
+    }
+    else if (typeof err === 'object' && err !== null) {
+        // jsforce SaveError objects are plain objects that carry `errorCode`/`statusCode` and `message`.
+        const e = err;
+        name = String(e.errorCode ?? e.statusCode ?? '');
+        msg = typeof e.message === 'string' ? e.message : '';
+    }
+    else {
+        msg = String(err);
+    }
+    return name === 'NOT_FOUND' && msg.includes('The requested resource does not exist');
+};
 //# sourceMappingURL=packageCreate.js.map

package/messages/package_create.md

@@ -1,3 +1,7 @@
 # unableToFindPackageWithId
 
 Unable to find Package with Id: "%s"
+
+# createPackagingNotEnabledOnOrg
+
+Can't create package. The Dev Hub you specified doesn't have the Second-Generation Managed Packages setting enabled. Enable this setting on your Dev Hub, and try again.

package/messages/package_version_create.md

@@ -115,6 +115,10 @@ No subscriber package was found for seed id: %s
 Only one package in a Dev Hub is allowed per converted from first-generation package, but the following were found:
 %s
 
+# convertPackagingNotEnabledOnOrg
+
+Can't convert package. The Dev Hub you specified doesn't have the Second-Generation Managed Packages setting enabled. Enable this setting on your Dev Hub, and try again.
+
 # errorMissingPackageIdOrPath
 
 You must specify either a package ID or a package path to create a new package version.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "5.0.12",
+  "version": "5.0.14",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,12 +42,12 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@jsforce/jsforce-node": "^3.10.24",
-    "@salesforce/core": "^9.1.9",
+    "@jsforce/jsforce-node": "^3.10.25",
+    "@salesforce/core": "^9.1.10",
     "@salesforce/kit": "^4.0.0",
     "@salesforce/schemas": "^1.10.3",
-    "@salesforce/source-deploy-retrieve": "^13.3.0",
-    "@salesforce/ts-types": "^3.0.1",
+    "@salesforce/source-deploy-retrieve": "^13.3.1",
+    "@salesforce/ts-types": "^3.2.0",
     "@salesforce/types": "^1.8.0",
     "fast-xml-parser": "^5.10.1",
     "globby": "^11",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^5.3.64",
-    "@salesforce/dev-scripts": "^13.0.2",
+    "@salesforce/dev-scripts": "^14.0.0",
     "@types/chai": "^4.3.17",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
@@ -67,10 +67,10 @@
     "@types/node": "^18",
     "@types/sinon": "^10.0.20",
     "eslint": "^10.4.0",
-    "eslint-config-salesforce-typescript": "^6.0.0",
+    "eslint-config-salesforce-typescript": "^7.0.0",
     "eslint-plugin-sf-plugin": "^3.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   },
   "resolutions": {
     "@jsforce/jsforce-node/node-fetch/whatwg-url": "^14.0.0",