transloadit 6.1.2 → 6.2.1

package/src/cli/commands/auth.ts

@@ -22,6 +22,7 @@ import {
   requireCliCredentials,
   resolveCliConfig,
 } from '../helpers.ts'
+import { createCliStepsSchema } from '../stepsInput.ts'
 import { UnauthenticatedCommand } from './BaseCommand.ts'
 
 type UrlParamPrimitive = string | number | boolean
@@ -113,6 +114,7 @@ function generateSignature(
   input: string,
   credentials: CliKeySecretCredentials,
   algorithm?: string,
+  output: Pick<IOutputCtl, 'warn'> = console,
 ): OutputResult {
   const { authKey } = credentials
   let params: CliSignatureParams
@@ -120,7 +122,10 @@ function generateSignature(
   if (input === '') {
     params = { auth: { key: authKey } }
   } else {
-    const parsedResult = parseJsonObject(input, cliSignatureParamsSchema)
+    const parsedResult = parseJsonObject(
+      input,
+      cliSignatureParamsSchema.extend({ steps: createCliStepsSchema(output).optional() }),
+    )
     if (!parsedResult.ok) {
       return { ok: false, error: parsedResult.error }
     }
@@ -347,7 +352,7 @@ export class SignatureCommand extends UnauthenticatedCommand {
 
     const { content } = await readCliInput({ allowStdinWhenNoPath: true })
     const rawInput = (content ?? '').trim()
-    const result = generateSignature(rawInput, credentials, this.algorithm)
+    const result = generateSignature(rawInput, credentials, this.algorithm, this.output)
 
     if (result.ok) {
       process.stdout.write(`${result.output}\n`)

package/src/cli/commands/templates.ts

@@ -1,7 +1,7 @@
 import type { TemplateContent } from '../../apiTypes.ts'
 import type { Transloadit } from '../../Transloadit.ts'
 import type { IOutputCtl } from '../OutputCtl.ts'
-import type { TemplateFile } from '../types.ts'
+import type { TemplateFile, TemplateFileData } from '../types.ts'
 
 import fsp from 'node:fs/promises'
 import path from 'node:path'
@@ -13,9 +13,9 @@ import { z } from 'zod'
 
 import { tryCatch } from '../../alphalib/tryCatch.ts'
 import { createReadStream, formatAPIError, streamToBuffer } from '../helpers.ts'
-import { parseStepsInputJson } from '../stepsInput.ts'
+import { createCliStepsSchema, parseStepsInputJson } from '../stepsInput.ts'
 import ModifiedLookup from '../template-last-modified.ts'
-import { ensureError, isTransloaditAPIError, TemplateFileDataSchema } from '../types.ts'
+import { ensureError, isTransloaditAPIError } from '../types.ts'
 import { AuthenticatedCommand } from './BaseCommand.ts'
 
 const rreaddirAsync = promisify(rreaddir)
@@ -62,7 +62,7 @@ export async function create(
   try {
     const buf = await streamToBuffer(createReadStream(file))
 
-    const steps = parseStepsInputJson(buf.toString())
+    const steps = parseStepsInputJson(buf.toString(), output)
 
     const result = await client.createTemplate({
       name,
@@ -107,7 +107,7 @@ export async function modify(
     let newName = name
 
     if (buf.length > 0) {
-      steps = parseStepsInputJson(buf.toString()) as TemplateContent['steps']
+      steps = parseStepsInputJson(buf.toString(), output) as TemplateContent['steps']
     }
 
     if (!name || buf.length === 0) {
@@ -225,6 +225,13 @@ export async function sync(
   client: Transloadit,
   { files, recursive }: TemplateSyncOptions,
 ): Promise<void> {
+  const templateFileDataSchema: z.ZodType<TemplateFileData> = z
+    .object({
+      transloadit_template_id: z.string().optional(),
+      steps: createCliStepsSchema(output).optional(),
+    })
+    .passthrough()
+
   // Promise [String] -- all files in the directory tree
   const relevantFilesNested = await Promise.all(
     files.map(async (file) => {
@@ -263,7 +270,7 @@ export async function sync(
     try {
       const data = await fsp.readFile(file, 'utf8')
       const parsed: unknown = JSON.parse(data)
-      const validated = TemplateFileDataSchema.safeParse(parsed)
+      const validated = templateFileDataSchema.safeParse(parsed)
       if (!validated.success) return null
       return 'transloadit_template_id' in validated.data ? { file, data: validated.data } : null
     } catch (e) {

package/src/cli/stepsInput.ts

@@ -1,14 +1,40 @@
 import type { StepsInput } from '../alphalib/types/template.ts'
+import type { IOutputCtl } from './OutputCtl.ts'
 
 import fsp from 'node:fs/promises'
 
 import { z } from 'zod'
 
-import { stepsSchema } from '../alphalib/types/template.ts'
+import { robotsSchema } from '../alphalib/types/robots/_index.ts'
+import { refineDocumentExtractOcr } from '../alphalib/types/robots/document-extract.ts'
+import { refineTransloaditImportSelector } from '../alphalib/types/robots/transloadit-import.ts'
 
 const stepsWrapperSchema = z.object({ steps: z.record(z.unknown()) })
 
-export function parseStepsInputJson(content: string): StepsInput {
+/** CLI inputs can be partial overrides; API2 validates OCR after merging their runtime context. */
+export function createCliStepsSchema(
+  output: Pick<IOutputCtl, 'warn'> = console,
+): z.ZodType<StepsInput> {
+  const cliStepSchema = robotsSchema
+    .superRefine(refineTransloaditImportSelector)
+    .superRefine((step, context) => {
+      // API2 merges Template defaults before Robot validation. New OCR checks must not reject
+      // partial --steps overrides in a minor release; explicit Zod schemas remain strict.
+      refineDocumentExtractOcr(step, {
+        ...context,
+        addIssue(issue) {
+          const field = [...context.path, ...(issue.path ?? [])].join('.')
+          output.warn(`${field}: ${issue.message ?? 'Invalid OCR dependency.'}`)
+        },
+      })
+    })
+  return z.record(cliStepSchema)
+}
+
+export function parseStepsInputJson(
+  content: string,
+  output: Pick<IOutputCtl, 'warn'> = console,
+): StepsInput {
   const parsed: unknown = JSON.parse(content)
   const wrapped = stepsWrapperSchema.safeParse(parsed)
   let stepsInput = parsed
@@ -21,7 +47,7 @@ export function parseStepsInputJson(content: string): StepsInput {
     }
     stepsInput = validatedWrapper.data.steps
   }
-  const validated = stepsSchema.safeParse(stepsInput)
+  const validated = createCliStepsSchema(output).safeParse(stepsInput)
   if (!validated.success) {
     throw new Error(`Invalid steps format: ${validated.error.message}`)
   }
@@ -42,7 +68,10 @@ export function parseStepsInputJson(content: string): StepsInput {
   ) as StepsInput
 }
 
-export async function readStepsInputFile(filePath: string): Promise<StepsInput> {
+export async function readStepsInputFile(
+  filePath: string,
+  output: Pick<IOutputCtl, 'warn'> = console,
+): Promise<StepsInput> {
   const content = await fsp.readFile(filePath, 'utf8')
-  return parseStepsInputJson(content)
+  return parseStepsInputJson(content, output)
 }

package/src/cli/types.ts

@@ -2,8 +2,6 @@ import type { Steps } from '../alphalib/types/template.ts'
 
 import { z } from 'zod'
 
-import { optionalStepsSchema } from '../alphalib/types/template.ts'
-
 // Zod schemas for runtime validation
 const APIErrorSchema = z.object({
   error: z.string(),
@@ -36,13 +34,6 @@ export interface TemplateFileData {
   [key: string]: unknown // passthrough
 }
 
-export const TemplateFileDataSchema: z.ZodType<TemplateFileData> = z
-  .object({
-    transloadit_template_id: z.string().optional(),
-    steps: optionalStepsSchema,
-  })
-  .passthrough() as z.ZodType<TemplateFileData>
-
 export interface TemplateFile {
   file: string
   data: TemplateFileData