Monorepo working

README.md

@@ -141,7 +141,7 @@ I have setup Prettier and ESLint, they use some basic rules (you can propose new
 
 To run all the tests (unit and e2e) please run: 
 
-`npm test`
+`npm run test`
 
 This is not instantaneous: playwright may seems to do nothing for a while at first.
 

package.json

@@ -1,17 +1,44 @@
 {
-    "name": "@aitube/clapper-monorepo",
-    "version": "1.0.0",
-    "private": true,
-    "description": "A monorepo for the Clapper project. Individual packages are in the packages directory.",
-    "workspaces": [
-      "packages/*"
-    ],
-    "scripts": {
-        "dev": "npm install --verbose && npm run dev --workspaces",
-        "start": "npm run start --workspaces",
-        "build": "npm install --verbose && npm run build --workspaces",
-        "test": "npm run test --workspaces",
-        "format": "npm run format --workspaces"
-    }
-  }
-  
+  "name": "@aitube/clapper-monorepo",
+  "version": "0.2.4",
+  "private": true,
+  "description": "A monorepo for the Clapper project. Individual packages are in the packages directory.",
+  "workspaces": [
+    "packages/clap",
+    "packages/timeline",
+    "packages/api-client",
+    "packages/io",
+    "packages/colors",
+    "packages/engine",
+    "packages/broadway",
+    "packages/clapper-services",
+    "packages/app"
+  ],
+  "engines": {
+    "bun": ">=1.0.0"
+  },
+  "scripts": {
+    "dev": "bun run --cwd packages/app dev",
+    "start": "bun run --cwd packages/app start",
+    "build": "bun run build:all",
+    "build:all": "bun run build:clap && bun run build:timeline && bun run build:api-client && bun run build:io && bun run build:colors && bun run build:engine && bun run build:broadway && bun run build:services && bun run build:app",
+    "build:clap": "bun run --cwd packages/clap build",
+    "build:timeline": "bun run --cwd packages/timeline build",
+    "build:api-client": "bun run --cwd packages/api-client build",
+    "build:io": "bun run --cwd packages/io build",
+    "build:colors": "bun run --cwd packages/colors build",
+    "build:engine": "bun run --cwd packages/engine build",
+    "build:broadway": "bun run --cwd packages/broadway build",
+    "build:clapper-services": "bun run --cwd packages/clapper-services build",
+    "build:app": "bun run --cwd packages/app build",
+    "test": "bun run test:all",
+    "test:all": "bun run --cwd packages/clap test && bun run --cwd packages/timeline test && bun run --cwd packages/api-client test && bun run --cwd packages/io test && bun run --cwd packages/colors test && bun run --cwd packages/engine test && bun run --cwd packages/broadway test && bun run --cwd packages/clapper-services test && bun run --cwd packages/app test",
+    "format": "bun run --cwd packages/app format"
+  },
+  "packageManager": "[email protected]",
+  "trustedDependencies": [
+    "@aitube/clapper",
+    "onnxruntime-node",
+    "protobufjs"
+  ]
+}

packages/api-client/README.md

@@ -1,4 +1,4 @@
-# @aitube/client
+# @aitube/api-client
 
 *Official API client for AiTube.at*
 
@@ -20,7 +20,7 @@ so we need to perform all API calls to `jbilcke-hf-ai-tube.hf.space`.
 To install the package, run the following command:
 
 ```bash
-npm install @aitube/client
+npm install @aitube/api-client
 ```
 
 ## Getting Started
@@ -48,7 +48,7 @@ import {
   ClapEntityPrompt,
   SupportedExportFormat,
   applyClapCompletion,
- } from '@aitube/client'
+ } from '@aitube/api-client'
 
 const ultraSecret = "ultra secret token unavailable to common mortals"
 

packages/api-client/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@aitube/client",
+  "name": "@aitube/api-client",
   "module": "index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Official API client for AiTube.at",
   "scripts": {
     "build": "bun build ./src/index.ts --outfile=dist/index.js --external=@aitube/clap && bun run build:declaration",
@@ -19,9 +19,6 @@
     "rimraf": "^6.0.1",
     "typescript": "^5.5.4"
   },
-  "peerDependencies": {
-    "@aitube/clap": "file:../clap"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jbilcke-hf/aitube-client.git"

packages/api-client/src/api/editClapVideos.ts

@@ -43,7 +43,7 @@ export async function editClapVideos({
   }
   // special trick to not touch the generated
   // storyboards that are used by pending videos
-  const idsOfStoryboardsToKeep = clap.segments.map(segment => {
+  const idsOfStoryboardsToKeep = clap.segments.map((segment: ClapSegment) => {
     
     const isPendingVideo = (
       segment.category === ClapSegmentCategory.VIDEO
@@ -61,7 +61,7 @@ export async function editClapVideos({
     ).at(0)
 
     return storyboard?.id
-  }).filter(x => x) as string[]
+  }).filter((x: any) => x) as string[]
 
   const newClap = await fetchClap(`${aitubeApiUrl}edit/videos?${queryString.stringify(params)}`, {
     method: "POST",

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aitube/clapper",
-  "version": "0.0.8",
+  "version": "0.2.4",
   "private": true,
   "description": "🎬 Clapper",
   "license": "GPL-3.0-only",
@@ -13,35 +13,35 @@
     "public:": "./public"
   },
   "scripts": {
-    "dev": "npm run checks && next dev",
-    "build": "npm run prepare && npm run checks && rm -Rf out && next build && npm run build:copyassets",
-    "build:ci": "rm -Rf out && npm run prepare && next build && npm run build:copyassets",
-    "build:copyassets": "cp -R public .next/standalone/public && cp -R .next/static .next/standalone/.next/static",
-    "prepare": "cp -R node_modules/mediainfo.js/dist/MediaInfoModule.wasm public/wasm/",
+    "dev": "bun run checks && next dev",
+    "build": "bun run prepare && bun run checks && rm -Rf out && next build && bun run build:copyassets",
+    "build:ci": "rm -Rf out && bun run prepare && next build && bun run build:copyassets",
+    "build:copyassets": "cp -R public .next/standalone/public && cp -R .next/static .next/standalone/static",
+    "prepare": "cp -R ../../node_modules/mediainfo.js/dist/MediaInfoModule.wasm public/wasm/",
     "start": "next start",
     "start:prod": "node .next/standalone/server.js",
-    "checks": "npm run format:fix && npm run lint",
+    "checks": "bun run format:fix && bun run lint",
     "format": "prettier --check --ignore-path .gitignore ./src/",
     "format:fix": "prettier --write --ignore-path .gitignore ./src/",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
-    "test": "npm run build && npm run test:unit:ci",
-    "test_TEMPORARY_DISABLED": "npm run build && npm run test:unit:ci && npm run test:e2e",
+    "test": "bun run build && bun run test:unit:ci",
+    "test_TEMPORARY_DISABLED": "bun run build && bun run test:unit:ci && bun run test:e2e",
     "test:unit:ci": "vitest run",
     "test:unit:watch": "vitest",
     "test:e2e": "npx playwright test",
-    "electron": "npm run build && electron .",
-    "electron:start": "npm run build && electron-forge start",
-    "electron:package": "npm run build && electron-forge package",
-    "electron:make": "npm run build && electron-forge make"
+    "electron": "bun run build && electron .",
+    "electron:start": "bun run build && electron-forge start",
+    "electron:package": "bun run build && electron-forge package",
+    "electron:make": "bun run build && electron-forge make"
   },
   "dependencies": {
-    "@aitube/broadway": "file:../broadway",
-    "@aitube/clap": "file:../clap",
-    "@aitube/clapper-services": "file:../services",
-    "@aitube/client": "file:../api-client",
-    "@aitube/engine": "file:../engine",
-    "@aitube/timeline": "file:../timeline",
+    "@aitube/api-client": "workspace:*",
+    "@aitube/broadway": "workspace:*",
+    "@aitube/clap": "workspace:*",
+    "@aitube/clapper-services": "workspace:*",
+    "@aitube/engine": "workspace:*",
+    "@aitube/timeline": "workspace:*",
     "@fal-ai/serverless-client": "^0.13.0",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

packages/app/src/app/api/assistant/askAnyAssistant.ts

@@ -202,7 +202,7 @@ export async function askAnyAssistant({
     })
     // console.log('Lanchain success on the first time! rawResponse:', rawResponse)
 
-    assistantMessage = parseLangChainResponse(rawResponse)
+    assistantMessage = parseLangChainResponse(rawResponse as any)
     // console.log('assistantMessage:', assistantMessage)
   } catch (err) {
     // LangChain failure (this happens quite often, actually)

packages/app/src/app/api/resolve/providers/aitube/index.ts

@@ -12,7 +12,7 @@ import {
   editClapSounds,
   editClapStoryboards,
   editClapVideos,
-} from '@aitube/client'
+} from '@aitube/api-client'
 
 import { getWorkflowInputValues } from '../getWorkflowInputValues'
 

packages/app/src/components/toolbars/top-menu/lists/AssistantWorkflows.tsx

@@ -62,7 +62,7 @@ export function AssistantWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/ImageDepthWorkflows.tsx

@@ -62,7 +62,7 @@ export function ImageDepthWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/ImageGenerationWorkflows.tsx

@@ -62,7 +62,7 @@ export function ImageGenerationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/ImageSegmentationWorkflows.tsx

@@ -62,7 +62,7 @@ export function ImageSegmentationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/ImageUpscalingWorkflows.tsx

@@ -62,7 +62,7 @@ export function ImageUpscalingWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/MusicGenerationWorkflows.tsx

@@ -62,7 +62,7 @@ export function MusicGenerationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/SoundGenerationWorkflows.tsx

@@ -62,7 +62,7 @@ export function SoundGenerationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/VideoDepthWorkflows.tsx

@@ -62,7 +62,7 @@ export function VideoDepthWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/VideoGenerationWorkflows.tsx

@@ -62,7 +62,7 @@ export function VideoGenerationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/VideoSegmentationWorkflows.tsx

@@ -62,7 +62,7 @@ export function VideoSegmentationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/VideoUpscalingWorkflows.tsx

@@ -62,7 +62,7 @@ export function VideoUpscalingWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/components/toolbars/top-menu/lists/VoiceGenerationWorkflows.tsx

@@ -62,7 +62,7 @@ export function VoiceGenerationWorkflows() {
               </ClapWorkflowProviderName>
             </MenubarSubTrigger>
             <MenubarSubContent>
-              {workflows.map((w) => (
+              {workflows?.map((w) => (
                 <MenubarCheckboxItem
                   key={w.id}
                   checked={workflowId === w.id}

packages/app/src/services/autocomplete/extractCaptionsFromFrames.ts

@@ -1,9 +1,9 @@
-import {
-  AutoProcessor,
-  AutoTokenizer,
-  Florence2ForConditionalGeneration,
-  RawImage,
-} from '@xenova/transformers'
+// import {
+//   AutoProcessor,
+//   AutoTokenizer,
+//   Florence2ForConditionalGeneration,
+//   RawImage,
+// } from '@xenova/transformers'
 
 export const cache: {
   model?: Promise<any>
@@ -11,36 +11,36 @@ export const cache: {
   tokenizer?: Promise<any>
 } = {}
 
-export async function loadModel(
-  modelId: string,
-  onProgress: (progress: number) => void
-) {
-  onProgress(0)
-  const model = await (cache.model
-    ? cache.model
-    : (cache.model = Florence2ForConditionalGeneration.from_pretrained(
-        modelId,
-        {
-          dtype: 'fp32',
-        }
-      )))
+// export async function loadModel(
+//   modelId: string,
+//   onProgress: (progress: number) => void
+// ) {
+//   onProgress(0)
+//   const model = await (cache.model
+//     ? cache.model
+//     : (cache.model = Florence2ForConditionalGeneration.from_pretrained(
+//         modelId,
+//         {
+//           dtype: 'fp32',
+//         }
+//       )))
 
-  onProgress(33)
+//   onProgress(33)
 
-  const processor = await (cache.processor
-    ? cache.processor
-    : (cache.processor = AutoProcessor.from_pretrained(modelId)))
+//   const processor = await (cache.processor
+//     ? cache.processor
+//     : (cache.processor = AutoProcessor.from_pretrained(modelId)))
 
-  onProgress(66)
+//   onProgress(66)
 
-  const tokenizer = await (cache.tokenizer
-    ? cache.tokenizer
-    : (cache.tokenizer = AutoTokenizer.from_pretrained(modelId)))
+//   const tokenizer = await (cache.tokenizer
+//     ? cache.tokenizer
+//     : (cache.tokenizer = AutoTokenizer.from_pretrained(modelId)))
 
-  onProgress(100)
+//   onProgress(100)
 
-  return { model, processor, tokenizer }
-}
+//   return { model, processor, tokenizer }
+// }
 
 export function closeModel() {
   cache.model = undefined
@@ -54,75 +54,86 @@ export async function extractCaptionsFromFrames(
     progress: number,
     storyboardIndex: number,
     nbStoryboards: number
-  ) => void
-): Promise<string[]> {
-  if (!(navigator as any).gpu) {
-    throw new Error(`Please enable WebGPU to analyze video frames:
-    
-1. You need a modern browser such as Google Chrome 113+, Microsoft Edge 113+, Safari 18 (macOS 15), Firefox Nightly
+  ) => any
+) {
+  return
+}
 
-2. You need to enable WebGPU (depends on your browser, see below)
+// export async function extractCaptionsFromFrames(
+//   images: string[] = [],
+//   onProgress: (
+//     progress: number,
+//     storyboardIndex: number,
+//     nbStoryboards: number
+//   ) => void
+// ): Promise<string[]> {
+//   if (!(navigator as any).gpu) {
+//     throw new Error(`Please enable WebGPU to analyze video frames:
 
-2.1 For Chrome: Perform the following operations in the Chrome / Microsoft Edge address bar
-The chrome://flags/#enable-unsafe-webgpu flag must be enabled (not enable-webgpu-developer-features).
-Linux experimental support also requires launching the browser with --enable-features=Vulkan.
+// 1. You need a modern browser such as Google Chrome 113+, Microsoft Edge 113+, Safari 18 (macOS 15), Firefox Nightly
 
-2.2 For Safari 18 (macOS 15): WebGPU is enabled by default
+// 2. You need to enable WebGPU (depends on your browser, see below)
 
-2.3 For Firefox Nightly: Type about:config in the address bar and set 'dom.webgpu.enabled" to true
-`)
-  }
+// 2.1 For Chrome: Perform the following operations in the Chrome / Microsoft Edge address bar
+// The chrome://flags/#enable-unsafe-webgpu flag must be enabled (not enable-webgpu-developer-features).
+// Linux experimental support also requires launching the browser with --enable-features=Vulkan.
 
-  let progress = 0
+// 2.2 For Safari 18 (macOS 15): WebGPU is enabled by default
 
-  // for code example, see:
-  // https://github.com/xenova/transformers.js/pull/545#issuecomment-2183625876
+// 2.3 For Firefox Nightly: Type about:config in the address bar and set 'dom.webgpu.enabled" to true
+// `)
+//   }
 
-  // Load model, processor, and tokenizer
-  const model_id = 'onnx-community/Florence-2-base-ft'
+//   let progress = 0
 
-  const { model, processor, tokenizer } = await loadModel(model_id, (p) => {
-    onProgress((progress = p * 15), 0, images.length)
-  })
+//   // for code example, see:
+//   // https://github.com/xenova/transformers.js/pull/545#issuecomment-2183625876
 
-  // not all prompts will work properly, see the official examples:
-  // https://huggingface.co/microsoft/Florence-2-base-ft/blob/e7a5acc73559546de6e12ec0319cd7cc1fa2437c/processing_florence2.py#L115-L117
+//   // Load model, processor, and tokenizer
+//   const model_id = 'onnx-community/Florence-2-base-ft'
 
-  // Prepare text inputs
-  const prompts = 'Describe with a paragraph what is shown in the image.'
-  // const prompts = 'Decompose the following video frame into era, genre, location, weather, characters, and action. Give the answer in YAML.'
+//   const { model, processor, tokenizer } = await loadModel(model_id, (p) => {
+//     onProgress((progress = p * 15), 0, images.length)
+//   })
 
-  const text_inputs = tokenizer(prompts)
+//   // not all prompts will work properly, see the official examples:
+//   // https://huggingface.co/microsoft/Florence-2-base-ft/blob/e7a5acc73559546de6e12ec0319cd7cc1fa2437c/processing_florence2.py#L115-L117
 
-  let i = 1
-  const captions: string[] = []
-  for (const imageInBase64DataUri of images) {
-    console.log('analyzing image:', imageInBase64DataUri.slice(0, 64))
-    // Prepare vision inputs
-    const image = await RawImage.fromURL(imageInBase64DataUri)
-    const vision_inputs = await processor(image)
+//   // Prepare text inputs
+//   const prompts = 'Describe with a paragraph what is shown in the image.'
+//   // const prompts = 'Decompose the following video frame into era, genre, location, weather, characters, and action. Give the answer in YAML.'
 
-    console.log(' - generating caption..')
-    // Generate text
-    const generated_ids = await model.generate({
-      ...text_inputs,
-      ...vision_inputs,
-      max_new_tokens: 100,
-    })
+//   const text_inputs = tokenizer(prompts)
 
-    // Decode generated text
-    const generated_text = tokenizer.batch_decode(generated_ids, {
-      skip_special_tokens: true,
-    })
+//   let i = 1
+//   const captions: string[] = []
+//   for (const imageInBase64DataUri of images) {
+//     console.log('analyzing image:', imageInBase64DataUri.slice(0, 64))
+//     // Prepare vision inputs
+//     const image = await RawImage.fromURL(imageInBase64DataUri)
+//     const vision_inputs = await processor(image)
 
-    const caption = `${generated_text[0] || ''}`
-    console.log(' - caption:', caption)
+//     console.log(' - generating caption..')
+//     // Generate text
+//     const generated_ids = await model.generate({
+//       ...text_inputs,
+//       ...vision_inputs,
+//       max_new_tokens: 100,
+//     })
 
-    const relativeProgress = i / images.length
+//     // Decode generated text
+//     const generated_text = tokenizer.batch_decode(generated_ids, {
+//       skip_special_tokens: true,
+//     })
 
-    progress += relativeProgress * 75
-    onProgress(progress, i, images.length)
-    captions.push(caption)
-  }
-  return captions
-}
+//     const caption = `${generated_text[0] || ''}`
+//     console.log(' - caption:', caption)
+
+//     const relativeProgress = i / images.length
+
+//     progress += relativeProgress * 75
+//     onProgress(progress, i, images.length)
+//     captions.push(caption)
+//   }
+//   return captions
+// }

packages/app/src/services/autocomplete/useAutocomplete.ts

@@ -133,27 +133,27 @@ export const useAutocomplete = create<AutocompleteStore>((set, get) => ({
           // able to decompose a scene automatically
           for (const sentence of sentences) {
             if (sentence.match(/(?:is wearing|wears)/)) {
-              categories.CHARACTER.push(sentence)
+              categories[ClapSegmentCategory.CHARACTER].push(sentence)
             } else if (sentence.match(/(?:the (?:image|screen) (?:is|has))/)) {
-              categories.STYLE.push(sentence)
+              categories[ClapSegmentCategory.STYLE].push(sentence)
             } else if (
               sentence.match(
                 /(?:the (?:lighting|lights|light|fire|sun|moon)|bright|dim|neon|candle|lit up)/
               )
             ) {
-              categories.LIGHTING.push(sentence)
+              categories[ClapSegmentCategory.LIGHTING].push(sentence)
             } else if (
               sentence.match(
                 /(?:the (?:man|woman|kid|child|person|animal|person|robot)|(?:she|he) (?:has|is))/
               )
             ) {
-              categories.CHARACTER.push(sentence)
+              categories[ClapSegmentCategory.CHARACTER].push(sentence)
             } else if (
               sentence.match(/(?:behind the|background|room|location|place)/)
             ) {
-              categories.LOCATION.push(sentence)
+              categories[ClapSegmentCategory.LOCATION].push(sentence)
             } else {
-              categories.GENERIC.push(sentence)
+              categories[ClapSegmentCategory.GENERIC].push(sentence)
             }
           }
 

packages/app/src/services/io/ffmpegUtils.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { UUID } from '@aitube/clap'
 import { FFmpeg } from '@ffmpeg/ffmpeg'
 import { toBlobURL } from '@ffmpeg/util'

packages/app/src/services/io/fix-xenova-transformers.d.ts

@@ -1 +0,0 @@
-declare module '@xenova/transformers'

packages/app/tsconfig.json

@@ -7,6 +7,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
+    "noImplicitAny": false,
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,

packages/broadway/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Convert a script to a clap file",
   "scripts": {
     "test": "bun test --preload ./src/tests/setup.js",
@@ -15,16 +15,12 @@
     "update": "rm -Rf node_modules && rm bun.lockb && bun i && bun run build"
   },
   "devDependencies": {
-    "@aitube/io": "file:../io",
+    "@aitube/io": "workspace:*",
     "bun-types": "latest",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "typescript": "^5.5.4"
   },
-  "peerDependencies": {
-    "@aitube/clap": "file:../clap",
-    "@aitube/colors": "file:../colors"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jbilcke-hf/aitube-broadway.git"

packages/broadway/src/parsers/utils/getParserItemFromLabel.ts

@@ -1,4 +1,4 @@
-import { ClapSegmentCategory } from "@aitube/clap"
+// import { ClapSegmentCategory } from "@aitube/clap"
 
 import { NamedEntity } from "@/types"
 
@@ -33,7 +33,7 @@ export const getParserItemFromLabel = (database: NamedEntity[]) => {
       return defaultEmptyItem
     }
 
-    const prompts: Partial<Record<ClapSegmentCategory, string[]>> =
+    const prompts: Partial<Record<any, string[]>> =
       typeof item.prompts === "undefined" ?  defaultEmptyItem.prompts! : item.prompts
 
     return {

packages/broadway/src/types.ts

@@ -1,5 +1,5 @@
 import { ScreenplaySequenceType } from "@/constants/screenplaySequences"
-import { ClapSegmentCategory } from "@aitube/clap"
+// import { ClapSegmentCategory } from "@aitube/clap"
 
 export type NamedEntity = {
   label: string
@@ -7,7 +7,7 @@ export type NamedEntity = {
     en: string[]
   }
   prompts: Omit<
-    Record<ClapSegmentCategory, string[]>,
+    Record<any, string[]>,
     "SPLAT" | "INTERFACE" | "EVENT" | "EFFECT" | "PHENOMENON" | "MESH" | "DEPTH" | "VIDEO" | "STORYBOARD" | "GENERIC"
   >
 }

packages/clap/package.json

@@ -2,9 +2,10 @@
   "name": "@aitube/clap",
   "module": "index.ts",
   "main": "dist/index.js",
+  "private": false,
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Types and helpers to manipulate .clap files",
   "scripts": {
     "build": "bun build ./src/index.ts --outfile=dist/index.js --external=yaml && bun run build:declaration",
@@ -43,4 +44,4 @@
     "dist/*.d.ts",
     "dist/**/*.d.ts"
   ]
-}
+}

packages/clap/src/constants/index.ts

@@ -1 +1 @@
-export { defaultMediaOrientation } from "./defaultValues"
+export { defaultMediaOrientation } from "@/constants/defaultValues"

packages/clap/src/converters/index.ts

@@ -1,3 +1,3 @@
-export { blobToDataUri } from './blobToDataUri'
-export { clapToDataUri } from './clapToDataUri'
-export { dataUriToBlob } from './dataUriToBlob'
+export { blobToDataUri } from '@/converters/blobToDataUri'
+export { clapToDataUri } from '@/converters/clapToDataUri'
+export { dataUriToBlob } from '@/converters/dataUriToBlob'

packages/clap/src/factories/index.ts

@@ -1,4 +1,4 @@
-export { newClap } from './newClap'
-export { newEntity } from './newEntity'
-export { newSegment } from './newSegment'
-export { newWorkflow } from './newWorkflow'
+export { newClap } from '@/factories/newClap'
+export { newEntity } from '@/factories/newEntity'
+export { newSegment } from '@/factories/newSegment'
+export { newWorkflow } from '@/factories/newWorkflow'

packages/clap/src/factories/newSegment.ts

@@ -3,7 +3,7 @@ import { isValidNumber } from "@/utils/isValidNumber"
 import { generateSeed } from "@/utils/generateSeed"
 import { UUID } from "@/utils/uuid"
 import { parseSegmentCategory } from "@/utils/parseSegmentCategory"
-import { parseOutputType } from ".."
+import { parseOutputType } from "@/index"
 
 export function newSegment(maybeSegment?: Partial<ClapSegment>) {
 

packages/clap/src/helpers/index.ts

@@ -1,6 +1,6 @@
-export { buildEntityIndex } from './buildEntityIndex'
-export { filterAssets } from './filterAssets'
-export { filterSegmentsByCategory } from './filterSegmentsByCategory'
-export { getEmptyClap } from './getEmptyClap'
-export { generateClapFromSimpleStory } from './generateClapFromSimpleStory'
-export { removeGeneratedAssetUrls } from './removeGeneratedAssetUrls'
+export { buildEntityIndex } from '@/helpers/buildEntityIndex'
+export { filterAssets } from '@/helpers/filterAssets'
+export { filterSegmentsByCategory } from '@/helpers/filterSegmentsByCategory'
+export { getEmptyClap } from '@/helpers/getEmptyClap'
+export { generateClapFromSimpleStory } from '@/helpers/generateClapFromSimpleStory'
+export { removeGeneratedAssetUrls } from '@/helpers/removeGeneratedAssetUrls'

packages/clap/src/index.ts

@@ -37,22 +37,22 @@ export {
   ClapWorkflowCategory,
   ClapWorkflowProvider,
   ClapWorkflow
-} from './types'
+} from '@/types'
 export {
   defaultMediaOrientation
-} from './constants'
+} from '@/constants'
 export {
   newClap,
   newEntity,
   newSegment,
   newWorkflow
-} from './factories'
+} from '@/factories'
 export {
   parseClap,
   serializeClap,
   fetchClap,
   updateClap
-} from './io'
+} from '@/io'
 export {
   filterSegments,
   filterSegmentsWithinRange,
@@ -68,12 +68,12 @@ export {
   parseSegmentCategory,
   parseSegmentStatus,
   UUID
-} from './utils'
+} from '@/utils'
 export {
   blobToDataUri,
   dataUriToBlob,
   clapToDataUri
-} from './converters'
+} from '@/converters'
 export {
   buildEntityIndex,
   filterAssets,
@@ -81,7 +81,7 @@ export {
   generateClapFromSimpleStory,
   getEmptyClap,
   removeGeneratedAssetUrls,
-} from './helpers'
+} from '@/helpers'
 export {
   sanitizeEntities,
   sanitizeEntity,
@@ -90,4 +90,4 @@ export {
   sanitizeSegments,
   sanitizeWorkflow,
   sanitizeWorkflows,
-} from './sanitizers'
+} from '@/sanitizers'

packages/clap/src/io/index.ts

@@ -1,4 +1,4 @@
-export { parseClap } from './parseClap'
-export { serializeClap } from './serializeClap'
-export { fetchClap } from './fetchClap'
-export { updateClap } from './updateClap'
+export { parseClap } from '@/io/parseClap'
+export { serializeClap } from '@/io/serializeClap'
+export { fetchClap } from '@/io/fetchClap'
+export { updateClap } from '@/io/updateClap'

packages/clap/src/io/parseClap.ts

@@ -1,7 +1,7 @@
 import YAML from "yaml"
 
-import { ClapHeader, ClapMeta, ClapEntity, ClapProject, ClapScene, ClapSegment, ClapFormat, ParseClapProgressUpdate, ClapWorkflow } from "../types"
-import { dataUriToBlob } from "../converters/dataUriToBlob"
+import { ClapHeader, ClapMeta, ClapEntity, ClapProject, ClapScene, ClapSegment, ClapFormat, ParseClapProgressUpdate, ClapWorkflow } from "@/types"
+import { dataUriToBlob } from "@/converters/dataUriToBlob"
 import { buildEntityIndex } from "@/helpers/buildEntityIndex"
 import { sanitizeWorkflows } from "@/sanitizers/sanitizeWorkflows"
 import { sanitizeEntities } from "@/sanitizers/sanitizeEntities"

packages/clap/src/sanitizers/index.ts

@@ -1,7 +1,7 @@
-export { sanitizeEntities } from "./sanitizeEntities"
-export { sanitizeEntity } from "./sanitizeEntity"
-export { sanitizeMeta } from "./sanitizeMeta"
-export { sanitizeSegment } from "./sanitizeSegment"
-export { sanitizeSegments } from "./sanitizeSegments"
-export { sanitizeWorkflow } from "./sanitizeWorkflow"
-export { sanitizeWorkflows } from "./sanitizeWorkflows"
+export { sanitizeEntities } from "@/sanitizers/sanitizeEntities"
+export { sanitizeEntity } from "@/sanitizers/sanitizeEntity"
+export { sanitizeMeta } from "@/sanitizers/sanitizeMeta"
+export { sanitizeSegment } from "@/sanitizers/sanitizeSegment"
+export { sanitizeSegments } from "@/sanitizers/sanitizeSegments"
+export { sanitizeWorkflow } from "@/sanitizers/sanitizeWorkflow"
+export { sanitizeWorkflows } from "@/sanitizers/sanitizeWorkflows"

packages/clap/src/sanitizers/sanitizeEntities.ts

@@ -1,5 +1,5 @@
 import { ClapEntity } from "@/types";
-import { sanitizeEntity } from "./sanitizeEntity";
+import { sanitizeEntity } from "@/sanitizers/sanitizeEntity";
 
 export function sanitizeEntities(maybeEntities: ClapEntity[] = []): ClapEntity[] {
   return maybeEntities.map(entity => sanitizeEntity(entity))

packages/clap/src/sanitizers/sanitizeSegments.ts

@@ -1,5 +1,5 @@
 import { ClapSegment } from "@/types";
-import { sanitizeSegment } from "./sanitizeSegment";
+import { sanitizeSegment } from "@/sanitizers/sanitizeSegment";
 
 export function sanitizeSegments(maybeSegments: ClapSegment[] = []): ClapSegment[] {
   return maybeSegments.map(segment => sanitizeSegment(segment))

packages/clap/src/sanitizers/sanitizeWorkflows.ts

@@ -1,5 +1,5 @@
 import { ClapWorkflow } from "@/types";
-import { sanitizeWorkflow } from "./sanitizeWorkflow";
+import { sanitizeWorkflow } from "@/sanitizers/sanitizeWorkflow";
 
 export function sanitizeWorkflows(maybeWorkflows: ClapWorkflow[] = []): ClapWorkflow[] {
   return maybeWorkflows.map(workflow => sanitizeWorkflow(workflow))

packages/clap/src/utils/filterSegments.ts

@@ -1,5 +1,5 @@
 import { ClapSegment, ClapSegmentCategory, ClapSegmentFilteringMode } from "@/types"
-import { filterSegmentsWithinRange } from "./filterSegmentsWithinRange"
+import { filterSegmentsWithinRange } from "@/utils/filterSegmentsWithinRange"
 
 /**
  * Return all the segments within the provided reference segment, for the given mode:

packages/clap/src/utils/index.ts

@@ -1,14 +1,14 @@
-export { filterSegments } from './filterSegments'
-export { filterSegmentsWithinRange } from './filterSegmentsWithinRange'
-export { generateSeed } from './generateSeed'
-export { getClapAssetSourceType } from './getClapAssetSourceType'
-export { getValidNumber } from './getValidNumber'
-export { isValidNumber } from './isValidNumber'
-export { parseMediaOrientation } from './parseMediaOrientation'
-export { parseOutputType } from './parseOutputType'
-export { parseSegmentCategory } from './parseSegmentCategory'
-export { parseSegmentStatus } from './parseSegmentStatus'
-export { parseWorkflowEngine } from './parseWorkflowEngine'
-export { parseWorkflowCategory } from './parseWorkflowCategory'
-export { parseWorkflowProvider } from './parseWorkflowProvider'
-export { UUID } from './uuid'
+export { filterSegments } from '@/utils/filterSegments'
+export { filterSegmentsWithinRange } from '@/utils/filterSegmentsWithinRange'
+export { generateSeed } from '@/utils/generateSeed'
+export { getClapAssetSourceType } from '@/utils/getClapAssetSourceType'
+export { getValidNumber } from '@/utils/getValidNumber'
+export { isValidNumber } from '@/utils/isValidNumber'
+export { parseMediaOrientation } from '@/utils/parseMediaOrientation'
+export { parseOutputType } from '@/utils/parseOutputType'
+export { parseSegmentCategory } from '@/utils/parseSegmentCategory'
+export { parseSegmentStatus } from '@/utils/parseSegmentStatus'
+export { parseWorkflowEngine } from '@/utils/parseWorkflowEngine'
+export { parseWorkflowCategory } from '@/utils/parseWorkflowCategory'
+export { parseWorkflowProvider } from '@/utils/parseWorkflowProvider'
+export { UUID } from '@/utils/uuid'

packages/clap/src/utils/parseSegmentCategory.ts

@@ -1,4 +1,4 @@
-import { ClapSegmentCategory } from "@/types"
+import { ClapSegmentCategory } from "../types"
 
 export function parseSegmentCategory(input: any, defaultCategory?: ClapSegmentCategory): ClapSegmentCategory {