npm-pkgbuild 10.14.0 → 10.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.14.0",
+  "version": "10.14.3",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "aggregate-async-iterator": "^1.1.14",
     "commander": "^9.4.0",
     "content-entry": "^5.1.1",
-    "content-entry-filesystem": "^5.2.0",
+    "content-entry-filesystem": "^5.2.1",
     "content-entry-transform": "^1.4.11",
     "execa": "^6.1.0",
     "expression-expander": "^7.0.19",

package/src/npm-shrink.mjs

@@ -107,7 +107,7 @@ export function shrinkNPM(pkg, options = { removeKeys: nameAndVersion, removeDef
     delete pkg[key];
   });
 
-  if (options && options.removeKeys) {
+  if (options?.removeKeys) {
     options.removeKeys.map(key => {
       delete pkg[key];
     });

package/src/output/arch.mjs

@@ -49,7 +49,7 @@ export const pkgKeyValuePairOptions = {
 
 function keyPrefix(key) {
   const f = fields[key];
-  return f && f.prefix ? f.prefix + key : key;
+  return f?.prefix ? f.prefix + key : key;
 }
 
 const PKGBUILD = "PKGBUILD";

package/src/output/oci.mjs

@@ -10,10 +10,16 @@ const MEDIA_TYPE_MANIFEST = "application/vnd.oci.image.manifest.v1+json";
 const MEDIA_TYPE_CONFIG = "application/vnd.oci.image.config.v1+json";
 const MEDI_TYPE_IMAGE_LAYER = "application/vnd.oci.image.layer.v1.tar+gzip";
 
-function into(buffer, offset, string) {
-  for (let i = 0; i < string.length; i++) {
+function into(buffer, offset, length, string) {
+  let i = 0;
+
+  for (; i < string.length; i++) {
     buffer[offset + i] = string.charCodeAt(i);
   }
+
+  for (; i < length; i++) {
+    buffer[offset + i] = 0;
+  }
 }
 
 function intoOctal(buffer, offset, length, number) {
@@ -91,15 +97,15 @@ export class OCI extends Packager {
     console.log(packageFile);
 
     const header = new Uint8Array(512);
-    into(header, 257, "ustar");
+    into(header, 257, 6, "ustar");
     header[263] = 48; // 0;
     header[264] = 48; // 0;
 
     intoOctal(header, 108, 8, 0 /* root */);
     intoOctal(header, 116, 8, 3 /* sys */);
 
-    into(header, 265, "root");
-    into(header, 297, "sys");
+    into(header, 265, 32, "root");
+    into(header, 297, 32, "sys");
 
     header[156] = 48; // 0
 
@@ -108,10 +114,12 @@ export class OCI extends Packager {
       const buffer = await entry.buffer;
       const size = buffer.length;
 
-      into(header, 0, entry.name);
+      into(header, 0,100, entry.name);
       intoOctal(header, 100, 8, entry.mode);
       intoOctal(header, 124, 12, size);
-      intoOctal(header, 136, 12, await entry.mtime);
+
+      const mtime = await entry.mtime;
+      intoOctal(header, 136, 12, mtime ? mtime.getTime() / 1000: 0);
       intoOctal(header, 148, 8, chksum(header));
 
       out.write(header);

package/src/output/packager.mjs

@@ -92,7 +92,7 @@ export class Packager {
       out[nd[0]] = nd[1];
     }
 
-    if (options.publish && options.publish.length) {
+    if (options.publish?.length) {
       const publish = analysePublish(options.publish[0], out.properties);
 
       out.destination = publish.scheme === "file:" ? publish.url : tmpdir;