repo-util 1.24.53 → 1.24.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repo-util",
-  "version": "1.24.53",
+  "version": "1.24.55",
   "publishConfig": {
     "access": "public"
   },
@@ -21,12 +21,12 @@
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp"
   },
   "dependencies": {
-    "aggregation-repository-provider": "^5.3.4",
+    "aggregation-repository-provider": "^5.3.6",
     "bitbucket-repository-provider": "^4.4.13",
     "commander": "^9.4.1",
     "etag-cache-leveldb": "^1.4.0",
-    "gitea-repository-provider": "^2.4.7",
-    "github-repository-provider": "^7.33.10",
+    "gitea-repository-provider": "^2.4.9",
+    "github-repository-provider": "^7.33.11",
     "leveldown": "^6.1.1",
     "levelup": "^5.1.1",
     "local-repository-provider": "^8.1.3"

package/src/repo-util-cli.mjs

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
 
-import { mkdir } from "node:fs/promises";
-import { join } from "node:path";
-import { homedir } from "node:os";
 import { program } from "commander";
-import levelup from "levelup";
-import leveldown from "leveldown";
 import {
   Repository,
   RepositoryGroup,
@@ -18,9 +13,8 @@ import {
   PullRequest,
   MultiGroupProvider
 } from "repository-provider";
-import AggregationProvider from "aggregation-repository-provider";
-import { ETagCacheLevelDB } from "etag-cache-leveldb";
 import pkg from "../package.json" assert { type: "json" };
+import { initializeRepositoryProvider } from "./setup-provider.mjs";
 
 process.on("uncaughtException", console.error);
 process.on("unhandledRejection", console.error);
@@ -34,6 +28,8 @@ program
     Object.assign(properties, Object.fromEntries([str.split(/=/)]))
   );
 
+const { provider } = await initializeRepositoryProvider(program);
+
 for (const o of [
   type(MultiGroupProvider),
   type(RepositoryGroup),
@@ -84,14 +80,18 @@ for (const o of [
     .option("--no-cache", "cache requests")
     .option("--statistics", "show cache statistics")
     .option("--json", "output as json")
-    .option("--no-identifier", "do not output identifier, show attribute values 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(",")
     );
+
   command.action(async (names, options) =>
     list(
-      await prepareProvider(options),
+      provider,
       names,
       options,
       o[1],
@@ -110,11 +110,7 @@ for (const o of [
         );
 
         command.action(async (names, options) => {
-          await actionOptions.execute(
-            await prepareProvider(options),
-            names,
-            options
-          );
+          await actionOptions.execute(provider, names, options);
         });
       }
       if (actionOptions.executeInstance) {
@@ -141,8 +137,7 @@ function listAttributes(object, attributes, options) {
     } else if (value instanceof Set) {
       value = [...value].join(" ");
     } else if (value === undefined) {
-      if(options["undefined"])
-      value = "";
+      if (options["undefined"]) value = "";
     }
 
     if (a.length > maxKeyLength) {
@@ -192,35 +187,6 @@ async function list(provider, names, options, slot, attributes, actions) {
   }
 }
 
-async function createCache() {
-  const dir = join(homedir(), ".cache/repository-provider");
-  await mkdir(dir, { recursive: true });
-  const db = await levelup(leveldown(dir));
-  return new ETagCacheLevelDB(db);
-}
-
-async function prepareProvider(options) {
-  const provider = await AggregationProvider.initialize(
-    [],
-    properties,
-    process.env
-  );
-
-  if (options.cache) {
-    const cache = await createCache();
-    provider._providers.forEach(p => (p.cache = cache));
-  }
-
-  provider.messageDestination = {
-    trace: options.trace ? console.log : () => {},
-    info: console.log,
-    warn: console.warn,
-    error: console.error
-  };
-
-  return provider;
-}
-
 function visibleAttributes(object) {
   return Object.fromEntries(
     Object.entries(object.attributes).filter(

package/src/setup-provider.mjs

@@ -0,0 +1,38 @@
+import AggregationProvider from "aggregation-repository-provider";
+import { ETagCacheLevelDB } from "etag-cache-leveldb";
+import levelup from "levelup";
+import leveldown from "leveldown";
+import { mkdir } from "node:fs/promises";
+import { join } from "node:path";
+import { homedir } from "node:os";
+
+async function createCache() {
+  const dir = join(homedir(), ".cache/repository-provider");
+  await mkdir(dir, { recursive: true });
+  const db = await levelup(leveldown(dir));
+  return new ETagCacheLevelDB(db);
+}
+
+export async function initializeRepositoryProvider(program, properties) {
+  const provider = await AggregationProvider.initialize(
+    [],
+    properties,
+    process.env
+  );
+
+  const options = program.opts();
+
+  provider.messageDestination = {
+    trace: options.trace ? console.log : () => {},
+    info: console.log,
+    warn: console.warn,
+    error: console.error
+  };
+
+  if (options.cache) {
+    const cache = await createCache();
+    provider._providers.forEach(p => (p.cache = cache));
+  }
+
+  return { provider, options };
+}