fix: handle workflow contexts without matrix

qoomon · Aug 4, 2024 · f212b2d · f212b2d
1 parent e6d6aa3
commit f212b2d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -35483,7 +35483,11 @@ const WorkflowContextSchema = z.object({
 const WorkflowContextParser = z.string()
     .transform((str, ctx) => {
     try {
-        return JSON.parse(`[${str.replace(/,\s*$/g, '')}]`);
+        return JSON.parse(`[${str
+            // fix trailing comma
+            .replace(/,\s*$/g, '')
+            // fix missing values
+            .replace(/,(?=,)/, ',null')}]`);
     }
     catch (error) {
         ctx.addIssue({ code: 'custom', message: error.message });
@@ -35502,15 +35506,13 @@ const WorkflowContextParser = z.string()
             });
             return z.NEVER;
         }
-        const matrix = contextArray.shift();
-        if (matrix != null && typeof matrix !== 'object') {
-            ctx.addIssue({
-                code: 'custom',
-                message: `Value must match the schema: "<JOB_NAME>", [<MATRIX_JSON>], [<JOB_NAME>", [<MATRIX_JSON>], ...]`,
-            });
-            return z.NEVER;
+        if (typeof contextArray[0] === 'object') {
+            const matrix = contextArray.shift();
+            context.push({ job, matrix });
+        }
+        else {
+            context.push({ job });
         }
-        context.push({ job, matrix });
     }
     return z.array(WorkflowContextSchema).parse(context);
 });

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/index.ts b/index.ts
@@ -304,7 +304,12 @@ type WorkflowContext = z.infer<typeof WorkflowContextSchema>
 const WorkflowContextParser = z.string()
     .transform((str, ctx) => {
       try {
-        return JSON.parse(`[${str.replace(/,\s*$/g, '')}]`)
+        return JSON.parse(`[${str
+            // fix trailing comma
+            .replace(/,\s*$/g, '')
+            // fix missing values
+            .replace(/,(?=,)/, ',null')
+        }]`)
       } catch (error: unknown) {
         ctx.addIssue({code: 'custom', message: (error as { message?: string }).message})
         return z.NEVER
@@ -322,15 +327,12 @@ const WorkflowContextParser = z.string()
           })
           return z.NEVER
         }
-        const matrix = contextArray.shift()
-        if (matrix != null && typeof matrix !== 'object') {
-          ctx.addIssue({
-            code: 'custom',
-            message: `Value must match the schema: "<JOB_NAME>", [<MATRIX_JSON>], [<JOB_NAME>", [<MATRIX_JSON>], ...]`,
-          })
-          return z.NEVER
+        if (typeof contextArray[0] === 'object') {
+          const matrix = contextArray.shift()
+          context.push({job, matrix})
+        } else {
+          context.push({job})
         }
-        context.push({job, matrix})
       }
       return z.array(WorkflowContextSchema).parse(context)
     })