@argos-ci/core 4.1.1 → 4.1.3

package/dist/index.js

@@ -587,25 +587,43 @@ var mustBeArgosToken = (value) => {
     throw new Error("Invalid Argos repository token (must be 40 characters)");
   }
 };
-var minNumber = (value, min) => {
-  const number = parseInt(value, 10);
-  if (!Number.isInteger(number)) {
-    throw new Error("must be a number");
+var minInteger = (min) => (value) => {
+  if (!Number.isInteger(value)) {
+    throw new Error("must be an integer");
   }
-  if (number < min) {
+  if (value < min) {
     throw new Error(`must be at least ${min}`);
   }
 };
+var toInt = (value) => {
+  if (value === "") {
+    return null;
+  }
+  const num = Number(value);
+  if (!Number.isInteger(num) || Number.isNaN(num)) {
+    return num;
+  }
+  return num;
+};
+var toFloat = (value) => parseFloat(value);
+convict.addFormat({
+  name: "parallel-total",
+  validate: minInteger(-1),
+  coerce: toInt
+});
+convict.addFormat({
+  name: "parallel-index",
+  validate: minInteger(1),
+  coerce: toInt
+});
 convict.addFormat({
   name: "float-percent",
-  validate: function(val) {
+  validate: (val) => {
     if (val !== 0 && (!val || val > 1 || val < 0)) {
       throw new Error("Must be a float between 0 and 1, inclusive.");
     }
   },
-  coerce: function(val) {
-    return parseFloat(val);
-  }
+  coerce: toFloat
 });
 var schema = {
   apiBaseUrl: {
@@ -671,15 +689,15 @@ var schema = {
   },
   parallelIndex: {
     env: "ARGOS_PARALLEL_INDEX",
+    format: "parallel-index",
     default: null,
-    nullable: true,
-    format: (value) => minNumber(value, 1)
+    nullable: true
   },
   parallelTotal: {
     env: "ARGOS_PARALLEL_TOTAL",
+    format: "parallel-total",
     default: null,
-    nullable: true,
-    format: (value) => minNumber(value, -1)
+    nullable: true
   },
   referenceBranch: {
     env: "ARGOS_REFERENCE_BRANCH",
@@ -731,36 +749,44 @@ var schema = {
     nullable: true
   }
 };
-var createConfig = () => {
-  return convict(schema, {
-    args: []
-  });
-};
+function createConfig() {
+  return convict(schema, { args: [], env: {} });
+}
+function getDefaultConfig() {
+  return Object.entries(schema).reduce(
+    (cfg, [key, entry]) => {
+      cfg[key] = "env" in entry && entry.env && process.env[entry.env] ? process.env[entry.env] : entry.default;
+      return cfg;
+    },
+    {}
+  );
+}
 async function readConfig(options = {}) {
   const config = createConfig();
   const ciEnv = await getCiEnvironment();
+  const defaultConfig = getDefaultConfig();
   config.load({
-    apiBaseUrl: options.apiBaseUrl || config.get("apiBaseUrl"),
-    commit: options.commit || config.get("commit") || ciEnv?.commit || null,
-    branch: options.branch || config.get("branch") || ciEnv?.branch || null,
-    token: options.token || config.get("token") || null,
-    buildName: options.buildName || config.get("buildName") || null,
-    prNumber: options.prNumber || config.get("prNumber") || ciEnv?.prNumber || null,
-    prHeadCommit: config.get("prHeadCommit") || ciEnv?.prHeadCommit || null,
-    prBaseBranch: config.get("prBaseBranch") || ciEnv?.prBaseBranch || null,
-    referenceBranch: options.referenceBranch || config.get("referenceBranch") || null,
-    referenceCommit: options.referenceCommit || config.get("referenceCommit") || null,
+    apiBaseUrl: options.apiBaseUrl || defaultConfig.apiBaseUrl,
+    commit: options.commit || defaultConfig.commit || ciEnv?.commit || null,
+    branch: options.branch || defaultConfig.branch || ciEnv?.branch || null,
+    token: options.token || defaultConfig.token || null,
+    buildName: options.buildName || defaultConfig.buildName || null,
+    prNumber: options.prNumber || defaultConfig.prNumber || ciEnv?.prNumber || null,
+    prHeadCommit: defaultConfig.prHeadCommit || ciEnv?.prHeadCommit || null,
+    prBaseBranch: defaultConfig.prBaseBranch || ciEnv?.prBaseBranch || null,
+    referenceBranch: options.referenceBranch || defaultConfig.referenceBranch || null,
+    referenceCommit: options.referenceCommit || defaultConfig.referenceCommit || null,
     repository: ciEnv?.repository || null,
     jobId: ciEnv?.jobId || null,
     runId: ciEnv?.runId || null,
     runAttempt: ciEnv?.runAttempt || null,
-    parallel: options.parallel ?? config.get("parallel") ?? false,
-    parallelNonce: options.parallelNonce || config.get("parallelNonce") || ciEnv?.nonce || null,
-    parallelTotal: options.parallelTotal ?? config.get("parallelTotal") ?? null,
-    parallelIndex: options.parallelIndex ?? config.get("parallelIndex") ?? null,
-    mode: options.mode || config.get("mode") || null,
+    parallel: options.parallel ?? defaultConfig.parallel ?? false,
+    parallelNonce: options.parallelNonce || defaultConfig.parallelNonce || ciEnv?.nonce || null,
+    parallelTotal: options.parallelTotal ?? defaultConfig.parallelTotal ?? null,
+    parallelIndex: options.parallelIndex ?? defaultConfig.parallelIndex ?? null,
+    mode: options.mode || defaultConfig.mode || null,
     ciProvider: ciEnv?.key || null,
-    previewBaseUrl: config.get("previewBaseUrl") || null
+    previewBaseUrl: defaultConfig.previewBaseUrl || null
   });
   config.validate();
   return config.get();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "type": "module",
   "main": "./dist/index.cjs",
   "exports": {
@@ -64,5 +64,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "7cbf27f8eb0415089d827759d9e14deaf891f797"
+  "gitHead": "9bda48090685f3215301526c7d979716d485f3ed"
 }