Skip to content

The VS Code of video editing, built for agents.

TypeScript

Refactor and replace `@diffusionstudio/ai` and `@diffusionstudio/solid` with `@diffusionstudio/jsx` across the codebase. Update dependencies in package-lock.json and documentation to reflect the new JSX runtime and asset generation capabilities. Remove the `@diffusionstudio/ai` package and its references, ensuring a cohesive transition to the new structure.

konstantin-paulus31332d23a11a
diff --git a/README.md b/README.md
index 9f9e8b6f..f12c1bd7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Compositions are [SolidJS](https://www.solidjs.com) modules. `dapi mount` compil
```tsx
import { For } from "solid-js";
-import { generate } from "@diffusionstudio/ai";
+import { generate } from "@diffusionstudio/jsx";
const hero = generate.image({ prompt: "A neon city at night, cinematic" });
const motion = generate.video({ prompt: "slow camera push-in", startFrame: hero });
@@ -96,8 +96,7 @@ Conventions throughout: single results are one JSON value, collections are JSON
| `apps/web` | `@diffusionstudio/web` | The editor UI (Solid + Vite) |
| `apps/desktop` | `@diffusionstudio/desktop` | Electron shell hosting the editor |
| `apps/cli` | `@diffusionstudio/cli` | The `dapi` CLI |
-| `packages/solid` | `@diffusionstudio/solid` | Solid JSX runtime and types for compositions |
-| `packages/ai` | `@diffusionstudio/ai` | Declarative generated assets (`generate.*`) |
+| `packages/jsx` | `@diffusionstudio/jsx` | JSX runtime, types, and generated assets (`generate.*`) for compositions |
## Contributing / local setup
diff --git a/apps/cli/api-spec.md b/apps/cli/api-spec.md
index 0d6d19cf..ffbf1899 100644
--- a/apps/cli/api-spec.md
+++ b/apps/cli/api-spec.md
@@ -278,7 +278,7 @@ Deletes one or more entities and all their descendants. Alias: `remove`.
### `dapi node patch ([path] | --json <str>)`
-Assigns JSX props on one or more existing entities in a single call. Every patch entry takes the same properties, with the same value requirements, as a JSX element in [`mount`](#dapi-mount-path---code-str) — the full table lives in [jsx-spec.md](./jsx-spec.md#element-reference) and is not repeated here; the payload type is `PatchProps` from `@diffusionstudio/solid`. Patches are applied through the same setters as a render, so the two surfaces cannot diverge. Changes are tracked for undo like a UI edit.
+Assigns JSX props on one or more existing entities in a single call. Every patch entry takes the same properties, with the same value requirements, as a JSX element in [`mount`](#dapi-mount-path---code-str) — the full table lives in [jsx-spec.md](./jsx-spec.md#element-reference) and is not repeated here; the payload type is `PatchProps` from `@diffusionstudio/jsx`. Patches are applied through the same setters as a render, so the two surfaces cannot diverge. Changes are tracked for undo like a UI edit.
Any live entity is addressable — not just nodes: paints and color stops can be patched too (`color`, `offset`, `opacity`, gradient `rotation`). There is no separate rename command: renaming a node is patching its `name`.
diff --git a/apps/cli/jsx-spec.md b/apps/cli/jsx-spec.md
index 52bf351c..7ce3a761 100644
--- a/apps/cli/jsx-spec.md
+++ b/apps/cli/jsx-spec.md
@@ -16,7 +16,7 @@ component tree renders into it.
1. **Compile** — the CLI bundles the entry file with esbuild + `babel-preset-solid`
in `universal` mode, so JSX compiles against the editor's renderer runtime
- (`@diffusionstudio/solid`) instead of the DOM. Compile errors fail here, before the
+ (`@diffusionstudio/jsx`) instead of the DOM. Compile errors fail here, before the
app is contacted.
2. **Ship** — the resulting single-file ESM bundle is sent to the running app over
the local socket.
@@ -59,7 +59,7 @@ maps onto is declared in the JSX itself via `key` (see [Roots](#roots)).
- **Provided by the host** (marked external at compile time, resolved in-app so the
project shares the editor's reactive runtime): `solid-js`, `solid-js/store`,
- `@diffusionstudio/solid`, `@diffusionstudio/ai`.
+ `@diffusionstudio/jsx`.
- **Everything else is bundled** by the CLI at compile time — npm dependencies,
local imports, JSON, etc. A project folder is an ordinary npm package: install
any helper library (`date-fns`, `zod`, `d3-scale`, …) and import it; it is
@@ -465,13 +465,13 @@ prop; a missing or omitted entry falls back to the slot's default.
## Generated assets
Assets that don't exist yet are **declared as values** with the `generate` namespace
-from `@diffusionstudio/ai`. A declaration returns an **`AssetRef`** that is passed
+from `@diffusionstudio/jsx`. A declaration returns an **`AssetRef`** that is passed
wherever a source is expected — `src`, `startFrame`, `endFrame`, `refs`. This makes
generative content declarative: the project describes the asset it wants and the
editor produces it on mount.
```tsx
-import { generate } from "@diffusionstudio/ai";
+import { generate } from "@diffusionstudio/jsx";
const hero = generate.image({
prompt: "A neon city at night, cinematic",
@@ -618,15 +618,15 @@ declared in the JSX via the root elements' `key` (see [Roots](#roots)).
## Types and tooling
-`@diffusionstudio/solid` ships the JSX namespace (intrinsic elements and props)
-and `Time`; `@diffusionstudio/ai` ships `AssetRef` and the `generate` namespace. For editor IntelliSense and
+`@diffusionstudio/jsx` ships the JSX namespace (intrinsic elements and props),
+`Time`, `AssetRef`, and the `generate` namespace. For editor IntelliSense and
typechecking in a project folder:
```json
{
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "@diffusionstudio/solid"
+ "jsxImportSource": "@diffusionstudio/jsx"
}
}
```
@@ -638,8 +638,7 @@ in the project folder for type safety.
```tsx
import { For } from "solid-js";
-import { generate } from "@diffusionstudio/ai";
-import type { Time } from "@diffusionstudio/solid";
+import { generate, type Time } from "@diffusionstudio/jsx";
const hero = generate.image({
prompt: "A neon city at night, cinematic",
diff --git a/apps/cli/src/cli-channels.ts b/apps/cli/src/cli-channels.ts
index 335550e9..26de46ab 100644
--- a/apps/cli/src/cli-channels.ts
+++ b/apps/cli/src/cli-channels.ts
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import type { PatchProps } from "@diffusionstudio/solid";
+import type { PatchProps } from "@diffusionstudio/jsx";
// Wire-level channels for the CLI-forwarding path. Main only knows these two —
// it does not inspect logical channel names. The renderer mirrors requests
diff --git a/apps/cli/src/compile-project.ts b/apps/cli/src/compile-project.ts
index e1585908..04af5731 100644
--- a/apps/cli/src/compile-project.ts
+++ b/apps/cli/src/compile-project.ts
@@ -17,7 +17,7 @@ import presetTypescript from "@babel/preset-typescript";
// contain by accident, so the app-side rewrite is unambiguous.
export const HOST_MODULE_PREFIX = "dapi-host:";
-const HOST_MODULES_RE = /^(?:solid-js(?:\/store)?|@diffusionstudio\/(?:solid|ai))$/;
+const HOST_MODULES_RE = /^(?:solid-js(?:\/store)?|@diffusionstudio\/jsx)$/;
async function transformSolidJsx(source: string, filename: string): Promise<string> {
const result = await transformAsync(source, {
@@ -25,7 +25,7 @@ async function transformSolidJsx(source: string, filename: string): Promise<stri
babelrc: false,
configFile: false,
presets: [
- [presetSolid, { generate: "universal", moduleName: "@diffusionstudio/solid" }],
+ [presetSolid, { generate: "universal", moduleName: "@diffusionstudio/jsx" }],
[presetTypescript, {}],
],
sourceMaps: "inline",
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
index 306aded8..fd26352b 100644
--- a/apps/cli/src/index.ts
+++ b/apps/cli/src/index.ts
@@ -9,7 +9,7 @@ import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "no
import { platform, tmpdir } from "node:os";
import { extname, isAbsolute, join, resolve } from "node:path";
import { Command } from "commander";
-import { parseTime, TIME_FPS } from "@diffusionstudio/solid";
+import { parseTime, TIME_FPS } from "@diffusionstudio/jsx";
import { cliAPI, waitForCliSocket } from "./cli-client";
import { compileProject } from "./compile-project";
import { listLocalFonts } from "./fonts";
diff --git a/apps/web/package.json b/apps/web/package.json
index 868acf37..4c6a9749 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -14,9 +14,8 @@
},
"dependencies": {
"@diffusionstudio/api-contract": "^0.1.0",
- "@diffusionstudio/ai": "*",
"@diffusionstudio/cli": "*",
- "@diffusionstudio/solid": "*",
+ "@diffusionstudio/jsx": "*",
"@kobalte/core": "^0.13.11",
"@sentry/solid": "^10.51.0",
"@solid-primitives/keyboard": "^1.3.3",
diff --git a/apps/web/src/context/electron/mount.ts b/apps/web/src/context/electron/mount.ts
index 4c8a202d..b0004f15 100644
--- a/apps/web/src/context/electron/mount.ts
+++ b/apps/web/src/context/electron/mount.ts
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { renderProject } from "@diffusionstudio/solid";
+import { renderProject } from "@diffusionstudio/jsx";
import { reorderEntity, switchActiveScene } from "@/components/engine";
import { WorldDocument, importProjectModule } from "@/utils/jsx";
diff --git a/apps/web/src/utils/jsx-generation.ts b/apps/web/src/utils/jsx-generation.ts
index 22edd65f..03a1953c 100644
--- a/apps/web/src/utils/jsx-generation.ts
+++ b/apps/web/src/utils/jsx-generation.ts
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { getAssetSpec, isAssetRef } from "@diffusionstudio/ai";
+import { getAssetSpec, isAssetRef } from "@diffusionstudio/jsx";
import { loadAsset, uploadAsset } from "@/components/engine";
import {
PROMPT_INPUT_AUDIO_MODEL_OPTIONS,
@@ -15,7 +15,7 @@ import { assert } from "@/utils";
import { ElectronFileHandle } from "@/lib/electron-file-handle";
import { trpc } from "@/lib/trpc";
-import type { AspectRatio, AssetInput, AssetRef, AssetSpecInput } from "@diffusionstudio/ai";
+import type { AspectRatio, AssetInput, AssetRef, AssetSpecInput } from "@diffusionstudio/jsx";
import type { EngineWorld } from "@/components/engine";
import type { Asset } from "@/components/engine/db";
diff --git a/apps/web/src/utils/jsx.ts b/apps/web/src/utils/jsx.ts
index 16aeef47..ac9d9ad3 100644
--- a/apps/web/src/utils/jsx.ts
+++ b/apps/web/src/utils/jsx.ts
@@ -3,12 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { hasComponent, query, Not } from "bitecs";
-import { getAssetSpec, isAssetRef } from "@diffusionstudio/ai";
-import { parseTime } from "@diffusionstudio/solid";
+import { getAssetSpec, isAssetRef, parseTime } from "@diffusionstudio/jsx";
import * as solid from "solid-js";
import * as solidStore from "solid-js/store";
-import * as diffusionSolid from "@diffusionstudio/solid";
-import * as diffusionAi from "@diffusionstudio/ai";
+import * as diffusionJsx from "@diffusionstudio/jsx";
import {
CaptionType,
FontStyle,
@@ -41,8 +39,7 @@ import { ASPECT_RATIO_DIMENSIONS, findEmptyPlacement } from "@/utils/genai";
import { resolveAsset, resolveGeneratedAsset } from "@/utils/jsx-generation";
import { assert, assertAllSettled, parseColor } from "@/utils";
-import type { AssetRef, AssetSpecInput } from "@diffusionstudio/ai";
-import type { ProjectDocument } from "@diffusionstudio/solid";
+import type { AssetRef, AssetSpecInput, ProjectDocument } from "@diffusionstudio/jsx";
import type { Engine, EngineWorld } from "@/components/engine";
import type { GenerationMemo } from "@/utils/jsx-generation";
@@ -917,8 +914,7 @@ const HOST_MODULE_PREFIX = "dapi-host:";
const HOST_MODULES: Record<string, object> = {
"solid-js": solid,
"solid-js/store": solidStore,
- "@diffusionstudio/solid": diffusionSolid,
- "@diffusionstudio/ai": diffusionAi,
+ "@diffusionstudio/jsx": diffusionJsx,
};
declare global {
diff --git a/docs/composition.md b/docs/composition.md
index 0c5b4a0e..f019397e 100644
--- a/docs/composition.md
+++ b/docs/composition.md
@@ -14,7 +14,7 @@ export default function Project() {
The module's default export is the project component. Solid's control flow (`<For>`, `<Show>`, …) and primitives (`createSignal`, `createMemo`, …) are available to *compose* the tree; the render is one-shot: after commit, the nodes belong to the document and signal changes no longer affect it. The update path is re-running the mount.
-**Dependencies:** `solid-js`, `@diffusionstudio/solid`, and `@diffusionstudio/ai` are provided by the app; everything else you import (npm packages, local files, JSON) is bundled by the CLI. Libraries must be browser-compatible.
+**Dependencies:** `solid-js` and `@diffusionstudio/jsx` are provided by the app; everything else you import (npm packages, local files, JSON) is bundled by the CLI. Libraries must be browser-compatible.
## Roots and keys
@@ -184,7 +184,7 @@ A node's fill is a **paint child**; the `fill` prop is shorthand for a solid pai
Assets that don't exist yet are declared as values with the `generate` namespace and passed wherever a source is expected:
```tsx
-import { generate } from "@diffusionstudio/ai";
+import { generate } from "@diffusionstudio/jsx";
const hero = generate.image({ prompt: "A neon city at night, cinematic", seed: 42 });
const motion = generate.video({ prompt: "slow camera push-in", startFrame: hero, duration: 5 });
@@ -227,7 +227,7 @@ Declarations are pure: nothing generates until the mount commits, and refs never
For IntelliSense and typechecking in a project folder:
```sh
-npm install --save-dev @diffusionstudio/solid @diffusionstudio/ai solid-js
+npm install --save-dev @diffusionstudio/jsx solid-js
```
```jsonc
@@ -235,7 +235,7 @@ npm install --save-dev @diffusionstudio/solid @diffusionstudio/ai solid-js
{
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "@diffusionstudio/solid"
+ "jsxImportSource": "@diffusionstudio/jsx"
}
}
```
diff --git a/package-lock.json b/package-lock.json
index 9ce64251..14935249 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,10 +57,9 @@
"version": "0.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@diffusionstudio/ai": "*",
"@diffusionstudio/api-contract": "^0.1.0",
"@diffusionstudio/cli": "*",
- "@diffusionstudio/solid": "*",
+ "@diffusionstudio/jsx": "*",
"@kobalte/core": "^0.13.11",
"@sentry/solid": "^10.51.0",
"@solid-primitives/keyboard": "^1.3.3",
@@ -563,10 +562,6 @@
"solid-js": "^1.8"
}
},
- "node_modules/@diffusionstudio/ai": {
- "resolved": "packages/ai",
- "link": true
- },
"node_modules/@diffusionstudio/api-contract": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@diffusionstudio/api-contract/-/api-contract-0.1.0.tgz",
@@ -585,8 +580,8 @@
"resolved": "apps/desktop",
"link": true
},
- "node_modules/@diffusionstudio/solid": {
- "resolved": "packages/solid",
+ "node_modules/@diffusionstudio/jsx": {
+ "resolved": "packages/jsx",
"link": true
},
"node_modules/@diffusionstudio/web": {
@@ -11644,18 +11639,9 @@
"url": "https://github.com/sponsors/colinhacks"
}
},
- "packages/ai": {
- "name": "@diffusionstudio/ai",
- "version": "0.1.0",
- "license": "MPL-2.0",
- "devDependencies": {
- "typescript": "~5.9.3"
- }
- },
"packages/jsx": {
"name": "@diffusionstudio/jsx",
"version": "0.1.0",
- "extraneous": true,
"license": "MPL-2.0",
"devDependencies": {
"typescript": "~5.9.3"
@@ -11663,20 +11649,6 @@
"peerDependencies": {
"solid-js": "^1.9.0"
}
- },
- "packages/solid": {
- "name": "@diffusionstudio/solid",
- "version": "0.1.0",
- "license": "MPL-2.0",
- "dependencies": {
- "@diffusionstudio/ai": "*"
- },
- "devDependencies": {
- "typescript": "~5.9.3"
- },
- "peerDependencies": {
- "solid-js": "^1.9.0"
- }
}
}
}
diff --git a/packages/ai/README.md b/packages/ai/README.md
deleted file mode 100644
index 17d7e3e0..00000000
--- a/packages/ai/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# @diffusionstudio/ai
-
-Declarative generated assets for [Diffusion Studio](https://diffusion.studio)
-compositions. A `generate.*` call is pure: it validates its options and returns
-an `AssetRef` value that is passed wherever a source is expected (`src`,
-`startFrame`, `endFrame`, `refs`) in a `@diffusionstudio/solid` composition.
-Nothing generates until the mounted tree commits; refs never used by a mounted
-element are dropped.
-
-```tsx
-import { generate } from "@diffusionstudio/ai";
-
-const hero = generate.image({ prompt: "A neon city at night, cinematic" });
-
-export default function Project() {
- return (
- <scene key="intro" name="Intro" width={1920} height={1080}>
- <image src={hero} />
- </scene>
- );
-}
-```
-
-## Setup
-
-The editor supplies the runtime when a project is mounted, so this package is
-needed for **types and tooling** — IntelliSense, `tsc --noEmit`, and testing
-components outside the editor.
-
-```sh
-npm install --save-dev @diffusionstudio/ai
-```
-
-## Documentation
-
-See the JSX API specification shipped with the Diffusion Studio CLI for the
-full `generate.*` declaration API.
-
-## License
-
-[MPL-2.0](./LICENSE)
diff --git a/packages/ai/package.json b/packages/ai/package.json
deleted file mode 100644
index 70a6e5bb..00000000
--- a/packages/ai/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "@diffusionstudio/ai",
- "version": "0.1.0",
- "description": "Declarative generated assets for Diffusion Studio compositions — `generate.*` returns AssetRef values consumed by `@diffusionstudio/solid` elements.",
- "license": "MPL-2.0",
- "type": "module",
- "sideEffects": false,
- "files": [
- "dist"
- ],
- "exports": {
- ".": "./src/index.ts"
- },
- "scripts": {
- "build": "tsc -p tsconfig.build.json",
- "check": "tsc --noEmit"
- },
- "keywords": [
- "diffusion-studio",
- "generative-ai",
- "video-editing"
- ],
- "devDependencies": {
- "typescript": "~5.9.3"
- }
-}
diff --git a/packages/ai/LICENSE b/packages/jsx/LICENSE
similarity index 100%
rename from packages/ai/LICENSE
rename to packages/jsx/LICENSE
diff --git a/packages/solid/README.md b/packages/jsx/README.md
similarity index 52%
rename from packages/solid/README.md
rename to packages/jsx/README.md
index a331c2c1..464cdbe2 100644
--- a/packages/solid/README.md
+++ b/packages/jsx/README.md
@@ -1,13 +1,13 @@
-# @diffusionstudio/solid
+# @diffusionstudio/jsx
-Solid JSX runtime and types for authoring [Diffusion Studio](https://diffusion.studio)
-compositions as code. Projects written against this package are compiled and
-mounted into the running editor with `dapi mount`; every JSX element becomes an
-editable node in the composition — there is no hidden DOM, no CSS resolution,
-and no measuring pass.
+JSX runtime, types, and declarative generated assets for authoring
+[Diffusion Studio](https://diffusion.studio) compositions as code. Projects
+written against this package are compiled and mounted into the running editor
+with `dapi mount`; every JSX element becomes an editable node in the
+composition — there is no hidden DOM, no CSS resolution, and no measuring pass.
```tsx
-import { generate } from "@diffusionstudio/ai";
+import { generate } from "@diffusionstudio/jsx";
const hero = generate.image({ prompt: "A neon city at night, cinematic" });
@@ -31,7 +31,7 @@ needed for **types and tooling** — IntelliSense, `tsc --noEmit`, and testing
components outside the editor.
```sh
-npm install --save-dev @diffusionstudio/solid solid-js
+npm install --save-dev @diffusionstudio/jsx solid-js
```
```jsonc
@@ -39,16 +39,23 @@ npm install --save-dev @diffusionstudio/solid solid-js
{
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "@diffusionstudio/solid"
+ "jsxImportSource": "@diffusionstudio/jsx"
}
}
```
+## Generated assets
+
+A `generate.*` call is pure: it validates its options and returns an
+`AssetRef` value that is passed wherever a source is expected (`src`,
+`startFrame`, `endFrame`, `refs`). Nothing generates until the mounted tree
+commits; refs never used by a mounted element are dropped.
+
## Documentation
-See the JSX API specification shipped with the Diffusion Studio CLI for the
-full element reference, timing model, and media source resolution. Generated
-assets (the `generate.*` declaration API) live in `@diffusionstudio/ai`.
+See the JSX API specification shipped with the Diffusion Studio CLI for the
+full element reference, timing model, media source resolution, and the
+`generate.*` declaration API.
## Testing outside the editor
@@ -57,8 +64,8 @@ so a test can supply a lightweight in-memory document and assert on what the
renderer wrote into it:
```ts
-import { renderProject } from "@diffusionstudio/solid";
-import type { ProjectDocument } from "@diffusionstudio/solid";
+import { renderProject } from "@diffusionstudio/jsx";
+import type { ProjectDocument } from "@diffusionstudio/jsx";
import Project from "./project";
const document: ProjectDocument = /* your in-memory implementation */;
diff --git a/packages/solid/package.json b/packages/jsx/package.json
similarity index 70%
rename from packages/solid/package.json
rename to packages/jsx/package.json
index 91fdf5d0..a86bbe34 100644
--- a/packages/solid/package.json
+++ b/packages/jsx/package.json
@@ -1,7 +1,7 @@
{
- "name": "@diffusionstudio/solid",
+ "name": "@diffusionstudio/jsx",
"version": "0.1.0",
- "description": "Solid JSX runtime and types for authoring Diffusion Studio compositions — mounted into the editor via `dapi mount`.",
+ "description": "JSX runtime, types, and declarative generated assets (`generate.*`) for authoring Diffusion Studio compositions — mounted into the editor via `dapi mount`.",
"license": "MPL-2.0",
"type": "module",
"sideEffects": false,
@@ -21,11 +21,9 @@
"diffusion-studio",
"solid-js",
"jsx",
+ "generative-ai",
"video-editing"
],
- "dependencies": {
- "@diffusionstudio/ai": "*"
- },
"peerDependencies": {
"solid-js": "^1.9.0"
},
diff --git a/packages/solid/src/document.ts b/packages/jsx/src/document.ts
similarity index 100%
rename from packages/solid/src/document.ts
rename to packages/jsx/src/document.ts
diff --git a/packages/ai/src/index.ts b/packages/jsx/src/generate.ts
similarity index 100%
rename from packages/ai/src/index.ts
rename to packages/jsx/src/generate.ts
diff --git a/packages/solid/src/index.ts b/packages/jsx/src/index.ts
similarity index 76%
rename from packages/solid/src/index.ts
rename to packages/jsx/src/index.ts
index ff1ecc5b..a8f35940 100644
--- a/packages/solid/src/index.ts
+++ b/packages/jsx/src/index.ts
@@ -3,6 +3,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// Public authoring API (used by project modules).
+export { generate, AssetRef, isAssetRef, getAssetSpec } from "./generate";
+export type {
+ AspectRatio,
+ AssetInput,
+ AssetSpecInput,
+ GenerateAudioOptions,
+ GenerateImageOptions,
+ GenerateVideoOptions,
+ GenerateVoiceOptions,
+} from "./generate";
export { PATCH_PROP_KEYS } from "./types";
export { parseTime, TIME_FPS } from "./time";
export type {
@@ -30,7 +40,7 @@ export type {
} from "./types";
// Renderer runtime — compiled project modules import these (babel-preset-solid
-// universal mode, moduleName "@diffusionstudio/solid").
+// universal mode, moduleName "@diffusionstudio/jsx").
export {
render,
effect,
diff --git a/packages/solid/src/jsx-runtime.ts b/packages/jsx/src/jsx-runtime.ts
similarity index 98%
rename from packages/solid/src/jsx-runtime.ts
rename to packages/jsx/src/jsx-runtime.ts
index 8ff6d425..a32442a8 100644
--- a/packages/solid/src/jsx-runtime.ts
+++ b/packages/jsx/src/jsx-runtime.ts
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
- * Type-only JSX runtime for `jsxImportSource: "@diffusionstudio/solid"`. JSX is
+ * Type-only JSX runtime for `jsxImportSource: "@diffusionstudio/jsx"`. JSX is
* compiled by babel-preset-solid (universal mode) against the renderer in
* "./renderer", so this module carries no runtime — only the JSX namespace
* TypeScript resolves element and prop types from.
diff --git a/packages/solid/src/renderer.ts b/packages/jsx/src/renderer.ts
similarity index 100%
rename from packages/solid/src/renderer.ts
rename to packages/jsx/src/renderer.ts
diff --git a/packages/solid/src/time.ts b/packages/jsx/src/time.ts
similarity index 100%
rename from packages/solid/src/time.ts
rename to packages/jsx/src/time.ts
diff --git a/packages/solid/src/types.ts b/packages/jsx/src/types.ts
similarity index 99%
rename from packages/solid/src/types.ts
rename to packages/jsx/src/types.ts
index d93299dc..d9763b7d 100644
--- a/packages/solid/src/types.ts
+++ b/packages/jsx/src/types.ts
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import type { JSX as SolidJSX } from "solid-js";
-import type { AssetRef } from "@diffusionstudio/ai";
+import type { AssetRef } from "./generate";
/**
* Composition-relative time: seconds (number), frames ("30f"), or a
diff --git a/packages/ai/tsconfig.build.json b/packages/jsx/tsconfig.build.json
similarity index 100%
rename from packages/ai/tsconfig.build.json
rename to packages/jsx/tsconfig.build.json
diff --git a/packages/ai/tsconfig.json b/packages/jsx/tsconfig.json
similarity index 100%
rename from packages/ai/tsconfig.json
rename to packages/jsx/tsconfig.json
diff --git a/packages/solid/LICENSE b/packages/solid/LICENSE
deleted file mode 100644
index f4bbcd20..00000000
--- a/packages/solid/LICENSE
+++ /dev/null
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
- means each individual or legal entity that creates, contributes to
- the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
- means the combination of the Contributions of others (if any) used
- by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
- means Source Code Form to which the initial Contributor has attached
- the notice in Exhibit A, the Executable Form of such Source Code
- Form, and Modifications of such Source Code Form, in each case
- including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- (a) that the initial Contributor has attached the notice described
- in Exhibit B to the Covered Software; or
-
- (b) that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the
- terms of a Secondary License.
-
-1.6. "Executable Form"
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
- a separate file or files, that is not Covered Software.
-
-1.8. "License"
- means this document.
-
-1.9. "Licensable"
- means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently, any and
- all of the rights conveyed by this License.
-
-1.10. "Modifications"
- means any of the following:
-
- (a) any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered
- Software; or
-
- (b) any new file in Source Code Form that contains any Covered
- Software.
-
-1.11. "Patent Claims" of a Contributor
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the
- License, by the making, using, selling, offering for sale, having
- made, import, or transfer of either its Contributions or its
- Contributor Version.
-
-1.12. "Secondary License"
- means either the GNU General Public License, Version 2.0, the GNU
- Lesser General Public License, Version 2.1, the GNU Affero General
- Public License, Version 3.0, or any later versions of those
- licenses.
-
-1.13. "Source Code Form"
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
- for sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
- or
-
-(b) for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
- Form, as described in Section 3.1, and You must inform recipients of
- the Executable Form how they can obtain a copy of such Source Code
- Form by reasonable means in a timely manner, at a charge no more
- than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter
- the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-* *
-* 6. Disclaimer of Warranty *
-* ------------------------- *
-* *
-* Covered Software is provided under this License on an "as is" *
-* basis, without warranty of any kind, either expressed, implied, or *
-* statutory, including, without limitation, warranties that the *
-* Covered Software is free of defects, merchantable, fit for a *
-* particular purpose or non-infringing. The entire risk as to the *
-* quality and performance of the Covered Software is with You. *
-* Should any Covered Software prove defective in any respect, You *
-* (not any Contributor) assume the cost of any necessary servicing, *
-* repair, or correction. This disclaimer of warranty constitutes an *
-* essential part of this License. No use of any Covered Software is *
-* authorized under this License except under this disclaimer. *
-* *
-************************************************************************
-
-************************************************************************
-* *
-* 7. Limitation of Liability *
-* -------------------------- *
-* *
-* Under no circumstances and under no legal theory, whether tort *
-* (including negligence), contract, or otherwise, shall any *
-* Contributor, or anyone who distributes Covered Software as *
-* permitted above, be liable to You for any direct, indirect, *
-* special, incidental, or consequential damages of any character *
-* including, without limitation, damages for lost profits, loss of *
-* goodwill, work stoppage, computer failure or malfunction, or any *
-* and all other commercial damages or losses, even if such party *
-* shall have been informed of the possibility of such damages. This *
-* limitation of liability shall not apply to liability for death or *
-* personal injury resulting from such party's negligence to the *
-* extent applicable law prohibits such limitation. Some *
-* jurisdictions do not allow the exclusion or limitation of *
-* incidental or consequential damages, so this exclusion and *
-* limitation may not apply to You. *
-* *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
- This Source Code Form is "Incompatible With Secondary Licenses", as
- defined by the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/packages/solid/tsconfig.build.json b/packages/solid/tsconfig.build.json
deleted file mode 100644
index 771e7dd9..00000000
--- a/packages/solid/tsconfig.build.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "noEmit": false,
- "declaration": true,
- "rootDir": "src",
- "outDir": "dist"
- }
-}
diff --git a/packages/solid/tsconfig.json b/packages/solid/tsconfig.json
deleted file mode 100644
index 5ed16ed1..00000000
--- a/packages/solid/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo",
- "lib": ["es2024"]
- },
- "include": ["src"]
-}