repo-util 1.23.0 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repo-util",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "publishConfig": {
     "access": "public"
   },
@@ -24,7 +24,7 @@
     "aggregation-repository-provider": "^5.2.36",
     "bitbucket-repository-provider": "^4.2.10",
     "commander": "^9.3.0",
-    "etag-cache-leveldb": "^1.2.0",
+    "etag-cache-leveldb": "^1.2.1",
     "gitea-repository-provider": "^2.2.11",
     "github-repository-provider": "^7.30.12",
     "leveldown": "^6.1.1",
@@ -38,7 +38,7 @@
     "semantic-release": "^19.0.3"
   },
   "engines": {
-    "node": ">=16.15.1"
+    "node": ">=18.3.0"
   },
   "repository": {
     "type": "git",

package/src/repo-util-cli.mjs

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 
-import { readFileSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
 import { homedir } from "node:os";
-import { fileURLToPath } from "node:url";
 import { program } from "commander";
 import levelup from "levelup";
 import leveldown from "leveldown";
@@ -22,21 +20,16 @@ import {
 } from "repository-provider";
 import AggregationProvider from "aggregation-repository-provider";
 import { ETagCacheLevelDB } from "etag-cache-leveldb";
+import pkg from "../package.json" assert { type: "json" };
 
 process.on("uncaughtException", console.error);
 process.on("unhandledRejection", console.error);
 
-const { version, description } = JSON.parse(
-  readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), {
-    encoding: "utf8"
-  })
-);
-
 const properties = {};
 
 program
-  .description(description)
-  .version(version)
+  .description(pkg.description)
+  .version(pkg.version)
   .option("-D --define <a=b>", "define property", str =>
     Object.assign(properties, Object.fromEntries([str.split(/=/)]))
   );
@@ -91,7 +84,8 @@ for (const o of [
     .option("--no-cache", "cache requests")
     .option("--statistics", "cache statistics")
     .option("--json", "output as json")
-    .option("--no-identifier", "do not output identifier, show attributes only")
+    .option("--no-identifier", "do not output identifier, show attribute values only")
+    .option("--no-undefined", "do not output undefined attribute values")
     .option("-a, --attribute <attributes>", "list attribute", a =>
       a.split(",")
     );
@@ -136,6 +130,37 @@ function normalize(names) {
   return names.length === 0 ? ["*"] : names;
 }
 
+function listAttributes(object, attributes, options) {
+  const values = {};
+  let maxKeyLength = 0;
+
+  for (const a of attributes) {
+    let value = object[a];
+    if (Array.isArray(value)) {
+      value = value.join(" ");
+    } else if (value instanceof Set) {
+      value = [...value].join(" ");
+    } else if (value === undefined) {
+      if(options["undefined"])
+      value = "";
+    }
+
+    if (a.length > maxKeyLength) {
+      maxKeyLength = a.length;
+    }
+
+    values[a] = value;
+  }
+
+  for (const [k, v] of Object.entries(values)) {
+    if (options.identifier) {
+      console.log(" ".repeat(maxKeyLength - k.length + 2) + k + `: ${v}`);
+    } else {
+      console.log(v);
+    }
+  }
+}
+
 async function list(provider, names, options, slot, attributes, actions) {
   const json = [];
 
@@ -151,27 +176,10 @@ async function list(provider, names, options, slot, attributes, actions) {
     if (options.json) {
       json.push(object);
     } else {
-      for (const a of attributes) {
-        let value = object[a];
-        if (Array.isArray(value)) {
-          value = value.join(" ");
-        } else if (value instanceof Set) {
-          value = [...value].join(" ");
-        } else if (value === undefined) {
-          value = "";
-        }
-
-        if (options.identifier === false) {
-          console.log(value);
-        } else {
-          console.log(
-            attributes.indexOf(a) === 0
-              ? object.fullName + ":"
-              : "             ".substring(a.length) + a + ":",
-            value
-          );
-        }
+      if (options.identifier) {
+        console.log(`${object.fullName}:`);
       }
+      listAttributes(object, attributes, options);
     }
   }