refactor: rename new implementation (drop .zod) pt 2

ffmpeg-templates.ts

@@ -1,5 +1,5 @@
 import * as flags from '@std/flags'
-import ffmpeg_templates from './lib/cli.zod.ts'
+import ffmpeg_templates from './lib/cli.ts'
 
 
 const VERSION = 'v0.2.0'

lib/bindings/ffmpeg.ts

@@ -1,8 +1,8 @@
 import {readlines} from '../util.ts'
 import { InputError, CommandError } from '../errors.ts'
-import { parse_duration } from '../parsers/duration.zod.ts'
+import { parse_duration } from '../parsers/duration.ts'
 import type { Context } from '../context.ts'
-import type { Timestamp } from '../template_input.zod.ts'
+import type { Timestamp } from '../template_input.ts'
 
 type OnReadLine = (line: string) => void
 async function exec(cmd: string[]) {

lib/builder/clip_base.ts

@@ -1,8 +1,8 @@
 import { parse_unit } from '../parsers/unit.ts'
-import type * as parsed from '../parsers/template.zod.ts'
-import type { TimelineClip } from '../timeline.zod.ts'
-import type { ComputedGeometry } from '../geometry.zod.ts'
-import type { ClipInfo } from '../probe.zod.ts'
+import type * as parsed from '../parsers/template.ts'
+import type { TimelineClip } from '../timeline.ts'
+import type { ComputedGeometry } from '../geometry.ts'
+import type { ClipInfo } from '../probe.ts'
 
 import { type ClipBuilderData } from './ffmpeg_base.ts'
 

lib/builder/clip_sample.ts

@@ -1,6 +1,6 @@
-import type { TimelineClip } from '../timeline.zod.ts'
-import type { ClipInfo } from '../probe.zod.ts'
-import type * as parsed from '../parsers/template.zod.ts'
+import type { TimelineClip } from '../timeline.ts'
+import type { ClipInfo } from '../probe.ts'
+import type * as parsed from '../parsers/template.ts'
 import { ClipBuilderBase } from './clip_base.ts'
 
 

lib/builder/ffmpeg_base.ts

@@ -1,11 +1,11 @@
 import * as errors from '../errors.ts'
 import { Context } from '../context.ts'
 import { relative_path } from '../util.ts'
-import type * as inputs from '../template_input.zod.ts'
-import type * as parsed from '../parsers/template.zod.ts'
-import type { TimelineClip } from '../timeline.zod.ts'
-import type { ComputedGeometry } from '../geometry.zod.ts'
-import type { ClipInfo } from '../probe.zod.ts'
+import type * as inputs from '../template_input.ts'
+import type * as parsed from '../parsers/template.ts'
+import type { TimelineClip } from '../timeline.ts'
+import type { ComputedGeometry } from '../geometry.ts'
+import type { ClipInfo } from '../probe.ts'
 
 import { ClipBuilderBase } from './clip_base.ts'
 

lib/builder/ffmpeg_sample.ts

@@ -1,10 +1,10 @@
 import * as path from '@std/path'
-import { parse_duration } from '../parsers/duration.zod.ts'
+import { parse_duration } from '../parsers/duration.ts'
 import { Context } from '../context.ts'
 import { relative_path } from '../util.ts'
-import type * as inputs from '../template_input.zod.ts'
-import type * as parsed from '../parsers/template.zod.ts'
-import type { ClipInfo } from '../probe.zod.ts'
+import type * as inputs from '../template_input.ts'
+import type * as parsed from '../parsers/template.ts'
+import type { ClipInfo } from '../probe.ts'
 
 import { FfmpegBuilderBase } from './ffmpeg_base.ts'
 import { ClipBuilderBase } from './clip_base.ts'

lib/builder/ffmpeg_video.ts

@@ -1,7 +1,7 @@
 import * as path from '@std/path'
 import { relative_path } from '../util.ts'
-import type * as parsed from '../parsers/template.zod.ts'
-import type { ClipInfo } from '../probe.zod.ts'
+import type * as parsed from '../parsers/template.ts'
+import type { ClipInfo } from '../probe.ts'
 
 import { FfmpegBuilderBase, type ClipBuilderData } from './ffmpeg_base.ts'
 import { ClipBuilderBase } from './clip_base.ts'

lib/canvas/font.ts

@@ -2,9 +2,9 @@ import * as path from '@std/path'
 import * as skia_canvas from '@gfx/canvas'
 // @deno-types="@types/culori"
 import * as culori from 'culori'
-import { compute_size } from '../geometry.zod.ts'
+import { compute_size } from '../geometry.ts'
 import type { Context } from '../context.ts'
-import type { TextClipParsed, MediaClipParsed } from '../parsers/template.zod.ts'
+import type { TextClipParsed, MediaClipParsed } from '../parsers/template.ts'
 
 // first in the list gets highest priority
 const PRIORITIED_FONT_FAMILIES = [

lib/cli.ts

@@ -7,11 +7,11 @@ import {open} from '@opensrc/deno-open'
 // import { open } from 'https://deno.land/x/[email protected]/index.ts'
 // // import open from 'npm:open'
 import * as errors from './errors.ts'
-import { parse_template } from './parsers/template.zod.ts'
-import { render_video, render_sample_frame } from './mod.zod.ts'
+import { parse_template } from './parsers/template.ts'
+import { render_video, render_sample_frame } from './mod.ts'
 import { Logger } from './logger.ts'
 import { InstanceContext } from './context.ts'
-import type * as inputs from './template_input.zod.ts'
+import type * as inputs from './template_input.ts'
 import type { ContextOptions } from './context.ts'
 
 

lib/context.ts

@@ -1,13 +1,13 @@
 import * as path from '@std/path'
 import * as errors from './errors.ts'
 import { Logger } from './logger.ts'
-import { ClipInfoMap } from './probe.zod.ts'
+import { ClipInfoMap } from './probe.ts'
 import { AbstractClipMap } from './util.ts'
 import { PreviewServer } from './preview/server.ts'
 import type { LogLevel } from './logger.ts'
-import type * as inputs from './template_input.zod.ts'
-import type { TemplateParsed, MediaClipParsed } from './parsers/template.zod.ts'
-import type { Keypoints } from './timeline.zod.ts'
+import type * as inputs from './template_input.ts'
+import type { TemplateParsed, MediaClipParsed } from './parsers/template.ts'
+import type { Keypoints } from './timeline.ts'
 
 interface ContextOptions {
   output_folder: string

lib/geometry.ts

@@ -2,8 +2,8 @@ import { InputError } from './errors.ts'
 import { parse_unit } from './parsers/unit.ts'
 import { AbstractClipMap } from './util.ts'
 import type { Context } from './context.ts'
-import type { DetailedSizeUnit } from './template_input.zod.ts'
-import type { TemplateParsed, MediaClipParsed, LayoutParsed, SizeParsed } from './parsers/template.zod.ts'
+import type { DetailedSizeUnit } from './template_input.ts'
+import type { TemplateParsed, MediaClipParsed, LayoutParsed, SizeParsed } from './parsers/template.ts'
 
 interface ComputedGeometry {
   x: number

lib/logger.ts

@@ -1,4 +1,4 @@
-import { fmt_human_readable_duration } from './parsers/duration.zod.ts'
+import { fmt_human_readable_duration } from './parsers/duration.ts'
 
 type LogLevel = 'error' | 'warn' | 'info'
 

lib/mod.ts

@@ -1,22 +1,22 @@
 import * as path from '@std/path'
 import * as errors from './errors.ts'
 import { parse_unit } from './parsers/unit.ts'
-import { parse_template } from './parsers/template.zod.ts'
+import { parse_template } from './parsers/template.ts'
 import { parse_percentage } from './parsers/unit.ts'
-import { parse_duration, fmt_human_readable_duration } from './parsers/duration.zod.ts'
+import { parse_duration, fmt_human_readable_duration } from './parsers/duration.ts'
 import { InstanceContext, Context } from './context.ts'
-import { compute_geometry, compute_size, compute_rotated_size } from './geometry.zod.ts'
-import { compute_zoompans } from './zoompan.zod.ts'
-import { compute_timeline } from './timeline.zod.ts'
-import { create_text_image } from './canvas/font.zod.ts'
+import { compute_geometry, compute_size, compute_rotated_size } from './geometry.ts'
+import { compute_zoompans } from './zoompan.ts'
+import { compute_timeline } from './timeline.ts'
+import { create_text_image } from './canvas/font.ts'
 import { relative_path } from './util.ts'
-import type * as inputs from './template_input.zod.ts'
-import type * as parsed from './parsers/template.zod.ts'
-import type { TimelineClip } from './timeline.zod.ts'
-import type { ComputedGeometry } from './geometry.zod.ts'
-import type { ClipInfo } from './probe.zod.ts'
+import type * as inputs from './template_input.ts'
+import type * as parsed from './parsers/template.ts'
+import type { TimelineClip } from './timeline.ts'
+import type { ComputedGeometry } from './geometry.ts'
+import type { ClipInfo } from './probe.ts'
 import type { ContextOptions } from './context.ts'
-import { ffmpeg } from './bindings/ffmpeg.zod.ts'
+import { ffmpeg } from './bindings/ffmpeg.ts'
 
 import { FfmpegBuilderBase, type ClipBuilderData } from './builder/ffmpeg_base.ts'
 import { ClipBuilderBase } from './builder/clip_base.ts'
@@ -150,5 +150,5 @@ async function render_image(template: inputs.Template, options: ContextOptions,
 
 export { render_video, render_sample_frame, render_image }
 export type Template = inputs.Template
-export type { TemplateParsed } from './parsers/template.zod.ts'
+export type { TemplateParsed } from './parsers/template.ts'
 export type { RenderData } from './builder/ffmpeg_base.ts'

lib/parsers/duration.ts

@@ -1,5 +1,5 @@
 import { InputError } from '../errors.ts'
-import type * as inputs from '../template_input.zod.ts'
+import type * as inputs from '../template_input.ts'
 import type { Context } from '../context.ts'
 
 type Seconds = number

lib/parsers/ffmpeg_output.ts

@@ -1,4 +1,4 @@
-import { compute_rotated_size } from '../geometry.zod.ts'
+import { compute_rotated_size } from '../geometry.ts'
 
 
 function parse_aspect_ratio(aspect_ratio: string, rotation?: number) {

lib/parsers/template.ts

@@ -1,6 +1,6 @@
 import * as path from '@std/path'
 import { z } from 'zod'
-import * as t from '../template_input.zod.ts'
+import * as t from '../template_input.ts'
 import * as errors from '../errors.ts'
 import { parse_unit } from './unit.ts'
 import * as tsafe from 'npm:[email protected]'

lib/parsers/unit.ts

@@ -1,4 +1,4 @@
-import type { DetailedSizeUnit } from '../template_input.zod.ts'
+import type { DetailedSizeUnit } from '../template_input.ts'
 import { InputError } from '../errors.ts'
 
 class UnitError extends InputError {}

lib/probe.ts

@@ -3,11 +3,11 @@ import {readlines} from './util.ts'
 import { ProbeError, CommandError } from './errors.ts'
 import { AbstractClipMap } from './util.ts'
 import { parse_aspect_ratio, parse_ffmpeg_packet } from './parsers/ffmpeg_output.ts'
-import { compute_rotated_size } from './geometry.zod.ts'
+import { compute_rotated_size } from './geometry.ts'
 import type { InstanceContext } from './context.ts'
-import type * as template from './template_input.zod.ts'
-import type { MediaClipParsed } from './parsers/template.zod.ts'
-import type { Seconds } from './parsers/duration.zod.ts'
+import type * as template from './template_input.ts'
+import type { MediaClipParsed } from './parsers/template.ts'
+import type { Seconds } from './parsers/duration.ts'
 
 const CLIP_INFO_FILENAME = 'probe_info.json'
 

lib/timeline.ts

@@ -1,8 +1,8 @@
 import * as errors from './errors.ts'
 import { parse_unit } from './parsers/unit.ts'
-import { parse_duration } from './parsers/duration.zod.ts'
-import type * as inputs from './template_input.zod.ts'
-import type * as parsed from './parsers/template.zod.ts'
+import { parse_duration } from './parsers/duration.ts'
+import type * as inputs from './template_input.ts'
+import type * as parsed from './parsers/template.ts'
 import type { Context } from './context.ts'
 
 

lib/util.ts

@@ -1,7 +1,7 @@
 import {TextLineStream} from '@std/streams'
 import * as path from '@std/path'
 import { InputError } from './errors.ts'
-import type * as template_input from './template_input.zod.ts'
+import type * as template_input from './template_input.ts'
 
 
 abstract class AbstractClipMap<T> extends Map<template_input.ClipID, T> {

lib/zoompan.ts

@@ -1,10 +1,10 @@
 import { InputError } from './errors.ts'
 import { parse_unit, parse_percentage } from './parsers/unit.ts'
-import { parse_duration } from './parsers/duration.zod.ts'
+import { parse_duration } from './parsers/duration.ts'
 import { AbstractClipMap } from './util.ts'
-import type { ClipID } from './template_input.zod.ts'
-import type { ClipInfoMap } from './probe.zod.ts'
-import type { ClipGeometryMap } from './geometry.zod.ts'
+import type { ClipID } from './template_input.ts'
+import type { ClipInfoMap } from './probe.ts'
+import type { ClipGeometryMap } from './geometry.ts'
 import type {Context} from './context.ts'
 
 type ComputedZoompan = {

test/cli.test.ts

@@ -1,7 +1,7 @@
 import * as path from '@std/path'
 import * as fs from '@std/fs'
-import ffmpeg_templates  from '../lib/cli.zod.ts'
-import { render_sample_frame, type Template, type TemplateParsed, type RenderData } from '../lib/mod.zod.ts'
+import ffmpeg_templates  from '../lib/cli.ts'
+import { render_sample_frame, type Template, type TemplateParsed, type RenderData } from '../lib/mod.ts'
 import { test, type TestContext } from './tools/test.ts'
 
 

test/font.test.ts

@@ -1,4 +1,4 @@
-import { render_image, render_video } from '../lib/mod.zod.ts'
+import { render_image, render_video } from '../lib/mod.ts'
 import { path } from './tools/deps.ts'
 import { test } from './tools/test.ts'
 

test/mod.test.ts

@@ -1,5 +1,5 @@
-import ffmpeg_templates from '../lib/cli.zod.ts'
-import { render_image, render_video } from '../lib/mod.zod.ts'
+import ffmpeg_templates from '../lib/cli.ts'
+import { render_image, render_video } from '../lib/mod.ts'
 import * as path from '@std/path'
 import { test } from './tools/test.ts'