clyops-jobs 0.7.0 → 0.9.0

package/clyops-jobs.cjs

@@ -179,12 +179,13 @@ function stamp(file) {
   return `${s.mtimeMs}:${s.size}`;
 }
 var cache = /* @__PURE__ */ new Map();
+var PROBE_TIMEOUT_MS = 3e4;
 function loadSchema(file, opts = {}) {
   const key = stamp(file);
   const hit = cache.get(file);
   if (hit && hit.stamp === key) return hit.schema;
   const schema = new Promise((resolve5, reject) => {
-    (0, import_node_child_process.execFile)(file, ["--help-json-schema"], { cwd: opts.cwd, timeout: opts.timeoutMs ?? 5e3, maxBuffer: 16 << 20 }, (err, stdout) => {
+    (0, import_node_child_process.execFile)(file, ["--help-json-schema"], { cwd: opts.cwd, timeout: opts.timeoutMs ?? PROBE_TIMEOUT_MS, maxBuffer: 16 << 20 }, (err, stdout) => {
       if (err) return reject(new Error(`${file} does not provide --help-json-schema: ${err.message}`));
       const start2 = stdout.indexOf("{");
       const end = stdout.lastIndexOf("}");
@@ -200,7 +201,9 @@ function loadSchema(file, opts = {}) {
       }
     });
   });
-  schema.catch(() => cache.delete(file));
+  schema.catch(() => {
+    if (cache.get(file)?.schema === schema) cache.delete(file);
+  });
   cache.set(file, { stamp: key, schema });
   return schema;
 }
@@ -230,6 +233,9 @@ var InputError = class extends Error {
 function isPathValued(validation, type) {
   return type === "path" || validation === "path" || validation.startsWith("file:") || validation.startsWith("dir:");
 }
+function isBareProgram(validation, value) {
+  return validation === "file:executable" && value !== "" && !value.includes("/") && !(process.platform === "win32" && value.includes("\\"));
+}
 var TRUE = /^(true|1|yes|on)$/i;
 var FALSE = /^(false|0|no|off)$/i;
 function toArgv(schema, input, opts = {}) {
@@ -244,9 +250,10 @@ function toArgv(schema, input, opts = {}) {
     }
     return void 0;
   };
-  const text = (value, pathValued, name = "") => {
+  const text = (value, pathValued, name = "", validation = "") => {
     let s = typeof value === "object" ? JSON.stringify(value) : String(value);
     if (opts.render) s = opts.render(s);
+    if (isBareProgram(validation, s)) return s;
     if (pathValued && opts.base && !["", "-", "disabled", "false"].includes(s) && !(0, import_node_path2.isAbsolute)(s) && !/^[a-z][a-z0-9+.-]*:\/\//i.test(s)) {
       s = (0, import_node_path2.resolve)(opts.base, s);
     }
@@ -273,11 +280,11 @@ function toArgv(schema, input, opts = {}) {
       continue;
     }
     if (opts.secretEnv && option.secret && !option.isArray) {
-      out.env[option.variableName] = text(found.value, isPathValued(option.validation, option.type), `--${option.name}`);
+      out.env[option.variableName] = text(found.value, isPathValued(option.validation, option.type), `--${option.name}`, option.validation);
       continue;
     }
     for (const item of Array.isArray(found.value) ? found.value : [found.value]) {
-      out.argv.push(`--${option.name}`, text(item, isPathValued(option.validation, option.type), `--${option.name}`));
+      out.argv.push(`--${option.name}`, text(item, isPathValued(option.validation, option.type), `--${option.name}`, option.validation));
     }
   }
   const explicit = Array.isArray(opts.positionals) ? opts.positionals : void 0;
@@ -288,6 +295,11 @@ function toArgv(schema, input, opts = {}) {
     let skipped = [];
     for (const argument of schema.arguments) {
       const found = pick(argument);
+      if (found && opts.controlled?.includes(argument.name)) {
+        out.controlled.push(found.key);
+        skipped.push(argument);
+        continue;
+      }
       if (!found || found.value === null || found.value === void 0) {
         skipped.push(argument);
         continue;
@@ -298,7 +310,7 @@ function toArgv(schema, input, opts = {}) {
       }
       skipped = [];
       const values = Array.isArray(found.value) ? found.value : [found.value];
-      positionals.push(...values.map((v) => text(v, isPathValued(argument.validation), argument.name)));
+      positionals.push(...values.map((v) => text(v, isPathValued(argument.validation), argument.name, argument.validation)));
     }
   }
   if (positionals.some((p) => p.startsWith("-"))) out.argv.push("--", ...positionals);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clyops-jobs",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Run clyops tools as jobs: config-bound functions, templated invocation, artifacts, job records and a queue.",
   "license": "MIT",
   "repository": {
@@ -38,7 +38,7 @@
     "typescript": "^5.6.0"
   },
   "dependencies": {
-    "clyops-tools": "0.7.0"
+    "clyops-tools": "0.9.0"
   },
   "homepage": "https://clyops.io/node-tools.html",
   "scripts": {