npm-pkgbuild 10.14.1 → 10.14.4

package/README.md

@@ -98,19 +98,8 @@ see [mf-hoting](https://www.npmjs.com/package/mf-hosting) module as an example.
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
     *   [Parameters](#parameters-2)
     *   [name](#name-2)
-*   [packageNameMapping](#packagenamemapping)
-*   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-3)
-*   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-4)
-*   [fieldProvider](#fieldprovider)
-    *   [Parameters](#parameters-5)
-*   [Expander](#expander)
-    *   [Parameters](#parameters-6)
-*   [copyEntries](#copyentries)
-    *   [Parameters](#parameters-7)
 *   [NPMPackContentProvider](#npmpackcontentprovider)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-3)
     *   [name](#name-3)
 *   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
 *   [fields](#fields)
@@ -121,11 +110,22 @@ see [mf-hoting](https://www.npmjs.com/package/mf-hosting) module as an example.
 *   [Field](#field)
     *   [Properties](#properties)
 *   [Packager](#packager)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-4)
     *   [tmpdir](#tmpdir)
     *   [execute](#execute)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-5)
 *   [available](#available)
+*   [packageNameMapping](#packagenamemapping)
+*   [decodePassword](#decodepassword)
+    *   [Parameters](#parameters-6)
+*   [extractFunctions](#extractfunctions)
+    *   [Parameters](#parameters-7)
+*   [fieldProvider](#fieldprovider)
+    *   [Parameters](#parameters-8)
+*   [Expander](#expander)
+    *   [Parameters](#parameters-9)
+*   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-10)
 
 ## ContentProvider
 
@@ -188,61 +188,6 @@ Content from node_modules
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
-## packageNameMapping
-
-What is the node name in the package eco-system
-
-## decodePassword
-
-Decode a password
-
-### Parameters
-
-*   `password` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** plaintext password
-
-## extractFunctions
-
-Extract shell functions from a given text.
-
-### Parameters
-
-*   `source` **AsyncIterator<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** 
-
-Returns **AsyncIterator\<FunctionDecl>** 
-
-## fieldProvider
-
-### Parameters
-
-*   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-*   `fields` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-
-Returns **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
-
-## Expander
-
-Type: [Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)
-
-### Parameters
-
-*   `path` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-## copyEntries
-
-Copy content from source into destinationDirectory.
-Destination paths a generated without leading '/' (as for entry names too).
-
-### Parameters
-
-*   `source` **AsyncIterator\<ContentEntry>** 
-*   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-*   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
-*   `attributes` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<ContentEntryAttribute>** 
-
 ## NPMPackContentProvider
 
 **Extends ContentProvider**
@@ -323,6 +268,61 @@ Check for rpmbuild presence.
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** true when rpmbuild is present
 
+## packageNameMapping
+
+What is the node name in the package eco-system
+
+## decodePassword
+
+Decode a password
+
+### Parameters
+
+*   `password` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** plaintext password
+
+## extractFunctions
+
+Extract shell functions from a given text.
+
+### Parameters
+
+*   `source` **AsyncIterator<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>** 
+
+Returns **AsyncIterator\<FunctionDecl>** 
+
+## fieldProvider
+
+### Parameters
+
+*   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+*   `fields` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+
+Returns **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
+
+## Expander
+
+Type: [Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)
+
+### Parameters
+
+*   `path` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+## copyEntries
+
+Copy content from source into destinationDirectory.
+Destination paths a generated without leading '/' (as for entry names too).
+
+### Parameters
+
+*   `source` **AsyncIterator\<ContentEntry>** 
+*   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
+*   `attributes` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<ContentEntryAttribute>** 
+
 # install
 
 With [npm](http://npmjs.org) do:

package/package.json

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

package/src/extract-from-package.mjs

@@ -60,10 +60,8 @@ function extractFromRootPackage(json) {
     properties.name = properties.name.replace(/^\@[^\/]+\//, "");
   }
 
-  if (json.bugs) {
-    if (json.bugs.url) {
-      properties.bugs = json.bugs.url;
-    }
+  if (json.bugs?.url) {
+    properties.bugs = json.bugs.url;
   }
 
   properties.access = json.publishConfig
@@ -167,7 +165,7 @@ export async function* extractFromPackage(options = {}) {
     if (pkgbuild) {
       if (modulePath) {
         if (!pkgbuild.abstract) {
-          if(pkgbuild.groups === groups) {
+          if (pkgbuild.groups === groups) {
             dependencies[pkgbuild.name || json.name] = ">=" + json.version;
           }
         }
@@ -257,7 +255,11 @@ export async function* extractFromPackage(options = {}) {
       }
     }
     if (numberOfArchs === 0) {
-      console.warn(`No matching arch remaining, ${[...arch]} : ${[...arch]} : ${process.arch}`);
+      console.warn(
+        `No matching arch remaining, ${[...arch]} : ${[...arch]} : ${
+          process.arch
+        }`
+      );
     }
   } else {
     // or one set if no arch is given

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

@@ -78,12 +78,6 @@ export class OCI extends Packager {
           "sha256:b5b2b2c507a0944348e0303114d8d93aaaa081732b86451d9bce1f432a537bc7"
       },
       layers: [
-        {
-          mediaType: MEDI_TYPE_IMAGE_LAYER,
-          size: 73109,
-          digest:
-            "sha256:ec4b8955958665577945c89419d1af06b5f7636b4ac3da7f12184802ad867736"
-        }
       ],
       annotations: {
         description: properties.description,
@@ -92,14 +86,11 @@ export class OCI extends Packager {
     };
 
     const out = createGzip();
-    const hash = createHash("sha256");
-
-    console.log(packageFile);
 
     const header = new Uint8Array(512);
     into(header, 257, 6, "ustar");
-    header[263] = 48; // 0;
-    header[264] = 48; // 0;
+    header[263] = 48; // '0';
+    header[264] = 48; // '0';
 
     intoOctal(header, 108, 8, 0 /* root */);
     intoOctal(header, 116, 8, 3 /* sys */);
@@ -107,17 +98,22 @@ export class OCI extends Packager {
     into(header, 265, 32, "root");
     into(header, 297, 32, "sys");
 
-    header[156] = 48; // 0
+    header[156] = 48; // '0'
 
     for await (const entry of aggregateFifo(sources)) {
       //      const size = await entry.size;
       const buffer = await entry.buffer;
       const size = buffer.length;
 
-      into(header, 0,100, 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;
+      if (!mtime) {
+        console.warn("no mtime", entry.name);
+      }
+      intoOctal(header, 136, 12, mtime ? mtime.getTime() / 1000 : 0);
       intoOctal(header, 148, 8, chksum(header));
 
       out.write(header);
@@ -139,12 +135,29 @@ export class OCI extends Packager {
       }
     }
 
+    const hash = createHash("sha256");
+    let size = 0;
+    out.on("data", chunk => {
+      hash.update(chunk);
+      size += chunk.length;
+    });
+
     const filler = new Uint8Array(1024 * 8);
     out.end(filler);
 
     await pipeline(out, createWriteStream(packageFile));
 
-    console.log(hash.digest("base64"));
+    const layer = {
+      mediaType: MEDI_TYPE_IMAGE_LAYER,
+      size,
+      digest: "sha256:" + hash.digest("hex")
+    };
+
+    console.log(layer);
+
+    meta.layers.push(layer);
+
+    console.log(packageFile);
 
     return packageFile;
   }

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;

package/src/util.mjs

@@ -23,7 +23,6 @@ export function decodePassword(password) {
     switch (m[1]) {
       case "BASE64":
         return Buffer.from(m[2], "base64").toString("utf8");
-        break;
       default:
         throw new Error(`Unknown algorithm ${m[1]}`);
     }