npm-pkgbuild 18.2.5 → 18.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "18.2.5",
+  "version": "18.2.7",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/npm-pkgbuild-cli.mjs

@@ -106,24 +106,25 @@ program
             const transformer = [
               {
                 name: "skip-architecutes",
-                match: (entry) => entry.name.endsWith(".node"),
+                match: (entry) => entry.name.endsWith(".node") && entry.filename,
                 async transform(entry) {                  
-                  const proc = await execa("file", ["-b", entry.name], {
+                  const proc = await execa("file", ["-b", entry.filename], {
                     cwd: options.dir
                   });
-                  const arch = proc.stdout.split(/\s*,\s*/)[1];
+                  let arch = proc.stdout.split(/\s*,\s*/)[1];
       
-                  console.log('SKIP', entry.name, arch, properties.arch);
+                  const archs = { "ARM aarch64" : "aarch64" };
+                  arch = archs[arch] || arch;
 
-                  if(arch === 'ARM aarch64') {
+                  if(properties.arch.indexOf(arch) >= 0) {
                     return entry;
                   }
 
-                  //return entry;
+                  console.log('SKIP', entry.name, arch);
                 }
               },
               createExpressionTransformer(
-                entry => uc.fileNameConformsTo(entry.name, "public.text") && !uc.fileNameConformsTo(entry.name, "com.netscape.javascript-source"),
+                entry => entry.isBlob && uc.fileNameConformsTo(entry.name, "public.text") && !uc.fileNameConformsTo(entry.name, "com.netscape.javascript-source"),
                 properties
               )
             ];

package/src/util.mjs

@@ -1,7 +1,7 @@
 import { join, dirname } from "node:path";
 import { mkdir } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
-import { Readable} from "node:stream";
+import { Readable } from "node:stream";
 
 import { createWriteStream } from "node:fs";
 import { ContentEntry } from "content-entry";
@@ -209,35 +209,37 @@ export async function* copyEntries(
   expander = v => v
 ) {
   for await (const entry of source) {
-    // @ts-ignore
-    const d = entry.destination;
-
-    const name = expander(
-      d === undefined
-        ? entry.name
-        : d.isCollection || d.endsWith("/")
-        ? join(d, entry.name)
-        : d
-    ).replace(/^\//, "");
-
-    // @ts-ignore
-    entry.destination = name;
-    const destination = join(destinationDirectory, name);
+    if (entry) {
+      // @ts-ignore
+      const d = entry.destination;
+
+      const name = expander(
+        d === undefined
+          ? entry.name
+          : d.isCollection || d.endsWith("/")
+          ? join(d, entry.name)
+          : d
+      ).replace(/^\//, "");
+
+      // @ts-ignore
+      entry.destination = name;
+      const destination = join(destinationDirectory, name);
+
+      if (entry.isCollection) {
+        await mkdir(destination, { recursive: true, mode: await entry.mode });
+      } else {
+        await mkdir(dirname(destination), { recursive: true });
+
+        await pipeline(
+          Readable.fromWeb(await entry.stream),
+          createWriteStream(
+            destination,
+            entry.mode ? { mode: await entry.mode } : undefined
+          )
+        );
+      }
 
-    if (entry.isCollection) {
-      await mkdir(destination, { recursive: true, mode: await entry.mode });
-    } else {
-      await mkdir(dirname(destination), { recursive: true });
-
-      await pipeline(
-        Readable.fromWeb(await entry.stream),
-        createWriteStream(
-          destination,
-          entry.mode ? { mode: await entry.mode } : undefined
-        )
-      );
+      yield entry;
     }
-
-    yield entry;
   }
 }