From b2890c377d9e9f68c689a07ff600063863e15373 Mon Sep 17 00:00:00 2001
From: Kratos2k7 <umernadeem321@gmail.com>
Date: Tue, 9 Jun 2026 18:52:43 +0500
Subject: [PATCH] fix: enforce resolution/size constraint on output schema for
 non-mp3 formats

Adds a superRefine check to outputOutputSchema via fix-discriminator.cjs
so that any generated @shotstack/schemas release rejects renders that
specify neither resolution nor a complete size (width + height).
mp3 format is exempt. Mirrors the defence-in-depth guard already added
to shotstack-edit-api's zodValidator.js.

Fixes the root cause of the engine SIGABRT triggered by payloads like
{ format: "mp4", aspectRatio: "9:16" } passing API validation with no
output dimensions.
---
 schemas/output.yaml           |  5 ++++-
 scripts/fix-discriminator.cjs | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/schemas/output.yaml b/schemas/output.yaml
index fc4ce0c..474b8cd 100644
--- a/schemas/output.yaml
+++ b/schemas/output.yaml
@@ -1,5 +1,7 @@
     Output:
-      description: The output format, render range and type of media to generate.
+      description: >-
+        The output format, render range and type of media to generate.
+        For all formats except `mp3`, either `resolution` or `size` (with both `width` and `height`) must be specified.
       properties:
         format:
           description: >-
@@ -24,6 +26,7 @@
         resolution:
           description: >-
             The preset output resolution of the video or image. For custom sizes use the `size` property.
+            Either `resolution` or `size` (with both `width` and `height`) must be specified for all formats except `mp3`.
             <ul>
               <li>`preview` - 512px x 288px @ 15fps</li>
               <li>`mobile` - 640px x 360px @ 25fps</li>
diff --git a/scripts/fix-discriminator.cjs b/scripts/fix-discriminator.cjs
index 3f74615..82edcf4 100644
--- a/scripts/fix-discriminator.cjs
+++ b/scripts/fix-discriminator.cjs
@@ -397,9 +397,40 @@ function addSrcOrPromptRefine(code, zPrefix) {
   return code;
 }
 
+function addOutputDimensionsRefine(code, zPrefix) {
+  const schemaName = 'outputOutputSchema';
+  const idx = code.indexOf(schemaName + ' = ');
+  if (idx === -1) {
+    console.log("⚠ output dimensions refine: could not find " + schemaName + " (" + zPrefix + ")");
+    return code;
+  }
+  const strictMarker = '.strict()';
+  const strictIdx = code.indexOf(strictMarker, idx);
+  if (strictIdx === -1 || strictIdx - idx > 3000) {
+    console.log("⚠ output dimensions refine: no .strict() for " + schemaName + " (" + zPrefix + ")");
+    return code;
+  }
+  const superRefine = strictMarker + '.superRefine((val, ctx) => {\n' +
+    '  var isMp3 = val.format === "mp3";\n' +
+    '  if (!isMp3 && val.size != null && (val.size.width == null || val.size.height == null)) {\n' +
+    '    ctx.addIssue({ code: ' + zPrefix + '.ZodIssueCode.custom, path: ["size"], message: "size requires both width and height" });\n' +
+    '    return;\n' +
+    '  }\n' +
+    '  var hasResolution = typeof val.resolution === "string";\n' +
+    '  var hasSize = val.size != null && val.size.width != null && val.size.height != null;\n' +
+    '  if (!isMp3 && !hasResolution && !hasSize) {\n' +
+    '    ctx.addIssue({ code: ' + zPrefix + '.ZodIssueCode.custom, message: \'output requires either "resolution" or "size" (with width and height)\' });\n' +
+    '  }\n' +
+    '})';
+  code = code.substring(0, strictIdx) + superRefine + code.substring(strictIdx + strictMarker.length);
+  console.log("✓ Added output dimensions refine to " + schemaName + " (" + zPrefix + ")");
+  return code;
+}
+
 content = addStrictToObjects(content, "z");
 content = addLegacyTextWrapMigrationError(content, "z");
 content = addSrcOrPromptRefine(content, "z");
+content = addOutputDimensionsRefine(content, "z");
 
 fs.writeFileSync(zodGenPath, content);
 
@@ -622,6 +653,7 @@ const clipClipSchemaWithFitFilter = exports.clipClipSchema.transform((clip) => {
   cjsContent = addStrictToObjects(cjsContent, "zod_1.z");
   cjsContent = addLegacyTextWrapMigrationError(cjsContent, "zod_1.z");
   cjsContent = addSrcOrPromptRefine(cjsContent, "zod_1.z");
+  cjsContent = addOutputDimensionsRefine(cjsContent, "zod_1.z");
 
   fs.writeFileSync(zodGenCjsPath, cjsContent);
 }
@@ -756,6 +788,7 @@ const clipClipSchemaWithFitFilter = clipClipSchema.transform((clip) => {
   jsContent = addStrictToObjects(jsContent, "z");
   jsContent = addLegacyTextWrapMigrationError(jsContent, "z");
   jsContent = addSrcOrPromptRefine(jsContent, "z");
+  jsContent = addOutputDimensionsRefine(jsContent, "z");
 
   fs.writeFileSync(zodGenJsPath, jsContent);
 }