@workglow/task-graph 0.0.103 → 0.0.104

package/dist/node.js

@@ -799,6 +799,26 @@ function getSchemaFormat(schema) {
   }
   return;
 }
+function getObjectSchema(schema) {
+  if (typeof schema !== "object" || schema === null)
+    return;
+  const s = schema;
+  if (s.type === "object" && s.properties && typeof s.properties === "object") {
+    return s;
+  }
+  const variants = s.oneOf ?? s.anyOf;
+  if (Array.isArray(variants)) {
+    for (const variant of variants) {
+      if (typeof variant === "object" && variant !== null) {
+        const v = variant;
+        if (v.type === "object" && v.properties && typeof v.properties === "object") {
+          return v;
+        }
+      }
+    }
+  }
+  return;
+}
 function getFormatPrefix(format) {
   const colonIndex = format.indexOf(":");
   return colonIndex >= 0 ? format.substring(0, colonIndex) : format;
@@ -812,22 +832,30 @@ async function resolveSchemaInputs(input, schema, config) {
   const resolvers = getInputResolvers();
   const resolved = { ...input };
   for (const [key, propSchema] of Object.entries(properties)) {
-    const value = resolved[key];
+    let value = resolved[key];
     const format = getSchemaFormat(propSchema);
-    if (!format)
-      continue;
-    let resolver = resolvers.get(format);
-    if (!resolver) {
-      const prefix = getFormatPrefix(format);
-      resolver = resolvers.get(prefix);
+    if (format) {
+      let resolver = resolvers.get(format);
+      if (!resolver) {
+        const prefix = getFormatPrefix(format);
+        resolver = resolvers.get(prefix);
+      }
+      if (resolver) {
+        if (typeof value === "string") {
+          value = await resolver(value, format, config.registry);
+          resolved[key] = value;
+        } else if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
+          const results = await Promise.all(value.map((item) => resolver(item, format, config.registry)));
+          value = results.filter((result) => result !== undefined);
+          resolved[key] = value;
+        }
+      }
     }
-    if (!resolver)
-      continue;
-    if (typeof value === "string") {
-      resolved[key] = await resolver(value, format, config.registry);
-    } else if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
-      const results = await Promise.all(value.map((item) => resolver(item, format, config.registry)));
-      resolved[key] = results.filter((result) => result !== undefined);
+    if (value !== null && value !== undefined && typeof value === "object" && !Array.isArray(value)) {
+      const objectSchema = getObjectSchema(propSchema);
+      if (objectSchema) {
+        resolved[key] = await resolveSchemaInputs(value, objectSchema, config);
+      }
     }
   }
   return resolved;
@@ -1475,7 +1503,7 @@ class Task {
         this.runInputData[inputId] = prop.default;
       }
     }
-    if (schema.additionalProperties === true) {
+    if (schema.additionalProperties) {
       for (const [inputId, value] of Object.entries(input)) {
         if (!(inputId in properties)) {
           this.runInputData[inputId] = value;
@@ -1528,7 +1556,7 @@ class Task {
         }
       }
     }
-    if (inputSchema.additionalProperties === true) {
+    if (inputSchema.additionalProperties) {
       for (const [inputId, value] of Object.entries(overrides)) {
         if (!(inputId in properties)) {
           if (!deepEqual(this.runInputData[inputId], value)) {
@@ -6166,4 +6194,4 @@ export {
   ConditionalTask
 };
 
-//# debugId=2492C1E27B2BED5064756E2164756E21
+//# debugId=CAEDE44FEB7E806964756E2164756E21