npm-pkgbuild 7.22.3 → 7.22.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.22.3",
+  "version": "7.22.7",
   "publishConfig": {
     "access": "public"
   },
@@ -38,21 +38,21 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^4.2.1",
-    "aggregate-async-iterator": "^1.1.7",
+    "@npmcli/arborist": "^4.3.0",
+    "aggregate-async-iterator": "^1.1.9",
     "commander": "^8.3.0",
     "content-entry": "^4.1.2",
-    "content-entry-filesystem": "^4.0.3",
-    "content-entry-transform": "^1.3.4",
+    "content-entry-filesystem": "^4.0.4",
+    "content-entry-transform": "^1.3.7",
     "execa": "^6.0.0",
-    "expression-expander": "^7.0.9",
-    "globby": "^13.0.0",
-    "iterable-string-interceptor": "^1.0.8",
-    "key-value-transformer": "^2.0.0",
+    "expression-expander": "^7.0.14",
+    "globby": "^13.1.0",
+    "iterable-string-interceptor": "^1.0.13",
+    "key-value-transformer": "^2.0.2",
     "node-fetch": "^3.2.0",
-    "npm-package-walker": "^5.0.3",
+    "npm-package-walker": "^5.0.5",
     "npm-packlist": "^3.0.0",
-    "pacote": "^12.0.2",
+    "pacote": "^12.0.3",
     "pkg-dir": "^6.0.1",
     "tar-stream": "^2.2.0"
   },

package/src/extract-from-package.mjs

@@ -63,53 +63,54 @@ export async function extractFromPackage(pkg, dir) {
   let arch = new Set();
 
   const processPkg = (pkg, dir, modulePath) => {
-    if (pkg.cpu) {
-      for (const a of asArray(pkg.cpu)) {
-        arch.add(npmArchMapping[a]);
-      }
-    }
-
     if (pkg.pkg) {
       const pkgbuild = pkg.pkg;
 
-      if (pkgbuild.arch) {
-        for (const a of asArray(pkgbuild.arch)) {
-          arch.add(a);
+      if (pkgbuild.abstract || !modulePath) {
+        if (pkgbuild.arch) {
+          for (const a of asArray(pkgbuild.arch)) {
+            arch.add(a);
+          }
         }
-      }
-
-      Object.assign(output, pkgbuild.output);
-
-      Object.entries(pkgbuild)
-        .filter(([k, v]) => typeof v === "string")
-        .forEach(([k, v]) => (properties[k] = v));
-
-      if (pkgbuild.content && !modulePath) {
-        Object.entries(pkgbuild.content).forEach(
-          ([destination, definitions]) => {
-            for (const definition of asArray(definitions)) {
-              const entryProperties = { destination };
 
-              if (definition.type) {
-                const type = allInputs.find(i => i.name === definition.type);
-                if (type) {
-                  delete definition.type;
+        if (pkg.cpu) {
+          for (const a of asArray(pkg.cpu)) {
+            arch.add(npmArchMapping[a]);
+          }
+        }
+    
+        Object.assign(output, pkgbuild.output);
+
+        Object.entries(pkgbuild)
+          .filter(([k, v]) => typeof v === "string")
+          .forEach(([k, v]) => (properties[k] = v));
+
+        if (pkgbuild.content && !modulePath) {
+          Object.entries(pkgbuild.content).forEach(
+            ([destination, definitions]) => {
+              for (const definition of asArray(definitions)) {
+                const entryProperties = { destination };
+
+                if (definition.type) {
+                  const type = allInputs.find(i => i.name === definition.type);
+                  if (type) {
+                    delete definition.type;
+                    sources.push(
+                      new type({ ...definition, dir }, entryProperties)
+                    );
+                  } else {
+                    console.error(`Unknown type '${type}'`);
+                  }
+                } else {
                   sources.push(
-                    new type({ ...definition, dir }, entryProperties)
+                    new FileContentProvider(definition, entryProperties)
                   );
-                } else {
-                  console.error(`Unknown type '${type}'`);
                 }
-              } else {
-                sources.push(
-                  new FileContentProvider(definition, entryProperties)
-                );
               }
             }
-          }
-        );
+          );
+        }
       }
-
       Object.assign(dependencies, pkgbuild.depends);
     }
   };

package/src/publish.mjs

@@ -8,7 +8,7 @@ export function analysePublish(publish, properties) {
     (match, key, offset, string) => properties[key] || '{{' + key + '}}'
   );
 
-  const m = publish.url.match(/^([\w_\+]+:)\/\/(.*)/);
+  const m = publish.url.match(/^([^:]+:)\/\/(.*)/);
 
   publish.scheme = m ? m[1] : "file:";