facturas 0.20.3 → 0.20.5

package/dist/cli.mjs

@@ -7,12 +7,13 @@ import {
   createWsaaAuthModule,
   createWsaaStoreAdapter,
   discoverArcaClientConfig
-} from "./chunk-5CUMVSJY.mjs";
+} from "./chunk-KBEV7QTU.mjs";
 import "./chunk-C2KX652X.mjs";
-import "./chunk-JP3LVU7K.mjs";
-import "./chunk-3NOKGXXX.mjs";
-import "./chunk-VF3XJXBG.mjs";
-import "./chunk-XTKZ5FDN.mjs";
+import "./chunk-UOIZQMA6.mjs";
+import "./chunk-VEKUMXHW.mjs";
+import "./chunk-EXJMG54W.mjs";
+import "./chunk-YPQJRSTA.mjs";
+import "./chunk-B2M64SIK.mjs";
 import {
   ArcaConfigurationError,
   ArcaServiceError,
@@ -109,7 +110,7 @@ function certificateFileName(environment) {
 function privateKeyFileName(environment) {
   return `arca-${environment}.key`;
 }
-function discoverCredentials(directory, environment) {
+function discoverCredentials(directory, environment, supplied = {}) {
   const candidates = (environment === void 0 ? DISCOVERY_ORDER : [environment]).map((candidate) => {
     const certificateFile = certificateFileName(candidate);
     const keyFile = privateKeyFileName(candidate);
@@ -122,12 +123,14 @@ function discoverCredentials(directory, environment) {
     };
   });
   const complete = candidates.filter(
-    (candidate) => candidate.hasCertificate && candidate.hasKey
+    (candidate) => (candidate.hasCertificate || supplied.certificatePem) && (candidate.hasKey || supplied.privateKeyPem)
   );
   if (complete.length > 1) {
     return {
       kind: "ambiguous",
-      files: complete.map((candidate) => candidate.certificateFile)
+      files: complete.map(
+        (candidate) => supplied.certificatePem ? candidate.keyFile : candidate.certificateFile
+      )
     };
   }
   const [pair] = complete;
@@ -138,8 +141,8 @@ function discoverCredentials(directory, environment) {
         environment: pair.environment,
         certificateFile: pair.certificateFile,
         keyFile: pair.keyFile,
-        certificatePem: read(directory, pair.certificateFile),
-        privateKeyPem: read(directory, pair.keyFile)
+        certificatePem: supplied.certificatePem || read(directory, pair.certificateFile),
+        privateKeyPem: supplied.privateKeyPem || read(directory, pair.keyFile)
       }
     };
   }
@@ -944,30 +947,33 @@ function resolveCheckEnvironment(io, flags) {
   if (chosen) {
     return chosen;
   }
-  if (flags.cert?.trim() || io.env.ARCA_CERTIFICATE_PEM?.trim()) {
-    return void 0;
-  }
   try {
-    const discovery = discoverCredentials(resolveDirectory(io, flags.dir));
+    const { discovery } = resolveCredentials(io, flags);
     return discovery.kind === "found" ? discovery.credentials.environment : void 0;
   } catch {
     return void 0;
   }
 }
+function resolveCredentials(io, flags, environment) {
+  const certificatePem = readPem(io, flags.cert, io.env.ARCA_CERTIFICATE_PEM);
+  const privateKeyPem = readPem(io, flags.key, io.env.ARCA_PRIVATE_KEY_PEM);
+  const discovery = certificatePem && privateKeyPem ? { kind: "none" } : discoverCredentials(resolveDirectory(io, flags.dir), environment, {
+    certificatePem,
+    privateKeyPem
+  });
+  return { certificatePem, privateKeyPem, discovery };
+}
 function resolveConfigLayer(io, flags) {
   const chosenEnvironment = flags.env?.trim().toLowerCase() || io.env.ARCA_ENVIRONMENT?.trim();
   let certificatePem;
   let privateKeyPem;
-  let discovery = { kind: "none" };
+  let discovery;
   try {
-    certificatePem = readPem(io, flags.cert, io.env.ARCA_CERTIFICATE_PEM);
-    privateKeyPem = readPem(io, flags.key, io.env.ARCA_PRIVATE_KEY_PEM);
-    if (!(certificatePem && privateKeyPem)) {
-      discovery = discoverCredentials(
-        resolveDirectory(io, flags.dir),
-        toEnvironment2(chosenEnvironment)
-      );
-    }
+    ({ certificatePem, privateKeyPem, discovery } = resolveCredentials(
+      io,
+      flags,
+      toEnvironment2(chosenEnvironment)
+    ));
   } catch (error) {
     const unknown = describeUnknownError(error);
     return {
@@ -1009,7 +1015,7 @@ function resolveConfigLayer(io, flags) {
         name: "config",
         ok: true,
         detail: describeSources({
-          ...describeCredentialSource(flags, found),
+          ...describeCredentialSource(flags, found, certificatePem),
           taxId: taxId.source,
           ...describeEnvironmentSource(io, flags, config.environment)
         })
@@ -1080,14 +1086,15 @@ function readPem(io, file, fromEnv) {
   const path = isAbsolute2(file) ? file : resolve3(io.cwd, file);
   return readFileSync3(path, "utf8").trim();
 }
-function describeCredentialSource(flags, found) {
-  if (found !== void 0) {
-    return { credentials: `${found.certificateFile} en este directorio` };
-  }
+function describeCredentialSource(flags, found, suppliedCertificate) {
   const named = [
     ...flags.cert?.trim() ? ["--cert"] : [],
     ...flags.key?.trim() ? ["--key"] : []
   ];
+  if (found !== void 0) {
+    const file = suppliedCertificate ? found.keyFile : found.certificateFile;
+    named.push(`${file} en este directorio`);
+  }
   return named.length === 0 ? {} : { credentials: named.join(" y ") };
 }
 function describeEnvironmentSource(io, flags, environment) {