Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

refactor: separate markup text and typography

kashorin76cae8eaab1c
diff --git a/README.md b/README.md
index 9caf10f6..d30a2036 100644
--- a/README.md
+++ b/README.md
@@ -179,12 +179,12 @@ packages/core domain-neutral Demand compiler and Build state machine
packages/source mandatory Source Header; no syntax default
packages/elaborator author declarations and hygienic Fragment expansion
packages/compiler-node reference Node compiler Host
-packages/compiler-text-node optional official Text compiler assembly
+packages/compiler-markup-node optional official Markup compiler assembly
packages/package-loader-node syntax-neutral trusted physical-package loading
packages/cli generic commands requiring an explicit Distribution
packages/video-cli official video command application; no author-package aggregate
packages/run syntax-neutral Run Source closure and complete Run Graph compiler
-packages/run-text optional official human-readable Run Frontend
+packages/run-markup optional official human-readable Run Frontend
packages/runtime environment-neutral scheduling and Store ports
packages/driver-node trusted Node command execution
packages/local zero-service SQLite/filesystem developer assembly
diff --git a/docs/README.md b/docs/README.md
index f363ddda..ab67e8e8 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -47,7 +47,7 @@ the working tree contains only documents that should inform current implementati
its temporal projection and occurrence-expansion laws are implemented across the current Track packages.
- [`../spec/spatial-layout.md`](../spec/spatial-layout.md) — shared Canvas/Frame/Point/Path geometry,
two-frame fitting, alignment and explicit backing-layer boundary.
-- [`../spec/text-track.md`](../spec/text-track.md) — complete two-dimensional Text model, old-system
+- [`../spec/typography-track.md`](../spec/typography-track.md) — complete two-dimensional Text model, old-system
and editor attack audit, terminal-IR gaps and Caption feedback.
- [`../spec/ranking-track.md`](../spec/ranking-track.md) — old Ranking audit, separate official
components, triggered group schedule and renderer-neutral migration plan.
@@ -63,7 +63,7 @@ the working tree contains only documents that should inform current implementati
- [`../spec/track-expressiveness.md`](../spec/track-expressiveness.md)
- [`../spec/visual-ir.md`](../spec/visual-ir.md)
- [`twinit-capability-migration.md`](./twinit-capability-migration.md) — one explicit ledger for every
- active Twinit node: complete replacement, expressible-but-missing Kit, backlog or deliberate omission.
+ active Twinit node: complete replacement, expressible-but-missing Template, backlog or deliberate omission.
The shared `svml.visual-track@1` / `svml.visual-ir@1` terminal waist is frozen inside the repository
before publication. Individual author Surfaces remain pre-release unless their own specification
diff --git a/docs/guide/author-packages.md b/docs/guide/author-packages.md
index 3d2fc208..e4765102 100644
--- a/docs/guide/author-packages.md
+++ b/docs/guide/author-packages.md
@@ -32,7 +32,7 @@ mkdir -p packages/my-component/src packages/my-component/test
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
```
@@ -64,13 +64,13 @@ type — installing a new package can add a new Type without a Core release.
## 4. Implement the Surface handler
-The Surface handler decodes the Text Frontend's XML elements into typed author declarations.
+The Surface handler decodes the Markup Frontend's XML elements into typed author declarations.
```typescript
// src/surface.ts
-import type { TextSurfaceDecoder } from "@narratage/text";
+import type { MarkupSurfaceDecoder } from "@narratage/markup";
-export const decodeMyComponentSurface: TextSurfaceDecoder = (element, context) => {
+export const decodeMyComponentSurface: MarkupSurfaceDecoder = (element, context) => {
// Read attributes and children from the XML element
// Validate inputs
// Emit typed Records and Operations into context
@@ -87,7 +87,7 @@ Look at existing Surface implementations for reference:
```typescript
// src/activation.ts
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
myComponentManifest,
myComponentModuleRef,
@@ -102,7 +102,7 @@ export const svmlPackage = {
specifiers: ["@narratage/my-component", "@narratage/my-component@1"],
}],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: myComponentModuleRef,
surface: "my-widget",
mode: "structured",
@@ -140,7 +140,7 @@ pnpm narratage lock-packages <lock-file> \
## 8. Use in Author Source
```xml
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import as="mine" from="@narratage/my-component@1"/>
@@ -156,9 +156,9 @@ authority.
| Package | What it demonstrates |
|---|---|
| `packages/seedance/` | Model family with multiple Surfaces (Prompt, Speech, Video) |
-| `packages/seedance-speaker/` | Higher-level binding that composes Script, Prompt Kit and Seedance |
+| `packages/seedance-speaker/` | Higher-level binding that composes Script, a Text Template and Seedance |
| `packages/caption/` | common Program, Cue/field contracts and whole-Atom timing |
| `packages/caption-fine/` | one field-free Style and Track Surface family |
| `packages/media-track/` | Track with Item/Sequence, layer, motion and handoff behavior |
-| `packages/text-track/` | Simple text overlay Track |
+| `packages/typography-track/` | Typography overlay Track |
| `packages/film/` | Composition target that consumes peer Tracks |
diff --git a/docs/guide/packages.md b/docs/guide/packages.md
index 521430b4..b3a8e594 100644
--- a/docs/guide/packages.md
+++ b/docs/guide/packages.md
@@ -46,18 +46,22 @@ Script, Seedance, Film or any video concept.
### Layer 2: Author language
-Author-facing vocabulary: the text Frontend, Script Surface, SVS Recipes, Run text Frontend and
-reusable compilation libraries.
+Author-facing vocabulary: the Markup Frontend, Script Surface, SVS Recipes, Run Markup Frontend and
+reusable deterministic text compilation.
```text
-@narratage/text official .svml markup Frontend
+@narratage/markup official .svml Markup Frontend
@narratage/script Script Surface
@narratage/svs SVS Recipe Frontend
-@narratage/run-text official .svrun Frontend
-@narratage/prompt-kit declarative prompt compilation
-@narratage/compiler-text-node Text Frontend + Surface Host assembly
+@narratage/run-markup official .svrun Markup Frontend
+@narratage/text graph-native text values, templates and deterministic rendering
+@narratage/compiler-markup-node Markup Frontend + Surface Host assembly
```
+`@narratage/text` is domain-neutral in meaning even though it is author-language vocabulary. Its
+ordinary `Text` outputs may feed model ports or visible video consumers. Those consumers depend on
+the Text waist; Text never depends back on Typography, Ranking, Sticker, Deck or any model family.
+
### Layer 3: Video domain
Video-specific types, generation model families, speech/caption/track contracts and composition.
@@ -93,7 +97,7 @@ Depends on Layer 1 and 2 but not on any Provider.
@narratage/caption-fine field-free fine caption Track family
@narratage/fonts-open exact redistributable font catalog
@narratage/media-track unified Media Item/Sequence Track
-@narratage/text-track text overlay Track
+@narratage/typography-track typography overlay Track
@narratage/audio-track arbitrary sample-domain Audio Track
@narratage/deck-track depth-stack collection Track
@narratage/ranking four ranking component families
@@ -132,7 +136,7 @@ never on exact-model packages or the CLI.
```text
@narratage/cli generic command engine (requires explicit Distribution)
-@narratage/video-cli video command application (selects Text compiler, no built-in author packages)
+@narratage/video-cli video command application (selects Markup compiler, no built-in author packages)
```
## Dependency rules
@@ -146,7 +150,7 @@ never on exact-model packages or the CLI.
3. **CLI independence.** Neither `@narratage/cli` nor `@narratage/video-cli` transitively depends on any
Provider package. The video CLI also does not depend on any author-level video package
- (`@narratage/script`, `@narratage/seedance-speaker`, `@narratage/media-track`, `@narratage/text-track`, `@narratage/film`).
+ (`@narratage/script`, `@narratage/seedance-speaker`, `@narratage/media-track`, `@narratage/typography-track`, `@narratage/film`).
Author packages are activated through the explicit package lock, not compile-time CLI
dependencies.
diff --git a/docs/quickstart/composition.md b/docs/quickstart/composition.md
index 3aadacbf..a2d46056 100644
--- a/docs/quickstart/composition.md
+++ b/docs/quickstart/composition.md
@@ -109,10 +109,11 @@ The complete data flow from Script to rendered video. This example is based on
### Author Source (`main.svml`)
```svml
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
+ <import as="wording" from="@narratage/text@1"/>
<import as="seedance" from="@narratage/seedance@1"/>
<import as="speech" from="@narratage/speech-spine@1"/>
<import as="whisperx" from="@narratage/whisperx@1"/>
@@ -122,7 +123,7 @@ The complete data flow from Script to rendered video. This example is based on
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<import as="film" from="@narratage/film@1"/>
<import as="render" from="@narratage/render-hyperframes@1"/>
@@ -134,11 +135,10 @@ The complete data flow from Script to rendered video. This example is based on
</script>
<!-- 2. Generation: Seedance talking head + standalone video -->
- <seedance:Prompt id="direction">
- Locked medium close-up in a quiet daylight studio.
- </seedance:Prompt>
+ <wording:Value id="direction">
+ Locked medium close-up in a quiet daylight studio. Spoken dialogue — say exactly: Meaning becomes the source.
+ </wording:Value>
<seedance:Speech id="take" model="mini"
- dialogue={story.segment.opening.dialogue}
prompt={direction} duration="5"/>
<seedance:Video id="motion" model="mini"
prompt={direction} duration="5"/>
@@ -230,7 +230,7 @@ The complete data flow from Script to rendered video. This example is based on
### Run Source (`build.svrun`)
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/docs/quickstart/generation.md b/docs/quickstart/generation.md
index e4faec92..f0858e17 100644
--- a/docs/quickstart/generation.md
+++ b/docs/quickstart/generation.md
@@ -89,35 +89,38 @@ You can also specify estimation parameters inline instead of using an SVS policy
**Output:** `{hook-duration.duration}` — the estimated duration in seconds, passed to generation
components.
-## seedance:Prompt
+## text:Value
-A reusable text block that provides visual direction for Seedance generation.
+A reusable literal `Text` value. It is model-neutral and can feed Seedance, GPT Image or any other
+declared text port.
```svml
-<seedance:Prompt id="alice-direction">
+<import as="text" from="@narratage/text@1"/>
+
+<text:Value id="alice-direction">
Locked medium close-up. Alice speaks directly to camera in a quiet daylight studio.
Calm, curious delivery; natural breathing and restrained hand movement.
-</seedance:Prompt>
+ Spoken dialogue — say exactly: What if editing began with meaning?
+</text:Value>
```
| Attribute | Required | Description |
|---|---|---|
| `id` | yes | Unique identifier |
-The element body is the prompt text. Referenced by `seedance:Speech` and `seedance:Video` via their
-`prompt` attribute.
+The element body is the exact Text value. `text:Render` can produce the same type from a template
+and explicit graph inputs.
## seedance:Speech
Generates a talking-head video clip via the Seedance model. This is the low-level generation
-component — it directly specifies the dialogue, prompt, and duration.
+component — its complete model input Text already includes any spoken dialogue.
```svml
<seedance:Speech id="alice-take" model="mini"
- dialogue={story.segment.opening.dialogue}
prompt={alice-direction}
duration="8">
- <seedance:Reference image={alice-reference} role="character"/>
+ <seedance:Reference image={alice-reference}/>
</seedance:Speech>
```
@@ -125,8 +128,7 @@ component — it directly specifies the dialogue, prompt, and duration.
|---|---|---|
| `id` | yes | Unique identifier |
| `model` | yes | Seedance model name: `mini` |
-| `dialogue` | yes | Script text to lip-sync — typically `{script.segment.NAME.dialogue}` |
-| `prompt` | yes | Visual direction — reference to a `seedance:Prompt` |
+| `prompt` | yes | Complete model input — reference to ordinary `Text` |
| `duration` | yes | Clip duration in seconds (number or `{estimate.duration}` reference) |
| `resolution` | no | Output resolution: `480p`, `720p` (default varies by model) |
| `aspect-ratio` | no | Output aspect ratio: `9:16`, `16:9`, `1:1` |
@@ -136,13 +138,12 @@ component — it directly specifies the dialogue, prompt, and duration.
Child element that provides a reference image for character consistency:
```svml
-<seedance:Reference image={alice-reference} role="character"/>
+<seedance:Reference image={alice-reference}/>
```
| Attribute | Required | Description |
|---|---|---|
| `image` | yes | Reference to a `media:Image` component |
-| `role` | yes | How this reference is used: `character`, `subject` |
**Output:** `{alice-take}` or `{alice-take.video}` — the generated video, passed to `speech:Spine`.
@@ -153,7 +154,7 @@ Generates a standalone video clip (not a talking-head — no dialogue lip-sync).
```svml
<seedance:Video id="product-motion" model="mini"
prompt={product-direction} duration="5">
- <seedance:Reference image={product-reference} role="subject"/>
+ <seedance:Reference image={product-reference}/>
</seedance:Video>
```
@@ -161,7 +162,7 @@ Generates a standalone video clip (not a talking-head — no dialogue lip-sync).
|---|---|---|
| `id` | yes | Unique identifier |
| `model` | yes | Seedance model name: `mini` |
-| `prompt` | yes | Visual direction — reference to a `seedance:Prompt` |
+| `prompt` | yes | Complete model input — reference to ordinary `Text` |
| `duration` | yes | Clip duration in seconds |
Also accepts `<seedance:Reference>` children for reference images.
@@ -170,8 +171,9 @@ Also accepts `<seedance:Reference>` children for reference images.
## speaker:Take
-A higher-level talking-head component built on top of Prompt Kit. Instead of writing a raw prompt,
-you provide a Recipe with generation settings and a Kit that assembles the prompt automatically.
+A higher-level talking-head component built on the domain-neutral Text Program. Instead of writing
+a raw prompt, you provide a Recipe with generation settings and a Text Template that assembles the
+model input explicitly in the graph.
```svml
<import as="speaker" from="@narratage/seedance-speaker@1"/>
@@ -193,7 +195,7 @@ you provide a Recipe with generation settings and a Kit that assembles the promp
| `dialogue` | yes | Script text — typically `{script.segment.NAME.dialogue}` |
| `duration` | yes | Estimated duration from `estimate:Speech` |
| `recipe` | yes | SVS speaker Recipe (see [SVS Stylesheets](./styles.md#speaker)) |
-| `kit` | yes | Prompt Kit SVS — the template that assembles the prompt |
+| `kit` | yes | Text Template SVS — the template that assembles model input text |
### speaker:Reference
@@ -212,21 +214,21 @@ Child element providing reference media. Accepts both images and audio:
**Output:** `{hook-take.video}` — the generated video, passed to `speech:Spine`.
-### Prompt Kits
+### Text Templates
-A Prompt Kit is a special SVS file that defines a structured prompt template with ordered blocks,
-variant choices, axis parameters, and slots. The official kit is at
+A Text Template can be authored as an SVS file with ordered blocks, variant choices, axis
+parameters and slots. The official template is at
`packages/seedance-speaker/kits/official-ugc-v1.svs`.
-The kit is imported using the Prompt Kit SVS parser:
+That source selects the optional Text Template SVS Frontend itself:
```svs
-<?svml using="@narratage/prompt-kit/svs@1"?>
+<?svml using="@narratage/text/svs@1"?>
```
-The Recipe in `studio.svs` sets the axis parameter values (composition-stability, camera-motion,
-edit-rhythm, performance, gesture, voice-mode), and the kit assembles them into a complete prompt
-automatically.
+The Recipe in `studio.svs` sets the axis parameter values. `speaker:Take` turns those values and
+Script dialogue into explicit Text Bindings; the Text render output then enters Seedance's exact
+`prompt` port through an ordinary graph edge.
## Combination example
diff --git a/docs/quickstart/run.md b/docs/quickstart/run.md
index d36151e3..cc686909 100644
--- a/docs/quickstart/run.md
+++ b/docs/quickstart/run.md
@@ -17,13 +17,13 @@ Neither of these changes what the video **is**. That is the Author Source's job.
Every `.svrun` file begins with its processing instruction:
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
```
### Minimal Run Source
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
@@ -86,7 +86,7 @@ Narratage has no implicit cache. Reusing a result is explicit Run Graph authorin
historical Records as zero-input Candidates and connect them through Satisfaction edges.
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/docs/quickstart/script.md b/docs/quickstart/script.md
index 8545bb16..b6202333 100644
--- a/docs/quickstart/script.md
+++ b/docs/quickstart/script.md
@@ -50,8 +50,9 @@ a Script.
- Segments cannot nest — every Segment is a top-level child of `<script>`.
- Segment names follow XML naming rules: letters, digits, hyphens, underscores.
-Other components reference individual Segments via `{story.segment.opening}` and their text
-projections via `{story.segment.opening.dialogue}` or `{story.segment.opening.speech}`.
+Other components reference individual Segments via `{story.segment.opening}`. Both
+`{story.segment.opening.dialogue}` and `{story.segment.opening.speech}` are ordinary `Text` values;
+the former preserves explicit Role prefixes and the latter contains pronunciation only.
## Role Cues
@@ -77,7 +78,7 @@ Role Cues produce different text projections:
| **speech** | `What time is it?`<br>`It's 8:30.` |
| **caption** | `What time is it?`<br>`It's 8:30.` |
-The dialogue projection includes Role Cue prefixes. Speech and caption projections strip them.
+The dialogue `Text` includes Role Cue prefixes. Speech `Text` and caption projection strip them.
Components like `seedance:Speech` use `{story.segment.dialogue.dialogue}` (with labels). Script also
emits `{story.caption}` as the ordered display Atom/Word universe and
`{story.caption.correspondence}` as the separate Atom-to-speech edge used only when timing joins.
diff --git a/docs/quickstart/tracks.md b/docs/quickstart/tracks.md
index bd478628..d8e968dd 100644
--- a/docs/quickstart/tracks.md
+++ b/docs/quickstart/tracks.md
@@ -1,17 +1,17 @@
---
-title: Caption, Media & Text
-description: Visual track components — captions, media overlays and text overlays.
+title: Caption, Media & Typography
+description: Visual track components — captions, media overlays and typography overlays.
---
-# Caption, Media & Text
+# Caption, Media & Typography
-> **Pre-release note:** Caption Fine, Media Track and Text execute their declared author Surfaces.
+> **Pre-release note:** Caption Fine, Media Track and Typography Track execute their declared author Surfaces.
> Their author APIs may still evolve; the shared terminal Track/Visual IR waist is frozen inside the
> repository but has not been published as an npm ABI.
Every audiovisual contribution entering the final composition is a peer **Track**. Tracks are flat
(no nesting), and their z-order is determined by the `stack-order` property in SVS. This page
-covers three official visual Track packages: captions, media, and text overlays.
+covers three official visual Track packages: captions, media, and typography overlays.
## Caption system
@@ -159,6 +159,7 @@ place a normalized image, video, animation or compositable Surface at a semantic
```svml
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
+<import as="wording" from="@narratage/text@1"/>
```
### media-track:Track and media-track:Item
@@ -166,14 +167,14 @@ place a normalized image, video, animation or compositable Surface at a semantic
Placement is an explicit Spatial Frame edge; appearance and motion remain reusable SVS values.
```svml
-<seedance:Prompt id="product-direction">
+<wording:Value id="product-direction">
A clean vertical product film: the written script becomes semantic regions,
then those regions assemble into a finished video.
-</seedance:Prompt>
+</wording:Value>
<seedance:Video id="product-motion" model="mini"
prompt={product-direction} duration="5">
- <seedance:Reference image={product-reference} role="subject"/>
+ <seedance:Reference image={product-reference}/>
</seedance:Video>
<pipeline:Normalize id="product-media" source={product-motion.video}
@@ -202,7 +203,8 @@ child layers, source occupancy and explicit Sequences are available when one sou
Static or timed text displayed on screen — titles, callouts, lower thirds.
```svml
-<import as="text" from="@narratage/text-track@1"/>
+<import as="text" from="@narratage/typography-track@1"/>
+<import as="wording" from="@narratage/text@1"/>
```
### text:Track
@@ -242,7 +244,7 @@ places flowing text inside a `SpatialFrame`:
| Attribute | Required | Description |
|---|---|---|
| `id` | yes | Stable item identity |
-| child content | yes | Plain text, or `P`, `Span` and `Break` for rich text |
+| child content or `content` | yes | Inline plain/rich content, or an ordinary graph `Text` reference; the two forms are exclusive |
| `during` | yes | `"program"` or a Selection reference; `at` and explicit `start`/`end` are also available |
| `placement` | yes | `SpatialPoint`, `SpatialFrame` or `SpatialPath`, matching the item form |
| `style` | yes | A `text:Style` compiled from an SVS Recipe plus exact font bytes |
@@ -260,6 +262,19 @@ or a Selection reference for semantic timing:
</text:Track>
```
+Graph-produced copy remains visible as an edge:
+
+```svml
+<wording:Value id="headline">EXACTLY THE RIGHT MOMENT</wording:Value>
+<text:Track id="callout" space={speech.space}>
+ <text:Area id="callout-copy" content={headline}
+ placement={callout-frame} style={callout-style} during="program"/>
+</text:Track>
+```
+
+The generic Text value supplies only characters. Typography still owns the item document wrapper,
+placement, timing, style and motion. Use inline `P`/`Span`/`Break` when the author needs rich runs.
+
**Output:** `{titles.track}` — a VisualTrack added to `film:Film`.
## Combination example
@@ -273,7 +288,7 @@ All three track types together in one source file:
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
-<import as="text" from="@narratage/text-track@1"/>
+<import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<!-- Captions: primary style for all text -->
diff --git a/docs/zh/guide/author-packages.md b/docs/zh/guide/author-packages.md
index 0d2f7066..0ca760ef 100644
--- a/docs/zh/guide/author-packages.md
+++ b/docs/zh/guide/author-packages.md
@@ -30,7 +30,7 @@ mkdir -p packages/my-component/src packages/my-component/test
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
```
@@ -60,13 +60,13 @@ Type 在名义上归属于 Module。Core 并不维护一个包含所有领域类
## 4. 实现 Surface handler
-Surface handler 把 Text Frontend 的 XML 元素解码成带类型的作者声明。
+Surface handler 把 Markup Frontend 的 XML 元素解码成带类型的作者声明。
```typescript
// src/surface.ts
-import type { TextSurfaceDecoder } from "@narratage/text";
+import type { MarkupSurfaceDecoder } from "@narratage/markup";
-export const decodeMyComponentSurface: TextSurfaceDecoder = (element, context) => {
+export const decodeMyComponentSurface: MarkupSurfaceDecoder = (element, context) => {
// Read attributes and children from the XML element
// Validate inputs
// Emit typed Records and Operations into context
@@ -83,7 +83,7 @@ export const decodeMyComponentSurface: TextSurfaceDecoder = (element, context) =
```typescript
// src/activation.ts
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
myComponentManifest,
myComponentModuleRef,
@@ -98,7 +98,7 @@ export const svmlPackage = {
specifiers: ["@narratage/my-component", "@narratage/my-component@1"],
}],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: myComponentModuleRef,
surface: "my-widget",
mode: "structured",
@@ -135,7 +135,7 @@ pnpm narratage lock-packages <lock-file> \
## 8. 在 Author Source 中使用
```xml
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import as="mine" from="@narratage/my-component@1"/>
@@ -150,9 +150,9 @@ pnpm narratage lock-packages <lock-file> \
| 包 | 它展示了什么 |
|---|---|
| `packages/seedance/` | 带多个 Surface(Prompt、Speech、Video)的模型族 |
-| `packages/seedance-speaker/` | 组合 Script、Prompt Kit 和 Seedance 的更高层绑定 |
+| `packages/seedance-speaker/` | 组合 Script、Text Template 和 Seedance 的更高层绑定 |
| `packages/caption/` | 公共 Program、Cue/字段合同和整 Atom 定时 |
| `packages/caption-fine/` | 一种无字段的 Style 与 Track Surface 样式族 |
| `packages/media-track/` | 带 Item/Sequence、图层、动效和交接行为的 Track |
-| `packages/text-track/` | 简单的文字叠加 Track |
+| `packages/typography-track/` | Typography 叠加 Track |
| `packages/film/` | 消费同级 Track 的合成 target |
diff --git a/docs/zh/guide/packages.md b/docs/zh/guide/packages.md
index b39da3a2..27429ea9 100644
--- a/docs/zh/guide/packages.md
+++ b/docs/zh/guide/packages.md
@@ -43,17 +43,21 @@ description: 五个分层、依赖边界、包的结构与 facet。
### Layer 2:作者语言层
-面向作者的词汇:文本 Frontend、Script Surface、SVS Recipe、Run 文本 Frontend 以及可复用的编译库。
+面向作者的词汇:Markup Frontend、Script Surface、SVS Recipe、Run Markup Frontend,以及可复用的确定性文字编译。
```text
-@narratage/text official .svml markup Frontend
+@narratage/markup official .svml Markup Frontend
@narratage/script Script Surface
@narratage/svs SVS Recipe Frontend
-@narratage/run-text official .svrun Frontend
-@narratage/prompt-kit declarative prompt compilation
-@narratage/compiler-text-node Text Frontend + Surface Host assembly
+@narratage/run-markup official .svrun Markup Frontend
+@narratage/text 图原生文字值、模板和确定性渲染
+@narratage/compiler-markup-node Markup Frontend + Surface Host assembly
```
+`@narratage/text` 的语义与领域无关,只是位于作者语言层。它输出的普通 `Text` 可以进入模型端口,
+也可以进入可见的视频组件。消费者依赖 Text 窄腰;Text 绝不会反向依赖 Typography、Ranking、
+Sticker、Deck 或任何模型家族。
+
### Layer 3:视频领域层
视频专属类型、生成模型族、语音/字幕/轨道契约以及合成。依赖 Layer 1 和 Layer 2,但不依赖任何 Provider。
@@ -88,7 +92,7 @@ description: 五个分层、依赖边界、包的结构与 facet。
@narratage/caption-fine 无字段细粒度字幕 Track family
@narratage/fonts-open exact redistributable font catalog
@narratage/media-track 统一的 Media Item/Sequence Track
-@narratage/text-track text overlay Track
+@narratage/typography-track typography overlay Track
@narratage/audio-track arbitrary sample-domain Audio Track
@narratage/deck-track depth-stack collection Track
@narratage/ranking four ranking component families
@@ -126,7 +130,7 @@ description: 五个分层、依赖边界、包的结构与 facet。
```text
@narratage/cli generic command engine (requires explicit Distribution)
-@narratage/video-cli video command application (selects Text compiler, no built-in author packages)
+@narratage/video-cli video command application (selects Markup compiler, no built-in author packages)
```
## 依赖规则
@@ -137,7 +141,7 @@ description: 五个分层、依赖边界、包的结构与 facet。
2. **领域无关闭包。** 每个 Layer 1 包的传递闭包只包含 Layer 1 的包。`@narratage/core` 只依赖 `@narratage/protocol`。
-3. **CLI 独立性。** `@narratage/cli` 和 `@narratage/video-cli` 都不会传递依赖任何 Provider 包。video CLI 同样不依赖任何作者层的视频包(`@narratage/script`、`@narratage/seedance-speaker`、`@narratage/media-track`、`@narratage/text-track`、`@narratage/film`)。作者包通过显式的 package lock 被 activate,而不是通过编译期的 CLI 依赖。
+3. **CLI 独立性。** `@narratage/cli` 和 `@narratage/video-cli` 都不会传递依赖任何 Provider 包。video CLI 同样不依赖任何作者层的视频包(`@narratage/script`、`@narratage/seedance-speaker`、`@narratage/media-track`、`@narratage/typography-track`、`@narratage/film`)。作者包通过显式的 package lock 被 activate,而不是通过编译期的 CLI 依赖。
## 包的结构
diff --git a/docs/zh/quickstart/composition.md b/docs/zh/quickstart/composition.md
index 90cc48b7..f0f3a9d7 100644
--- a/docs/zh/quickstart/composition.md
+++ b/docs/zh/quickstart/composition.md
@@ -106,10 +106,11 @@ Track 是**扁平的**——没有嵌套或分组。Z 轴排序完全由每个 T
### Author Source (`main.svml`)
```svml
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
+ <import as="wording" from="@narratage/text@1"/>
<import as="seedance" from="@narratage/seedance@1"/>
<import as="speech" from="@narratage/speech-spine@1"/>
<import as="whisperx" from="@narratage/whisperx@1"/>
@@ -119,7 +120,7 @@ Track 是**扁平的**——没有嵌套或分组。Z 轴排序完全由每个 T
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<import as="film" from="@narratage/film@1"/>
<import as="render" from="@narratage/render-hyperframes@1"/>
@@ -131,11 +132,10 @@ Track 是**扁平的**——没有嵌套或分组。Z 轴排序完全由每个 T
</script>
<!-- 2. Generation: Seedance talking head + standalone video -->
- <seedance:Prompt id="direction">
- Locked medium close-up in a quiet daylight studio.
- </seedance:Prompt>
+ <wording:Value id="direction">
+ Locked medium close-up in a quiet daylight studio. Spoken dialogue — say exactly: Meaning becomes the source.
+ </wording:Value>
<seedance:Speech id="take" model="mini"
- dialogue={story.segment.opening.dialogue}
prompt={direction} duration="5"/>
<seedance:Video id="motion" model="mini"
prompt={direction} duration="5"/>
@@ -227,7 +227,7 @@ Track 是**扁平的**——没有嵌套或分组。Z 轴排序完全由每个 T
### Run Source (`build.svrun`)
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/docs/zh/quickstart/generation.md b/docs/zh/quickstart/generation.md
index 3fd670e1..670a10bb 100644
--- a/docs/zh/quickstart/generation.md
+++ b/docs/zh/quickstart/generation.md
@@ -85,33 +85,35 @@ speech.normal {
**输出:** `{hook-duration.duration}`——估算的时长(秒),传递给生成组件。
-## seedance:Prompt
+## text:Value
-一个可复用的文本块,为 Seedance 生成提供视觉指导。
+一个可复用的字面 `Text` 值。它与模型无关,可以进入 Seedance、GPT Image 或任何声明的文字端口。
```svml
-<seedance:Prompt id="alice-direction">
+<import as="text" from="@narratage/text@1"/>
+
+<text:Value id="alice-direction">
Locked medium close-up. Alice speaks directly to camera in a quiet daylight studio.
Calm, curious delivery; natural breathing and restrained hand movement.
-</seedance:Prompt>
+ Spoken dialogue — say exactly: What if editing began with meaning?
+</text:Value>
```
| 属性 | 必填 | 说明 |
|---|---|---|
| `id` | 是 | 唯一标识符 |
-元素主体即为提示文本。通过 `seedance:Speech` 和 `seedance:Video` 的 `prompt` 属性引用。
+元素主体就是精确的 Text 值。`text:Render` 也能用模板和显式图输入产出同一类型。
## seedance:Speech
-通过 Seedance 模型生成说话人头部视频片段。这是低层级的生成组件——直接指定对话、提示和时长。
+通过 Seedance 模型生成口播视频片段。这是低层生成组件——完整的模型输入 Text 已包含需要朗读的台词。
```svml
<seedance:Speech id="alice-take" model="mini"
- dialogue={story.segment.opening.dialogue}
prompt={alice-direction}
duration="8">
- <seedance:Reference image={alice-reference} role="character"/>
+ <seedance:Reference image={alice-reference}/>
</seedance:Speech>
```
@@ -119,8 +121,7 @@ speech.normal {
|---|---|---|
| `id` | 是 | 唯一标识符 |
| `model` | 是 | Seedance 模型名称:`mini` |
-| `dialogue` | 是 | 要进行口型同步的 Script 文本——通常为 `{script.segment.NAME.dialogue}` |
-| `prompt` | 是 | 视觉指导——引用 `seedance:Prompt` |
+| `prompt` | 是 | 完整模型输入——引用普通 `Text` |
| `duration` | 是 | 片段时长(秒)(数字或 `{estimate.duration}` 引用) |
| `resolution` | 否 | 输出分辨率:`480p`、`720p`(默认值因模型而异) |
| `aspect-ratio` | 否 | 输出宽高比:`9:16`、`16:9`、`1:1` |
@@ -130,13 +131,12 @@ speech.normal {
提供参考图片以保持角色一致性的子元素:
```svml
-<seedance:Reference image={alice-reference} role="character"/>
+<seedance:Reference image={alice-reference}/>
```
| 属性 | 必填 | 说明 |
|---|---|---|
| `image` | 是 | 引用 `media:Image` 组件 |
-| `role` | 是 | 该参考的用途:`character`、`subject` |
**输出:** `{alice-take}` 或 `{alice-take.video}`——生成的视频,传递给 `speech:Spine`。
@@ -147,7 +147,7 @@ speech.normal {
```svml
<seedance:Video id="product-motion" model="mini"
prompt={product-direction} duration="5">
- <seedance:Reference image={product-reference} role="subject"/>
+ <seedance:Reference image={product-reference}/>
</seedance:Video>
```
@@ -155,7 +155,7 @@ speech.normal {
|---|---|---|
| `id` | 是 | 唯一标识符 |
| `model` | 是 | Seedance 模型名称:`mini` |
-| `prompt` | 是 | 视觉指导——引用 `seedance:Prompt` |
+| `prompt` | 是 | 完整模型输入——引用普通 `Text` |
| `duration` | 是 | 片段时长(秒) |
同样接受 `<seedance:Reference>` 子元素作为参考图片。
@@ -164,7 +164,7 @@ speech.normal {
## speaker:Take
-基于 Prompt Kit 构建的更高层级说话人头部组件。无需编写原始提示,你只需提供一个包含生成设置的 Recipe 和一个自动组装提示的 Kit。
+基于领域无关 Text Program 构建的更高层口播组件。无需内联原始提示,只需提供生成 Recipe 和显式组装模型输入文字的 Text Template。
```svml
<import as="speaker" from="@narratage/seedance-speaker@1"/>
@@ -186,7 +186,7 @@ speech.normal {
| `dialogue` | 是 | Script 文本——通常为 `{script.segment.NAME.dialogue}` |
| `duration` | 是 | 来自 `estimate:Speech` 的估算时长 |
| `recipe` | 是 | SVS speaker Recipe(参见 [SVS 样式表](./styles.md#speaker)) |
-| `kit` | 是 | Prompt Kit SVS——用于组装提示的模板 |
+| `kit` | 是 | Text Template SVS——用于组装模型输入文字的模板 |
### speaker:Reference
@@ -205,17 +205,17 @@ speech.normal {
**输出:** `{hook-take.video}`——生成的视频,传递给 `speech:Spine`。
-### Prompt Kits
+### Text Template
-Prompt Kit 是一种特殊的 SVS 文件,定义了包含有序块、变体选择、轴参数和 Slot 的结构化提示模板。官方 Kit 位于 `packages/seedance-speaker/kits/official-ugc-v1.svs`。
+Text Template 可以用 SVS 表达有序块、有限分支、轴参数和 Slot。官方模板位于 `packages/seedance-speaker/kits/official-ugc-v1.svs`。
-该 Kit 使用 Prompt Kit SVS 解析器导入:
+该源码自己选择可选的 Text Template SVS Frontend:
```svs
-<?svml using="@narratage/prompt-kit/svs@1"?>
+<?svml using="@narratage/text/svs@1"?>
```
-`studio.svs` 中的 Recipe 设置轴参数值(composition-stability、camera-motion、edit-rhythm、performance、gesture、voice-mode),Kit 会自动将它们组装成完整的提示。
+`studio.svs` 中的 Recipe 设置轴参数值。`speaker:Take` 把这些值和 Script 台词变成显式 Text Bindings;Text 渲染结果再通过普通图边进入 Seedance 的精确 `prompt` 端口。
## 组合示例
diff --git a/docs/zh/quickstart/run.md b/docs/zh/quickstart/run.md
index 90de1abc..b235c6ac 100644
--- a/docs/zh/quickstart/run.md
+++ b/docs/zh/quickstart/run.md
@@ -14,13 +14,13 @@ Run Source(`.svrun`)声明**要构建什么**——需要哪些输出、接
每个 `.svrun` 文件都以其处理指令开头:
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
```
### 最简 Run Source
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
@@ -80,7 +80,7 @@ Run Source(`.svrun`)声明**要构建什么**——需要哪些输出、接
Narratage 没有隐式缓存。复用结果是显式的运行图编写——你将历史 Record 声明为零输入 Candidate,并通过 Satisfaction 边将它们连接起来。
```svml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/docs/zh/quickstart/script.md b/docs/zh/quickstart/script.md
index 48995c65..33846b75 100644
--- a/docs/zh/quickstart/script.md
+++ b/docs/zh/quickstart/script.md
@@ -45,7 +45,8 @@ Segment 是按顺序排列的语音内容块。标签名**即**其 id——在
- Segment 不能嵌套——每个 Segment 都是 `<script>` 的顶层子元素。
- Segment 名称遵循 XML 命名规则:字母、数字、连字符、下划线。
-其他组件通过 `{story.segment.opening}` 引用单个 Segment,通过 `{story.segment.opening.dialogue}` 或 `{story.segment.opening.speech}` 引用其文本投影。
+其他组件通过 `{story.segment.opening}` 引用单个 Segment。`{story.segment.opening.dialogue}` 与
+`{story.segment.opening.speech}` 都是普通 `Text`:前者保留显式 Role 前缀,后者只有实际读音。
## Role Cue
@@ -70,7 +71,7 @@ Role Cue 会产生不同的文本投影:
| **speech** | `What time is it?`<br>`It's 8:30.` |
| **caption** | `What time is it?`<br>`It's 8:30.` |
-dialogue 投影包含 Role Cue 前缀,speech 和 caption 投影会去除前缀。像 `seedance:Speech` 这样的组件使用 `{story.segment.dialogue.dialogue}`(带标签)。Script 还会显式输出 `{story.caption}` 作为有序的显示 Atom/Word 全集,并以 `{story.caption.correspondence}` 单独提供 Atom 到口播 token 的对应;只有定时汇合处需要后者。
+dialogue `Text` 包含 Role Cue 前缀,speech `Text` 和 caption 投影会去除前缀。像 `seedance:Speech` 这样的组件使用 `{story.segment.dialogue.dialogue}`(带标签)。Script 还会显式输出 `{story.caption}` 作为有序的显示 Atom/Word 全集,并以 `{story.caption.correspondence}` 单独提供 Atom 到口播 token 的对应;只有定时汇合处需要后者。
## Dual Text
diff --git a/docs/zh/quickstart/tracks.md b/docs/zh/quickstart/tracks.md
index e4934b90..83d9d3b0 100644
--- a/docs/zh/quickstart/tracks.md
+++ b/docs/zh/quickstart/tracks.md
@@ -1,15 +1,15 @@
---
-title: 字幕、Media 与文字
-description: 视觉 Track 组件——字幕、媒体叠加层和文字叠加层。
+title: 字幕、Media 与 Typography
+description: 视觉 Track 组件——字幕、媒体叠加层和排版叠加层。
---
-# 字幕、Media 与文字
+# 字幕、Media 与 Typography
-> **发布前说明:** Caption Fine、Media Track 与 Text 都执行各自声明的作者 Surface。
+> **发布前说明:** Caption Fine、Media Track 与 Typography Track 都执行各自声明的作者 Surface。
> 它们的作者 API 仍可演进;共享终端 Track/Visual IR 窄腰已在仓库内冻结,但尚未作为
> npm ABI 发布。
-每个进入最终合成的视听内容都是一个对等的 **Track**。Track 是扁平的(无嵌套),其 z 轴顺序由 SVS 中的 `stack-order` 属性决定。本页介绍三个官方视觉 Track 包:字幕、Media 和文字叠加层。
+每个进入最终合成的视听内容都是一个对等的 **Track**。Track 是扁平的(无嵌套),其 z 轴顺序由 SVS 中的 `stack-order` 属性决定。本页介绍三个官方视觉 Track 包:字幕、Media 和 Typography 叠加层。
## 字幕系统
@@ -129,6 +129,7 @@ B-roll 是通用 Media Track 的一种剪辑用途,不是独立 Track 家族
```svml
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
+<import as="wording" from="@narratage/text@1"/>
```
### media-track:Track 与 media-track:Item
@@ -136,14 +137,14 @@ B-roll 是通用 Media Track 的一种剪辑用途,不是独立 Track 家族
位置是一条显式 Spatial Frame 边,外观和运动则是可复用的 SVS 值:
```svml
-<seedance:Prompt id="product-direction">
+<wording:Value id="product-direction">
A clean vertical product film: the written script becomes semantic regions,
then those regions assemble into a finished video.
-</seedance:Prompt>
+</wording:Value>
<seedance:Video id="product-motion" model="mini"
prompt={product-direction} duration="5">
- <seedance:Reference image={product-reference} role="subject"/>
+ <seedance:Reference image={product-reference}/>
</seedance:Video>
<pipeline:Normalize id="product-media" source={product-motion.video}
@@ -172,7 +173,8 @@ Selection 只贡献语义点;Media 包负责将这些点投影为窗口。同
在屏幕上显示的静态或定时文字——标题、标注、下方三分之一字幕条。
```svml
-<import as="text" from="@narratage/text-track@1"/>
+<import as="text" from="@narratage/typography-track@1"/>
+<import as="wording" from="@narratage/text@1"/>
```
### text:Track
@@ -212,7 +214,7 @@ Selection 只贡献语义点;Media 包负责将这些点投影为窗口。同
| 属性 | 必填 | 描述 |
|---|---|---|
| `id` | 是 | 稳定的 Item 身份 |
-| 子内容 | 是 | 纯文本,或用于富文本的 `P`、`Span` 与 `Break` |
+| 子内容或 `content` | 是 | 内联纯文本/富文本,或普通图 `Text` 引用;两种形式互斥 |
| `during` | 是 | `"program"` 或 Selection 引用;也可使用 `at` 与显式 `start`/`end` |
| `placement` | 是 | 与 Item 形式匹配的 `SpatialPoint`、`SpatialFrame` 或 `SpatialPath` |
| `style` | 是 | 由 SVS Recipe 与精确字体字节共同编译出的 `text:Style` |
@@ -229,6 +231,19 @@ Selection 只贡献语义点;Media 包负责将这些点投影为窗口。同
</text:Track>
```
+图中产生的文字会保留为显式边:
+
+```svml
+<wording:Value id="headline">EXACTLY THE RIGHT MOMENT</wording:Value>
+<text:Track id="callout" space={speech.space}>
+ <text:Area id="callout-copy" content={headline}
+ placement={callout-frame} style={callout-style} during="program"/>
+</text:Track>
+```
+
+通用 `Text` 只提供字符;Typography 仍然拥有文档包装、位置、时间、样式与动画。作者需要富文本
+Run 时,继续使用内联 `P`/`Span`/`Break`。
+
**输出:**`{titles.track}` —— 添加到 `film:Film` 的 VisualTrack。
## 组合示例
@@ -242,7 +257,7 @@ Selection 只贡献语义点;Media 包负责将这些点投影为窗口。同
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
-<import as="text" from="@narratage/text-track@1"/>
+<import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<!-- Captions: primary style for all text -->
diff --git a/examples/README.md b/examples/README.md
index 3c4d18af..df821a1c 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,7 +1,7 @@
# Examples
- [`talking-film-graph-check`](./talking-film-graph-check/README.md) compiles the complete
- provider-free author graph through Speech, WhisperX, Caption, Media Track, Text, Film and final render
+ provider-free author graph through Speech, WhisperX, Caption, Media Track, Typography, Film and final render
requirements.
- [`talking-film-live`](./talking-film-live/README.md) executes the real paid two-take path with KIE,
local media processing, local WhisperX, Vertex Caption planning and local HyperFrames rendering.
@@ -10,7 +10,7 @@
Candidates without another KIE submission.
- [`talking-film-golden`](./talking-film-golden/README.md) is the larger authoring and visual design
fixture used while video packages remain pre-freeze.
-- [`bootstrap`](./bootstrap/README.md) is the smallest official Text/Script/SVS source-closure
+- [`bootstrap`](./bootstrap/README.md) is the smallest official Markup/Script/SVS source-closure
check.
Generated assets, local Runtime databases and output media are ignored by Git.
diff --git a/examples/bootstrap/README.md b/examples/bootstrap/README.md
index 1b428f0c..cfd5f5ec 100644
--- a/examples/bootstrap/README.md
+++ b/examples/bootstrap/README.md
@@ -1,7 +1,7 @@
# Bootstrap source example
-This is the smallest real-file example for the official Text compiler Host. It proves that a
-self-described Text entry source can import the Script Surface and recursively compile an SVS
+This is the smallest real-file example for the official Markup compiler Host. It proves that a
+self-described Markup entry source can import the Script Surface and recursively compile an SVS
source selected by another Header. There is no built-in video prelude or suffix-selected parser:
```bash
diff --git a/examples/bootstrap/main.svml b/examples/bootstrap/main.svml
index 28395560..9b149b9e 100644
--- a/examples/bootstrap/main.svml
+++ b/examples/bootstrap/main.svml
@@ -1,4 +1,4 @@
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
diff --git a/examples/talking-film-golden/README.md b/examples/talking-film-golden/README.md
index 4bdcd2a6..c8a1d425 100644
--- a/examples/talking-film-golden/README.md
+++ b/examples/talking-film-golden/README.md
@@ -27,7 +27,7 @@ different model family.
Prompt declarations, media declarations and `.svs` recipes appear before their uses. The Script
remains prose-first and contains no generation, styling or Track configuration.
-The outer namespaced `.svml` tags do not each require a custom parser. `@narratage/text` reads them with
+The outer namespaced `.svml` tags do not each require a custom parser. `@narratage/markup` reads them with
one generic structured parser and validates them against the imported package Manifest; the owning
package supplies its schema and lowerer. Only the prose-first Script body needs the imported raw
Script Surface, while the CSS-like `.svs` source deliberately uses the separate `@narratage/svs`
@@ -68,7 +68,7 @@ Candidates and Operations.
|---|---|---|---|
| `<script>` | `@narratage/script` | authored `Narrative` and projections | implemented |
| `media:Image` | `@narratage/media` | content-addressed authored Artifact | implemented |
-| `seedance:Prompt` | `@narratage/seedance` | package-private immutable direction value | implemented |
+| `wording:Value` | `@narratage/text` | model-neutral immutable Text value | implemented |
| `seedance:Speech model="mini"` | `@narratage/seedance` | explicit Seedance Mini Need plus primary-video projection | implemented; explicit duration remains authored until Speech scheduling exists |
| `speech:Spine` | `@narratage/speech` | ordered clips -> normalized Takes, one `SpeechBasis`, then ordinary projections | Surface, fold, media normalization and projection components implemented |
| `whisperx:Alignment` | `@narratage/whisperx` | 48k speech master -> explicit 16k evidence Need -> WhisperX -> provider-neutral `@narratage/speech-alignment` -> Map | Surface, Graph Fragment, deterministic components and local Provider/service implemented |
@@ -77,7 +77,7 @@ Candidates and Operations.
| `caption-fine:Style` / `caption:Program` | Fine + common Caption | explicit default over all words + ordered whole-Style replacement by Role or word subset | implemented |
| `caption-ai:Planner` | `@narratage/caption-gemini` | immutable display Atoms/Words + per-run requirements -> whole-Atom Cue cuts and optional per-Word fields | implemented; Google Vertex Endpoint implemented separately |
| `caption-fine:Track` | `@narratage/caption-fine` | CaptionPlan + independent SemanticMap + complete Fine Styles -> VisualTrack | implemented |
-| `text:Track` | `@narratage/text-track` | package Spec + ProgramSpace -> VisualTrack | provider-free Surface/lowering implemented; exact-font use remains |
+| `text:Track` | `@narratage/typography-track` | package Spec + ProgramSpace -> VisualTrack | provider-free Surface/lowering implemented; exact-font use remains |
| `film:Film` | `@narratage/film` | finite TrackSet fold -> Composition | Graph Fragment and official Surface implemented |
| `render:Video` | `@narratage/render-hyperframes` | Composition -> silent HyperframesDocument render + explicit program audio + mux -> final video Artifact + Receipt | Surface, Fragment and all local execution Providers implemented |
| `studio.svs` | `@narratage/svs` | generic immutable Recipe Records; consuming packages validate and lower them | parser, imports and current package consumers implemented; exact font assets remain |
diff --git a/examples/talking-film-golden/build.svrun b/examples/talking-film-golden/build.svrun
index 28ce938e..6ff526b9 100644
--- a/examples/talking-film-golden/build.svrun
+++ b/examples/talking-film-golden/build.svrun
@@ -1,4 +1,4 @@
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/examples/talking-film-golden/main.svml b/examples/talking-film-golden/main.svml
index ff03f3f3..a68c466a 100644
--- a/examples/talking-film-golden/main.svml
+++ b/examples/talking-film-golden/main.svml
@@ -1,4 +1,4 @@
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<!--
SVML authoring golden fixture.
@@ -8,6 +8,7 @@
-->
<svml>
<import from="@narratage/script@1"/>
+ <import as="wording" from="@narratage/text@1"/>
<import as="media" from="@narratage/media@1"/>
<import as="seedance" from="@narratage/seedance@1"/>
<import as="speech" from="@narratage/speech-spine@1"/>
@@ -18,7 +19,7 @@
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="pipeline" from="@narratage/media-pipeline@1"/>
<import as="media-track" from="@narratage/media-track@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<import as="film" from="@narratage/film@1"/>
<import as="render" from="@narratage/render-hyperframes@1"/>
@@ -51,20 +52,22 @@
<space:Frame id="product-frame" within={vertical}
left="8%" top="20%" right="8%" bottom="32%"/>
- <seedance:Prompt id="alice-direction">
+ <wording:Value id="alice-direction">
Locked medium close-up. Alice speaks directly to camera in a quiet daylight studio.
Calm, curious delivery; natural breathing and restrained hand movement.
- </seedance:Prompt>
+ Spoken dialogue — say exactly: What if a video could be edited by meaning instead of a timeline?
+ </wording:Value>
- <seedance:Prompt id="bob-direction">
+ <wording:Value id="bob-direction">
Locked medium close-up. Bob answers from a warm editorial workspace.
Precise, assured delivery; hold eye contact and keep the background still.
- </seedance:Prompt>
+ Spoken dialogue — say exactly: Then the script becomes the source. Semantic video markup language lets every visual know why it is there.
+ </wording:Value>
- <seedance:Prompt id="product-direction">
+ <wording:Value id="product-direction">
A clean vertical product film: the written script becomes semantic regions, then those
regions assemble into a finished video. No readable UI text and no camera shake.
- </seedance:Prompt>
+ </wording:Value>
<!-- Complete styles are declared once. Selection and use remain separate. -->
<fonts:Stack id="caption-font" family="inter" weight="600" style="normal"/>
@@ -93,21 +96,19 @@
<seedance:Speech
id="alice-take"
model="mini"
- dialogue={script.segment.opening.dialogue}
prompt={alice-direction}
duration="8"
>
- <seedance:Reference image={alice-reference} role="character"/>
+ <seedance:Reference image={alice-reference}/>
</seedance:Speech>
<seedance:Speech
id="bob-take"
model="mini"
- dialogue={script.segment.answer.dialogue}
prompt={bob-direction}
duration="8"
>
- <seedance:Reference image={bob-reference} role="character"/>
+ <seedance:Reference image={bob-reference}/>
</seedance:Speech>
<!-- Ordered generated Takes become one audio basis plus its peer visual/audio Tracks. -->
@@ -125,7 +126,7 @@
prompt={product-direction}
duration="5"
>
- <seedance:Reference image={product-reference} role="subject"/>
+ <seedance:Reference image={product-reference}/>
</seedance:Video>
<pipeline:Normalize id="product-media" source={product-motion.video}
diff --git a/examples/talking-film-graph-check/build.svrun b/examples/talking-film-graph-check/build.svrun
index 28ce938e..6ff526b9 100644
--- a/examples/talking-film-graph-check/build.svrun
+++ b/examples/talking-film-graph-check/build.svrun
@@ -1,4 +1,4 @@
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/examples/talking-film-graph-check/main.svml b/examples/talking-film-graph-check/main.svml
index 75f9686f..a473678d 100644
--- a/examples/talking-film-graph-check/main.svml
+++ b/examples/talking-film-graph-check/main.svml
@@ -1,7 +1,8 @@
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
+ <import as="wording" from="@narratage/text@1"/>
<import as="seedance" from="@narratage/seedance@1"/>
<import as="speech" from="@narratage/speech-spine@1"/>
<import as="whisperx" from="@narratage/whisperx@1"/>
@@ -11,7 +12,7 @@
<import as="caption-fine" from="@narratage/caption-fine@1"/>
<import as="caption-ai" from="@narratage/caption-gemini@1"/>
<import as="fonts" from="@narratage/fonts-open@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<import as="film" from="@narratage/film@1"/>
<import as="render" from="@narratage/render-hyperframes@1"/>
@@ -27,8 +28,8 @@
<space:Frame id="card-frame" within={vertical}
left="10%" top="20%" right="10%" bottom="30%"/>
- <seedance:Prompt id="direction">Locked medium close-up in a quiet daylight studio.</seedance:Prompt>
- <seedance:Speech id="take" model="mini" dialogue={story.segment.opening.dialogue} prompt={direction} duration="5"/>
+ <wording:Value id="direction">Locked medium close-up in a quiet daylight studio. Spoken dialogue — say exactly: Meaning becomes the source.</wording:Value>
+ <seedance:Speech id="take" model="mini" prompt={direction} duration="5"/>
<seedance:Video id="motion" model="mini" prompt={direction} duration="5"/>
<speech:Spine id="speech" canvas={vertical}>
diff --git a/examples/talking-film-graph-check/svml.packages.lock b/examples/talking-film-graph-check/svml.packages.lock
index e4b565ad..2ebad537 100644
--- a/examples/talking-film-graph-check/svml.packages.lock
+++ b/examples/talking-film-graph-check/svml.packages.lock
@@ -554,17 +554,17 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:82cb17e2781256f785f389de0e3afd0796cc91718bfe135c6dd8c38e8dcec2fc"
+ "digest": "sha256:b3629ec8e280ac0ab5fa4e92500b7d762974e97600f8021bfc4b0a8694ae593b"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:58ec895c81d343e50b6efc1a2fae49e851ff2a9fe6926680ac7e8b27f1553ae8"
+ "digest": "sha256:f52a343838062199d0b77634f27099db4876d0b494e90616017dc743d1abab8c"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6e2aadeb3f5b8e833aa6a53ae5c2cee3c16a49542457a110eec528675de00c3d"
+ "digest": "sha256:d365d74d385b56d25bbe9fa08e0d70a58dafaef3cc51683a43821d9cf8da08de"
},
{
"name": "@narratage/component-kit",
@@ -579,32 +579,27 @@
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:2bd6c5c9ea9bb11e3bf32141f2aaff6f42e61a1800d609cd28752f62b269a7af"
+ "digest": "sha256:651c4d546708cd8648e1730a906fc3f9f9fc274db421e6374afee83574cecc7d"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:1a59d1179cf5ea91d05f4c3976c50502a2a8faad07a15bda8b51d5741668777b"
- },
- {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev",
- "digest": "sha256:8375787eed9b3d9b1dc1634847a7e74789b8fc9e288cd7b5388871c47215ece7"
+ "digest": "sha256:d433a2298b3afcf12d41575a9f0d3e7fd6a3feec297ba66466cc9d98b5aa8f1f"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:8259d45c4f5f3e26956480aa30b54010ce0470e63a344b197932f83aa07e0661"
+ "digest": "sha256:cf696aea5fd093832875c12a7f22e5ee3dbc45679069a1d8644aed0c0309bd19"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:30bfdba162645ed887fe84a14b7a5e999c5a3e81ef82bfbb32f4347cebc0ba4c"
+ "digest": "sha256:2636ba4fa9323b3d5715db76f819ed702ff55fbc8a1e7f44f0401389f2a7bdb6"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:aa8125353ac0e60222bd038503fd3787bd7c942bccd794c013bf5220eb454bc9"
+ "digest": "sha256:0bc59f02ac62828923e280b61e88d66198471a78cc829970b7b3ca5e219530c9"
},
{
"name": "@narratage/host",
@@ -614,32 +609,37 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:7797eeafb6991715191a6310a6edbeb2b65d546d9ec582fab2cf633975d6e527"
+ "digest": "sha256:cd4b8c4cfb11307e0a487fa5d065a961c1cfb701a48f6d293f98b90c6d01b5cb"
+ },
+ {
+ "name": "@narratage/markup",
+ "version": "0.0.0-dev",
+ "digest": "sha256:d038863cedf4d22162dc0b390485131caf0977be11032861415a766d068e3745"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:42db6579923c798cfe098f8876148dd54996f707366bd9d3d4655d845e9ca862"
+ "digest": "sha256:08b62e21bd0f6f03fd7e2b481f820c56006a0ff92e6a7318927bd0c3607223f5"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:03a14d67e30fe287c872303cad75acf40806c23a0dc718d7320bec3f50d3f383"
+ "digest": "sha256:d371b1bdc8747fef280640dbc8a9cb03acde9322ad8e6f11ed02396ff8f53260"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:72856b532f458b6805c988e521c68919b011efcd8f82003e69f1e9bb740d6bef"
+ "digest": "sha256:bec05028a561e1e9272756b47df52be20534c235e918df08a4f5f6c4a1db58f7"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:b5ce0f8b10756e801827f119b3335b22b8aab1ed1765f6a6261457355506bcab"
+ "digest": "sha256:00d8ca97f522f9692748d2ef83336df759626317d9e2baf6b8a42dc1473e9746"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:410b1c0b30dfe4b8a81e67bbb5833dc915418337cce71325fb1bb8b93f227fac"
+ "digest": "sha256:c25b30b1881baa443ca91447f2529ac744feebe54eb2e4fbf3d2ba1d797a457d"
},
{
"name": "@narratage/program-space",
@@ -654,27 +654,27 @@
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:a46f0a848273f303d2e1cf6122e0ba882534da9202ecc0bd3fd55887e4624bfc"
+ "digest": "sha256:28847756a67fc7a9c304d9ed358964e422956d86da6f53e3b7d2ebccdff54cad"
},
{
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d7c8549650244571fe6fab24a2518edac8b17368934a141594d093f846455d6"
+ "digest": "sha256:325fcbfc221a0de4a0fa94563d2c4960b6826723a7c523cdef301ee8d1a4102e"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:a828b37f801d3ebfcc4cae84e4fd0a1baf9342f00a85d1d9440c92d570acb8c9"
+ "digest": "sha256:d734eb7ef18623d279d7176ce3fb1ed8b9c3a457aec7fcec2d439129815efaff"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:aeef6425f2f830a2420df1ffcd57ce6ae973bdcc8f6f45f55265714d842d6df8"
+ "digest": "sha256:425cb50348d40a7d14e4bac5d28f32be2f50c9a0504341ad8d72112f6e776d16"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:e218a3c54118c75a21c080cc20a4dd410c78223000100a009dfe270c1429b03d"
+ "digest": "sha256:66cdf600171833956e1f5c5494f6757471d8f795a4d8fe7cfabd791303127ecf"
},
{
"name": "@narratage/semantic-map",
@@ -684,12 +684,12 @@
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:8bbfa48c0fde45639578902c907d9190bd5bbb8a03bd59fca8fd364b820a3184"
+ "digest": "sha256:cdf2bca700af10b30f2c29117ed7492fae82a434f4fd3e48747e8c51a7aab4c7"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:c467d5c9b4dcf4e07c8261e9ec7c2a18463c9af4a5171933b71a5a9a8b49dd64"
+ "digest": "sha256:4b41917023c9a9fc9b1e4a3a2c6d82fafeb3d732733c6e4ca6721ae2009edbdf"
},
{
"name": "@narratage/speech-alignment",
@@ -709,7 +709,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:5fb81d1a7cbd1852c0d96e5994c06f4a256500516e75cc4d1bb4dcb5ac3a44c5"
+ "digest": "sha256:982b442194d970a75e183cc32669b7d213a03c91e933cf1472cb6dae5f22fe73"
},
{
"name": "@narratage/speech",
@@ -719,7 +719,7 @@
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:351ff3b7bde621cdd258ed48a7906aabe4158a21c1e7ecad227e93655d8842d9"
+ "digest": "sha256:e44ae945c23e041602eb2f029a4c72b96fc2525e6c767e117e2bf0f11a830e0e"
},
{
"name": "@narratage/temporal",
@@ -727,14 +727,14 @@
"digest": "sha256:12d53493f58be066b213644f73a127d09d9242f2ccbc3f60eff5b3c2d1f25470"
},
{
- "name": "@narratage/text-track",
+ "name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:728b679e65629c6795f3932373bec4cfdd4b2e56dd2d96d2170fd05070646220"
+ "digest": "sha256:ec9b6917a6f9d52efa6f62a9f40c4d1e3ae85623b15bdc7dffa60f96c50a7b4b"
},
{
- "name": "@narratage/text",
+ "name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:a94370b40d7d59148f8b17c64c16e27a50a73126eb374aeeab40344374f58ae1"
+ "digest": "sha256:d032d7f7e034803d6253c9b9082f6ddd30bff95719325f6524e87b84c6c5af7f"
},
{
"name": "@narratage/validation",
@@ -749,7 +749,7 @@
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:72e6847d77034d361d6ff2b69eafb84ac84156c14de8e37e0b39c93334081942"
+ "digest": "sha256:7209d52d61e9c9237b59695a30f2f04a055d83053f06439ba9e9a31dd6cd189c"
}
],
"packages": [
@@ -768,8 +768,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:ade06568b7785a95cd11f2ebd43fd4ace924054ddcd9f17938a3e42efb3964c9",
- "closureDigest": "sha256:46230cb84643c076faaaac97f1d68dc96da0a5b6348acd6ba97e8891da5d5251"
+ "facetsDigest": "sha256:6a2991ec75f9fd30e8d286213fc7993aae2c570b85a8faae5d3c2af661c9fdfc",
+ "closureDigest": "sha256:3c8af2887098d34054e238fe1717168ef95e4804dd88cc88d83d9b72f25da9e4"
},
{
"specifier": "@narratage/caption-fine",
@@ -777,8 +777,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c8632226339780aff145728d60db8a6e53f6873c9a07a4c0ed65a5595cb13976",
- "closureDigest": "sha256:cc59e2818488a7afa9e72bc9d1390c11873a3c625853b456dbaeee86402345ba"
+ "facetsDigest": "sha256:c5616408dd56ce9c903523319b2a697ff6b8af5bfe1dc66fe793a11e4629f3cf",
+ "closureDigest": "sha256:3cf5629f0b0b0104e5bd6342ef0ba05e3f22ba22fa62fb9e079eec90dec2fb75"
},
{
"specifier": "@narratage/caption-gemini",
@@ -786,8 +786,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:91699bf2e7604e2607c646ccc2276d1b3630fc9ab7f21569181fd6dd0b18bd09",
- "closureDigest": "sha256:f23b261ee558ea7da9b8795c5f74c1b5ea7895bfa5797446f1a6abde6f52eb83"
+ "facetsDigest": "sha256:22fed1f1748349c11b6f28448be38cbea68b1dd5a51a3dc2d548ae0a376b9c71",
+ "closureDigest": "sha256:1ebef8225afd6df622935e9d67f0895fd8eb9145bc5c2f96281ddadd6ded803f"
},
{
"specifier": "@narratage/composition",
@@ -796,16 +796,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:0a988b665baf0846246e309d9faf39ffb3ef6ec455bf37f7c438eb30429ff46e",
- "closureDigest": "sha256:fb832926800e80c6707ec22d811cb25d5fb63d673acb558e0a4e1e73cfd30395"
- },
- {
- "specifier": "@narratage/estimate",
- "package": {
- "name": "@narratage/estimate",
- "version": "0.0.0-dev"
- },
- "facetsDigest": "sha256:9c5b0b0c211cddbb3230a2cbed3d03cef758c3678a20c44d2bedbea74b4f5fad",
- "closureDigest": "sha256:2e80008eea92c1dcfcc0862502da3794b57af5ee16e0da8d947d7f4cf2bce652"
+ "closureDigest": "sha256:abcc228356713b66fd2125b2bdd66679df75d8e0d39c5fd1fbacac133317c0ce"
},
{
"specifier": "@narratage/film",
@@ -813,8 +804,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:edf2cc49e512c60b171f073096f4dfff8dd92f0ab02d0c092557421ed66f8d10",
- "closureDigest": "sha256:d2d7e005c31e3c8c63be77a23c3fdeeecf1af28fba393ec44b05ed32978ce5bb"
+ "facetsDigest": "sha256:8e58b5630b9a68a8ce7314620f5f1c7cda973a05c179c18d61e10d68002964f0",
+ "closureDigest": "sha256:bcad5a1643f1b1193b79c726ce03b4ce50929652814567712d66c596599f272f"
},
{
"specifier": "@narratage/fonts-open",
@@ -822,8 +813,8 @@
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:0e612226ab43e7bafb61c6057bade2783abcad761f242b5cde53e11babc7ffe1",
- "closureDigest": "sha256:4588c548b07aec3afa3a5c9b6535fa99df40005cb7ec9eeec803c39051c95291"
+ "facetsDigest": "sha256:31b51352edcb4f34beccc9d9ac8cf7397125a840971a72c912df3d34d1f3feda",
+ "closureDigest": "sha256:cf404e70036afe899420d8271a0fa29e640fbe727fe25020c0a852c33db25cae"
},
{
"specifier": "@narratage/generation",
@@ -832,7 +823,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:ae96c20681e676094f7a411ce82a4b2d9f835a4fffa189dd7b6550c321166d94"
+ "closureDigest": "sha256:d79fcf6dfc72ff84f9c04fc02f6efb175f1d6e2b9ef636425ce257cb0ca82f5b"
},
{
"specifier": "@narratage/hyperframes",
@@ -841,7 +832,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b8b8773d03f19844cdc8d714650380145056649245e33c607f30220fff194157",
- "closureDigest": "sha256:7c5bfb1ac15cc3a84009426b1e8703ae9f13c1a69a2ee406f665ed07c303719b"
+ "closureDigest": "sha256:242c745bb6a51cd17dbfc9c9aa3408464b9bb14d6eab26bdebd35bcc0f958014"
},
{
"specifier": "@narratage/media",
@@ -849,8 +840,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:da929a3aa531aeaa3df4e80e0d7a258b99a670b1a6ca1eff45509d31b20612be",
- "closureDigest": "sha256:4e9f908283701f68781f500ab868855f5917984572351ed2388c0318d3e62543"
+ "facetsDigest": "sha256:6c7cf563a92aa8e48db6da224697fd5f56c50b636b0327efc17fbbc264502b3f",
+ "closureDigest": "sha256:8e3cfeef1b2a0b0bab78e5ac27ac6bbe763ae0216c58d30fdd0688634efcda78"
},
{
"specifier": "@narratage/media-pipeline",
@@ -858,8 +849,8 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b7decce74d60905aa28f31ef3220960389a846e242d56c47e918ee6188c974dc",
- "closureDigest": "sha256:a2ede75d2364c61cf6fe7dd9104ab480e9cf20b48fe3252d3507e2bf376c8bbd"
+ "facetsDigest": "sha256:b7bf62142837adc7bad4f8c4b74b60ee6b4ade74140788cf4b682c140893b4af",
+ "closureDigest": "sha256:4a96ed320c8c32a65b6d93fb671f19562c1178b15ac89b268876e9c3c268df28"
},
{
"specifier": "@narratage/media-track",
@@ -867,8 +858,8 @@
"name": "@narratage/media-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:6b72968b9fb9ed73b87cf25ac1528e1627177d140a5f182fdfd4118fa9f3037c",
- "closureDigest": "sha256:53f581ca1923f06cf1196332326a8c09d70e52ac95ab348686128a558decda1e"
+ "facetsDigest": "sha256:b3e32ad8fd0f074d9e7cb707383e45c79f89ed1c28044f6d70294c96411cb393",
+ "closureDigest": "sha256:67c8618e8047675b9b315bab6c91e57d51c8f9264fe6f185a12b08c3e05db438"
},
{
"specifier": "@narratage/narrative",
@@ -876,8 +867,8 @@
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f5b284001a68af57ef5fc03480627f18247d1440aa0c1d3cc9927a740669e790",
- "closureDigest": "sha256:2965cf34a59c349d41919092f54c3ed09da74952beb4955d05bf8e93441da524"
+ "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
+ "closureDigest": "sha256:16bcfd1e174cec129692fd72d97374541a16db2bd0c9e1a036a4c3d65e978a98"
},
{
"specifier": "@narratage/program-space",
@@ -894,17 +885,17 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:66e8fed1b9f4aa04f2c48da32f4be47c0a87387b973c4aed3130877139278da9",
- "closureDigest": "sha256:6ee37a10f5230436f6dcc2957fa1ee42ce01cefd314eedbeed0412065ba3cbbf"
+ "facetsDigest": "sha256:965f293a64a8b1c7ae87e6e13986a751d4c26a2fcded9dd81fc24a7790980b45",
+ "closureDigest": "sha256:0c046a66947a9ef4cccc89f589b0eb9841bf668cdbdf1ef80f69eefaa34741bf"
},
{
- "specifier": "@narratage/run-text",
+ "specifier": "@narratage/run-markup",
"package": {
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:fbcab7cea86223fe00ea04b51c2160bb534aafbb99067f5877e6825b0ce4eefc",
- "closureDigest": "sha256:d8955d51f118c01ee2861f7223abd8479dcedcd8ae25ee682c22a6f3dc4d4502"
+ "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
+ "closureDigest": "sha256:3f22b01f207599d4b848adffe915b4b34cc6dfb6f98d7230d2d8a54cbd588252"
},
{
"specifier": "@narratage/script",
@@ -912,8 +903,8 @@
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:353904690b6774d720ff72ee9d05ff9c99c1dbc48d106b8c396396380e336d54",
- "closureDigest": "sha256:67f3dd9a74f2141bab7766c394cbdb0ec9e8d0746db417051fe69ffee1ca1bec"
+ "facetsDigest": "sha256:a112e8e461c03e0ab53b4190518f79a16fff6b885f3e6601e5a0e5e0631829fc",
+ "closureDigest": "sha256:b0f5855f33808b50c6afcae1e0e9317f5d4aacda6eff272f142e0d0268848e80"
},
{
"specifier": "@narratage/seedance",
@@ -921,8 +912,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c1f9cb32b1343f2a5b095e43c5a9501b6d015fe064b47af480fa6d3d10e1782e",
- "closureDigest": "sha256:3d75f4413dd8b4435ce8e3e96d1a6881ff11872aa0b2b7dd3e7b4b8e6469903a"
+ "facetsDigest": "sha256:4750e07548e9706f3a0d8da1f8ca1960a27227e1cae647f743934ff2338e11ae",
+ "closureDigest": "sha256:c329b039f8560a54b56749f7b96329c6c06605d58165a0c6ba5e81a34e84fd9f"
},
{
"specifier": "@narratage/semantic-map",
@@ -930,8 +921,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c2281ee13f070550fa242dde689ca8966436d7f7a672e9bacc28305bce8844a7",
- "closureDigest": "sha256:35576ef96b8c68fd3b3133fd795840073c7a492059c4b3c5c1e4e65e9c41465f"
+ "facetsDigest": "sha256:a9d81ddfa09dfa23c9c3c0817b60299431ca9ec640252a659d490be55d92ba68",
+ "closureDigest": "sha256:43811f9ce23c253befa080c6e2d3caa315d2710f826d87966b3a6e6672ea2ff2"
},
{
"specifier": "@narratage/spatial",
@@ -939,8 +930,8 @@
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3cbff7cc307fa4279c4420b0eda163d236874ae2916f37938f5de619410dcf34",
- "closureDigest": "sha256:77d2b9c1d09a6399cc38b657b85aaa7b888e9bd038a92e9aeb82144d6ccebbc1"
+ "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
+ "closureDigest": "sha256:3c2704b4e613dc23d94a1e842a7bd58f0248ee53dcc3395be0fadcde2013f311"
},
{
"specifier": "@narratage/speech",
@@ -948,8 +939,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:476b63fe9fd265f5fbf569ac87608b274eb81850acbb58e29fe3e6b7aebce72a",
- "closureDigest": "sha256:4decc2c96ff7f2a3887a0869aa9776355d92acbedf744a4261e1daba85cb75b2"
+ "facetsDigest": "sha256:75b1537c9b9729c2e9197445c34b295bc9f72dbef754a4702e1ca792dceea472",
+ "closureDigest": "sha256:d2fe74b7cc9f05d60562bf0d669261446d43c712dc7431fb5d7aa6205bf31183"
},
{
"specifier": "@narratage/speech-alignment",
@@ -957,8 +948,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:41cb7990b0fbaaf9e8379e86f5b6689e6730067a4ecf13f9280153a990b15821",
- "closureDigest": "sha256:744799dc54884e33f948e7111200acf42cabe5ecfc585250823bc1d8c20942a6"
+ "facetsDigest": "sha256:bdfe219081310041d11c6d54440e6ccb80398bfb97f93afc28e9d1ed101b4a79",
+ "closureDigest": "sha256:e6fa4a50ba65c85c048766f4cbe00c9c4deb41f99b18855d7f670cce4e7dbeaa"
},
{
"specifier": "@narratage/speech-basis",
@@ -966,8 +957,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:13753ec0da39640013d2f624531c456bcf6b2f240733fc359db97e6f94d3f96b",
- "closureDigest": "sha256:3b40a5350a75a0fccbed3a106726a623db459fd178cf5c594a77fe2525547d21"
+ "facetsDigest": "sha256:f01f21badb0ccdd5cc62b131be05f46030bffee96042c7323a0c572786d012ef",
+ "closureDigest": "sha256:fb0cab2d5cc764267e5891938e2f3a4beec8706e96821e4906d290fbb7eb1be7"
},
{
"specifier": "@narratage/speech-evidence",
@@ -975,8 +966,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3682709ce170cd1c8569b11d75af7ed9d7dbcddb81fd280e2f8d96874baeb121",
- "closureDigest": "sha256:201b9d7abfa268864052098e2aecbd6c1caf6668bcbfdb817c33ea4abaa119b1"
+ "facetsDigest": "sha256:60f366de074a7fba20c71dcbd825083fddc54ea7de602a903eb144eab5555425",
+ "closureDigest": "sha256:c6a9b286b2895ab40d585051d029852ec2aa57295a597adbc1f2ff616f3cf4a9"
},
{
"specifier": "@narratage/speech-spine",
@@ -984,8 +975,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:051a5e330928dd245f13c81e98f5b518ce5308ccfe8b12828f04e6927dd85421",
- "closureDigest": "sha256:28012e35cf051e1e2a01d8d9fef15488c4e2415c57eed110d68e348b83b629aa"
+ "facetsDigest": "sha256:c2d3ae7c5a676c66368c9225fd516aa6cfa7dab749123f7ecd31007628ee4666",
+ "closureDigest": "sha256:d0e8ca2fc3403689d8edb798787c61c934ce31a895bb779f2db9a7fdda93af00"
},
{
"specifier": "@narratage/svs",
@@ -994,7 +985,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:5da318effc3367ac68121a33223e20792f736267f1acb8308cfe91b94e961b20"
+ "closureDigest": "sha256:6ee450114180d7f6f515b834a9cf1000795007b3ec8e57ba6860b30320fb2eba"
},
{
"specifier": "@narratage/temporal",
@@ -1003,16 +994,25 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:2e9c4804f142e08e87b2e11af79aa17770109fb573e865397bed14ed7a4f1d0e",
- "closureDigest": "sha256:61552ea4dcc2e8507d3ae01309cf9e5dbac15ba5028b53edd76da7eadc5d1eda"
+ "closureDigest": "sha256:ff208e3b6edaf26da26e7b21ba587103b3c1f2b01b52c607eca9ef7c8073aabc"
+ },
+ {
+ "specifier": "@narratage/text",
+ "package": {
+ "name": "@narratage/text",
+ "version": "0.0.0-dev"
+ },
+ "facetsDigest": "sha256:9d46bd8d61b985122dedd8d0247a5a202bee23f2c4c6b61e6217c020dd87e075",
+ "closureDigest": "sha256:ef092b2ed243988cc772db0259fd5ece4aa0708de2464f7ed0cd132c271e04d5"
},
{
- "specifier": "@narratage/text-track",
+ "specifier": "@narratage/typography-track",
"package": {
- "name": "@narratage/text-track",
+ "name": "@narratage/typography-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:7b57525779eb26931c9a210a1ef380542195cc37c9ff8d012a490ddb6f3baf4f",
- "closureDigest": "sha256:cbfa3f780692e7acfa17f930a500f8d11799cbe62fc745d7b9a5f7cc3704a11d"
+ "facetsDigest": "sha256:a8193c2426018cccfc1ca9911b4d1aed7f9499b17196e14f858797b8d109bd13",
+ "closureDigest": "sha256:50e46db546a27733cc395b2ea48974026575890c09394ad2b7eb4da99a1e60c9"
},
{
"specifier": "@narratage/visual-ir",
@@ -1029,9 +1029,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:745ecd1d41b5fa12539edbbbe20cb43c6bdf7599bf71c1b7f2113946bdfe39dd",
- "closureDigest": "sha256:1dd3e16f58411fd77f2daf4a945781a784618cffe7512d83d6181f701c39cadb"
+ "facetsDigest": "sha256:be22a14fb7f6eb437aa17b541a35320f5e26b77d7d9925702b2977609f874fe3",
+ "closureDigest": "sha256:a2724330f6ee6fd5ff6e804d440236852819e57c67f123b04c486a5a964027a7"
}
],
- "digest": "sha256:bb5c2de4ed05234f9bdbc3ee6b966479d10c0dfee77e49d27a66571fddfc7de0"
+ "digest": "sha256:6d100564480d64e4c538e98ffb63877b3d62550bae40d40ae0dba34ce5a37b62"
}
diff --git a/examples/talking-film-live/README.md b/examples/talking-film-live/README.md
index 51098ccf..195b688c 100644
--- a/examples/talking-film-live/README.md
+++ b/examples/talking-film-live/README.md
@@ -61,7 +61,7 @@ To reuse the paid shot outputs from a verified earlier Build, add two zero-input
Candidates and their explicit Satisfaction edges to another `.svrun`:
```xml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
<target-set id="delivery">
diff --git a/examples/talking-film-live/build.svrun b/examples/talking-film-live/build.svrun
index 28ce938e..6ff526b9 100644
--- a/examples/talking-film-live/build.svrun
+++ b/examples/talking-film-live/build.svrun
@@ -1,4 +1,4 @@
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/examples/talking-film-live/main.svml b/examples/talking-film-live/main.svml
index 0631148b..e6190c2e 100644
--- a/examples/talking-film-live/main.svml
+++ b/examples/talking-film-live/main.svml
@@ -1,7 +1,8 @@
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
+ <import as="wording" from="@narratage/text@1"/>
<import as="media" from="@narratage/media@1"/>
<import as="estimate" from="@narratage/estimate@1"/>
<import as="seedance" from="@narratage/seedance@1"/>
@@ -11,7 +12,7 @@
<import as="caption-fine" from="@narratage/caption-fine@1"/>
<import as="caption-ai" from="@narratage/caption-gemini@1"/>
<import as="fonts" from="@narratage/fonts-open@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<import as="space" from="@narratage/spatial@1"/>
<import as="film" from="@narratage/film@1"/>
<import as="render" from="@narratage/render-hyperframes@1"/>
@@ -48,40 +49,40 @@
rounding="ceil"
/>
- <seedance:Prompt id="opening-direction">
+ <wording:Value id="opening-direction">
Vertical medium close-up of the reference presenter in a quiet daylight studio.
She looks directly into camera and speaks in a calm, clear, conversational voice.
Natural breathing, restrained movement, locked camera, no text in the scene.
- </seedance:Prompt>
+ Spoken dialogue — say exactly: Video editing begins with meaning, not a pile of clips on a timeline.
+ </wording:Value>
- <seedance:Prompt id="answer-direction">
+ <wording:Value id="answer-direction">
Continue with the same reference presenter, studio and calm female voice.
Vertical medium close-up, direct eye contact, slightly more assured delivery,
restrained movement, locked camera, no text in the scene.
- </seedance:Prompt>
+ Spoken dialogue — say exactly: Then every caption and visual can arrive at exactly the right moment.
+ </wording:Value>
<seedance:Speech
id="opening-take"
model="mini"
- dialogue={story.segment.opening.dialogue}
prompt={opening-direction}
duration={opening-duration.duration}
resolution="480p"
aspect-ratio="9:16"
>
- <seedance:Reference image={presenter} role="character"/>
+ <seedance:Reference image={presenter}/>
</seedance:Speech>
<seedance:Speech
id="answer-take"
model="mini"
- dialogue={story.segment.answer.dialogue}
prompt={answer-direction}
duration={answer-duration.duration}
resolution="480p"
aspect-ratio="9:16"
>
- <seedance:Reference image={presenter} role="character"/>
+ <seedance:Reference image={presenter}/>
</seedance:Speech>
<space:Canvas id="vertical" width="480" height="854"/>
diff --git a/examples/talking-film-live/svml.packages.lock b/examples/talking-film-live/svml.packages.lock
index 8ccbb4d5..b8e773f3 100644
--- a/examples/talking-film-live/svml.packages.lock
+++ b/examples/talking-film-live/svml.packages.lock
@@ -554,17 +554,17 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:82cb17e2781256f785f389de0e3afd0796cc91718bfe135c6dd8c38e8dcec2fc"
+ "digest": "sha256:b3629ec8e280ac0ab5fa4e92500b7d762974e97600f8021bfc4b0a8694ae593b"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:58ec895c81d343e50b6efc1a2fae49e851ff2a9fe6926680ac7e8b27f1553ae8"
+ "digest": "sha256:f52a343838062199d0b77634f27099db4876d0b494e90616017dc743d1abab8c"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6e2aadeb3f5b8e833aa6a53ae5c2cee3c16a49542457a110eec528675de00c3d"
+ "digest": "sha256:d365d74d385b56d25bbe9fa08e0d70a58dafaef3cc51683a43821d9cf8da08de"
},
{
"name": "@narratage/component-kit",
@@ -579,32 +579,32 @@
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:2bd6c5c9ea9bb11e3bf32141f2aaff6f42e61a1800d609cd28752f62b269a7af"
+ "digest": "sha256:651c4d546708cd8648e1730a906fc3f9f9fc274db421e6374afee83574cecc7d"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:1a59d1179cf5ea91d05f4c3976c50502a2a8faad07a15bda8b51d5741668777b"
+ "digest": "sha256:d433a2298b3afcf12d41575a9f0d3e7fd6a3feec297ba66466cc9d98b5aa8f1f"
},
{
"name": "@narratage/estimate",
"version": "0.0.0-dev",
- "digest": "sha256:8375787eed9b3d9b1dc1634847a7e74789b8fc9e288cd7b5388871c47215ece7"
+ "digest": "sha256:6f162eddb9c274d4c1a4f1637a8c154c5e516e2e466c383f0b3e7a312a10aecf"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:8259d45c4f5f3e26956480aa30b54010ce0470e63a344b197932f83aa07e0661"
+ "digest": "sha256:cf696aea5fd093832875c12a7f22e5ee3dbc45679069a1d8644aed0c0309bd19"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:30bfdba162645ed887fe84a14b7a5e999c5a3e81ef82bfbb32f4347cebc0ba4c"
+ "digest": "sha256:2636ba4fa9323b3d5715db76f819ed702ff55fbc8a1e7f44f0401389f2a7bdb6"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:aa8125353ac0e60222bd038503fd3787bd7c942bccd794c013bf5220eb454bc9"
+ "digest": "sha256:0bc59f02ac62828923e280b61e88d66198471a78cc829970b7b3ca5e219530c9"
},
{
"name": "@narratage/host",
@@ -614,32 +614,37 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:7797eeafb6991715191a6310a6edbeb2b65d546d9ec582fab2cf633975d6e527"
+ "digest": "sha256:cd4b8c4cfb11307e0a487fa5d065a961c1cfb701a48f6d293f98b90c6d01b5cb"
+ },
+ {
+ "name": "@narratage/markup",
+ "version": "0.0.0-dev",
+ "digest": "sha256:d038863cedf4d22162dc0b390485131caf0977be11032861415a766d068e3745"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:42db6579923c798cfe098f8876148dd54996f707366bd9d3d4655d845e9ca862"
+ "digest": "sha256:08b62e21bd0f6f03fd7e2b481f820c56006a0ff92e6a7318927bd0c3607223f5"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:03a14d67e30fe287c872303cad75acf40806c23a0dc718d7320bec3f50d3f383"
+ "digest": "sha256:d371b1bdc8747fef280640dbc8a9cb03acde9322ad8e6f11ed02396ff8f53260"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:72856b532f458b6805c988e521c68919b011efcd8f82003e69f1e9bb740d6bef"
+ "digest": "sha256:bec05028a561e1e9272756b47df52be20534c235e918df08a4f5f6c4a1db58f7"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:b5ce0f8b10756e801827f119b3335b22b8aab1ed1765f6a6261457355506bcab"
+ "digest": "sha256:00d8ca97f522f9692748d2ef83336df759626317d9e2baf6b8a42dc1473e9746"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:410b1c0b30dfe4b8a81e67bbb5833dc915418337cce71325fb1bb8b93f227fac"
+ "digest": "sha256:c25b30b1881baa443ca91447f2529ac744feebe54eb2e4fbf3d2ba1d797a457d"
},
{
"name": "@narratage/program-space",
@@ -654,27 +659,27 @@
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:a46f0a848273f303d2e1cf6122e0ba882534da9202ecc0bd3fd55887e4624bfc"
+ "digest": "sha256:28847756a67fc7a9c304d9ed358964e422956d86da6f53e3b7d2ebccdff54cad"
},
{
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d7c8549650244571fe6fab24a2518edac8b17368934a141594d093f846455d6"
+ "digest": "sha256:325fcbfc221a0de4a0fa94563d2c4960b6826723a7c523cdef301ee8d1a4102e"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:a828b37f801d3ebfcc4cae84e4fd0a1baf9342f00a85d1d9440c92d570acb8c9"
+ "digest": "sha256:d734eb7ef18623d279d7176ce3fb1ed8b9c3a457aec7fcec2d439129815efaff"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:aeef6425f2f830a2420df1ffcd57ce6ae973bdcc8f6f45f55265714d842d6df8"
+ "digest": "sha256:425cb50348d40a7d14e4bac5d28f32be2f50c9a0504341ad8d72112f6e776d16"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:e218a3c54118c75a21c080cc20a4dd410c78223000100a009dfe270c1429b03d"
+ "digest": "sha256:66cdf600171833956e1f5c5494f6757471d8f795a4d8fe7cfabd791303127ecf"
},
{
"name": "@narratage/semantic-map",
@@ -684,12 +689,12 @@
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:8bbfa48c0fde45639578902c907d9190bd5bbb8a03bd59fca8fd364b820a3184"
+ "digest": "sha256:cdf2bca700af10b30f2c29117ed7492fae82a434f4fd3e48747e8c51a7aab4c7"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:c467d5c9b4dcf4e07c8261e9ec7c2a18463c9af4a5171933b71a5a9a8b49dd64"
+ "digest": "sha256:4b41917023c9a9fc9b1e4a3a2c6d82fafeb3d732733c6e4ca6721ae2009edbdf"
},
{
"name": "@narratage/speech-alignment",
@@ -709,7 +714,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:5fb81d1a7cbd1852c0d96e5994c06f4a256500516e75cc4d1bb4dcb5ac3a44c5"
+ "digest": "sha256:982b442194d970a75e183cc32669b7d213a03c91e933cf1472cb6dae5f22fe73"
},
{
"name": "@narratage/speech",
@@ -719,7 +724,7 @@
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:351ff3b7bde621cdd258ed48a7906aabe4158a21c1e7ecad227e93655d8842d9"
+ "digest": "sha256:e44ae945c23e041602eb2f029a4c72b96fc2525e6c767e117e2bf0f11a830e0e"
},
{
"name": "@narratage/temporal",
@@ -727,14 +732,14 @@
"digest": "sha256:12d53493f58be066b213644f73a127d09d9242f2ccbc3f60eff5b3c2d1f25470"
},
{
- "name": "@narratage/text-track",
+ "name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:728b679e65629c6795f3932373bec4cfdd4b2e56dd2d96d2170fd05070646220"
+ "digest": "sha256:ec9b6917a6f9d52efa6f62a9f40c4d1e3ae85623b15bdc7dffa60f96c50a7b4b"
},
{
- "name": "@narratage/text",
+ "name": "@narratage/typography-track",
"version": "0.0.0-dev",
- "digest": "sha256:a94370b40d7d59148f8b17c64c16e27a50a73126eb374aeeab40344374f58ae1"
+ "digest": "sha256:d032d7f7e034803d6253c9b9082f6ddd30bff95719325f6524e87b84c6c5af7f"
},
{
"name": "@narratage/validation",
@@ -749,7 +754,7 @@
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:72e6847d77034d361d6ff2b69eafb84ac84156c14de8e37e0b39c93334081942"
+ "digest": "sha256:7209d52d61e9c9237b59695a30f2f04a055d83053f06439ba9e9a31dd6cd189c"
}
],
"packages": [
@@ -768,8 +773,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:ade06568b7785a95cd11f2ebd43fd4ace924054ddcd9f17938a3e42efb3964c9",
- "closureDigest": "sha256:46230cb84643c076faaaac97f1d68dc96da0a5b6348acd6ba97e8891da5d5251"
+ "facetsDigest": "sha256:6a2991ec75f9fd30e8d286213fc7993aae2c570b85a8faae5d3c2af661c9fdfc",
+ "closureDigest": "sha256:3c8af2887098d34054e238fe1717168ef95e4804dd88cc88d83d9b72f25da9e4"
},
{
"specifier": "@narratage/caption-fine",
@@ -777,8 +782,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c8632226339780aff145728d60db8a6e53f6873c9a07a4c0ed65a5595cb13976",
- "closureDigest": "sha256:cc59e2818488a7afa9e72bc9d1390c11873a3c625853b456dbaeee86402345ba"
+ "facetsDigest": "sha256:c5616408dd56ce9c903523319b2a697ff6b8af5bfe1dc66fe793a11e4629f3cf",
+ "closureDigest": "sha256:3cf5629f0b0b0104e5bd6342ef0ba05e3f22ba22fa62fb9e079eec90dec2fb75"
},
{
"specifier": "@narratage/caption-gemini",
@@ -786,8 +791,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:91699bf2e7604e2607c646ccc2276d1b3630fc9ab7f21569181fd6dd0b18bd09",
- "closureDigest": "sha256:f23b261ee558ea7da9b8795c5f74c1b5ea7895bfa5797446f1a6abde6f52eb83"
+ "facetsDigest": "sha256:22fed1f1748349c11b6f28448be38cbea68b1dd5a51a3dc2d548ae0a376b9c71",
+ "closureDigest": "sha256:1ebef8225afd6df622935e9d67f0895fd8eb9145bc5c2f96281ddadd6ded803f"
},
{
"specifier": "@narratage/composition",
@@ -796,7 +801,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:0a988b665baf0846246e309d9faf39ffb3ef6ec455bf37f7c438eb30429ff46e",
- "closureDigest": "sha256:fb832926800e80c6707ec22d811cb25d5fb63d673acb558e0a4e1e73cfd30395"
+ "closureDigest": "sha256:abcc228356713b66fd2125b2bdd66679df75d8e0d39c5fd1fbacac133317c0ce"
},
{
"specifier": "@narratage/estimate",
@@ -804,8 +809,8 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:9c5b0b0c211cddbb3230a2cbed3d03cef758c3678a20c44d2bedbea74b4f5fad",
- "closureDigest": "sha256:2e80008eea92c1dcfcc0862502da3794b57af5ee16e0da8d947d7f4cf2bce652"
+ "facetsDigest": "sha256:55e886419b6c25c3ab08c21401896d0352c90dfa32666f71882918309461e5c2",
+ "closureDigest": "sha256:46469d00067903d023a07077c0d06bac11668e54e00768dea9f0820504ef2e7a"
},
{
"specifier": "@narratage/film",
@@ -813,8 +818,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:edf2cc49e512c60b171f073096f4dfff8dd92f0ab02d0c092557421ed66f8d10",
- "closureDigest": "sha256:d2d7e005c31e3c8c63be77a23c3fdeeecf1af28fba393ec44b05ed32978ce5bb"
+ "facetsDigest": "sha256:8e58b5630b9a68a8ce7314620f5f1c7cda973a05c179c18d61e10d68002964f0",
+ "closureDigest": "sha256:bcad5a1643f1b1193b79c726ce03b4ce50929652814567712d66c596599f272f"
},
{
"specifier": "@narratage/fonts-open",
@@ -822,8 +827,8 @@
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:0e612226ab43e7bafb61c6057bade2783abcad761f242b5cde53e11babc7ffe1",
- "closureDigest": "sha256:4588c548b07aec3afa3a5c9b6535fa99df40005cb7ec9eeec803c39051c95291"
+ "facetsDigest": "sha256:31b51352edcb4f34beccc9d9ac8cf7397125a840971a72c912df3d34d1f3feda",
+ "closureDigest": "sha256:cf404e70036afe899420d8271a0fa29e640fbe727fe25020c0a852c33db25cae"
},
{
"specifier": "@narratage/generation",
@@ -832,7 +837,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:ae96c20681e676094f7a411ce82a4b2d9f835a4fffa189dd7b6550c321166d94"
+ "closureDigest": "sha256:d79fcf6dfc72ff84f9c04fc02f6efb175f1d6e2b9ef636425ce257cb0ca82f5b"
},
{
"specifier": "@narratage/hyperframes",
@@ -841,7 +846,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b8b8773d03f19844cdc8d714650380145056649245e33c607f30220fff194157",
- "closureDigest": "sha256:7c5bfb1ac15cc3a84009426b1e8703ae9f13c1a69a2ee406f665ed07c303719b"
+ "closureDigest": "sha256:242c745bb6a51cd17dbfc9c9aa3408464b9bb14d6eab26bdebd35bcc0f958014"
},
{
"specifier": "@narratage/media",
@@ -849,8 +854,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:da929a3aa531aeaa3df4e80e0d7a258b99a670b1a6ca1eff45509d31b20612be",
- "closureDigest": "sha256:4e9f908283701f68781f500ab868855f5917984572351ed2388c0318d3e62543"
+ "facetsDigest": "sha256:6c7cf563a92aa8e48db6da224697fd5f56c50b636b0327efc17fbbc264502b3f",
+ "closureDigest": "sha256:8e3cfeef1b2a0b0bab78e5ac27ac6bbe763ae0216c58d30fdd0688634efcda78"
},
{
"specifier": "@narratage/media-pipeline",
@@ -858,8 +863,17 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b7decce74d60905aa28f31ef3220960389a846e242d56c47e918ee6188c974dc",
- "closureDigest": "sha256:a2ede75d2364c61cf6fe7dd9104ab480e9cf20b48fe3252d3507e2bf376c8bbd"
+ "facetsDigest": "sha256:b7bf62142837adc7bad4f8c4b74b60ee6b4ade74140788cf4b682c140893b4af",
+ "closureDigest": "sha256:4a96ed320c8c32a65b6d93fb671f19562c1178b15ac89b268876e9c3c268df28"
+ },
+ {
+ "specifier": "@narratage/media-track",
+ "package": {
+ "name": "@narratage/media-track",
+ "version": "0.0.0-dev"
+ },
+ "facetsDigest": "sha256:b3e32ad8fd0f074d9e7cb707383e45c79f89ed1c28044f6d70294c96411cb393",
+ "closureDigest": "sha256:67c8618e8047675b9b315bab6c91e57d51c8f9264fe6f185a12b08c3e05db438"
},
{
"specifier": "@narratage/narrative",
@@ -867,8 +881,8 @@
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f5b284001a68af57ef5fc03480627f18247d1440aa0c1d3cc9927a740669e790",
- "closureDigest": "sha256:2965cf34a59c349d41919092f54c3ed09da74952beb4955d05bf8e93441da524"
+ "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
+ "closureDigest": "sha256:16bcfd1e174cec129692fd72d97374541a16db2bd0c9e1a036a4c3d65e978a98"
},
{
"specifier": "@narratage/program-space",
@@ -885,17 +899,17 @@
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:66e8fed1b9f4aa04f2c48da32f4be47c0a87387b973c4aed3130877139278da9",
- "closureDigest": "sha256:6ee37a10f5230436f6dcc2957fa1ee42ce01cefd314eedbeed0412065ba3cbbf"
+ "facetsDigest": "sha256:965f293a64a8b1c7ae87e6e13986a751d4c26a2fcded9dd81fc24a7790980b45",
+ "closureDigest": "sha256:0c046a66947a9ef4cccc89f589b0eb9841bf668cdbdf1ef80f69eefaa34741bf"
},
{
- "specifier": "@narratage/run-text",
+ "specifier": "@narratage/run-markup",
"package": {
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:fbcab7cea86223fe00ea04b51c2160bb534aafbb99067f5877e6825b0ce4eefc",
- "closureDigest": "sha256:d8955d51f118c01ee2861f7223abd8479dcedcd8ae25ee682c22a6f3dc4d4502"
+ "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
+ "closureDigest": "sha256:3f22b01f207599d4b848adffe915b4b34cc6dfb6f98d7230d2d8a54cbd588252"
},
{
"specifier": "@narratage/script",
@@ -903,8 +917,8 @@
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:353904690b6774d720ff72ee9d05ff9c99c1dbc48d106b8c396396380e336d54",
- "closureDigest": "sha256:67f3dd9a74f2141bab7766c394cbdb0ec9e8d0746db417051fe69ffee1ca1bec"
+ "facetsDigest": "sha256:a112e8e461c03e0ab53b4190518f79a16fff6b885f3e6601e5a0e5e0631829fc",
+ "closureDigest": "sha256:b0f5855f33808b50c6afcae1e0e9317f5d4aacda6eff272f142e0d0268848e80"
},
{
"specifier": "@narratage/seedance",
@@ -912,8 +926,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c1f9cb32b1343f2a5b095e43c5a9501b6d015fe064b47af480fa6d3d10e1782e",
- "closureDigest": "sha256:3d75f4413dd8b4435ce8e3e96d1a6881ff11872aa0b2b7dd3e7b4b8e6469903a"
+ "facetsDigest": "sha256:4750e07548e9706f3a0d8da1f8ca1960a27227e1cae647f743934ff2338e11ae",
+ "closureDigest": "sha256:c329b039f8560a54b56749f7b96329c6c06605d58165a0c6ba5e81a34e84fd9f"
},
{
"specifier": "@narratage/semantic-map",
@@ -921,8 +935,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c2281ee13f070550fa242dde689ca8966436d7f7a672e9bacc28305bce8844a7",
- "closureDigest": "sha256:35576ef96b8c68fd3b3133fd795840073c7a492059c4b3c5c1e4e65e9c41465f"
+ "facetsDigest": "sha256:a9d81ddfa09dfa23c9c3c0817b60299431ca9ec640252a659d490be55d92ba68",
+ "closureDigest": "sha256:43811f9ce23c253befa080c6e2d3caa315d2710f826d87966b3a6e6672ea2ff2"
},
{
"specifier": "@narratage/spatial",
@@ -930,8 +944,8 @@
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3cbff7cc307fa4279c4420b0eda163d236874ae2916f37938f5de619410dcf34",
- "closureDigest": "sha256:77d2b9c1d09a6399cc38b657b85aaa7b888e9bd038a92e9aeb82144d6ccebbc1"
+ "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
+ "closureDigest": "sha256:3c2704b4e613dc23d94a1e842a7bd58f0248ee53dcc3395be0fadcde2013f311"
},
{
"specifier": "@narratage/speech",
@@ -939,8 +953,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:476b63fe9fd265f5fbf569ac87608b274eb81850acbb58e29fe3e6b7aebce72a",
- "closureDigest": "sha256:4decc2c96ff7f2a3887a0869aa9776355d92acbedf744a4261e1daba85cb75b2"
+ "facetsDigest": "sha256:75b1537c9b9729c2e9197445c34b295bc9f72dbef754a4702e1ca792dceea472",
+ "closureDigest": "sha256:d2fe74b7cc9f05d60562bf0d669261446d43c712dc7431fb5d7aa6205bf31183"
},
{
"specifier": "@narratage/speech-alignment",
@@ -948,8 +962,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:41cb7990b0fbaaf9e8379e86f5b6689e6730067a4ecf13f9280153a990b15821",
- "closureDigest": "sha256:744799dc54884e33f948e7111200acf42cabe5ecfc585250823bc1d8c20942a6"
+ "facetsDigest": "sha256:bdfe219081310041d11c6d54440e6ccb80398bfb97f93afc28e9d1ed101b4a79",
+ "closureDigest": "sha256:e6fa4a50ba65c85c048766f4cbe00c9c4deb41f99b18855d7f670cce4e7dbeaa"
},
{
"specifier": "@narratage/speech-basis",
@@ -957,8 +971,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:13753ec0da39640013d2f624531c456bcf6b2f240733fc359db97e6f94d3f96b",
- "closureDigest": "sha256:3b40a5350a75a0fccbed3a106726a623db459fd178cf5c594a77fe2525547d21"
+ "facetsDigest": "sha256:f01f21badb0ccdd5cc62b131be05f46030bffee96042c7323a0c572786d012ef",
+ "closureDigest": "sha256:fb0cab2d5cc764267e5891938e2f3a4beec8706e96821e4906d290fbb7eb1be7"
},
{
"specifier": "@narratage/speech-evidence",
@@ -966,8 +980,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3682709ce170cd1c8569b11d75af7ed9d7dbcddb81fd280e2f8d96874baeb121",
- "closureDigest": "sha256:201b9d7abfa268864052098e2aecbd6c1caf6668bcbfdb817c33ea4abaa119b1"
+ "facetsDigest": "sha256:60f366de074a7fba20c71dcbd825083fddc54ea7de602a903eb144eab5555425",
+ "closureDigest": "sha256:c6a9b286b2895ab40d585051d029852ec2aa57295a597adbc1f2ff616f3cf4a9"
},
{
"specifier": "@narratage/speech-spine",
@@ -975,8 +989,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:051a5e330928dd245f13c81e98f5b518ce5308ccfe8b12828f04e6927dd85421",
- "closureDigest": "sha256:28012e35cf051e1e2a01d8d9fef15488c4e2415c57eed110d68e348b83b629aa"
+ "facetsDigest": "sha256:c2d3ae7c5a676c66368c9225fd516aa6cfa7dab749123f7ecd31007628ee4666",
+ "closureDigest": "sha256:d0e8ca2fc3403689d8edb798787c61c934ce31a895bb779f2db9a7fdda93af00"
},
{
"specifier": "@narratage/svs",
@@ -985,16 +999,34 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:5da318effc3367ac68121a33223e20792f736267f1acb8308cfe91b94e961b20"
+ "closureDigest": "sha256:6ee450114180d7f6f515b834a9cf1000795007b3ec8e57ba6860b30320fb2eba"
+ },
+ {
+ "specifier": "@narratage/temporal",
+ "package": {
+ "name": "@narratage/temporal",
+ "version": "0.0.0-dev"
+ },
+ "facetsDigest": "sha256:2e9c4804f142e08e87b2e11af79aa17770109fb573e865397bed14ed7a4f1d0e",
+ "closureDigest": "sha256:ff208e3b6edaf26da26e7b21ba587103b3c1f2b01b52c607eca9ef7c8073aabc"
+ },
+ {
+ "specifier": "@narratage/text",
+ "package": {
+ "name": "@narratage/text",
+ "version": "0.0.0-dev"
+ },
+ "facetsDigest": "sha256:9d46bd8d61b985122dedd8d0247a5a202bee23f2c4c6b61e6217c020dd87e075",
+ "closureDigest": "sha256:ef092b2ed243988cc772db0259fd5ece4aa0708de2464f7ed0cd132c271e04d5"
},
{
- "specifier": "@narratage/text-track",
+ "specifier": "@narratage/typography-track",
"package": {
- "name": "@narratage/text-track",
+ "name": "@narratage/typography-track",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:7b57525779eb26931c9a210a1ef380542195cc37c9ff8d012a490ddb6f3baf4f",
- "closureDigest": "sha256:cbfa3f780692e7acfa17f930a500f8d11799cbe62fc745d7b9a5f7cc3704a11d"
+ "facetsDigest": "sha256:a8193c2426018cccfc1ca9911b4d1aed7f9499b17196e14f858797b8d109bd13",
+ "closureDigest": "sha256:50e46db546a27733cc395b2ea48974026575890c09394ad2b7eb4da99a1e60c9"
},
{
"specifier": "@narratage/visual-ir",
@@ -1011,9 +1043,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:745ecd1d41b5fa12539edbbbe20cb43c6bdf7599bf71c1b7f2113946bdfe39dd",
- "closureDigest": "sha256:1dd3e16f58411fd77f2daf4a945781a784618cffe7512d83d6181f701c39cadb"
+ "facetsDigest": "sha256:be22a14fb7f6eb437aa17b541a35320f5e26b77d7d9925702b2977609f874fe3",
+ "closureDigest": "sha256:a2724330f6ee6fd5ff6e804d440236852819e57c67f123b04c486a5a964027a7"
}
],
- "digest": "sha256:b6cc9ac228600f6e32a7487547765f67083213971fabdc3f2290263581995702"
+ "digest": "sha256:e0c424dddda6fdb53537177367613b82b5a8e3ddc9d3f58ce84221c6251a629e"
}
diff --git a/examples/talking-film-live/svml.runtime-packages.lock b/examples/talking-film-live/svml.runtime-packages.lock
index 10f06b2a..b5e433c7 100644
--- a/examples/talking-film-live/svml.runtime-packages.lock
+++ b/examples/talking-film-live/svml.runtime-packages.lock
@@ -34,17 +34,17 @@
{
"name": "@narratage/background-removal",
"version": "0.0.0-dev",
- "digest": "sha256:8886181d467475a0419e07cf0da8a3cdc3923dcb8ca5b33cf191d33105f93a62"
+ "digest": "sha256:a9d70daf4af81911b62cd38ce04cecc5c7f157ef0150b9236bfe9db8ad688954"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:58ec895c81d343e50b6efc1a2fae49e851ff2a9fe6926680ac7e8b27f1553ae8"
+ "digest": "sha256:f52a343838062199d0b77634f27099db4876d0b494e90616017dc743d1abab8c"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6e2aadeb3f5b8e833aa6a53ae5c2cee3c16a49542457a110eec528675de00c3d"
+ "digest": "sha256:d365d74d385b56d25bbe9fa08e0d70a58dafaef3cc51683a43821d9cf8da08de"
},
{
"name": "@narratage/component-kit",
@@ -59,12 +59,12 @@
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:2bd6c5c9ea9bb11e3bf32141f2aaff6f42e61a1800d609cd28752f62b269a7af"
+ "digest": "sha256:651c4d546708cd8648e1730a906fc3f9f9fc274db421e6374afee83574cecc7d"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:1a59d1179cf5ea91d05f4c3976c50502a2a8faad07a15bda8b51d5741668777b"
+ "digest": "sha256:d433a2298b3afcf12d41575a9f0d3e7fd6a3feec297ba66466cc9d98b5aa8f1f"
},
{
"name": "@narratage/endpoint-kit",
@@ -74,7 +74,7 @@
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:4ceaf545fa645de80873c5cc3b9df7655474a262057f805e85eca2679025536e"
+ "digest": "sha256:0bc59f02ac62828923e280b61e88d66198471a78cc829970b7b3ca5e219530c9"
},
{
"name": "@narratage/host",
@@ -84,7 +84,12 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:7797eeafb6991715191a6310a6edbeb2b65d546d9ec582fab2cf633975d6e527"
+ "digest": "sha256:cd4b8c4cfb11307e0a487fa5d065a961c1cfb701a48f6d293f98b90c6d01b5cb"
+ },
+ {
+ "name": "@narratage/markup",
+ "version": "0.0.0-dev",
+ "digest": "sha256:8a8f2e935fa5b3248661b426b8429df007296f786dacf147c829b964410ce93d"
},
{
"name": "@narratage/media-execution",
@@ -94,12 +99,12 @@
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:42db6579923c798cfe098f8876148dd54996f707366bd9d3d4655d845e9ca862"
+ "digest": "sha256:08b62e21bd0f6f03fd7e2b481f820c56006a0ff92e6a7318927bd0c3607223f5"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:72856b532f458b6805c988e521c68919b011efcd8f82003e69f1e9bb740d6bef"
+ "digest": "sha256:bec05028a561e1e9272756b47df52be20534c235e918df08a4f5f6c4a1db58f7"
},
{
"name": "@narratage/narrative",
@@ -129,7 +134,7 @@
{
"name": "@narratage/provider-kie",
"version": "0.0.0-dev",
- "digest": "sha256:e9047810ec2972880c798ac717c720b33e84dcc8edb7b4421dc8c3dbf55d731e"
+ "digest": "sha256:e3d5b5752f13d8069a54c6157b1cbcec0a90ba0c22bbf54c6f6b8bf97fe8af5e"
},
{
"name": "@narratage/provider-media-local",
@@ -144,7 +149,7 @@
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:a46f0a848273f303d2e1cf6122e0ba882534da9202ecc0bd3fd55887e4624bfc"
+ "digest": "sha256:28847756a67fc7a9c304d9ed358964e422956d86da6f53e3b7d2ebccdff54cad"
},
{
"name": "@narratage/runtime-adapter-node",
@@ -169,12 +174,12 @@
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:8bbfa48c0fde45639578902c907d9190bd5bbb8a03bd59fca8fd364b820a3184"
+ "digest": "sha256:cdf2bca700af10b30f2c29117ed7492fae82a434f4fd3e48747e8c51a7aab4c7"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:c467d5c9b4dcf4e07c8261e9ec7c2a18463c9af4a5171933b71a5a9a8b49dd64"
+ "digest": "sha256:4b41917023c9a9fc9b1e4a3a2c6d82fafeb3d732733c6e4ca6721ae2009edbdf"
},
{
"name": "@narratage/speech-alignment",
@@ -191,10 +196,15 @@
"version": "0.0.0-dev",
"digest": "sha256:ad66df5763802600b43d5df3538e5dc43bfe52cb7f1dabe63497e79834cfbe09"
},
+ {
+ "name": "@narratage/svs",
+ "version": "0.0.0-dev",
+ "digest": "sha256:e44ae945c23e041602eb2f029a4c72b96fc2525e6c767e117e2bf0f11a830e0e"
+ },
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:a94370b40d7d59148f8b17c64c16e27a50a73126eb374aeeab40344374f58ae1"
+ "digest": "sha256:989b56f87a21e907aca26f768262d43e5fe4a4ab3efee17595d774d4ccbca141"
},
{
"name": "@narratage/validation",
@@ -209,7 +219,7 @@
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:72e6847d77034d361d6ff2b69eafb84ac84156c14de8e37e0b39c93334081942"
+ "digest": "sha256:7209d52d61e9c9237b59695a30f2f04a055d83053f06439ba9e9a31dd6cd189c"
},
{
"name": "@protobufjs/aspromise",
@@ -860,7 +870,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:86976124a2cf5cb216f5bbd137959d6358c4f31bec0b125e6caf957d812609c7"
+ "closureDigest": "sha256:d61896f51d88c5d07a1d198a1879055e62986b23dd50f00437486da512e6faa2"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -869,7 +879,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:8109e98417945a0d1b5f8df2e4839806e1404a5a26bb435aa391fbff8fa668b9"
+ "closureDigest": "sha256:a76597166b1e27453d77f3b209498f88e6ae1204249b51d531b71258b75d6f3d"
},
{
"specifier": "@narratage/provider-kie",
@@ -878,7 +888,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",
- "closureDigest": "sha256:35e95885907dbc295141ad63c0d2801be742295f4536e574c213a22a99e49530"
+ "closureDigest": "sha256:606dc72a6f601a7aec856efa5436a0f74e3f0b505569a4017f8f30675f444fb8"
},
{
"specifier": "@narratage/provider-media-local",
@@ -887,7 +897,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:2edc989b92d295cd5e997ebd12b835f2e36ed8964d8e6391f694d383a2ed8651"
+ "closureDigest": "sha256:5dcea5c6536c78a52a8900b8dc864a4c9c2353ef57cf8122a2590c7be62e8e76"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -896,8 +906,8 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:90bd3d82d9006322e174a24e616981d6dd942cb9844f676878ab91de38c07e87"
+ "closureDigest": "sha256:9d00849016e4f24e679f7176207db44d410cfa4a46cf65df761d5cc397502655"
}
],
- "digest": "sha256:76ed6d4b9b4ec2dcd8aec5b30a6a3043dd0c637fcf9314cf6abc234393673ec7"
+ "digest": "sha256:96871b6a5f84cb7c60d835eebc0f384025b641d7cb0a2f7239db7f77be4a7632"
}
diff --git a/examples/talking-head-aroll/README.md b/examples/talking-head-aroll/README.md
index 6ded68c7..37d471a9 100644
--- a/examples/talking-head-aroll/README.md
+++ b/examples/talking-head-aroll/README.md
@@ -12,9 +12,9 @@ Every take uses the same voice-timbre reference. The visual reference sequence i
alternate, base.
`@narratage/seedance-speaker` binds the reusable project SVS Recipe, Script dialogue and explicit
-references into a Prompt Kit Invocation. The generic `@narratage/prompt-kit` author compiler applies the
-separately imported `official-ugc-v1.svs` mapping. It emits an ordered Prompt Program and exact
-Seedance Speech Program while compiling `main.svml`; neither operation is a Runtime task.
+references into Text Bindings. The separately imported `official-ugc-v1.svs` compiles to a
+domain-neutral Text Template. A visible Text render Operation produces each prompt and connects it
+to the exact Seedance request; prompt assembly is therefore part of the graph, not hidden package logic.
The four generated videos are normalized and concatenated into one Speech Spine. One canonical
audio projection goes through WhisperX, direct Script alignment produces the complete SemanticMap,
Gemini plans Cue cuts without seeing timing, and the resulting Caption
@@ -35,12 +35,13 @@ pnpm narratage lock-packages examples/talking-head-aroll/svml.packages.lock \
--package @narratage/speech \
--package @narratage/speech-evidence \
--package @narratage/semantic-map \
+ --package @narratage/spatial \
--package @narratage/visual-ir \
--package @narratage/composition \
--package @narratage/svs \
--package @narratage/script \
--package @narratage/estimate \
- --package @narratage/prompt-kit \
+ --package @narratage/text \
--package @narratage/generation \
--package @narratage/seedance \
--package @narratage/seedance-speaker \
@@ -56,7 +57,7 @@ pnpm narratage lock-packages examples/talking-head-aroll/svml.packages.lock \
--package @narratage/hyperframes \
--package @narratage/media-pipeline \
--package @narratage/render-hyperframes \
- --package @narratage/run-text \
+ --package @narratage/run-markup \
--root .
pnpm narratage lock-packages examples/talking-head-aroll/svml.runtime-packages.lock \
@@ -68,7 +69,7 @@ pnpm narratage lock-packages examples/talking-head-aroll/svml.runtime-packages.l
--root .
```
-Inspect all authored outputs—including `*.prompt` and `*.program`—without a paid call:
+Inspect the authored graph—including the visible `*.prompt` Text output and `*.program`—without a paid call:
```sh
pnpm narratage check examples/talking-head-aroll/main.svml \
diff --git a/examples/talking-head-aroll/build.svrun b/examples/talking-head-aroll/build.svrun
index 72d75ac9..e30caf7d 100644
--- a/examples/talking-head-aroll/build.svrun
+++ b/examples/talking-head-aroll/build.svrun
@@ -1,4 +1,4 @@
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/examples/talking-head-aroll/main.svml b/examples/talking-head-aroll/main.svml
index d5be09a4..b0857341 100644
--- a/examples/talking-head-aroll/main.svml
+++ b/examples/talking-head-aroll/main.svml
@@ -1,4 +1,4 @@
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
diff --git a/examples/talking-head-aroll/reuse-generated.svrun b/examples/talking-head-aroll/reuse-generated.svrun
index 069590e7..6d12c123 100644
--- a/examples/talking-head-aroll/reuse-generated.svrun
+++ b/examples/talking-head-aroll/reuse-generated.svrun
@@ -1,4 +1,4 @@
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/examples/talking-head-aroll/svml.packages.lock b/examples/talking-head-aroll/svml.packages.lock
index b45e4895..c6d05715 100644
--- a/examples/talking-head-aroll/svml.packages.lock
+++ b/examples/talking-head-aroll/svml.packages.lock
@@ -554,17 +554,17 @@
{
"name": "@narratage/caption-fine",
"version": "0.0.0-dev",
- "digest": "sha256:82cb17e2781256f785f389de0e3afd0796cc91718bfe135c6dd8c38e8dcec2fc"
+ "digest": "sha256:b3629ec8e280ac0ab5fa4e92500b7d762974e97600f8021bfc4b0a8694ae593b"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:58ec895c81d343e50b6efc1a2fae49e851ff2a9fe6926680ac7e8b27f1553ae8"
+ "digest": "sha256:f52a343838062199d0b77634f27099db4876d0b494e90616017dc743d1abab8c"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6e2aadeb3f5b8e833aa6a53ae5c2cee3c16a49542457a110eec528675de00c3d"
+ "digest": "sha256:d365d74d385b56d25bbe9fa08e0d70a58dafaef3cc51683a43821d9cf8da08de"
},
{
"name": "@narratage/component-kit",
@@ -579,32 +579,32 @@
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:2bd6c5c9ea9bb11e3bf32141f2aaff6f42e61a1800d609cd28752f62b269a7af"
+ "digest": "sha256:651c4d546708cd8648e1730a906fc3f9f9fc274db421e6374afee83574cecc7d"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:1a59d1179cf5ea91d05f4c3976c50502a2a8faad07a15bda8b51d5741668777b"
+ "digest": "sha256:d433a2298b3afcf12d41575a9f0d3e7fd6a3feec297ba66466cc9d98b5aa8f1f"
},
{
"name": "@narratage/estimate",
"version": "0.0.0-dev",
- "digest": "sha256:8375787eed9b3d9b1dc1634847a7e74789b8fc9e288cd7b5388871c47215ece7"
+ "digest": "sha256:6f162eddb9c274d4c1a4f1637a8c154c5e516e2e466c383f0b3e7a312a10aecf"
},
{
"name": "@narratage/film",
"version": "0.0.0-dev",
- "digest": "sha256:8259d45c4f5f3e26956480aa30b54010ce0470e63a344b197932f83aa07e0661"
+ "digest": "sha256:cf696aea5fd093832875c12a7f22e5ee3dbc45679069a1d8644aed0c0309bd19"
},
{
"name": "@narratage/fonts-open",
"version": "0.0.0-dev",
- "digest": "sha256:30bfdba162645ed887fe84a14b7a5e999c5a3e81ef82bfbb32f4347cebc0ba4c"
+ "digest": "sha256:2636ba4fa9323b3d5715db76f819ed702ff55fbc8a1e7f44f0401389f2a7bdb6"
},
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:aa8125353ac0e60222bd038503fd3787bd7c942bccd794c013bf5220eb454bc9"
+ "digest": "sha256:0bc59f02ac62828923e280b61e88d66198471a78cc829970b7b3ca5e219530c9"
},
{
"name": "@narratage/host",
@@ -614,43 +614,43 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:7797eeafb6991715191a6310a6edbeb2b65d546d9ec582fab2cf633975d6e527"
+ "digest": "sha256:cd4b8c4cfb11307e0a487fa5d065a961c1cfb701a48f6d293f98b90c6d01b5cb"
+ },
+ {
+ "name": "@narratage/markup",
+ "version": "0.0.0-dev",
+ "digest": "sha256:d038863cedf4d22162dc0b390485131caf0977be11032861415a766d068e3745"
},
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:42db6579923c798cfe098f8876148dd54996f707366bd9d3d4655d845e9ca862"
+ "digest": "sha256:08b62e21bd0f6f03fd7e2b481f820c56006a0ff92e6a7318927bd0c3607223f5"
},
{
"name": "@narratage/media-track",
"version": "0.0.0-dev",
- "digest": "sha256:03a14d67e30fe287c872303cad75acf40806c23a0dc718d7320bec3f50d3f383"
+ "digest": "sha256:d371b1bdc8747fef280640dbc8a9cb03acde9322ad8e6f11ed02396ff8f53260"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:72856b532f458b6805c988e521c68919b011efcd8f82003e69f1e9bb740d6bef"
+ "digest": "sha256:bec05028a561e1e9272756b47df52be20534c235e918df08a4f5f6c4a1db58f7"
},
{
"name": "@narratage/model-kit",
"version": "0.0.0-dev",
- "digest": "sha256:b5ce0f8b10756e801827f119b3335b22b8aab1ed1765f6a6261457355506bcab"
+ "digest": "sha256:00d8ca97f522f9692748d2ef83336df759626317d9e2baf6b8a42dc1473e9746"
},
{
"name": "@narratage/narrative",
"version": "0.0.0-dev",
- "digest": "sha256:410b1c0b30dfe4b8a81e67bbb5833dc915418337cce71325fb1bb8b93f227fac"
+ "digest": "sha256:c25b30b1881baa443ca91447f2529ac744feebe54eb2e4fbf3d2ba1d797a457d"
},
{
"name": "@narratage/program-space",
"version": "0.0.0-dev",
"digest": "sha256:7f5e69b2642332f7f901569609ac8840d0c8f52d5aa9ff9dad0d894d91895b28"
},
- {
- "name": "@narratage/prompt-kit",
- "version": "0.0.0-dev",
- "digest": "sha256:6a390347b6f958206c0304c92bac5f6cdb5485d30f6295799c99442ad370a44a"
- },
{
"name": "@narratage/protocol",
"version": "0.0.0-dev",
@@ -659,32 +659,32 @@
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:a46f0a848273f303d2e1cf6122e0ba882534da9202ecc0bd3fd55887e4624bfc"
+ "digest": "sha256:28847756a67fc7a9c304d9ed358964e422956d86da6f53e3b7d2ebccdff54cad"
},
{
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev",
- "digest": "sha256:3d7c8549650244571fe6fab24a2518edac8b17368934a141594d093f846455d6"
+ "digest": "sha256:325fcbfc221a0de4a0fa94563d2c4960b6826723a7c523cdef301ee8d1a4102e"
},
{
"name": "@narratage/run",
"version": "0.0.0-dev",
- "digest": "sha256:a828b37f801d3ebfcc4cae84e4fd0a1baf9342f00a85d1d9440c92d570acb8c9"
+ "digest": "sha256:d734eb7ef18623d279d7176ce3fb1ed8b9c3a457aec7fcec2d439129815efaff"
},
{
"name": "@narratage/script",
"version": "0.0.0-dev",
- "digest": "sha256:aeef6425f2f830a2420df1ffcd57ce6ae973bdcc8f6f45f55265714d842d6df8"
+ "digest": "sha256:425cb50348d40a7d14e4bac5d28f32be2f50c9a0504341ad8d72112f6e776d16"
},
{
"name": "@narratage/seedance-speaker",
"version": "0.0.0-dev",
- "digest": "sha256:4141de3dcd31bf05be36204bdc2112aa2f5b849fd4a062df5e513ef22460e963"
+ "digest": "sha256:e8a18e87c2cf40a900d0bc6fb4e151f2fe2d89922ece069812e89aea2c2bedfd"
},
{
"name": "@narratage/seedance",
"version": "0.0.0-dev",
- "digest": "sha256:e218a3c54118c75a21c080cc20a4dd410c78223000100a009dfe270c1429b03d"
+ "digest": "sha256:66cdf600171833956e1f5c5494f6757471d8f795a4d8fe7cfabd791303127ecf"
},
{
"name": "@narratage/semantic-map",
@@ -694,12 +694,12 @@
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:8bbfa48c0fde45639578902c907d9190bd5bbb8a03bd59fca8fd364b820a3184"
+ "digest": "sha256:cdf2bca700af10b30f2c29117ed7492fae82a434f4fd3e48747e8c51a7aab4c7"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:c467d5c9b4dcf4e07c8261e9ec7c2a18463c9af4a5171933b71a5a9a8b49dd64"
+ "digest": "sha256:4b41917023c9a9fc9b1e4a3a2c6d82fafeb3d732733c6e4ca6721ae2009edbdf"
},
{
"name": "@narratage/speech-alignment",
@@ -719,7 +719,7 @@
{
"name": "@narratage/speech-spine",
"version": "0.0.0-dev",
- "digest": "sha256:5fb81d1a7cbd1852c0d96e5994c06f4a256500516e75cc4d1bb4dcb5ac3a44c5"
+ "digest": "sha256:982b442194d970a75e183cc32669b7d213a03c91e933cf1472cb6dae5f22fe73"
},
{
"name": "@narratage/speech",
@@ -729,7 +729,7 @@
{
"name": "@narratage/svs",
"version": "0.0.0-dev",
- "digest": "sha256:351ff3b7bde621cdd258ed48a7906aabe4158a21c1e7ecad227e93655d8842d9"
+ "digest": "sha256:e44ae945c23e041602eb2f029a4c72b96fc2525e6c767e117e2bf0f11a830e0e"
},
{
"name": "@narratage/temporal",
@@ -739,7 +739,7 @@
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:a94370b40d7d59148f8b17c64c16e27a50a73126eb374aeeab40344374f58ae1"
+ "digest": "sha256:ec9b6917a6f9d52efa6f62a9f40c4d1e3ae85623b15bdc7dffa60f96c50a7b4b"
},
{
"name": "@narratage/validation",
@@ -754,7 +754,7 @@
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:72e6847d77034d361d6ff2b69eafb84ac84156c14de8e37e0b39c93334081942"
+ "digest": "sha256:7209d52d61e9c9237b59695a30f2f04a055d83053f06439ba9e9a31dd6cd189c"
}
],
"packages": [
@@ -773,8 +773,8 @@
"name": "@narratage/caption",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:ade06568b7785a95cd11f2ebd43fd4ace924054ddcd9f17938a3e42efb3964c9",
- "closureDigest": "sha256:46230cb84643c076faaaac97f1d68dc96da0a5b6348acd6ba97e8891da5d5251"
+ "facetsDigest": "sha256:6a2991ec75f9fd30e8d286213fc7993aae2c570b85a8faae5d3c2af661c9fdfc",
+ "closureDigest": "sha256:3c8af2887098d34054e238fe1717168ef95e4804dd88cc88d83d9b72f25da9e4"
},
{
"specifier": "@narratage/caption-fine",
@@ -782,8 +782,8 @@
"name": "@narratage/caption-fine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c8632226339780aff145728d60db8a6e53f6873c9a07a4c0ed65a5595cb13976",
- "closureDigest": "sha256:cc59e2818488a7afa9e72bc9d1390c11873a3c625853b456dbaeee86402345ba"
+ "facetsDigest": "sha256:c5616408dd56ce9c903523319b2a697ff6b8af5bfe1dc66fe793a11e4629f3cf",
+ "closureDigest": "sha256:3cf5629f0b0b0104e5bd6342ef0ba05e3f22ba22fa62fb9e079eec90dec2fb75"
},
{
"specifier": "@narratage/caption-gemini",
@@ -791,8 +791,8 @@
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:91699bf2e7604e2607c646ccc2276d1b3630fc9ab7f21569181fd6dd0b18bd09",
- "closureDigest": "sha256:f23b261ee558ea7da9b8795c5f74c1b5ea7895bfa5797446f1a6abde6f52eb83"
+ "facetsDigest": "sha256:22fed1f1748349c11b6f28448be38cbea68b1dd5a51a3dc2d548ae0a376b9c71",
+ "closureDigest": "sha256:1ebef8225afd6df622935e9d67f0895fd8eb9145bc5c2f96281ddadd6ded803f"
},
{
"specifier": "@narratage/composition",
@@ -801,7 +801,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:0a988b665baf0846246e309d9faf39ffb3ef6ec455bf37f7c438eb30429ff46e",
- "closureDigest": "sha256:fb832926800e80c6707ec22d811cb25d5fb63d673acb558e0a4e1e73cfd30395"
+ "closureDigest": "sha256:abcc228356713b66fd2125b2bdd66679df75d8e0d39c5fd1fbacac133317c0ce"
},
{
"specifier": "@narratage/estimate",
@@ -809,8 +809,8 @@
"name": "@narratage/estimate",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:9c5b0b0c211cddbb3230a2cbed3d03cef758c3678a20c44d2bedbea74b4f5fad",
- "closureDigest": "sha256:2e80008eea92c1dcfcc0862502da3794b57af5ee16e0da8d947d7f4cf2bce652"
+ "facetsDigest": "sha256:55e886419b6c25c3ab08c21401896d0352c90dfa32666f71882918309461e5c2",
+ "closureDigest": "sha256:46469d00067903d023a07077c0d06bac11668e54e00768dea9f0820504ef2e7a"
},
{
"specifier": "@narratage/film",
@@ -818,8 +818,8 @@
"name": "@narratage/film",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:edf2cc49e512c60b171f073096f4dfff8dd92f0ab02d0c092557421ed66f8d10",
- "closureDigest": "sha256:d2d7e005c31e3c8c63be77a23c3fdeeecf1af28fba393ec44b05ed32978ce5bb"
+ "facetsDigest": "sha256:8e58b5630b9a68a8ce7314620f5f1c7cda973a05c179c18d61e10d68002964f0",
+ "closureDigest": "sha256:bcad5a1643f1b1193b79c726ce03b4ce50929652814567712d66c596599f272f"
},
{
"specifier": "@narratage/fonts-open",
@@ -827,8 +827,8 @@
"name": "@narratage/fonts-open",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:0e612226ab43e7bafb61c6057bade2783abcad761f242b5cde53e11babc7ffe1",
- "closureDigest": "sha256:4588c548b07aec3afa3a5c9b6535fa99df40005cb7ec9eeec803c39051c95291"
+ "facetsDigest": "sha256:31b51352edcb4f34beccc9d9ac8cf7397125a840971a72c912df3d34d1f3feda",
+ "closureDigest": "sha256:cf404e70036afe899420d8271a0fa29e640fbe727fe25020c0a852c33db25cae"
},
{
"specifier": "@narratage/generation",
@@ -837,7 +837,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:d74a57a3210267e665366513324db5c313b3ca0f770da66e74cc38aee5048efb",
- "closureDigest": "sha256:ae96c20681e676094f7a411ce82a4b2d9f835a4fffa189dd7b6550c321166d94"
+ "closureDigest": "sha256:d79fcf6dfc72ff84f9c04fc02f6efb175f1d6e2b9ef636425ce257cb0ca82f5b"
},
{
"specifier": "@narratage/hyperframes",
@@ -846,7 +846,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b8b8773d03f19844cdc8d714650380145056649245e33c607f30220fff194157",
- "closureDigest": "sha256:7c5bfb1ac15cc3a84009426b1e8703ae9f13c1a69a2ee406f665ed07c303719b"
+ "closureDigest": "sha256:242c745bb6a51cd17dbfc9c9aa3408464b9bb14d6eab26bdebd35bcc0f958014"
},
{
"specifier": "@narratage/media",
@@ -854,8 +854,8 @@
"name": "@narratage/media",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:da929a3aa531aeaa3df4e80e0d7a258b99a670b1a6ca1eff45509d31b20612be",
- "closureDigest": "sha256:4e9f908283701f68781f500ab868855f5917984572351ed2388c0318d3e62543"
+ "facetsDigest": "sha256:6c7cf563a92aa8e48db6da224697fd5f56c50b636b0327efc17fbbc264502b3f",
+ "closureDigest": "sha256:8e3cfeef1b2a0b0bab78e5ac27ac6bbe763ae0216c58d30fdd0688634efcda78"
},
{
"specifier": "@narratage/media-pipeline",
@@ -863,8 +863,8 @@
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:b7decce74d60905aa28f31ef3220960389a846e242d56c47e918ee6188c974dc",
- "closureDigest": "sha256:a2ede75d2364c61cf6fe7dd9104ab480e9cf20b48fe3252d3507e2bf376c8bbd"
+ "facetsDigest": "sha256:b7bf62142837adc7bad4f8c4b74b60ee6b4ade74140788cf4b682c140893b4af",
+ "closureDigest": "sha256:4a96ed320c8c32a65b6d93fb671f19562c1178b15ac89b268876e9c3c268df28"
},
{
"specifier": "@narratage/narrative",
@@ -872,8 +872,8 @@
"name": "@narratage/narrative",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:f5b284001a68af57ef5fc03480627f18247d1440aa0c1d3cc9927a740669e790",
- "closureDigest": "sha256:2965cf34a59c349d41919092f54c3ed09da74952beb4955d05bf8e93441da524"
+ "facetsDigest": "sha256:703db7ad343b00701dc39e3b316992dc371307f0c6c2ad15d1e0269257ffb326",
+ "closureDigest": "sha256:16bcfd1e174cec129692fd72d97374541a16db2bd0c9e1a036a4c3d65e978a98"
},
{
"specifier": "@narratage/program-space",
@@ -884,32 +884,23 @@
"facetsDigest": "sha256:b1e4eab41a135914556872f0f47a0c02b8ce76920366cbf86121b720af069052",
"closureDigest": "sha256:d108ad2d1d34a512288faa0dc43fc11cc451b9816ff51d6c19dd1e892dade92a"
},
- {
- "specifier": "@narratage/prompt-kit",
- "package": {
- "name": "@narratage/prompt-kit",
- "version": "0.0.0-dev"
- },
- "facetsDigest": "sha256:3d0616025092423f378d28da088c26f4782d9be000eb55575e22c4653afdb7f5",
- "closureDigest": "sha256:1a224de0ec4e6cb206d37f84227c4d4d89a7dc25e1b3d232a71166fcdd8dffeb"
- },
{
"specifier": "@narratage/render-hyperframes",
"package": {
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:66e8fed1b9f4aa04f2c48da32f4be47c0a87387b973c4aed3130877139278da9",
- "closureDigest": "sha256:6ee37a10f5230436f6dcc2957fa1ee42ce01cefd314eedbeed0412065ba3cbbf"
+ "facetsDigest": "sha256:965f293a64a8b1c7ae87e6e13986a751d4c26a2fcded9dd81fc24a7790980b45",
+ "closureDigest": "sha256:0c046a66947a9ef4cccc89f589b0eb9841bf668cdbdf1ef80f69eefaa34741bf"
},
{
- "specifier": "@narratage/run-text",
+ "specifier": "@narratage/run-markup",
"package": {
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:fbcab7cea86223fe00ea04b51c2160bb534aafbb99067f5877e6825b0ce4eefc",
- "closureDigest": "sha256:d8955d51f118c01ee2861f7223abd8479dcedcd8ae25ee682c22a6f3dc4d4502"
+ "facetsDigest": "sha256:fb3a8a5be9a0ef0aa914026a199be641f4e20df27f9b284be196f52fd260be55",
+ "closureDigest": "sha256:3f22b01f207599d4b848adffe915b4b34cc6dfb6f98d7230d2d8a54cbd588252"
},
{
"specifier": "@narratage/script",
@@ -917,8 +908,8 @@
"name": "@narratage/script",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:353904690b6774d720ff72ee9d05ff9c99c1dbc48d106b8c396396380e336d54",
- "closureDigest": "sha256:67f3dd9a74f2141bab7766c394cbdb0ec9e8d0746db417051fe69ffee1ca1bec"
+ "facetsDigest": "sha256:a112e8e461c03e0ab53b4190518f79a16fff6b885f3e6601e5a0e5e0631829fc",
+ "closureDigest": "sha256:b0f5855f33808b50c6afcae1e0e9317f5d4aacda6eff272f142e0d0268848e80"
},
{
"specifier": "@narratage/seedance",
@@ -926,8 +917,8 @@
"name": "@narratage/seedance",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c1f9cb32b1343f2a5b095e43c5a9501b6d015fe064b47af480fa6d3d10e1782e",
- "closureDigest": "sha256:3d75f4413dd8b4435ce8e3e96d1a6881ff11872aa0b2b7dd3e7b4b8e6469903a"
+ "facetsDigest": "sha256:4750e07548e9706f3a0d8da1f8ca1960a27227e1cae647f743934ff2338e11ae",
+ "closureDigest": "sha256:c329b039f8560a54b56749f7b96329c6c06605d58165a0c6ba5e81a34e84fd9f"
},
{
"specifier": "@narratage/seedance-speaker",
@@ -935,8 +926,8 @@
"name": "@narratage/seedance-speaker",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:66aa6e0a9ae24f7c6a04bd45e79266a8195292d5b6e3c4069fd8f465f3c5386a",
- "closureDigest": "sha256:2157e4331d10cc2b12e16efdac41a7951827fde88242bef2e99e032294596fa7"
+ "facetsDigest": "sha256:56ba468bb0aba538382354da37eb7fb51b0c1d1c8b61bbe46bd279861cb8fc7d",
+ "closureDigest": "sha256:c16a1aa701a3f793f4a79988f9b860d1fe3dd81c1dce0ab81e3633cd24801cff"
},
{
"specifier": "@narratage/semantic-map",
@@ -944,8 +935,8 @@
"name": "@narratage/semantic-map",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:c2281ee13f070550fa242dde689ca8966436d7f7a672e9bacc28305bce8844a7",
- "closureDigest": "sha256:35576ef96b8c68fd3b3133fd795840073c7a492059c4b3c5c1e4e65e9c41465f"
+ "facetsDigest": "sha256:a9d81ddfa09dfa23c9c3c0817b60299431ca9ec640252a659d490be55d92ba68",
+ "closureDigest": "sha256:43811f9ce23c253befa080c6e2d3caa315d2710f826d87966b3a6e6672ea2ff2"
},
{
"specifier": "@narratage/spatial",
@@ -953,8 +944,8 @@
"name": "@narratage/spatial",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3cbff7cc307fa4279c4420b0eda163d236874ae2916f37938f5de619410dcf34",
- "closureDigest": "sha256:77d2b9c1d09a6399cc38b657b85aaa7b888e9bd038a92e9aeb82144d6ccebbc1"
+ "facetsDigest": "sha256:5062281ffadb46495ec12e1a67185b57fe13879e90f03bcf544e93fd1d273716",
+ "closureDigest": "sha256:3c2704b4e613dc23d94a1e842a7bd58f0248ee53dcc3395be0fadcde2013f311"
},
{
"specifier": "@narratage/speech",
@@ -962,8 +953,8 @@
"name": "@narratage/speech",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:476b63fe9fd265f5fbf569ac87608b274eb81850acbb58e29fe3e6b7aebce72a",
- "closureDigest": "sha256:4decc2c96ff7f2a3887a0869aa9776355d92acbedf744a4261e1daba85cb75b2"
+ "facetsDigest": "sha256:75b1537c9b9729c2e9197445c34b295bc9f72dbef754a4702e1ca792dceea472",
+ "closureDigest": "sha256:d2fe74b7cc9f05d60562bf0d669261446d43c712dc7431fb5d7aa6205bf31183"
},
{
"specifier": "@narratage/speech-alignment",
@@ -971,8 +962,8 @@
"name": "@narratage/speech-alignment",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:41cb7990b0fbaaf9e8379e86f5b6689e6730067a4ecf13f9280153a990b15821",
- "closureDigest": "sha256:744799dc54884e33f948e7111200acf42cabe5ecfc585250823bc1d8c20942a6"
+ "facetsDigest": "sha256:bdfe219081310041d11c6d54440e6ccb80398bfb97f93afc28e9d1ed101b4a79",
+ "closureDigest": "sha256:e6fa4a50ba65c85c048766f4cbe00c9c4deb41f99b18855d7f670cce4e7dbeaa"
},
{
"specifier": "@narratage/speech-basis",
@@ -980,8 +971,8 @@
"name": "@narratage/speech-basis",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:13753ec0da39640013d2f624531c456bcf6b2f240733fc359db97e6f94d3f96b",
- "closureDigest": "sha256:3b40a5350a75a0fccbed3a106726a623db459fd178cf5c594a77fe2525547d21"
+ "facetsDigest": "sha256:f01f21badb0ccdd5cc62b131be05f46030bffee96042c7323a0c572786d012ef",
+ "closureDigest": "sha256:fb0cab2d5cc764267e5891938e2f3a4beec8706e96821e4906d290fbb7eb1be7"
},
{
"specifier": "@narratage/speech-evidence",
@@ -989,8 +980,8 @@
"name": "@narratage/speech-evidence",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:3682709ce170cd1c8569b11d75af7ed9d7dbcddb81fd280e2f8d96874baeb121",
- "closureDigest": "sha256:201b9d7abfa268864052098e2aecbd6c1caf6668bcbfdb817c33ea4abaa119b1"
+ "facetsDigest": "sha256:60f366de074a7fba20c71dcbd825083fddc54ea7de602a903eb144eab5555425",
+ "closureDigest": "sha256:c6a9b286b2895ab40d585051d029852ec2aa57295a597adbc1f2ff616f3cf4a9"
},
{
"specifier": "@narratage/speech-spine",
@@ -998,8 +989,8 @@
"name": "@narratage/speech-spine",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:051a5e330928dd245f13c81e98f5b518ce5308ccfe8b12828f04e6927dd85421",
- "closureDigest": "sha256:28012e35cf051e1e2a01d8d9fef15488c4e2415c57eed110d68e348b83b629aa"
+ "facetsDigest": "sha256:c2d3ae7c5a676c66368c9225fd516aa6cfa7dab749123f7ecd31007628ee4666",
+ "closureDigest": "sha256:d0e8ca2fc3403689d8edb798787c61c934ce31a895bb779f2db9a7fdda93af00"
},
{
"specifier": "@narratage/svs",
@@ -1008,7 +999,16 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:9cc7c397d2cd97b5a3e814886b6553b6d236fd8825df0d056e328b7f0cf20163",
- "closureDigest": "sha256:5da318effc3367ac68121a33223e20792f736267f1acb8308cfe91b94e961b20"
+ "closureDigest": "sha256:6ee450114180d7f6f515b834a9cf1000795007b3ec8e57ba6860b30320fb2eba"
+ },
+ {
+ "specifier": "@narratage/text",
+ "package": {
+ "name": "@narratage/text",
+ "version": "0.0.0-dev"
+ },
+ "facetsDigest": "sha256:9d46bd8d61b985122dedd8d0247a5a202bee23f2c4c6b61e6217c020dd87e075",
+ "closureDigest": "sha256:ef092b2ed243988cc772db0259fd5ece4aa0708de2464f7ed0cd132c271e04d5"
},
{
"specifier": "@narratage/visual-ir",
@@ -1025,9 +1025,9 @@
"name": "@narratage/whisperx",
"version": "0.0.0-dev"
},
- "facetsDigest": "sha256:745ecd1d41b5fa12539edbbbe20cb43c6bdf7599bf71c1b7f2113946bdfe39dd",
- "closureDigest": "sha256:1dd3e16f58411fd77f2daf4a945781a784618cffe7512d83d6181f701c39cadb"
+ "facetsDigest": "sha256:be22a14fb7f6eb437aa17b541a35320f5e26b77d7d9925702b2977609f874fe3",
+ "closureDigest": "sha256:a2724330f6ee6fd5ff6e804d440236852819e57c67f123b04c486a5a964027a7"
}
],
- "digest": "sha256:34569197250bc2b943f156fa3d7e41267b4defd2066e147eb38e702c553b3f36"
+ "digest": "sha256:925c518aa319628c2a3dc6258b4b1ed769c95ad9f5f4708e0c338bbc4386d7f5"
}
diff --git a/examples/talking-head-aroll/svml.runtime-packages.lock b/examples/talking-head-aroll/svml.runtime-packages.lock
index 10f06b2a..b5e433c7 100644
--- a/examples/talking-head-aroll/svml.runtime-packages.lock
+++ b/examples/talking-head-aroll/svml.runtime-packages.lock
@@ -34,17 +34,17 @@
{
"name": "@narratage/background-removal",
"version": "0.0.0-dev",
- "digest": "sha256:8886181d467475a0419e07cf0da8a3cdc3923dcb8ca5b33cf191d33105f93a62"
+ "digest": "sha256:a9d70daf4af81911b62cd38ce04cecc5c7f157ef0150b9236bfe9db8ad688954"
},
{
"name": "@narratage/caption-gemini",
"version": "0.0.0-dev",
- "digest": "sha256:58ec895c81d343e50b6efc1a2fae49e851ff2a9fe6926680ac7e8b27f1553ae8"
+ "digest": "sha256:f52a343838062199d0b77634f27099db4876d0b494e90616017dc743d1abab8c"
},
{
"name": "@narratage/caption",
"version": "0.0.0-dev",
- "digest": "sha256:6e2aadeb3f5b8e833aa6a53ae5c2cee3c16a49542457a110eec528675de00c3d"
+ "digest": "sha256:d365d74d385b56d25bbe9fa08e0d70a58dafaef3cc51683a43821d9cf8da08de"
},
{
"name": "@narratage/component-kit",
@@ -59,12 +59,12 @@
{
"name": "@narratage/core",
"version": "0.0.0-dev",
- "digest": "sha256:2bd6c5c9ea9bb11e3bf32141f2aaff6f42e61a1800d609cd28752f62b269a7af"
+ "digest": "sha256:651c4d546708cd8648e1730a906fc3f9f9fc274db421e6374afee83574cecc7d"
},
{
"name": "@narratage/elaborator",
"version": "0.0.0-dev",
- "digest": "sha256:1a59d1179cf5ea91d05f4c3976c50502a2a8faad07a15bda8b51d5741668777b"
+ "digest": "sha256:d433a2298b3afcf12d41575a9f0d3e7fd6a3feec297ba66466cc9d98b5aa8f1f"
},
{
"name": "@narratage/endpoint-kit",
@@ -74,7 +74,7 @@
{
"name": "@narratage/generation",
"version": "0.0.0-dev",
- "digest": "sha256:4ceaf545fa645de80873c5cc3b9df7655474a262057f805e85eca2679025536e"
+ "digest": "sha256:0bc59f02ac62828923e280b61e88d66198471a78cc829970b7b3ca5e219530c9"
},
{
"name": "@narratage/host",
@@ -84,7 +84,12 @@
{
"name": "@narratage/hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:7797eeafb6991715191a6310a6edbeb2b65d546d9ec582fab2cf633975d6e527"
+ "digest": "sha256:cd4b8c4cfb11307e0a487fa5d065a961c1cfb701a48f6d293f98b90c6d01b5cb"
+ },
+ {
+ "name": "@narratage/markup",
+ "version": "0.0.0-dev",
+ "digest": "sha256:8a8f2e935fa5b3248661b426b8429df007296f786dacf147c829b964410ce93d"
},
{
"name": "@narratage/media-execution",
@@ -94,12 +99,12 @@
{
"name": "@narratage/media-pipeline",
"version": "0.0.0-dev",
- "digest": "sha256:42db6579923c798cfe098f8876148dd54996f707366bd9d3d4655d845e9ca862"
+ "digest": "sha256:08b62e21bd0f6f03fd7e2b481f820c56006a0ff92e6a7318927bd0c3607223f5"
},
{
"name": "@narratage/media",
"version": "0.0.0-dev",
- "digest": "sha256:72856b532f458b6805c988e521c68919b011efcd8f82003e69f1e9bb740d6bef"
+ "digest": "sha256:bec05028a561e1e9272756b47df52be20534c235e918df08a4f5f6c4a1db58f7"
},
{
"name": "@narratage/narrative",
@@ -129,7 +134,7 @@
{
"name": "@narratage/provider-kie",
"version": "0.0.0-dev",
- "digest": "sha256:e9047810ec2972880c798ac717c720b33e84dcc8edb7b4421dc8c3dbf55d731e"
+ "digest": "sha256:e3d5b5752f13d8069a54c6157b1cbcec0a90ba0c22bbf54c6f6b8bf97fe8af5e"
},
{
"name": "@narratage/provider-media-local",
@@ -144,7 +149,7 @@
{
"name": "@narratage/render-hyperframes",
"version": "0.0.0-dev",
- "digest": "sha256:a46f0a848273f303d2e1cf6122e0ba882534da9202ecc0bd3fd55887e4624bfc"
+ "digest": "sha256:28847756a67fc7a9c304d9ed358964e422956d86da6f53e3b7d2ebccdff54cad"
},
{
"name": "@narratage/runtime-adapter-node",
@@ -169,12 +174,12 @@
{
"name": "@narratage/source",
"version": "0.0.0-dev",
- "digest": "sha256:8bbfa48c0fde45639578902c907d9190bd5bbb8a03bd59fca8fd364b820a3184"
+ "digest": "sha256:cdf2bca700af10b30f2c29117ed7492fae82a434f4fd3e48747e8c51a7aab4c7"
},
{
"name": "@narratage/spatial",
"version": "0.0.0-dev",
- "digest": "sha256:c467d5c9b4dcf4e07c8261e9ec7c2a18463c9af4a5171933b71a5a9a8b49dd64"
+ "digest": "sha256:4b41917023c9a9fc9b1e4a3a2c6d82fafeb3d732733c6e4ca6721ae2009edbdf"
},
{
"name": "@narratage/speech-alignment",
@@ -191,10 +196,15 @@
"version": "0.0.0-dev",
"digest": "sha256:ad66df5763802600b43d5df3538e5dc43bfe52cb7f1dabe63497e79834cfbe09"
},
+ {
+ "name": "@narratage/svs",
+ "version": "0.0.0-dev",
+ "digest": "sha256:e44ae945c23e041602eb2f029a4c72b96fc2525e6c767e117e2bf0f11a830e0e"
+ },
{
"name": "@narratage/text",
"version": "0.0.0-dev",
- "digest": "sha256:a94370b40d7d59148f8b17c64c16e27a50a73126eb374aeeab40344374f58ae1"
+ "digest": "sha256:989b56f87a21e907aca26f768262d43e5fe4a4ab3efee17595d774d4ccbca141"
},
{
"name": "@narratage/validation",
@@ -209,7 +219,7 @@
{
"name": "@narratage/whisperx",
"version": "0.0.0-dev",
- "digest": "sha256:72e6847d77034d361d6ff2b69eafb84ac84156c14de8e37e0b39c93334081942"
+ "digest": "sha256:7209d52d61e9c9237b59695a30f2f04a055d83053f06439ba9e9a31dd6cd189c"
},
{
"name": "@protobufjs/aspromise",
@@ -860,7 +870,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b2636492ab0b0b500d674899ab2ff14fc61c7f2b22ef44eb8f816f141b21ec4d",
- "closureDigest": "sha256:86976124a2cf5cb216f5bbd137959d6358c4f31bec0b125e6caf957d812609c7"
+ "closureDigest": "sha256:d61896f51d88c5d07a1d198a1879055e62986b23dd50f00437486da512e6faa2"
},
{
"specifier": "@narratage/provider-hyperframes-local",
@@ -869,7 +879,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:b14b721bdc0c9d5d9ced1c345107c92a3a5878f3383dea2ecd3e310442c2a40c",
- "closureDigest": "sha256:8109e98417945a0d1b5f8df2e4839806e1404a5a26bb435aa391fbff8fa668b9"
+ "closureDigest": "sha256:a76597166b1e27453d77f3b209498f88e6ae1204249b51d531b71258b75d6f3d"
},
{
"specifier": "@narratage/provider-kie",
@@ -878,7 +888,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:e61ebb911a33d4c5d0e4e4ee4fb69cdb790f4ced050ef35f7472bfbd72013d9b",
- "closureDigest": "sha256:35e95885907dbc295141ad63c0d2801be742295f4536e574c213a22a99e49530"
+ "closureDigest": "sha256:606dc72a6f601a7aec856efa5436a0f74e3f0b505569a4017f8f30675f444fb8"
},
{
"specifier": "@narratage/provider-media-local",
@@ -887,7 +897,7 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:701abcc923bf8a711c20b6e308d8cc8be27bf560f249b8c5a801e1dbd9cb3979",
- "closureDigest": "sha256:2edc989b92d295cd5e997ebd12b835f2e36ed8964d8e6391f694d383a2ed8651"
+ "closureDigest": "sha256:5dcea5c6536c78a52a8900b8dc864a4c9c2353ef57cf8122a2590c7be62e8e76"
},
{
"specifier": "@narratage/provider-whisperx-local",
@@ -896,8 +906,8 @@
"version": "0.0.0-dev"
},
"facetsDigest": "sha256:3686b84c42cc2b1bcaccf57cbdcda25a15c7d9d3778fb92d25437f9880ed8f5d",
- "closureDigest": "sha256:90bd3d82d9006322e174a24e616981d6dd942cb9844f676878ab91de38c07e87"
+ "closureDigest": "sha256:9d00849016e4f24e679f7176207db44d410cfa4a46cf65df761d5cc397502655"
}
],
- "digest": "sha256:76ed6d4b9b4ec2dcd8aec5b30a6a3043dd0c637fcf9314cf6abc234393673ec7"
+ "digest": "sha256:96871b6a5f84cb7c60d835eebc0f384025b641d7cb0a2f7239db7f77be4a7632"
}
diff --git a/package.json b/package.json
index d9227925..277c8f71 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
"@narratage/mimo-tts": "workspace:*",
"@narratage/narrative": "workspace:*",
"@narratage/program-space": "workspace:*",
- "@narratage/prompt-kit": "workspace:*",
"@narratage/ranking": "workspace:*",
"@narratage/provider-google-vertex": "workspace:*",
"@narratage/provider-hyperframes-local": "workspace:*",
@@ -57,7 +56,7 @@
"@narratage/provider-whisperx-local": "workspace:*",
"@narratage/raster": "workspace:*",
"@narratage/render-hyperframes": "workspace:*",
- "@narratage/run-text": "workspace:*",
+ "@narratage/run-markup": "workspace:*",
"@narratage/runtime-adapter": "workspace:*",
"@narratage/runtime-adapter-node": "workspace:*",
"@narratage/script": "workspace:*",
@@ -71,8 +70,9 @@
"@narratage/speech-evidence": "workspace:*",
"@narratage/speech-spine": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text-track": "workspace:*",
+ "@narratage/typography-track": "workspace:*",
"@narratage/temporal": "workspace:*",
+ "@narratage/text": "workspace:*",
"@narratage/spatial": "workspace:*",
"@narratage/visual-ir": "workspace:*",
"@narratage/whisperx": "workspace:*",
diff --git a/packages/audio-track/package.json b/packages/audio-track/package.json
index 7f2fb20b..e44ec75f 100644
--- a/packages/audio-track/package.json
+++ b/packages/audio-track/package.json
@@ -19,6 +19,6 @@
"@narratage/protocol": "workspace:*",
"@narratage/semantic-map": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/audio-track/src/activation.ts b/packages/audio-track/src/activation.ts
index ed023dc9..a6171b47 100644
--- a/packages/audio-track/src/activation.ts
+++ b/packages/audio-track/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
audioTrackComponent,
audioTrackManifest,
@@ -12,7 +12,7 @@ export const svmlPackage = {
name: "@narratage/audio-track",
modules: [{ manifest: audioTrackManifest, specifiers: [audioTrackModuleRef.name, `${audioTrackModuleRef.name}@1`] }],
components: [audioTrackComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: audioTrackModuleRef,
surface: "track",
mode: "structured",
diff --git a/packages/audio-track/src/surface.ts b/packages/audio-track/src/surface.ts
index a885983a..0ac8df8a 100644
--- a/packages/audio-track/src/surface.ts
+++ b/packages/audio-track/src/surface.ts
@@ -7,8 +7,8 @@ import type {
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import type { TemporalDuration, TemporalPointExpression } from "@narratage/temporal";
import { createAudioTrackFragment } from "./fragment.js";
@@ -41,7 +41,7 @@ function optionalText(element: StructuredElement, name: string): string | undefi
}
function resolved(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: SurfaceResolvedReference["type"],
resolve: (path: string) => SurfaceResolvedReference | undefined,
diff --git a/packages/audio-track/test/audio-track.test.ts b/packages/audio-track/test/audio-track.test.ts
index 29314bde..b837516a 100644
--- a/packages/audio-track/test/audio-track.test.ts
+++ b/packages/audio-track/test/audio-track.test.ts
@@ -37,7 +37,7 @@ import { speechEvidenceManifest } from "@narratage/speech-evidence";
import { speechManifest } from "@narratage/speech";
import { spatialManifest } from "@narratage/spatial";
import { temporalManifest } from "@narratage/temporal";
-import { TextSurfaceRegistry, createTextAuthorFrontend } from "@narratage/text";
+import { MarkupSurfaceRegistry, createMarkupAuthorFrontend } from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
import { visualIrManifest } from "@narratage/visual-ir";
@@ -288,7 +288,7 @@ test("the self-described Audio Surface parses into the same finite Producer grap
audioTrackManifest,
fixtureManifest,
]);
- const registry = new TextSurfaceRegistry();
+ const registry = new MarkupSurfaceRegistry();
registry.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
records: [
{ id: "source", type: mediaTypes.synchronized, value: { kind: "inline", value: media("surface", 48_000) }, range: element.range },
@@ -304,7 +304,7 @@ test("the self-described Audio Surface parses into the same finite Producer grap
decodeAudioTrackSurface,
);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry,
resolveModule: (request) => request.from === "example.audio-inputs@1" ? fixtureModule : audioTrackModuleRef,
}));
@@ -314,7 +314,7 @@ test("the self-described Audio Surface parses into the same finite Producer grap
entry: {
id: "/project/audio.svml",
name: "audio.svml",
- text: `<?svml using="@narratage/text@1"?>
+ text: `<?svml using="@narratage/markup@1"?>
<svml>
<import as="fixture" from="example.audio-inputs@1"/>
<import as="audio" from="@narratage/audio-track@1"/>
diff --git a/packages/background-removal/package.json b/packages/background-removal/package.json
index 122f9392..2206957b 100644
--- a/packages/background-removal/package.json
+++ b/packages/background-removal/package.json
@@ -10,6 +10,6 @@
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/background-removal/src/activation.ts b/packages/background-removal/src/activation.ts
index 03689349..f1da53ef 100644
--- a/packages/background-removal/src/activation.ts
+++ b/packages/background-removal/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
backgroundRemovalComponent, backgroundRemovalImplementationDigests, backgroundRemovalManifest,
@@ -10,7 +10,7 @@ export const svmlPackage = {
name: "@narratage/background-removal",
modules: [{ manifest: backgroundRemovalManifest, specifiers: ["@narratage/background-removal", "@narratage/background-removal@1"] }],
components: [backgroundRemovalComponent],
- hostFacets: [{ ...createTextSurfaceHostFacet({
+ hostFacets: [{ ...createMarkupSurfaceHostFacet({
module: backgroundRemovalModuleRef, surface: "background", mode: "structured",
implementationDigest: backgroundRemovalImplementationDigests.surface, handler: decodeBackgroundRemovalSurface,
}) }],
diff --git a/packages/background-removal/src/surface.ts b/packages/background-removal/src/surface.ts
index 95233491..3a5f7bca 100644
--- a/packages/background-removal/src/surface.ts
+++ b/packages/background-removal/src/surface.ts
@@ -1,5 +1,5 @@
import { artifactTypes } from "@narratage/artifact";
-import type { StructuredSurfaceHandler, SurfaceResolvedReference, TextAttributeValue } from "@narratage/text";
+import type { StructuredSurfaceHandler, SurfaceResolvedReference, MarkupAttributeValue } from "@narratage/markup";
import { backgroundRemovalFragment } from "./fragment.js";
@@ -13,7 +13,7 @@ export const decodeBackgroundRemovalSurface: StructuredSurfaceHandler = ({ eleme
if (element.children.some((child) => child.kind === "element" || child.value.trim())) throw new Error(`${element.name} must be empty.`);
const id = element.attributes.id;
if (typeof id !== "string" || !id.trim()) throw new Error(`${element.name}.id must be text.`);
- const raw: TextAttributeValue | undefined = element.attributes.source;
+ const raw: MarkupAttributeValue | undefined = element.attributes.source;
if (typeof raw !== "object" || raw.kind !== "reference") throw new Error(`${element.name}.source must be a reference.`);
const source = resolveReference(raw.path);
if (source === undefined || !sameType(source.type, artifactTypes.blob)) throw new Error(`${element.name}.source must be a Blob Artifact.`);
diff --git a/packages/caption-fine/package.json b/packages/caption-fine/package.json
index 58e57a50..c2bcf391 100644
--- a/packages/caption-fine/package.json
+++ b/packages/caption-fine/package.json
@@ -20,7 +20,7 @@
"@narratage/protocol": "workspace:*",
"@narratage/semantic-map": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/script": "workspace:*"
diff --git a/packages/caption-fine/src/activation.ts b/packages/caption-fine/src/activation.ts
index a9b0e5ff..a7dfc68c 100644
--- a/packages/caption-fine/src/activation.ts
+++ b/packages/caption-fine/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
captionFineComponent,
@@ -19,14 +19,14 @@ export const svmlPackage = {
}],
components: [captionFineComponent],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: captionFineModuleRef,
surface: "style",
mode: "structured",
implementationDigest: captionFineStyleSurfaceImplementationDigest,
handler: decodeFineCaptionStyleSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: captionFineModuleRef,
surface: "track",
mode: "structured",
diff --git a/packages/caption-fine/src/surface.ts b/packages/caption-fine/src/surface.ts
index 4fb9c62a..2e02bdcf 100644
--- a/packages/caption-fine/src/surface.ts
+++ b/packages/caption-fine/src/surface.ts
@@ -10,8 +10,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { fineCaptionTrackFragment } from "./fragment.js";
import { fineCaptionStyle } from "./style.js";
@@ -41,7 +41,7 @@ function reference(
expected: SurfaceResolvedReference["type"],
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference") {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
diff --git a/packages/caption-gemini/package.json b/packages/caption-gemini/package.json
index 9569d8d8..181c0ce3 100644
--- a/packages/caption-gemini/package.json
+++ b/packages/caption-gemini/package.json
@@ -15,7 +15,7 @@
"@narratage/elaborator": "workspace:*",
"@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/script": "workspace:*"
diff --git a/packages/caption-gemini/src/activation.ts b/packages/caption-gemini/src/activation.ts
index 4c79943f..c1cc8315 100644
--- a/packages/caption-gemini/src/activation.ts
+++ b/packages/caption-gemini/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
captionGeminiComponent, captionGeminiImplementationDigests, captionGeminiManifest,
captionGeminiModuleRef, decodeCaptionGeminiPlannerSurface,
@@ -9,7 +9,7 @@ export const svmlPackage = {
name: "@narratage/caption-gemini",
modules: [{ manifest: captionGeminiManifest, specifiers: ["@narratage/caption-gemini", "@narratage/caption-gemini@1"] }],
components: [captionGeminiComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: captionGeminiModuleRef, surface: "planner", mode: "structured",
implementationDigest: captionGeminiImplementationDigests.plannerSurface,
handler: decodeCaptionGeminiPlannerSurface,
diff --git a/packages/caption-gemini/src/surface.ts b/packages/caption-gemini/src/surface.ts
index e896d302..2506e6ab 100644
--- a/packages/caption-gemini/src/surface.ts
+++ b/packages/caption-gemini/src/surface.ts
@@ -3,8 +3,8 @@ import { narrativeTypes } from "@narratage/narrative";
import type {
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { captionGeminiPlanningFragment } from "./fragment.js";
import { captionGeminiTypes } from "./manifest.js";
@@ -21,7 +21,7 @@ function reference(
expected: SurfaceResolvedReference["type"],
resolve: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference") throw new Error(`${element.name}.${name} must be a whole-value reference`);
const value = resolve(raw.path);
if (value === undefined || !sameType(value.type, expected)) throw new Error(`${element.name}.${name} cannot resolve the required type`);
diff --git a/packages/caption/package.json b/packages/caption/package.json
index 42026219..90b05f0a 100644
--- a/packages/caption/package.json
+++ b/packages/caption/package.json
@@ -15,7 +15,7 @@
"@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/semantic-map": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/script": "workspace:*",
diff --git a/packages/caption/src/activation.ts b/packages/caption/src/activation.ts
index c51ea4c4..125ce697 100644
--- a/packages/caption/src/activation.ts
+++ b/packages/caption/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
captionComponent, captionManifest, captionModuleRef,
captionProgramSurfaceImplementationDigest, decodeCaptionProgramSurface,
@@ -10,7 +10,7 @@ export const svmlPackage = {
modules: [{ manifest: captionManifest, specifiers: ["@narratage/caption", "@narratage/caption@1"] }],
components: [captionComponent],
hostFacets: [
- createTextSurfaceHostFacet({ module: captionModuleRef, surface: "program", mode: "structured", implementationDigest: captionProgramSurfaceImplementationDigest, handler: decodeCaptionProgramSurface }),
+ createMarkupSurfaceHostFacet({ module: captionModuleRef, surface: "program", mode: "structured", implementationDigest: captionProgramSurfaceImplementationDigest, handler: decodeCaptionProgramSurface }),
],
};
export default svmlPackage;
diff --git a/packages/caption/src/surface.ts b/packages/caption/src/surface.ts
index 43b00bd4..668e2839 100644
--- a/packages/caption/src/surface.ts
+++ b/packages/caption/src/surface.ts
@@ -4,8 +4,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { captionTypes } from "./manifest.js";
import { captionWordsForRole } from "./display.js";
@@ -46,7 +46,7 @@ function reference(
expected: SurfaceResolvedReference["type"],
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference") {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
diff --git a/packages/caption/test/caption.test.ts b/packages/caption/test/caption.test.ts
index 7fa183c6..10da5469 100644
--- a/packages/caption/test/caption.test.ts
+++ b/packages/caption/test/caption.test.ts
@@ -27,7 +27,7 @@ import {
captionSelectionWordSubset,
parseScript,
} from "@narratage/script";
-import type { StructuredElement, SurfaceResolvedReference } from "@narratage/text";
+import type { StructuredElement, SurfaceResolvedReference } from "@narratage/markup";
function locate(narrative: Narrative, durationSec: number, segments: readonly AlignedTranscriptSegment[]) {
const space = sealProgramSpace({
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 84a74d58..1fc9e456 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -17,7 +17,7 @@ type CliDistribution = {
```
A Distribution is trusted application assembly, not Core data or source-import authority. The
-official `@narratage/video-cli` selects `@narratage/compiler-text-node` and the current video Runtime
+official `@narratage/video-cli` selects `@narratage/compiler-markup-node` and the current video Runtime
adapters, but no author-package aggregate. A package lock selects the exact Author/Run packages.
Another domain can reuse this command engine without installing any video package.
diff --git a/packages/comment-sticker/README.md b/packages/comment-sticker/README.md
index ede03912..9190d66e 100644
--- a/packages/comment-sticker/README.md
+++ b/packages/comment-sticker/README.md
@@ -10,21 +10,28 @@ The author surface keeps the three independent concerns visible:
- the shared Temporal projection owns when an item exists.
```xml
+<import as="copy" from="@narratage/text@1"/>
+
+<copy:Value id="comment-copy">This part finally made the idea click.</copy:Value>
+<copy:Value id="comment-author">@viewer</copy:Value>
+
<comment:Style id="social-comment" recipe={styles.comment} font={fonts.ui}/>
<comment:Track id="comments" canvas={video.canvas} space={video.space}>
<comment:Sticker
id="opening-comment"
+ comment={comment-copy}
frame={layout.comment}
style={social-comment}
- author="@viewer"
+ author={comment-author}
meta="Featured comment"
during="program"
- >
- This part finally made the idea click.
- </comment:Sticker>
+ />
</comment:Track>
```
-`author`, `avatar`, `header`, and `meta` are optional. Metadata is never fabricated: if `meta` is
-absent, no metadata row is rendered. Sound effects remain a separate Audio Track.
+Body text remains the compact literal form. `comment`, `author`, `header` and `meta` also accept
+ordinary graph `Text` references; `comment={...}` is exclusive with body text. The Fragment builds
+one package-owned content value through explicit Text edges before temporal placement. `avatar` is
+an independent Artifact edge. Metadata is never fabricated: if `meta` is absent, no metadata row
+is rendered. Sound effects remain a separate Audio Track.
diff --git a/packages/comment-sticker/package.json b/packages/comment-sticker/package.json
index d756cd64..6f46f289 100644
--- a/packages/comment-sticker/package.json
+++ b/packages/comment-sticker/package.json
@@ -18,6 +18,7 @@
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/comment-sticker/src/activation.ts b/packages/comment-sticker/src/activation.ts
index 37a17a51..ef9f7b43 100644
--- a/packages/comment-sticker/src/activation.ts
+++ b/packages/comment-sticker/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
commentStickerComponent,
@@ -19,14 +19,14 @@ export const svmlPackage = {
}],
components: [commentStickerComponent],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: commentStickerModuleRef,
surface: "style",
mode: "structured",
implementationDigest: commentStickerStyleSurfaceImplementationDigest,
handler: decodeCommentStickerStyleSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: commentStickerModuleRef,
surface: "track",
mode: "structured",
diff --git a/packages/comment-sticker/src/component.ts b/packages/comment-sticker/src/component.ts
index 45aed673..590e287d 100644
--- a/packages/comment-sticker/src/component.ts
+++ b/packages/comment-sticker/src/component.ts
@@ -5,6 +5,7 @@ import { canonicalize } from "@narratage/protocol";
import type { BlobRef, StoredValue } from "@narratage/protocol";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { CanvasSpace, SpatialFrame } from "@narratage/spatial";
+import type { Text } from "@narratage/text";
import { commentStickerProducers, commentStickerTypes } from "./manifest.js";
import {
@@ -15,11 +16,14 @@ import {
commentStickerImplementationDigests,
commentStickerValidatorDigests,
createCommentStickerSet,
+ createCommentStickerContent,
+ setCommentStickerContentText,
finalizeCommentSticker,
renderCommentSticker,
} from "./program.js";
import type {
CommentStickerHeader,
+ CommentStickerContent,
CommentStickerItemSpec,
CommentStickerProgram,
CommentStickerSet,
@@ -41,12 +45,33 @@ function common(inputs: Record<string, { readonly value: StoredValue } | undefin
style: inline<CommentStickerStyle>(inputs.style?.value, "CommentStickerStyle"),
space: inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
spec: inline<CommentStickerItemSpec>(inputs.spec?.value, "CommentStickerItemSpec"),
+ content: inline<CommentStickerContent>(inputs.content?.value, "CommentStickerContent"),
};
}
export const commentStickerComponent = {
name: "@narratage/comment-sticker",
producers: [
+ {
+ producer: commentStickerProducers.createContent,
+ implementationDigest: commentStickerImplementationDigests.createContent,
+ handler: ({ inputs }) => ({ outputs: { content: output(createCommentStickerContent(
+ inline<Text>(inputs.comment?.value, "Text"),
+ )) }, needs: {} }),
+ },
+ ...([
+ [commentStickerProducers.setContentAuthor, commentStickerImplementationDigests.setContentAuthor, "author"],
+ [commentStickerProducers.setContentHeader, commentStickerImplementationDigests.setContentHeader, "header"],
+ [commentStickerProducers.setContentMeta, commentStickerImplementationDigests.setContentMeta, "meta"],
+ ] as const).map(([producer, implementationDigest, field]) => ({
+ producer,
+ implementationDigest,
+ handler: ({ inputs }: ProducerHandlerContext) => ({ outputs: { content: output(setCommentStickerContentText(
+ inline<CommentStickerContent>(inputs.content?.value, "CommentStickerContent"),
+ field,
+ inline<Text>(inputs[field]?.value, "Text"),
+ )) }, needs: {} }),
+ })),
{
producer: commentStickerProducers.createSet,
implementationDigest: commentStickerImplementationDigests.createSet,
@@ -61,7 +86,7 @@ export const commentStickerComponent = {
handler: ({ inputs }: ProducerHandlerContext) => {
const values = common(inputs);
return { outputs: { set: output(appendProgramCommentSticker(
- values.set, values.header, values.frame, values.style, values.space, values.spec,
+ values.set, values.header, values.frame, values.style, values.space, values.spec, values.content,
...(avatar ? [inline<BlobRef>(inputs.avatar?.value, "Comment Sticker avatar")] : []),
)) }, needs: {} };
},
@@ -77,7 +102,7 @@ export const commentStickerComponent = {
return { outputs: { set: output(appendSelectionCommentSticker(
values.set, values.header, values.frame, values.style, values.space,
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
- inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"), values.spec,
+ inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"), values.spec, values.content,
...(avatar ? [inline<BlobRef>(inputs.avatar?.value, "Comment Sticker avatar")] : []),
)) }, needs: {} };
},
@@ -93,7 +118,7 @@ export const commentStickerComponent = {
return { outputs: { set: output(appendMomentCommentSticker(
values.set, values.header, values.frame, values.style, values.space,
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
- inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"), values.spec,
+ inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"), values.spec, values.content,
...(avatar ? [inline<BlobRef>(inputs.avatar?.value, "Comment Sticker avatar")] : []),
)) }, needs: {} };
},
diff --git a/packages/comment-sticker/src/fragment.ts b/packages/comment-sticker/src/fragment.ts
index ecca27dd..770fbdaa 100644
--- a/packages/comment-sticker/src/fragment.ts
+++ b/packages/comment-sticker/src/fragment.ts
@@ -7,6 +7,7 @@ import { programSpaceTypes } from "@narratage/program-space";
import type { TypeRef } from "@narratage/protocol";
import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
+import { textTypes } from "@narratage/text";
import { commentStickerProducers, commentStickerTypes } from "./manifest.js";
@@ -20,6 +21,10 @@ export type CommentStickerFragmentItem = TimedItem & {
readonly frameName: string;
readonly styleName: string;
readonly avatarName?: string;
+ readonly commentName: string;
+ readonly authorName?: string;
+ readonly headerTextName?: string;
+ readonly metaName?: string;
};
const input = (name: string) => ({ kind: "fragment-input" as const, name });
@@ -49,12 +54,40 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
types.set(item.specName, commentStickerTypes.itemSpec);
types.set(item.frameName, spatialTypes.frame);
types.set(item.styleName, commentStickerTypes.style);
+ types.set(item.commentName, textTypes.text);
+ if (item.authorName !== undefined) types.set(item.authorName, textTypes.text);
+ if (item.headerTextName !== undefined) types.set(item.headerTextName, textTypes.text);
+ if (item.metaName !== undefined) types.set(item.metaName, textTypes.text);
if (item.avatarName !== undefined) types.set(item.avatarName, artifactTypes.blob);
if (item.kind !== "program") {
types.set(item.mapName, semanticMapTypes.complete);
types.set(item.sourceName, item.kind === "selection" ? narrativeTypes.selection : narrativeTypes.moment);
}
- const id = `comment:set:append:${String(index + 1).padStart(4, "0")}`;
+ const suffix = String(index + 1).padStart(4, "0");
+ const createContentId = `comment:content:${suffix}:create`;
+ operations.push({
+ id: createContentId,
+ producer: commentStickerProducers.createContent,
+ inputs: { comment: input(item.commentName) },
+ result: { kind: "output", name: "content" },
+ });
+ let content = operation(createContentId);
+ for (const [field, name, producer] of [
+ ["author", item.authorName, commentStickerProducers.setContentAuthor],
+ ["header", item.headerTextName, commentStickerProducers.setContentHeader],
+ ["meta", item.metaName, commentStickerProducers.setContentMeta],
+ ] as const) {
+ if (name === undefined) continue;
+ const fieldId = `comment:content:${suffix}:${field}`;
+ operations.push({
+ id: fieldId,
+ producer,
+ inputs: { content, [field]: input(name) },
+ result: { kind: "output", name: "content" },
+ });
+ content = operation(fieldId);
+ }
+ const id = `comment:set:append:${suffix}`;
operations.push({
id,
producer: appendProducer(item),
@@ -65,6 +98,7 @@ export function createCommentStickerFragment(items: readonly CommentStickerFragm
style: input(item.styleName),
space: input("space"),
spec: input(item.specName),
+ content,
...(item.avatarName === undefined ? {} : { avatar: input(item.avatarName) }),
...(item.kind === "program" ? {} : {
map: input(item.mapName),
diff --git a/packages/comment-sticker/src/index.ts b/packages/comment-sticker/src/index.ts
index b7e992de..854cfad7 100644
--- a/packages/comment-sticker/src/index.ts
+++ b/packages/comment-sticker/src/index.ts
@@ -21,6 +21,7 @@ export {
appendMomentCommentSticker,
appendProgramCommentSticker,
appendSelectionCommentSticker,
+ assertCommentStickerContent,
assertCommentStickerHeader,
assertCommentStickerItemSpec,
assertCommentStickerProgram,
@@ -29,12 +30,14 @@ export {
commentStickerImplementationDigests,
commentStickerValidatorDigests,
createCommentStickerSet,
+ createCommentStickerContent,
finalizeCommentSticker,
renderCommentSticker,
sealCommentStickerHeader,
sealCommentStickerItemSpec,
sealCommentStickerProgram,
sealCommentStickerStyle,
+ setCommentStickerContentText,
} from "./program.js";
export { decodeCommentStickerStyleSurface, decodeCommentStickerTrackSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/comment-sticker/src/manifest.ts b/packages/comment-sticker/src/manifest.ts
index dbbab7f0..a6982aee 100644
--- a/packages/comment-sticker/src/manifest.ts
+++ b/packages/comment-sticker/src/manifest.ts
@@ -8,6 +8,7 @@ import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narrata
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/spatial";
import { temporalDependency } from "@narratage/temporal";
+import { textDependency, textTypes } from "@narratage/text";
import { commentStickerImplementationDigests, commentStickerValidatorDigests } from "./program.js";
@@ -17,6 +18,7 @@ export const commentStickerTypes = {
header: { module: commentStickerModuleRef, name: "CommentStickerHeader" },
style: { module: commentStickerModuleRef, name: "CommentStickerStyle" },
itemSpec: { module: commentStickerModuleRef, name: "CommentStickerItemSpec" },
+ content: { module: commentStickerModuleRef, name: "CommentStickerContent" },
set: { module: commentStickerModuleRef, name: "CommentStickerSet" },
program: { module: commentStickerModuleRef, name: "CommentStickerProgram" },
} satisfies Record<string, TypeRef>;
@@ -31,6 +33,10 @@ export const commentStickerProducers = {
appendMomentAvatar: { module: commentStickerModuleRef, name: "append-moment-comment-sticker-avatar" },
finalize: { module: commentStickerModuleRef, name: "finalize-comment-sticker" },
render: { module: commentStickerModuleRef, name: "render-comment-sticker" },
+ createContent: { module: commentStickerModuleRef, name: "create-comment-sticker-content" },
+ setContentAuthor: { module: commentStickerModuleRef, name: "set-comment-sticker-content-author" },
+ setContentHeader: { module: commentStickerModuleRef, name: "set-comment-sticker-content-header" },
+ setContentMeta: { module: commentStickerModuleRef, name: "set-comment-sticker-content-meta" },
} satisfies Record<string, ProducerRef>;
const string = { kind: "string", minLength: 1 } as const;
@@ -102,12 +108,13 @@ const style = object({
}) },
});
const content = object({
+ contract: { schema: { kind: "literal", value: "svml.comment-sticker-content@1" } },
comment: { schema: string }, author: { schema: string, optional: true },
header: { schema: string, optional: true }, meta: { schema: string, optional: true },
});
const itemSpec = object({
contract: { schema: { kind: "literal", value: "svml.comment-sticker-item-spec@1" } },
- id: { schema: string }, content: { schema: content }, projection: { schema: projection },
+ id: { schema: string }, projection: { schema: projection },
expansion: { schema: object({ kind: { schema: enumString(["one", "each"]) } }) },
});
const frameSpan = object({ startFrame: { schema: unsignedInteger }, endFrameExclusive: { schema: positiveInteger } });
@@ -138,26 +145,39 @@ const appendInputs = [
{ name: "set", type: commentStickerTypes.set }, { name: "header", type: commentStickerTypes.header },
{ name: "frame", type: spatialTypes.frame }, { name: "style", type: commentStickerTypes.style },
{ name: "space", type: programSpaceTypes.programSpace }, { name: "spec", type: commentStickerTypes.itemSpec },
+ { name: "content", type: commentStickerTypes.content },
] as const;
export const commentStickerManifest: ModuleManifest = {
format: "svml.module@1",
name: commentStickerModuleRef.name,
version: commentStickerModuleRef.version,
- dependencies: [artifactDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, compositionDependency],
+ dependencies: [artifactDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, compositionDependency, textDependency],
types: [
{ name: commentStickerTypes.header.name, schema: commentStickerHeaderSchema },
{ name: commentStickerTypes.style.name, schema: commentStickerStyleSchema },
{ name: commentStickerTypes.itemSpec.name, schema: commentStickerItemSpecSchema },
+ { name: commentStickerTypes.content.name, schema: content },
{ name: commentStickerTypes.set.name, schema: commentStickerSetSchema },
{ name: commentStickerTypes.program.name, schema: commentStickerProgramSchema, validator: validator("@narratage/comment-sticker/validate-program", commentStickerValidatorDigests.program) },
],
capabilities: [],
surfaces: [
{ name: "style", tag: "Style", mode: "structured", outputs: [commentStickerTypes.style], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/comment-sticker/style-surface", digest: commentStickerStyleSurfaceImplementationDigest } },
- { name: "track", tag: "Track", mode: "structured", outputs: [commentStickerTypes.header, commentStickerTypes.itemSpec, commentStickerTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/comment-sticker/track-surface", digest: commentStickerTrackSurfaceImplementationDigest } },
+ { name: "track", tag: "Track", mode: "structured", outputs: [textTypes.text, commentStickerTypes.header, commentStickerTypes.itemSpec, commentStickerTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/comment-sticker/track-surface", digest: commentStickerTrackSurfaceImplementationDigest } },
],
producers: [
+ { name: commentStickerProducers.createContent.name, inputs: [{ name: "comment", type: textTypes.text }], outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [], implementation: registered("@narratage/comment-sticker/create-content", commentStickerImplementationDigests.createContent) },
+ ...([
+ [commentStickerProducers.setContentAuthor, commentStickerImplementationDigests.setContentAuthor, "author"],
+ [commentStickerProducers.setContentHeader, commentStickerImplementationDigests.setContentHeader, "header"],
+ [commentStickerProducers.setContentMeta, commentStickerImplementationDigests.setContentMeta, "meta"],
+ ] as const).map(([producer, implementationDigest, field]) => ({
+ name: producer.name,
+ inputs: [{ name: "content", type: commentStickerTypes.content }, { name: field, type: textTypes.text }],
+ outputs: [{ name: "content", type: commentStickerTypes.content }], needs: [],
+ implementation: registered(`@narratage/comment-sticker/set-content-${field}`, implementationDigest),
+ })),
{ name: commentStickerProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: commentStickerTypes.set }], needs: [], implementation: registered("@narratage/comment-sticker/create-set", commentStickerImplementationDigests.createSet) },
...([
[commentStickerProducers.appendProgram, commentStickerImplementationDigests.appendProgram, "@narratage/comment-sticker/append-program", []],
diff --git a/packages/comment-sticker/src/program.ts b/packages/comment-sticker/src/program.ts
index 55713d1c..94a07068 100644
--- a/packages/comment-sticker/src/program.ts
+++ b/packages/comment-sticker/src/program.ts
@@ -25,6 +25,8 @@ import {
projectSelectionWindows,
} from "@narratage/temporal";
import type { ProjectedOccurrence } from "@narratage/temporal";
+import { verifyText } from "@narratage/text";
+import type { Text } from "@narratage/text";
import type {
CommentStickerContent,
@@ -45,6 +47,10 @@ export const commentStickerImplementationDigests = {
appendSelectionAvatar: digestOf("@narratage/comment-sticker/append-selection-avatar@1"),
appendMoment: digestOf("@narratage/comment-sticker/append-moment@1"),
appendMomentAvatar: digestOf("@narratage/comment-sticker/append-moment-avatar@1"),
+ createContent: digestOf("@narratage/comment-sticker/create-content@1"),
+ setContentAuthor: digestOf("@narratage/comment-sticker/set-content-author@1"),
+ setContentHeader: digestOf("@narratage/comment-sticker/set-content-header@1"),
+ setContentMeta: digestOf("@narratage/comment-sticker/set-content-meta@1"),
finalize: digestOf("@narratage/comment-sticker/finalize@1"),
render: digestOf("@narratage/comment-sticker/render@1"),
} as const;
@@ -148,13 +154,33 @@ export function sealCommentStickerStyle(value: CommentStickerStyle): CommentStic
return canonicalize(value) as unknown as CommentStickerStyle;
}
-function assertContent(value: CommentStickerContent): void {
+export function assertCommentStickerContent(value: CommentStickerContent): void {
+ assert(value.contract === "svml.comment-sticker-content@1", "Unsupported CommentStickerContent contract.");
assert(value.comment.trim().length > 0, "Comment Sticker comment cannot be blank.");
optionalText(value.author, "Comment Sticker author");
optionalText(value.header, "Comment Sticker header");
optionalText(value.meta, "Comment Sticker meta");
}
+export function createCommentStickerContent(comment: Text): CommentStickerContent {
+ verifyText(comment);
+ const value: CommentStickerContent = { contract: "svml.comment-sticker-content@1", comment: comment.value };
+ assertCommentStickerContent(value);
+ return canonicalize(value) as unknown as CommentStickerContent;
+}
+
+export function setCommentStickerContentText(
+ content: CommentStickerContent,
+ field: "author" | "header" | "meta",
+ value: Text,
+): CommentStickerContent {
+ assertCommentStickerContent(content);
+ verifyText(value);
+ const result = { ...structuredClone(content), [field]: value.value };
+ assertCommentStickerContent(result);
+ return canonicalize(result) as unknown as CommentStickerContent;
+}
+
function assertAvatar(value: BlobRef): void {
assert(value.kind === "blob" && isDigest(value.digest), "Comment Sticker avatar is not a BlobRef.");
integer(value.size, "Comment Sticker avatar size");
@@ -174,7 +200,6 @@ export function sealCommentStickerHeader(value: CommentStickerHeader): CommentSt
export function assertCommentStickerItemSpec(value: CommentStickerItemSpec): void {
assert(value.contract === "svml.comment-sticker-item-spec@1", "Unsupported CommentStickerItemSpec contract.");
identity(value.id, "CommentStickerItemSpec.id");
- assertContent(value.content);
assert(value.expansion.kind === "one" || value.expansion.kind === "each", "CommentStickerItemSpec expansion is invalid.");
}
@@ -197,6 +222,7 @@ function realized(
frame: SpatialFrame,
style: CommentStickerStyle,
spec: CommentStickerItemSpec,
+ content: CommentStickerContent,
occurrences: readonly ProjectedOccurrence[],
avatar?: BlobRef,
): CommentStickerSet {
@@ -205,6 +231,7 @@ function realized(
assertSpatialFrame(frame);
assertCommentStickerStyle(style);
assertCommentStickerItemSpec(spec);
+ assertCommentStickerContent(content);
if (avatar !== undefined) assertAvatar(avatar);
const additions = occurrences.map((occurrence, index): CommentStickerItemProgram => ({
id: occurrence.id,
@@ -212,7 +239,7 @@ function realized(
span: { ...occurrence.span },
frame: structuredClone(frame),
style: structuredClone(style),
- content: structuredClone(spec.content),
+ content: structuredClone(content),
...(avatar === undefined ? {} : { avatar: structuredClone(avatar) }),
tieBreak: `${header.id}:${spec.id}:${index + 1}`,
}));
@@ -231,10 +258,11 @@ export function appendProgramCommentSticker(
style: CommentStickerStyle,
space: ProgramSpace,
spec: CommentStickerItemSpec,
+ content: CommentStickerContent,
avatar?: BlobRef,
): CommentStickerSet {
assert(spec.expansion.kind === "one", `Program Comment Sticker ${spec.id} must use one occurrence.`);
- return realized(set, header, frame, style, spec, [projectProgramWindow({ itemId: spec.id, space, projection: spec.projection })], avatar);
+ return realized(set, header, frame, style, spec, content, [projectProgramWindow({ itemId: spec.id, space, projection: spec.projection })], avatar);
}
export function appendSelectionCommentSticker(
@@ -246,9 +274,10 @@ export function appendSelectionCommentSticker(
map: CompleteSemanticMap,
selection: NarrativeSelectionRef,
spec: CommentStickerItemSpec,
+ content: CommentStickerContent,
avatar?: BlobRef,
): CommentStickerSet {
- return realized(set, header, frame, style, spec,
+ return realized(set, header, frame, style, spec, content,
projectSelectionWindows({ itemId: spec.id, map, selection, space, expansion: spec.expansion, projection: spec.projection }), avatar);
}
@@ -261,9 +290,10 @@ export function appendMomentCommentSticker(
map: CompleteSemanticMap,
moment: NarrativeMomentRef,
spec: CommentStickerItemSpec,
+ content: CommentStickerContent,
avatar?: BlobRef,
): CommentStickerSet {
- return realized(set, header, frame, style, spec,
+ return realized(set, header, frame, style, spec, content,
projectMomentWindows({ itemId: spec.id, map, moment, space, expansion: spec.expansion, projection: spec.projection }), avatar);
}
@@ -281,7 +311,7 @@ export function assertCommentStickerProgram(value: CommentStickerProgram): void
`Comment Sticker Item ${item.id} timing is invalid.`);
assertSpatialFrame(item.frame);
assertCommentStickerStyle(item.style);
- assertContent(item.content);
+ assertCommentStickerContent(item.content);
if (item.avatar !== undefined) assertAvatar(item.avatar);
assert(item.tieBreak.length > 0, `Comment Sticker Item ${item.id} tie break is empty.`);
}
diff --git a/packages/comment-sticker/src/surface.ts b/packages/comment-sticker/src/surface.ts
index 2e5de457..96d59418 100644
--- a/packages/comment-sticker/src/surface.ts
+++ b/packages/comment-sticker/src/surface.ts
@@ -7,13 +7,14 @@ import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
+import { sealText, textTypes } from "@narratage/text";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import type { TemporalDuration, TemporalPointExpression } from "@narratage/temporal";
import { decodeCommentStickerStyle } from "./author.js";
@@ -47,7 +48,7 @@ function optionalText(element: StructuredElement, name: string): string | undefi
return value.trim();
}
function reference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: SurfaceResolvedReference["type"],
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -143,6 +144,15 @@ function dedent(value: string): string {
return lines.map((line) => line.slice(Number.isFinite(indentation) ? indentation : 0)).join("\n").trim();
}
+function graphText(
+ raw: MarkupAttributeValue | undefined,
+ label: string,
+ resolve: (path: string) => SurfaceResolvedReference | undefined,
+): string | SurfaceResolvedReference {
+ if (typeof raw === "string" && raw.trim().length > 0) return raw.trim();
+ return reference(raw, label, textTypes.text, resolve);
+}
+
export const decodeCommentStickerStyleSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
allowed(element, ["id", "recipe", "font"], ["id", "recipe", "font"]);
if (element.children.some((child) => child.kind === "element" || child.value.trim())) throw new Error(`${element.name} must be empty.`);
@@ -175,9 +185,7 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
}
if (localName(child.name) !== "Sticker") throw new Error(`${element.name} accepts only Sticker children.`);
if (child.children.some((node) => node.kind === "element")) throw new Error(`${child.name} accepts plain comment text only.`);
- allowed(child, ["id", "frame", "style", "avatar", "author", "header", "meta", ...TIMING], ["id", "frame", "style"]);
- const comment = dedent(child.children.map((node) => node.kind === "text" ? node.value : "").join(""));
- if (!comment) throw new Error(`${child.name} requires comment text.`);
+ allowed(child, ["id", "comment", "frame", "style", "avatar", "author", "header", "meta", ...TIMING], ["id", "frame", "style"]);
const temporal = binding(child, resolveReference);
const occurrences = text(child, "occurrences", "one");
if (occurrences !== "one" && occurrences !== "each") throw new Error(`${child.name}.occurrences must be one or each.`);
@@ -185,9 +193,16 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
const frame = reference(child.attributes.frame, `${child.name}.frame`, spatialTypes.frame, resolveReference);
const style = reference(child.attributes.style, `${child.name}.style`, commentStickerTypes.style, resolveReference);
const avatar = child.attributes.avatar === undefined ? undefined : reference(child.attributes.avatar, `${child.name}.avatar`, artifactTypes.blob, resolveReference);
- const author = optionalText(child, "author");
- const displayHeader = optionalText(child, "header");
- const meta = optionalText(child, "meta");
+ const comment = child.attributes.comment === undefined
+ ? dedent(child.children.map((node) => node.kind === "text" ? node.value : "").join(""))
+ : graphText(child.attributes.comment, `${child.name}.comment`, resolveReference);
+ if (child.attributes.comment !== undefined && child.children.some((node) => node.kind === "element" || node.value.trim())) {
+ throw new Error(`${child.name} cannot combine comment with body text.`);
+ }
+ if (typeof comment === "string" && !comment) throw new Error(`${child.name} requires comment text.`);
+ const author = child.attributes.author === undefined ? undefined : graphText(child.attributes.author, `${child.name}.author`, resolveReference);
+ const displayHeader = child.attributes.header === undefined ? undefined : graphText(child.attributes.header, `${child.name}.header`, resolveReference);
+ const meta = child.attributes.meta === undefined ? undefined : graphText(child.attributes.meta, `${child.name}.meta`, resolveReference);
const specId = `${id}.item.${suffix}.spec`;
records.push({
id: specId,
@@ -195,12 +210,6 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
value: { kind: "inline", value: sealCommentStickerItemSpec({
contract: "svml.comment-sticker-item-spec@1",
id: text(child, "id"),
- content: {
- comment,
- ...(author === undefined ? {} : { author }),
- ...(displayHeader === undefined ? {} : { header: displayHeader }),
- ...(meta === undefined ? {} : { meta }),
- },
projection: temporal.projection,
expansion: { kind: occurrences },
}) },
@@ -208,14 +217,28 @@ export const decodeCommentStickerTrackSurface: StructuredSurfaceHandler = ({ ele
});
const specName = `item-${suffix}-spec`; const frameName = `item-${suffix}-frame`; const styleName = `item-${suffix}-style`;
inputs[specName] = { kind: "record", id: specId }; inputs[frameName] = frame.ref; inputs[styleName] = style.ref;
+ const attachText = (field: string, value: string | SurfaceResolvedReference): string => {
+ const name = `item-${suffix}-${field}`;
+ if (typeof value === "string") {
+ const recordId = `${id}.item.${suffix}.${field}`;
+ records.push({ id: recordId, type: textTypes.text, value: { kind: "inline", value: sealText(value) }, range: child.range });
+ inputs[name] = { kind: "record", id: recordId };
+ } else inputs[name] = value.ref;
+ return name;
+ };
+ const commentName = attachText("comment", comment);
+ const authorName = author === undefined ? undefined : attachText("author", author);
+ const headerTextName = displayHeader === undefined ? undefined : attachText("header", displayHeader);
+ const metaName = meta === undefined ? undefined : attachText("meta", meta);
const avatarName = avatar === undefined ? undefined : `item-${suffix}-avatar`;
if (avatar !== undefined) inputs[avatarName!] = avatar.ref;
- if (temporal.kind === "program") items.push({ kind: "program", specName, frameName, styleName, ...(avatarName === undefined ? {} : { avatarName }) });
+ const copy = { commentName, ...(authorName === undefined ? {} : { authorName }), ...(headerTextName === undefined ? {} : { headerTextName }), ...(metaName === undefined ? {} : { metaName }) };
+ if (temporal.kind === "program") items.push({ kind: "program", specName, frameName, styleName, ...copy, ...(avatarName === undefined ? {} : { avatarName }) });
else {
usesMap = true;
const sourceName = `item-${suffix}-${temporal.kind}`;
inputs[sourceName] = temporal.source!.ref;
- items.push({ kind: temporal.kind, specName, frameName, styleName, sourceName, mapName: "map", ...(avatarName === undefined ? {} : { avatarName }) });
+ items.push({ kind: temporal.kind, specName, frameName, styleName, ...copy, sourceName, mapName: "map", ...(avatarName === undefined ? {} : { avatarName }) });
}
}
if (items.length === 0) throw new Error(`${element.name} requires at least one Sticker.`);
diff --git a/packages/comment-sticker/src/types.ts b/packages/comment-sticker/src/types.ts
index 125e694b..f50e9c2d 100644
--- a/packages/comment-sticker/src/types.ts
+++ b/packages/comment-sticker/src/types.ts
@@ -75,6 +75,7 @@ export type CommentStickerStyle = {
};
export type CommentStickerContent = {
+ readonly contract: "svml.comment-sticker-content@1";
readonly comment: string;
readonly author?: string;
readonly header?: string;
@@ -84,7 +85,6 @@ export type CommentStickerContent = {
export type CommentStickerItemSpec = {
readonly contract: "svml.comment-sticker-item-spec@1";
readonly id: string;
- readonly content: CommentStickerContent;
readonly projection: TemporalWindowProjection;
readonly expansion: OccurrenceExpansion;
};
diff --git a/packages/comment-sticker/test/comment-sticker.test.ts b/packages/comment-sticker/test/comment-sticker.test.ts
index db1d4728..6e57308c 100644
--- a/packages/comment-sticker/test/comment-sticker.test.ts
+++ b/packages/comment-sticker/test/comment-sticker.test.ts
@@ -10,14 +10,17 @@ import { digestOf } from "@narratage/protocol";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
-import { parseStructuredElement } from "@narratage/text";
-import type { SurfaceResolvedReference } from "@narratage/text";
+import { parseStructuredElement } from "@narratage/markup";
+import type { SurfaceResolvedReference } from "@narratage/markup";
+import { sealText } from "@narratage/text";
+import { textTypes } from "@narratage/text";
import {
appendProgramCommentSticker,
commentStickerProducers,
commentStickerTypes,
createCommentStickerSet,
+ createCommentStickerContent,
decodeCommentStickerStyle,
decodeCommentStickerStyleSurface,
decodeCommentStickerTrackSurface,
@@ -25,6 +28,7 @@ import {
renderCommentSticker,
sealCommentStickerHeader,
sealCommentStickerItemSpec,
+ setCommentStickerContentText,
} from "../src/index.js";
const font: FontArtifactRef = {
@@ -46,18 +50,24 @@ const canvas = { contract: "svml.canvas-space@1" as const, widthPx: 1080, height
const space = sealProgramSpace({ contract: "svml.program-space@1", durationSec: 3, frameRate: { numerator: 30, denominator: 1 } });
const header = sealCommentStickerHeader({ contract: "svml.comment-sticker-header@1", id: "comments" });
-function item(id: string, meta?: string) {
+function item(id: string) {
return sealCommentStickerItemSpec({
contract: "svml.comment-sticker-item-spec@1",
id,
- content: { comment: "This part finally made the idea click.", author: "@viewer", ...(meta === undefined ? {} : { meta }) },
projection: { start: { ref: "program.start" }, end: { ref: "program.end" } },
expansion: { kind: "one" },
});
}
+function content(meta?: string) {
+ let value = createCommentStickerContent(sealText("This part finally made the idea click."));
+ value = setCommentStickerContentText(value, "author", sealText("@viewer"));
+ if (meta !== undefined) value = setCommentStickerContentText(value, "meta", sealText(meta));
+ return value;
+}
+
function track(meta?: string) {
- const set = appendProgramCommentSticker(createCommentStickerSet(), header, frame, style, space, item("opening", meta));
+ const set = appendProgramCommentSticker(createCommentStickerSet(), header, frame, style, space, item("opening"), content(meta));
return renderCommentSticker(canvas, space, finalizeCommentSticker(set, header));
}
@@ -137,13 +147,12 @@ test("Track Surface lowers mixed program and semantic Stickers to a finite expli
["layout.comment", authored("layout.comment", spatialTypes.frame, frame)],
["social", authored("social", commentStickerTypes.style, style)],
["avatar", authored("avatar", artifactTypes.blob, blob)],
+ ["copy", authored("copy", textTypes.text, sealText("This is graph-supplied comment content."))],
]);
const result = await decodeCommentStickerTrackSurface({
sourceName: "fixture.svml",
element: parsed(`<comment:Track id="comments" canvas={video.canvas} space={video.space}>
- <comment:Sticker id="one" frame={layout.comment} style={social} avatar={avatar} author="@viewer" meta="Featured" during="program">
- This is explicit author content.
- </comment:Sticker>
+ <comment:Sticker id="one" comment={copy} frame={layout.comment} style={social} avatar={avatar} author="@viewer" meta="Featured" during="program"/>
</comment:Track>`),
resolveReference: (path) => refs.get(path),
resolveAsset: noAsset,
@@ -151,6 +160,9 @@ test("Track Surface lowers mixed program and semantic Stickers to a finite expli
assert.equal(result.components.length, 1);
assert.deepEqual(result.fragments[0]?.operations.map((operation) => operation.producer.name).sort(), [
commentStickerProducers.createSet.name,
+ commentStickerProducers.createContent.name,
+ commentStickerProducers.setContentAuthor.name,
+ commentStickerProducers.setContentMeta.name,
commentStickerProducers.appendProgramAvatar.name,
commentStickerProducers.finalize.name,
commentStickerProducers.render.name,
diff --git a/packages/compiler-text-node/README.md b/packages/compiler-markup-node/README.md
similarity index 54%
rename from packages/compiler-text-node/README.md
rename to packages/compiler-markup-node/README.md
index 74bdb076..65f567ad 100644
--- a/packages/compiler-text-node/README.md
+++ b/packages/compiler-markup-node/README.md
@@ -1,12 +1,12 @@
-# `@narratage/compiler-text-node`
+# `@narratage/compiler-markup-node`
-Reference Node compiler assembly for the official `@narratage/text` authoring language.
+Reference Node compiler assembly for the official `@narratage/markup` authoring language.
-The package selects the Text Frontend ABI, installs Text Surface Host facets from already trusted
+The package selects the Markup Frontend ABI, installs Markup Surface Host facets from already trusted
package contributions, and combines them with the syntax-neutral `@narratage/compiler-node`. It does not
discover packages, grant Runtime authority or know any video component by name.
-Every compiled source selects Text—or another registered Frontend—through its mandatory Source
+Every compiled source selects Markup—or another registered Frontend—through its mandatory Source
Header. Use `@narratage/compiler-node` directly for another Frontend assembly. Use
`@narratage/package-loader-node` independently when a Runtime only needs locked deterministic compute
facets and no author syntax.
diff --git a/packages/compiler-text-node/package.json b/packages/compiler-markup-node/package.json
similarity index 84%
rename from packages/compiler-text-node/package.json
rename to packages/compiler-markup-node/package.json
index ca398c81..44fc7b37 100644
--- a/packages/compiler-text-node/package.json
+++ b/packages/compiler-markup-node/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/compiler-text-node",
+ "name": "@narratage/compiler-markup-node",
"version": "0.0.0-dev",
"private": true,
"type": "module",
@@ -12,7 +12,7 @@
"@narratage/elaborator": "workspace:*",
"@narratage/host": "workspace:*",
"@narratage/package-loader-node": "workspace:*",
- "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*",
"@narratage/validation": "workspace:*"
},
"devDependencies": {
diff --git a/packages/compiler-text-node/src/index.ts b/packages/compiler-markup-node/src/index.ts
similarity index 77%
rename from packages/compiler-text-node/src/index.ts
rename to packages/compiler-markup-node/src/index.ts
index f8df706c..e2d566f3 100644
--- a/packages/compiler-text-node/src/index.ts
+++ b/packages/compiler-markup-node/src/index.ts
@@ -11,26 +11,26 @@ import {
} from "@narratage/package-loader-node";
import type { NodePackageContribution } from "@narratage/package-loader-node";
import {
- createTextAuthorFrontend,
- installTextSurfaceHostFacets,
- TextSurfaceRegistry,
- textAuthorFrontendId,
-} from "@narratage/text";
+ createMarkupAuthorFrontend,
+ installMarkupSurfaceHostFacets,
+ MarkupSurfaceRegistry,
+ markupAuthorFrontendId,
+} from "@narratage/markup";
import { TypeValidatorRegistry } from "@narratage/validation";
-export type CreateTextNodeCompilerOptions = {
+export type CreateMarkupNodeCompilerOptions = {
readonly root?: string;
readonly workspace?: Workspace;
};
-/** Assemble the official Text authoring environment from already trusted package facets. */
-export function createTextNodeCompiler(
+/** Assemble the official Markup authoring environment from already trusted package facets. */
+export function createMarkupNodeCompiler(
packages: readonly NodePackageContribution[],
- options: CreateTextNodeCompilerOptions = {},
+ options: CreateMarkupNodeCompilerOptions = {},
): NodeCompiler {
const names = new Set<string>();
const modules = new ModulePackageRegistry();
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
const frontends = new AuthorFrontendRegistry();
const validators = new TypeValidatorRegistry();
@@ -39,7 +39,7 @@ export function createTextNodeCompiler(
if (names.has(item.name)) throw new Error(`Node package contribution ${item.name} is listed twice`);
names.add(item.name);
for (const module of item.modules ?? []) modules.register(module);
- installTextSurfaceHostFacets(item.hostFacets ?? [], surfaces);
+ installMarkupSurfaceHostFacets(item.hostFacets ?? [], surfaces);
for (const frontend of item.authorFrontends ?? []) frontends.register(frontend);
}
@@ -47,7 +47,7 @@ export function createTextNodeCompiler(
registerTypeValidatorFacets(validators, component.validators ?? []);
}
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request) {
const resolved = modules.resolve(request.from);
diff --git a/packages/compiler-text-node/test/compiler.test.ts b/packages/compiler-markup-node/test/compiler.test.ts
similarity index 82%
rename from packages/compiler-text-node/test/compiler.test.ts
rename to packages/compiler-markup-node/test/compiler.test.ts
index ca56327d..cab8bc26 100644
--- a/packages/compiler-text-node/test/compiler.test.ts
+++ b/packages/compiler-markup-node/test/compiler.test.ts
@@ -8,10 +8,10 @@ import { tmpdir } from "node:os";
import { join } from "node:path";
import test from "node:test";
-import { createTextNodeCompiler } from "@narratage/compiler-text-node";
+import { createMarkupNodeCompiler } from "@narratage/compiler-markup-node";
import type { NodePackageContribution } from "@narratage/package-loader-node";
import { digestOf } from "@narratage/protocol";
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
const module = { name: "example.card", version: "1" } as const;
const resultType = { module, name: "CardResult" } as const;
@@ -44,7 +44,7 @@ const installedPackage: NodePackageContribution = {
specifiers: ["example.card@1"],
}],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module,
surface: "card",
mode: "structured",
@@ -72,16 +72,16 @@ const installedPackage: NodePackageContribution = {
],
};
-test("Text compiler alone selects Text Surface Host facets from a generic package contribution", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-text-compiler-"));
+test("Markup compiler alone selects Markup Surface Host facets from a generic package contribution", async () => {
+ const root = await mkdtemp(join(tmpdir(), "svml-markup-compiler-"));
try {
const source = join(root, "main.svml");
- await writeFile(source, `<?svml using="@narratage/text@1"?>
+ await writeFile(source, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="example" from="example.card@1"/>
<example:Card/>
</svml>`, "utf8");
- const compiler = createTextNodeCompiler([installedPackage], { root });
+ const compiler = createMarkupNodeCompiler([installedPackage], { root });
const result = await compiler.compileFile(source);
assert.deepEqual(result.program.closure.modules.map((item) => item.ref), [module]);
diff --git a/packages/compiler-node/package.json b/packages/compiler-node/package.json
index 6e6ce5bb..34877cbd 100644
--- a/packages/compiler-node/package.json
+++ b/packages/compiler-node/package.json
@@ -17,7 +17,7 @@
"@narratage/workspace-fs-node": "workspace:*"
},
"devDependencies": {
- "@narratage/run-text": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/run-markup": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/compiler-node/test/compiler.test.ts b/packages/compiler-node/test/compiler.test.ts
index 387d9546..55261d0c 100644
--- a/packages/compiler-node/test/compiler.test.ts
+++ b/packages/compiler-node/test/compiler.test.ts
@@ -43,13 +43,13 @@ import {
RunFragmentRegistry,
RunFrontendRegistry,
} from "@narratage/run";
-import { runTextFrontend } from "@narratage/run-text";
+import { runMarkupFrontend } from "@narratage/run-markup";
import type { Workspace } from "@narratage/host";
import { WorkspaceError } from "@narratage/host";
import {
- createTextAuthorFrontend,
- TextSurfaceRegistry,
-} from "@narratage/text";
+ createMarkupAuthorFrontend,
+ MarkupSurfaceRegistry,
+} from "@narratage/markup";
import { NodeFilesystemWorkspace } from "@narratage/workspace-fs-node";
function emptyManifest(name: string, version = "1"): ModuleManifest {
@@ -186,7 +186,7 @@ function compiler(root: string, additional: readonly ModuleManifest[] = []): Nod
const modules = new ModulePackageRegistry();
modules.register({ manifest: laboratoryManifest });
for (const manifest of additional) modules.register({ manifest });
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(laboratory, "result", surfaceDigest, ({ element }) => {
const id = element.attributes.id;
if (typeof id !== "string") throw new Error("Result id is required");
@@ -203,7 +203,7 @@ function compiler(root: string, additional: readonly ModuleManifest[] = []): Nod
};
});
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request): ModuleRef {
const resolved = modules.resolve(request.from);
@@ -255,7 +255,7 @@ const previewFragment = sealGraphFragment({
function assetCompiler(environment: { readonly root: string } | { readonly workspace: Workspace }): NodeCompiler {
const modules = new ModulePackageRegistry();
modules.register({ manifest: assetManifest });
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(assetLaboratory, "asset", assetSurfaceDigest, async ({ element, resolveAsset }) => {
const id = element.attributes.id;
const src = element.attributes.src;
@@ -275,7 +275,7 @@ function assetCompiler(environment: { readonly root: string } | { readonly works
};
});
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request): ModuleRef {
const resolved = modules.resolve(request.from);
@@ -323,7 +323,7 @@ function memoryWorkspace(sourceText: string, assetBytes: Uint8Array): Workspace
test("Node Compiler discovers real imports and emits a named public Author Graph export", async () => {
const root = await mkdtemp(join(tmpdir(), "svml-compiler-node-"));
const file = join(root, "main.svml");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="lab" from="example.compiler-lab@1"/>
<lab:Result id="hello"/>
@@ -337,7 +337,7 @@ test("Node Compiler discovers real imports and emits a named public Author Graph
test("Author Frontend identity comes only from the mandatory Source Header, never the suffix", async () => {
const root = await mkdtemp(join(tmpdir(), "svml-self-described-source-"));
- const text = `<?svml using="@narratage/text@1"?>
+ const text = `<?svml using="@narratage/markup@1"?>
<svml>
<import as="lab" from="example.compiler-lab@1"/>
<lab:Result id="hello"/>
@@ -363,12 +363,12 @@ test("Run-only Fragment modules extend the execution closure without polluting t
const root = await mkdtemp(join(tmpdir(), "svml-dual-graph-closure-"));
const authorFile = join(root, "main.svml");
const runFile = join(root, "build.svrun");
- await writeFile(authorFile, `<?svml using="@narratage/text@1"?>
+ await writeFile(authorFile, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="lab" from="example.compiler-lab@1"/>
<lab:Result id="hello"/>
</svml>`, "utf8");
- await writeFile(runFile, `<?svml using="@narratage/run-text@1"?>
+ await writeFile(runFile, `<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="preview">
<author source="./main.svml"/>
<import from="@example/preview" as="preview"/>
@@ -379,7 +379,7 @@ test("Run-only Fragment modules extend the execution closure without polluting t
const authorCompiler = compiler(root, [previewManifest]);
const frontends = new RunFrontendRegistry();
- frontends.register(runTextFrontend);
+ frontends.register(runMarkupFrontend);
const fragments = new RunFragmentRegistry();
fragments.register({ name: "@example/preview", fragments: { result: previewFragment } });
const runCompiler = new NodeRunCompiler({ authorCompiler, frontends, fragments, root });
@@ -403,7 +403,7 @@ test("source assets are content addressed, closure-bound and returned as a Host
const root = await mkdtemp(join(tmpdir(), "svml-source-assets-"));
const file = join(root, "main.svml");
const asset = join(root, "reference.bin");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="asset" from="example.asset-lab@1"/>
<asset:Asset id="reference" src="./reference.bin"/>
@@ -441,7 +441,7 @@ test("source assets are content addressed, closure-bound and returned as a Host
test("an installed package Surface can contribute locked bytes without an author file or network", async () => {
const root = await mkdtemp(join(tmpdir(), "svml-embedded-assets-"));
const file = join(root, "main.svml");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="asset" from="example.asset-lab@1"/>
<asset:Asset id="embedded" src="package:example.asset-lab/embedded.bin"/>
@@ -508,7 +508,7 @@ test("filesystem Workspace contains symlinks and reads each canonical source onl
test("filesystem and in-memory Workspaces compile identical source and bytes to one semantic result", async () => {
const root = await mkdtemp(join(tmpdir(), "svml-workspace-equivalence-"));
const file = join(root, "main.svml");
- const source = `<?svml using="@narratage/text@1"?>
+ const source = `<?svml using="@narratage/markup@1"?>
<svml>
<import as="asset" from="example.asset-lab@1"/>
<asset:Asset id="reference" src="./reference.bin"/>
diff --git a/packages/core/README.md b/packages/core/README.md
index 66b45720..77c1b181 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -32,7 +32,7 @@ structure. Those responsibilities remain outside Core. The normative laws are in
For a non-video domain, the irreducible reusable base is only `@narratage/protocol` plus `@narratage/core`.
Most source languages will also use `@narratage/elaborator` to turn modular component declarations into a
-Graph, and a Driver/Runtime package to execute Commands. `@narratage/text`, `@narratage/run` and every
+Graph, and a Driver/Runtime package to execute Commands. `@narratage/markup`, `@narratage/run` and every
domain contract package are optional layers; none receives Kernel privilege by being official.
Domains that declare semantic Type validators additionally need a Host admission implementation;
the reference one is `@narratage/validation`.
diff --git a/packages/deck-track/README.md b/packages/deck-track/README.md
index b5648f5e..16c66214 100644
--- a/packages/deck-track/README.md
+++ b/packages/deck-track/README.md
@@ -7,6 +7,12 @@ relative-depth poses and one deterministic whole-collection reflow. Card pixels
Media layer lowerer, but Deck is not a Media mode and exports only an ordinary peer `VisualTrack`.
```xml
+<import as="copy" from="@narratage/text@1"/>
+
+<copy:Value id="proof-label">Evidence, not inference</copy:Value>
+<deck:Label id="proof-label-style" content={proof-label}
+ font={fonts.ui} size="34" color="#ffffff"/>
+
<deck:DepthStack
id="proof-stack"
map={timing.map}
@@ -16,7 +22,8 @@ Media layer lowerer, but Deck is not a Media mode and exports only an ordinary p
until={story.selection.proof}
appearance={studio.deck.proof}
>
- <deck:Card id="proof-1" source={proof1.image} extent={proof1.extent} at={story.moment.proof1}/>
+ <deck:Card id="proof-1" source={proof1.image} extent={proof1.extent}
+ at={story.moment.proof1} label={proof-label-style}/>
<deck:Card id="proof-2" source={proof2.video} at={story.moment.proof2}/>
</deck:DepthStack>
```
@@ -29,6 +36,10 @@ silently depend on renderer playback history.
Optional labels are separate exact-font values and are referenced by Cards. Filenames, URLs and
media metadata are never treated as label truth.
+`deck:Label` accepts either literal body copy or `content={Text}`. It binds that copy to exact font
+and label appearance in a small explicit Fragment. The Deck Track receives the resulting label as
+one normal edge; it never reads filenames, URLs or hidden media metadata.
+
The package has no Provider, Need, queue, credential, global z band or cross-Track input. Another
Deck family can install independently and lower to the same terminal `VisualTrack` without changing
this package, Core, Film, Composition or HyperFrames.
diff --git a/packages/deck-track/package.json b/packages/deck-track/package.json
index 85954151..52101077 100644
--- a/packages/deck-track/package.json
+++ b/packages/deck-track/package.json
@@ -22,6 +22,7 @@
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/deck-track/src/activation.ts b/packages/deck-track/src/activation.ts
index 28e9eb20..cb3cc837 100644
--- a/packages/deck-track/src/activation.ts
+++ b/packages/deck-track/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeDepthStackLabelSurface,
@@ -18,14 +18,14 @@ export const svmlPackage = {
}],
components: [depthStackComponent],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: depthStackModuleRef,
surface: "label",
mode: "structured",
implementationDigest: depthStackSurfaceImplementationDigests.label,
handler: decodeDepthStackLabelSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: depthStackModuleRef,
surface: "track",
mode: "structured",
diff --git a/packages/deck-track/src/component.ts b/packages/deck-track/src/component.ts
index 8c7cdb6c..1329883e 100644
--- a/packages/deck-track/src/component.ts
+++ b/packages/deck-track/src/component.ts
@@ -6,6 +6,7 @@ import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { CanvasSpace, SpatialFrame } from "@narratage/spatial";
import type { NarrativeMomentRef, NarrativeSelectionRef } from "@narratage/narrative";
import type { MediaLayerSet } from "@narratage/media-track";
+import type { Text } from "@narratage/text";
import { renderDepthStack } from "./lower.js";
import { depthStackProducers, depthStackTypes } from "./manifest.js";
@@ -18,9 +19,11 @@ import {
finalizeDepthStackAtProgramEnd,
finalizeDepthStackUntilMoment,
finalizeDepthStackUntilSelection,
+ bindDepthStackCardLabelText,
} from "./program.js";
import type {
DepthStackCardLabel,
+ DepthStackCardLabelStyle,
DepthStackCardSet,
DepthStackCardSpec,
DepthStackHeader,
@@ -47,6 +50,14 @@ function finalizeInputs(inputs: ProducerHandlerContext["inputs"]) {
export const depthStackComponent = {
name: "@narratage/deck-track",
producers: [
+ {
+ producer: depthStackProducers.bindLabelText,
+ implementationDigest: depthStackImplementationDigests.bindLabelText,
+ handler: ({ inputs }) => ({ outputs: { label: output(bindDepthStackCardLabelText(
+ inline<DepthStackCardLabelStyle>(inputs.style?.value, "DepthStackCardLabelStyle"),
+ inline<Text>(inputs.content?.value, "Text"),
+ )) }, needs: {} }),
+ },
{
producer: depthStackProducers.createCards,
implementationDigest: depthStackImplementationDigests.createCards,
diff --git a/packages/deck-track/src/index.ts b/packages/deck-track/src/index.ts
index 6fcf6c51..8eccefd5 100644
--- a/packages/deck-track/src/index.ts
+++ b/packages/deck-track/src/index.ts
@@ -13,6 +13,7 @@ export {
export { renderDepthStack } from "./lower.js";
export {
depthStackCardLabelSchema,
+ depthStackCardLabelStyleSchema,
depthStackCardSetSchema,
depthStackCardSpecSchema,
depthStackDependency,
@@ -30,6 +31,7 @@ export {
appendDepthStackCard,
appendDepthStackMomentCard,
assertDepthStackCardLabel,
+ assertDepthStackCardLabelStyle,
assertDepthStackCardSet,
assertDepthStackCardSpec,
assertDepthStackHeader,
@@ -47,6 +49,8 @@ export {
resolveDepthStackPose,
resolveDepthStackState,
sealDepthStackCardLabel,
+ sealDepthStackCardLabelStyle,
+ bindDepthStackCardLabelText,
sealDepthStackCardSpec,
sealDepthStackHeader,
sealDepthStackSpec,
diff --git a/packages/deck-track/src/manifest.ts b/packages/deck-track/src/manifest.ts
index 441a495e..80056b53 100644
--- a/packages/deck-track/src/manifest.ts
+++ b/packages/deck-track/src/manifest.ts
@@ -21,6 +21,7 @@ import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narrata
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/spatial";
import { temporalDependency } from "@narratage/temporal";
+import { textDependency, textTypes } from "@narratage/text";
import { depthStackImplementationDigests, depthStackValidatorDigests } from "./program.js";
@@ -30,6 +31,7 @@ export const depthStackTypes = {
spec: { module: depthStackModuleRef, name: "DepthStackSpec" },
cardSpec: { module: depthStackModuleRef, name: "DepthStackCardSpec" },
cardLabel: { module: depthStackModuleRef, name: "DepthStackCardLabel" },
+ cardLabelStyle: { module: depthStackModuleRef, name: "DepthStackCardLabelStyle" },
cardSet: { module: depthStackModuleRef, name: "DepthStackCardSet" },
program: { module: depthStackModuleRef, name: "DepthStackProgram" },
} satisfies Record<string, TypeRef>;
@@ -41,6 +43,7 @@ export const depthStackProducers = {
finalizeUntilSelectionStart: { module: depthStackModuleRef, name: "finalize-depth-stack-until-selection-start" },
finalizeUntilSelectionEnd: { module: depthStackModuleRef, name: "finalize-depth-stack-until-selection-end" },
render: { module: depthStackModuleRef, name: "render-depth-stack" },
+ bindLabelText: { module: depthStackModuleRef, name: "bind-depth-stack-label-text" },
} satisfies Record<string, ProducerRef>;
const string = { kind: "string", minLength: 1 } as const;
@@ -85,6 +88,11 @@ export const depthStackCardLabelSchema: ValueSchema = { kind: "oneOf", variants:
paints: { schema: { kind: "array", items: visualTextPaintSchema } }, flow: { schema: visualTextFlowSchema },
}),
] };
+export const depthStackCardLabelStyleSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.depth-stack-card-label-style@1" } },
+ typography: { schema: visualTextTypographySchema }, paints: { schema: { kind: "array", items: visualTextPaintSchema } },
+ flow: { schema: visualTextFlowSchema },
+});
const frameSpan = object({ startFrame: { schema: unsignedInteger }, endFrameExclusive: { schema: positiveInteger } });
const card = object({
id: { schema: string }, activationFrame: { schema: unsignedInteger }, material: { schema: mediaLayerSetSchema },
@@ -116,20 +124,22 @@ const finalizeInputs = [
export const depthStackManifest: ModuleManifest = {
format: "svml.module@1", name: depthStackModuleRef.name, version: depthStackModuleRef.version,
- dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, mediaTrackDependency, compositionDependency],
+ dependencies: [narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, mediaDependency, mediaTrackDependency, compositionDependency, textDependency],
types: [
{ name: depthStackTypes.header.name, schema: depthStackHeaderSchema },
{ name: depthStackTypes.spec.name, schema: depthStackSpecSchema },
{ name: depthStackTypes.cardSpec.name, schema: depthStackCardSpecSchema },
{ name: depthStackTypes.cardLabel.name, schema: depthStackCardLabelSchema },
+ { name: depthStackTypes.cardLabelStyle.name, schema: depthStackCardLabelStyleSchema },
{ name: depthStackTypes.cardSet.name, schema: depthStackCardSetSchema },
{ name: depthStackTypes.program.name, schema: depthStackProgramSchema, validator: validator("@narratage/deck-track/validate-program", depthStackValidatorDigests.program) },
], capabilities: [],
surfaces: [
- { name: "label", tag: "Label", mode: "structured", outputs: [depthStackTypes.cardLabel], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/deck-track/label-surface", digest: depthStackSurfaceImplementationDigests.label } },
+ { name: "label", tag: "Label", mode: "structured", outputs: [textTypes.text, depthStackTypes.cardLabelStyle, depthStackTypes.cardLabel], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/deck-track/label-surface", digest: depthStackSurfaceImplementationDigests.label } },
{ name: "track", tag: "DepthStack", mode: "structured", outputs: [depthStackTypes.header, depthStackTypes.spec, depthStackTypes.cardSpec, depthStackTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/deck-track/depth-stack-surface", digest: depthStackSurfaceImplementationDigests.track } },
],
producers: [
+ { name: depthStackProducers.bindLabelText.name, inputs: [{ name: "style", type: depthStackTypes.cardLabelStyle }, { name: "content", type: textTypes.text }], outputs: [{ name: "label", type: depthStackTypes.cardLabel }], needs: [], implementation: registered("@narratage/deck-track/bind-label-text", depthStackImplementationDigests.bindLabelText) },
{ name: depthStackProducers.createCards.name, inputs: [], outputs: [{ name: "set", type: depthStackTypes.cardSet }], needs: [], implementation: registered("@narratage/deck-track/create-cards", depthStackImplementationDigests.createCards) },
{ name: depthStackProducers.appendMomentCard.name, inputs: [
{ name: "set", type: depthStackTypes.cardSet }, { name: "material", type: mediaTrackTypes.layerSet },
diff --git a/packages/deck-track/src/program.ts b/packages/deck-track/src/program.ts
index 89d222e9..fed8077a 100644
--- a/packages/deck-track/src/program.ts
+++ b/packages/deck-track/src/program.ts
@@ -14,6 +14,8 @@ import {
} from "@narratage/program-space";
import type { ProgramSpace } from "@narratage/program-space";
import { canonicalize, digestOf } from "@narratage/protocol";
+import { verifyText } from "@narratage/text";
+import type { Text } from "@narratage/text";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { assertSpatialFrame } from "@narratage/spatial";
import type { SpatialFrame } from "@narratage/spatial";
@@ -25,6 +27,7 @@ import {
import type {
DeckCardTone,
DepthStackCardLabel,
+ DepthStackCardLabelStyle,
DepthStackCardSet,
DepthStackCardSpec,
DepthStackHeader,
@@ -36,6 +39,7 @@ import type {
} from "./types.js";
export const depthStackImplementationDigests = {
+ bindLabelText: digestOf("@narratage/deck-track/bind-label-text@1"),
createCards: digestOf("@narratage/deck-track/create-cards@1"),
appendMomentCard: digestOf("@narratage/deck-track/append-moment-card@1"),
finalizeProgramEnd: digestOf("@narratage/deck-track/finalize-program-end@1"),
@@ -140,6 +144,33 @@ export function sealDepthStackCardLabel(value: DepthStackCardLabel): DepthStackC
return canonicalize(value) as unknown as DepthStackCardLabel;
}
+export function assertDepthStackCardLabelStyle(value: DepthStackCardLabelStyle): void {
+ assert(value.contract === "svml.depth-stack-card-label-style@1", "Unsupported DepthStackCardLabelStyle contract.");
+ assert(value.typography.fonts.length > 0, "DepthStackCardLabelStyle requires exact fonts.");
+ value.typography.fonts.forEach((font, index) => assertFontArtifactRef(font, `DepthStackCardLabelStyle.fonts.${index}`));
+ assert(value.typography.synthesis === "none", "DepthStackCardLabelStyle cannot synthesize an exact font.");
+ assert(value.flow.form.kind === "area", "DepthStackCardLabelStyle uses Area flow inside its Card.");
+}
+
+export function sealDepthStackCardLabelStyle(value: DepthStackCardLabelStyle): DepthStackCardLabelStyle {
+ assertDepthStackCardLabelStyle(value);
+ return canonicalize(value) as unknown as DepthStackCardLabelStyle;
+}
+
+export function bindDepthStackCardLabelText(style: DepthStackCardLabelStyle, content: Text): DepthStackCardLabel {
+ assertDepthStackCardLabelStyle(style);
+ verifyText(content);
+ assert(content.value.trim().length > 0, "DepthStack Card label Text is empty.");
+ return sealDepthStackCardLabel({
+ contract: "svml.depth-stack-card-label@1",
+ kind: "text",
+ document: { paragraphs: [{ id: "label:paragraph", inlines: [{ kind: "text", id: "label:text", text: content.value }] }] },
+ typography: structuredClone(style.typography),
+ paints: structuredClone(style.paints),
+ flow: structuredClone(style.flow),
+ });
+}
+
export const noDepthStackCardLabel = (): DepthStackCardLabel => ({
contract: "svml.depth-stack-card-label@1",
kind: "none",
diff --git a/packages/deck-track/src/surface.ts b/packages/deck-track/src/surface.ts
index 9b105a5e..bd6143ea 100644
--- a/packages/deck-track/src/surface.ts
+++ b/packages/deck-track/src/surface.ts
@@ -9,13 +9,16 @@ import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
+import { sealText, textTypes } from "@narratage/text";
+import { sealGraphFragment } from "@narratage/elaborator";
+import type { AuthorValueRef } from "@narratage/elaborator";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import {
decodeDepthStackCardSpec,
@@ -29,13 +32,13 @@ import type {
DepthStackFragmentCard,
DepthStackFragmentTerminal,
} from "./fragment.js";
-import { depthStackTypes } from "./manifest.js";
+import { depthStackProducers, depthStackTypes } from "./manifest.js";
import {
noDepthStackCardLabel,
- sealDepthStackCardLabel,
+ sealDepthStackCardLabelStyle,
sealDepthStackHeader,
} from "./program.js";
-import type { DepthStackCardLabel } from "./types.js";
+import type { DepthStackCardLabelStyle } from "./types.js";
function sameType(left: TypeRef, right: TypeRef): boolean {
return left.module.name === right.module.name && left.module.version === right.module.version && left.name === right.name;
@@ -76,7 +79,7 @@ function numeric(element: StructuredElement, name: string, fallback: number): nu
}
function reference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: TypeRef,
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -88,7 +91,7 @@ function reference(
}
function oneOfReference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: readonly TypeRef[],
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -105,7 +108,7 @@ function inline<T>(value: SurfaceResolvedReference, label: string): T {
}
function recipe(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
resolve: (path: string) => SurfaceResolvedReference | undefined,
): SvsRecipe {
@@ -119,8 +122,22 @@ function labelText(element: StructuredElement): string {
return value;
}
+function labelFragment(id: string) {
+ const input = (name: string) => ({ kind: "fragment-input" as const, name });
+ const operation = { kind: "fragment-operation" as const, operation: "bind" };
+ return sealGraphFragment({
+ name: `@narratage/deck-track/label-surface/${id}@1`,
+ inputs: [{ name: "style", type: depthStackTypes.cardLabelStyle }, { name: "content", type: textTypes.text }],
+ operations: [{
+ id: "bind", producer: depthStackProducers.bindLabelText,
+ inputs: { style: input("style"), content: input("content") }, result: { kind: "output", name: "label" },
+ }],
+ exports: [{ name: "label", type: depthStackTypes.cardLabel, root: operation, semanticInputs: ["style", "content"], fidelity: "exact" }],
+ });
+}
+
export const decodeDepthStackLabelSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
- allowed(element, ["id", "font", "size", "color", "align", "block", "padding"]);
+ allowed(element, ["id", "content", "font", "size", "color", "align", "block", "padding"]);
const id = text(element, "id");
const stack = inline<FontStackRef>(reference(element.attributes.font, `${element.name}.font`, mediaTypes.fontStack, resolveReference), `${element.name}.font`);
const primary = stack.faces[0];
@@ -130,10 +147,8 @@ export const decodeDepthStackLabelSurface: StructuredSurfaceHandler = ({ element
if (!["start", "center", "end", "justify"].includes(align)) throw new Error(`${element.name}.align is invalid.`);
if (!["start", "center", "end"].includes(block)) throw new Error(`${element.name}.block is invalid.`);
const padding = numeric(element, "padding", 20);
- const value: DepthStackCardLabel = sealDepthStackCardLabel({
- contract: "svml.depth-stack-card-label@1",
- kind: "text",
- document: { paragraphs: [{ id: `${id}:paragraph`, inlines: [{ kind: "text", id: `${id}:text`, text: labelText(element) }] }] },
+ const style: DepthStackCardLabelStyle = sealDepthStackCardLabelStyle({
+ contract: "svml.depth-stack-card-label-style@1",
typography: {
fonts: structuredClone(stack.faces), sizePx: numeric(element, "size", 34), weight: primary.weight, style: primary.style,
axes: [], features: [], synthesis: "none", kerning: "normal", trackingPx: 0, wordSpacingPx: 0,
@@ -150,9 +165,22 @@ export const decodeDepthStackLabelSurface: StructuredSurfaceHandler = ({ element
wrap: "word", overflow: "clip", clipToFrame: true, columns: 1, columnGapPx: 0, metricEdge: "line-box",
},
});
+ const styleId = `${id}.__style`;
+ const records: SurfaceRecordDraft[] = [{ id: styleId, type: depthStackTypes.cardLabelStyle, value: { kind: "inline", value: style }, range: element.range }];
+ let contentRef: AuthorValueRef;
+ if (element.attributes.content === undefined) {
+ const contentId = `${id}.__content`;
+ records.push({ id: contentId, type: textTypes.text, value: { kind: "inline", value: sealText(labelText(element)) }, range: element.range });
+ contentRef = { kind: "record", id: contentId };
+ } else {
+ empty(element);
+ contentRef = reference(element.attributes.content, `${element.name}.content`, textTypes.text, resolveReference).ref;
+ }
+ const fragment = labelFragment(id);
return {
- records: [{ id, type: depthStackTypes.cardLabel, value: { kind: "inline", value }, range: element.range }],
- components: [], fragments: [],
+ records,
+ components: [{ id, fragment: fragment.id, inputs: { style: { kind: "record", id: styleId }, content: contentRef }, outputs: { label: id }, range: element.range }],
+ fragments: [fragment],
};
};
diff --git a/packages/deck-track/src/types.ts b/packages/deck-track/src/types.ts
index 2b54080d..ed054719 100644
--- a/packages/deck-track/src/types.ts
+++ b/packages/deck-track/src/types.ts
@@ -82,6 +82,13 @@ export type DepthStackCardLabel =
readonly flow: VisualTextFlow;
};
+export type DepthStackCardLabelStyle = {
+ readonly contract: "svml.depth-stack-card-label-style@1";
+ readonly typography: VisualTextTypography;
+ readonly paints: readonly VisualTextPaintLayer[];
+ readonly flow: VisualTextFlow;
+};
+
export type DepthStackCardSpec = {
readonly contract: "svml.depth-stack-card-spec@1";
readonly id: string;
diff --git a/packages/deck-track/test/deck-track.test.ts b/packages/deck-track/test/deck-track.test.ts
index 9ded0ca7..423cdabf 100644
--- a/packages/deck-track/test/deck-track.test.ts
+++ b/packages/deck-track/test/deck-track.test.ts
@@ -12,6 +12,8 @@ import {
createDepthStackCardSet,
decodeDepthStackSpec,
depthStackManifest,
+ depthStackProducers,
+ depthStackTypes,
finalizeDepthStack,
noDepthStackCardLabel,
renderDepthStack,
@@ -37,13 +39,14 @@ import type { ModuleManifest } from "@narratage/protocol";
import { semanticMapTypes } from "@narratage/semantic-map";
import { sealCanvasSpace, sealSpatialFrame, spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
+import { sealText, textManifest, textTypes } from "@narratage/text";
import type { SvsRecipe } from "@narratage/svs";
import type {
StructuredElement,
StructuredNode,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { artifactTypes } from "@narratage/artifact";
import { mediaTrackManifest } from "@narratage/media-track";
@@ -365,8 +368,8 @@ test("rendering is a pure absolute-frame result", () => {
test("the author Surface keeps every source, trigger, terminal, Frame and optional label as graph inputs", async () => {
const range = { source: "deck.svml", start: 0, end: 1 };
- const ref = (path: string): TextAttributeValue => ({ kind: "reference", path });
- const node = (name: string, attributes: Record<string, TextAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({ kind: "element", name, attributes, children, range });
+ const ref = (path: string): MarkupAttributeValue => ({ kind: "reference", path });
+ const node = (name: string, attributes: Record<string, MarkupAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({ kind: "element", name, attributes, children, range });
const plain = (path: string, type: SurfaceResolvedReference["type"]): SurfaceResolvedReference => ({ path, ref: { kind: "record", id: path }, type });
const appearance = (path: string, properties: SvsRecipe["properties"]): SurfaceResolvedReference => ({
path, ref: { kind: "record", id: path }, type: svsRecipeType,
@@ -420,11 +423,34 @@ test("Label Surface compiles explicit exact-font text rather than media metadata
} : undefined,
resolveAsset: async () => { throw new Error("no asset resolution expected"); },
});
- const value = result.records[0]?.value;
- assert.equal(value?.kind, "inline");
- const label = value?.kind === "inline" ? value.value as unknown as DepthStackCardLabel : undefined;
- assert.equal(label?.kind, "text");
- if (label?.kind === "text") assert.equal(label.document.paragraphs[0]?.inlines[0]?.kind, "text");
+ assert.equal(result.components.length, 1);
+ assert.equal(result.components[0]?.outputs.label, "proof-label");
+ assert.equal(result.fragments[0]?.operations[0]?.producer.name, depthStackProducers.bindLabelText.name);
+ assert.ok(result.records.some((record) => record.type.name === depthStackTypes.cardLabelStyle.name));
+ assert.ok(result.records.some((record) => record.type.module.name === "@narratage/text" && record.type.name === "Text"));
+});
+
+test("Label Surface accepts ordinary graph Text without copying it during author compilation", async () => {
+ const range = { source: "deck.svml", start: 0, end: 1 };
+ const stack = { contract: "svml.font-stack@1" as const, faces: [font] };
+ const result = await decodeDepthStackLabelSurface({
+ sourceName: "deck.svml",
+ element: {
+ kind: "element", name: "deck:Label", attributes: {
+ id: "dynamic-label", font: { kind: "reference", path: "font" }, content: { kind: "reference", path: "copy" },
+ }, children: [], range,
+ },
+ resolveReference: (path) => path === "font" ? {
+ path, ref: { kind: "record", id: path }, type: mediaTypes.fontStack,
+ record: { value: { kind: "inline", value: stack } } as never,
+ } : path === "copy" ? {
+ path, ref: { kind: "record", id: path }, type: textTypes.text,
+ record: { value: { kind: "inline", value: sealText("Dynamic evidence") } } as never,
+ } : undefined,
+ resolveAsset: async () => { throw new Error("no asset resolution expected"); },
+ });
+ assert.deepEqual(result.components[0]?.inputs.content, { kind: "record", id: "copy" });
+ assert.equal(result.records.some((record) => record.type.name === textTypes.text.name), false);
});
test("another Deck family can coexist by contributing only the existing VisualTrack waist", () => {
@@ -448,6 +474,7 @@ test("another Deck family can coexist by contributing only the existing VisualTr
const closure = createResolvedClosure([
...videoContractManifests,
mediaTrackManifest,
+ textManifest,
depthStackManifest,
other,
]);
diff --git a/packages/elaborator/README.md b/packages/elaborator/README.md
index b1f94668..e3896f4a 100644
--- a/packages/elaborator/README.md
+++ b/packages/elaborator/README.md
@@ -14,11 +14,11 @@ phases:
Because all exports are collected before any input is resolved, declaration order has no meaning
and a component may reference a later component. The linker itself does not parse `.svml`, execute
package code or know any domain vocabulary. The non-video laboratory test demonstrates that the
-same layer works without `@narratage/text` or audiovisual contracts.
+same layer works without `@narratage/markup` or audiovisual contracts.
-The official Text adapter now emits this exact Author Module format. Its separate non-video
+The official Markup adapter emits this exact Author Module format. Its separate non-video
integration fixture proves the complete `source → Surface → AuthorModule → Graph → BuildPlan` path;
-Text still does not become a prerequisite for direct API or visual-editor callers.
+Markup still does not become a prerequisite for direct API or visual-editor callers.
The package also provides the domain-neutral recursive Source Closure reference implementation.
The Host supplies an entry SourceUnit, exact Frontend registry, immutable module closure and a
diff --git a/packages/estimate/README.md b/packages/estimate/README.md
index a34b2db9..facf1d39 100644
--- a/packages/estimate/README.md
+++ b/packages/estimate/README.md
@@ -2,8 +2,8 @@
Provider-free deterministic speech-duration planning.
-`<estimate:Speech>` consumes the public `NarrativeSpeechExcerpt` contract and produces the public
-`SpeechDuration` contract. It uses a language-aware syllable/character/mora rate, then applies an
+`<estimate:Speech>` consumes an ordinary `Text` value and produces the public `SpeechDuration`
+contract. It uses a language-aware syllable/character/mora rate, then applies an
explicit tail padding, bounds and rounding policy. It performs no network or media work.
```xml
diff --git a/packages/estimate/package.json b/packages/estimate/package.json
index d9097aec..661675ad 100644
--- a/packages/estimate/package.json
+++ b/packages/estimate/package.json
@@ -12,10 +12,10 @@
"dependencies": {
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/speech": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/estimate/src/activation.ts b/packages/estimate/src/activation.ts
index 27ee3630..0d3005b1 100644
--- a/packages/estimate/src/activation.ts
+++ b/packages/estimate/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeSpeechEstimateSurface,
@@ -13,7 +13,7 @@ export const svmlPackage = {
name: "@narratage/estimate",
modules: [{ manifest: estimateManifest, specifiers: ["@narratage/estimate", "@narratage/estimate@1"] }],
components: [estimateComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: estimateModuleRef,
surface: "speech",
mode: "structured",
diff --git a/packages/estimate/src/component.ts b/packages/estimate/src/component.ts
index c5d1454d..9da6ce7d 100644
--- a/packages/estimate/src/component.ts
+++ b/packages/estimate/src/component.ts
@@ -1,7 +1,7 @@
import type { ComponentPackage } from "@narratage/component-kit";
-import type { NarrativeSpeechExcerpt } from "@narratage/narrative";
import type { StoredValue } from "@narratage/protocol";
import { canonicalize } from "@narratage/protocol";
+import type { Text } from "@narratage/text";
import { estimateProducers } from "./manifest.js";
import { estimateSpeechDuration, estimateSpeechImplementationDigest } from "./program.js";
@@ -22,7 +22,7 @@ export const estimateComponent = {
duration: {
kind: "inline",
value: canonicalize(estimateSpeechDuration(
- inline<NarrativeSpeechExcerpt>(inputs.speech?.value, "NarrativeSpeechExcerpt"),
+ inline<Text>(inputs.speech?.value, "Speech Text"),
inline<SpeechEstimatePolicy>(inputs.policy?.value, "SpeechEstimatePolicy"),
)),
},
diff --git a/packages/estimate/src/fragment.ts b/packages/estimate/src/fragment.ts
index 85935147..713ee354 100644
--- a/packages/estimate/src/fragment.ts
+++ b/packages/estimate/src/fragment.ts
@@ -1,6 +1,6 @@
-import { narrativeTypes } from "@narratage/narrative";
import { speechTypes } from "@narratage/speech";
import { sealGraphFragment } from "@narratage/elaborator";
+import { textTypes } from "@narratage/text";
import { estimateProducers, estimateTypes } from "./manifest.js";
@@ -10,7 +10,7 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
export const speechEstimateFragment = sealGraphFragment({
name: "@narratage/estimate/speech@1",
inputs: [
- { name: "speech", type: narrativeTypes.speechExcerpt },
+ { name: "speech", type: textTypes.text },
{ name: "policy", type: estimateTypes.speechPolicy },
],
operations: [{
diff --git a/packages/estimate/src/manifest.ts b/packages/estimate/src/manifest.ts
index 92f2b723..2e57ab73 100644
--- a/packages/estimate/src/manifest.ts
+++ b/packages/estimate/src/manifest.ts
@@ -1,5 +1,5 @@
-import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
import { speechDependency, speechTypes } from "@narratage/speech";
+import { textDependency, textTypes } from "@narratage/text";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
import { svsManifest, svsRecipeType } from "@narratage/svs";
@@ -34,8 +34,8 @@ export const estimateManifest: ModuleManifest = {
name: estimateModuleRef.name,
version: estimateModuleRef.version,
dependencies: [
- narrativeDependency,
speechDependency,
+ textDependency,
{ module: svsRecipeType.module, digest: digestOf(svsManifest) },
],
types: [{ name: estimateTypes.speechPolicy.name, schema: speechEstimatePolicySchema }],
@@ -54,7 +54,7 @@ export const estimateManifest: ModuleManifest = {
producers: [{
name: estimateProducers.speech.name,
inputs: [
- { name: "speech", type: narrativeTypes.speechExcerpt },
+ { name: "speech", type: textTypes.text },
{ name: "policy", type: estimateTypes.speechPolicy },
],
outputs: [{ name: "duration", type: speechTypes.duration }],
diff --git a/packages/estimate/src/program.ts b/packages/estimate/src/program.ts
index 07fed9ba..39bee859 100644
--- a/packages/estimate/src/program.ts
+++ b/packages/estimate/src/program.ts
@@ -1,4 +1,4 @@
-import type { NarrativeSpeechExcerpt } from "@narratage/narrative";
+import type { Text } from "@narratage/text";
import { assertSpeechDurationIdentity, sealSpeechDuration } from "@narratage/speech";
import type { SpeechDuration } from "@narratage/speech";
import { digestOf } from "@narratage/protocol";
@@ -125,17 +125,12 @@ export function assertSpeechEstimatePolicy(value: SpeechEstimatePolicy): void {
}
}
-function assertSpeechExcerpt(value: NarrativeSpeechExcerpt): void {
+function assertSpeechText(value: Text): void {
if (
- value.contract !== "svml.narrative-speech-excerpt@1"
- || value.kind !== "segment"
- || value.id.length === 0
- || !Number.isSafeInteger(value.tokenStart)
- || !Number.isSafeInteger(value.tokenEndExclusive)
- || value.tokenEndExclusive <= value.tokenStart
- || value.speech.trim().length === 0
+ value.contract !== "svml.text@1"
+ || value.value.trim().length === 0
) {
- throw new Error("NarrativeSpeechExcerpt is invalid");
+ throw new Error("Speech Text is invalid");
}
}
@@ -146,14 +141,14 @@ function rounded(value: number, mode: SpeechEstimatePolicy["rounding"]): number
}
export function estimateSpeechDuration(
- excerpt: NarrativeSpeechExcerpt,
+ text: Text,
policy: SpeechEstimatePolicy,
): SpeechDuration {
- assertSpeechExcerpt(excerpt);
+ assertSpeechText(text);
assertSpeechEstimatePolicy(policy);
- const language = policy.language === "auto" ? detectSpeechEstimateLanguage(excerpt.speech) : policy.language;
- const units = countSpeechEstimateUnits(excerpt.speech, language);
- if (units < 1) throw new Error("NarrativeSpeechExcerpt contains no countable speech units");
+ const language = policy.language === "auto" ? detectSpeechEstimateLanguage(text.value) : policy.language;
+ const units = countSpeechEstimateUnits(text.value, language);
+ if (units < 1) throw new Error("Speech Text contains no countable speech units");
const raw = units / (BASE_RATE[language] * PACE_MULTIPLIER[policy.pace]) + policy.paddingSec;
const firstClamp = Math.min(policy.maximumSec, Math.max(policy.minimumSec, raw));
const durationSec = Math.min(policy.maximumSec, Math.max(policy.minimumSec, rounded(firstClamp, policy.rounding)));
diff --git a/packages/estimate/src/surface.ts b/packages/estimate/src/surface.ts
index 9a934431..8ae64ed5 100644
--- a/packages/estimate/src/surface.ts
+++ b/packages/estimate/src/surface.ts
@@ -1,14 +1,13 @@
-import { narrativeTypes } from "@narratage/narrative";
-import type { NarrativeSpeechExcerpt } from "@narratage/narrative";
import type { CanonicalValue } from "@narratage/protocol";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
+import { textTypes } from "@narratage/text";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { speechEstimateFragment } from "./fragment.js";
import { estimateTypes } from "./manifest.js";
@@ -43,7 +42,7 @@ function attributes(element: StructuredElement): void {
}
function wholeReference(element: StructuredElement, name: string): string {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference" || raw.path.length === 0) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
@@ -121,13 +120,13 @@ function reference(
element: StructuredElement,
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes.source;
+ const raw: MarkupAttributeValue | undefined = element.attributes.source;
if (typeof raw !== "object" || raw.kind !== "reference") {
throw new Error(`${element.name}.source must be a whole-value reference`);
}
const result = resolveReference(raw.path);
- if (result === undefined || !sameType(result.type, narrativeTypes.speechExcerpt)) {
- throw new Error(`${element.name}.source must reference a NarrativeSpeechExcerpt`);
+ if (result === undefined || !sameType(result.type, textTypes.text)) {
+ throw new Error(`${element.name}.source must reference Text`);
}
return result;
}
diff --git a/packages/estimate/test/estimate.test.ts b/packages/estimate/test/estimate.test.ts
index 5b1fe7b3..dd907fad 100644
--- a/packages/estimate/test/estimate.test.ts
+++ b/packages/estimate/test/estimate.test.ts
@@ -1,6 +1,6 @@
-import type { NarrativeSpeechExcerpt } from "@narratage/narrative";
import assert from "node:assert/strict";
import test from "node:test";
+import { sealText } from "@narratage/text";
import {
countSpeechEstimateUnits,
@@ -9,17 +9,6 @@ import {
speechEstimatePolicyFromRecipe,
} from "@narratage/estimate";
-function excerpt(id: string, speech: string): NarrativeSpeechExcerpt {
- return {
- contract: "svml.narrative-speech-excerpt@1" as const,
- kind: "segment" as const,
- id,
- tokenStart: 0,
- tokenEndExclusive: speech.trim().split(/\s+/u).length,
- speech,
- };
-}
-
const normal = sealSpeechEstimatePolicy({
contract: "svml.speech-estimate-policy@1",
language: "en",
@@ -31,19 +20,18 @@ const normal = sealSpeechEstimatePolicy({
});
test("normal English speech estimate follows the syllable-rate policy", () => {
- const source = excerpt(
- "opening",
+ const source = sealText(
"Video editing begins with meaning, not a pile of clips on a timeline.",
);
- assert.equal(countSpeechEstimateUnits(source.speech, "en"), 21);
+ assert.equal(countSpeechEstimateUnits(source.value, "en"), 21);
const result = estimateSpeechDuration(source, normal);
assert.equal(result.durationSec, 5);
});
test("the minimum applies before rounding and the maximum applies after rounding", () => {
- assert.equal(estimateSpeechDuration(excerpt("short", "Hello."), normal).durationSec, 4);
+ assert.equal(estimateSpeechDuration(sealText("Hello."), normal).durationSec, 4);
const bounded = sealSpeechEstimatePolicy({ ...normal, maximumSec: 4.5 });
- assert.equal(estimateSpeechDuration(excerpt("long", "This sentence intentionally contains far more spoken syllables than the selected model duration allows."), bounded).durationSec, 4.5);
+ assert.equal(estimateSpeechDuration(sealText("This sentence intentionally contains far more spoken syllables than the selected model duration allows."), bounded).durationSec, 4.5);
});
test("an SVS Recipe configures one reusable estimate policy without becoming executable", () => {
diff --git a/packages/film/package.json b/packages/film/package.json
index d6b3f8c9..b2a04613 100644
--- a/packages/film/package.json
+++ b/packages/film/package.json
@@ -17,14 +17,14 @@
"@narratage/protocol": "workspace:*",
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/component-kit": "workspace:*",
"@narratage/core": "workspace:*",
"@narratage/driver-node": "workspace:*",
"@narratage/hyperframes": "workspace:*",
- "@narratage/text-track": "workspace:*",
+ "@narratage/typography-track": "workspace:*",
"@narratage/validation": "workspace:*"
}
}
diff --git a/packages/film/src/activation.ts b/packages/film/src/activation.ts
index 10b7cd8c..88c6ae0f 100644
--- a/packages/film/src/activation.ts
+++ b/packages/film/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeFilmSurface, filmComponent, filmManifest, filmModuleRef, filmSurfaceImplementationDigest,
} from "./index.js";
@@ -8,7 +8,7 @@ export const svmlPackage = {
name: "@narratage/film",
modules: [{ manifest: filmManifest, specifiers: ["@narratage/film", "@narratage/film@1"] }],
components: [filmComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: filmModuleRef, surface: "film", mode: "structured",
implementationDigest: filmSurfaceImplementationDigest, handler: decodeFilmSurface,
})],
diff --git a/packages/film/src/surface.ts b/packages/film/src/surface.ts
index b81be1ae..359a98e4 100644
--- a/packages/film/src/surface.ts
+++ b/packages/film/src/surface.ts
@@ -10,8 +10,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { createFilmAssemblyFragment } from "./fragment.js";
import { filmTypes } from "./manifest.js";
@@ -38,7 +38,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referenceAttribute(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
diff --git a/packages/film/test/film.test.ts b/packages/film/test/film.test.ts
index f635c649..5c7ba76b 100644
--- a/packages/film/test/film.test.ts
+++ b/packages/film/test/film.test.ts
@@ -49,17 +49,18 @@ import {
} from "@narratage/hyperframes";
import type { CanonicalValue, CompiledGraph, StoredValue, TypedRecord } from "@narratage/protocol";
import { svsManifest } from "@narratage/svs";
+import { textManifest } from "@narratage/text";
import {
- renderTextTrack,
- renderTextTrackImplementationDigest,
- sealTextTrackProgram,
+ renderTypographyTrack,
+ renderTypographyTrackImplementationDigest,
+ sealTypographyTrackProgram,
stillTextMotion,
- textTrackFragment,
- textTrackManifest,
- textTrackProducers,
- textTrackTypes,
-} from "@narratage/text-track";
-import type { TextStyle } from "@narratage/text-track";
+ typographyTrackFragment,
+ typographyTrackManifest,
+ typographyTrackProducers,
+ typographyTrackTypes,
+} from "@narratage/typography-track";
+import type { TextStyle } from "@narratage/typography-track";
import { admitRecord, TypeValidatorRegistry } from "@narratage/validation";
const space = sealProgramSpace({
@@ -118,8 +119,8 @@ const titleStyle: TextStyle = {
point: { anchorInline: "center", anchorBlock: "center" },
path: { side: "left", orientation: "follow", startMarginPx: 0, endMarginPx: 0, align: "start", reverse: false, overflow: "visible" },
};
-const textProgram = sealTextTrackProgram({
- contract: "svml.text-track-program@1",
+const textProgram = sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1",
id: "title-track",
items: [{
id: "title",
@@ -163,8 +164,9 @@ const closure = createResolvedClosure([
...videoContractManifests,
svsManifest,
hyperframesManifest,
+ textManifest,
filmManifest,
- textTrackManifest,
+ typographyTrackManifest,
]);
const origin = {
kind: "authored" as const,
@@ -175,15 +177,15 @@ const records = await Promise.all([
sealRecord({ id: "space", type: programSpaceTypes.programSpace, value: stored(space), conformance: "exact", origin }),
sealRecord({ id: "canvas", type: spatialTypes.canvas, value: stored(canvas), conformance: "exact", origin }),
sealRecord({ id: "film-program", type: filmTypes.program, value: stored(filmProgram), conformance: "exact", origin }),
- sealRecord({ id: "text-program", type: textTrackTypes.program, value: stored(textProgram), conformance: "exact", origin }),
+ sealRecord({ id: "text-program", type: typographyTrackTypes.program, value: stored(textProgram), conformance: "exact", origin }),
sealRecord({ id: "background", type: compositionTypes.visualTrack, value: stored(background), conformance: "exact", origin }),
sealRecord({ id: "audio", type: compositionTypes.audioTrack, value: stored(audio), conformance: "exact", origin }),
].map(async (record) => await admitRecord(closure, record, validatorRegistry())));
const linked = link(closure, [sealTypedModule({ id: "author:film-test", closureDigest: closure.digest, records })]);
-const textInstance = elaborateGraphFragment(linked, textTrackFragment, {
+const textInstance = elaborateGraphFragment(linked, typographyTrackFragment, {
id: "title",
- fragment: textTrackFragment.id,
+ fragment: typographyTrackFragment.id,
inputs: {
space: { kind: "record", id: "space" },
program: { kind: "record", id: "text-program" },
@@ -250,7 +252,7 @@ function producerModules(target: string): string[] {
}
test("Film stops at Composition and Hyperframes remains an ordinary downstream Fragment", () => {
- assert.deepEqual(producerNames("title.track"), [textTrackProducers.render.name]);
+ assert.deepEqual(producerNames("title.track"), [typographyTrackProducers.render.name]);
assert.equal(producerModules("main.composition").includes(hyperframesProducers.compile.module.name), false);
assert.deepEqual(producerNames("main.composition").filter((name) => name.startsWith("append-")).sort(), [
filmProducers.appendAudioTrack.name,
@@ -265,8 +267,8 @@ test("Film stops at Composition and Hyperframes remains an ordinary downstream F
test("the Driver folds peer Tracks, then independently compiles the Composition", async () => {
const registry = new ProducerRegistry();
- registry.registerProducer(textTrackProducers.render, renderTextTrackImplementationDigest, ({ inputs }) => ({
- outputs: { track: stored(renderTextTrack(inline(inputs.space) as typeof space, inline(inputs.program) as typeof textProgram)) },
+ registry.registerProducer(typographyTrackProducers.render, renderTypographyTrackImplementationDigest, ({ inputs }) => ({
+ outputs: { track: stored(renderTypographyTrack(inline(inputs.space) as typeof space, inline(inputs.program) as typeof textProgram)) },
needs: {},
}));
registry.registerProducer(filmProducers.createTrackSet, createFilmTrackSetImplementationDigest, () => ({
diff --git a/packages/film/test/surface.test.ts b/packages/film/test/surface.test.ts
index 6cacf75f..4e6b392a 100644
--- a/packages/film/test/surface.test.ts
+++ b/packages/film/test/surface.test.ts
@@ -30,9 +30,9 @@ import {
spatialSurfaceDigests,
} from "@narratage/spatial";
import {
- TextSurfaceRegistry,
- createTextAuthorFrontend,
-} from "@narratage/text";
+ MarkupSurfaceRegistry,
+ createMarkupAuthorFrontend,
+} from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
const fixtureModule = { name: "example.film-fixture", version: "1" } as const;
@@ -86,7 +86,7 @@ const closure = createResolvedClosure([
]);
function source(id: string, text: string): AuthorSourceUnit {
- const frontend = id.endsWith(".svs") ? "@narratage/svs@1" : "@narratage/text@1";
+ const frontend = id.endsWith(".svs") ? "@narratage/svs@1" : "@narratage/markup@1";
return {
id,
name: id.split("/").at(-1) ?? id,
@@ -108,7 +108,7 @@ const validStyles = `<sheet version="1">
</sheet>`;
async function compileFilm(options: { readonly reverse?: boolean; readonly styles?: string } = {}) {
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
records: [
{ id: "space", type: programSpaceTypes.programSpace, value: { kind: "inline", value: space }, range: element.range },
@@ -131,7 +131,7 @@ async function compileFilm(options: { readonly reverse?: boolean; readonly style
decodeCanvasSurface,
);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request) {
if (request.from.startsWith("@narratage/film")) return filmModuleRef;
diff --git a/packages/fonts-open/package.json b/packages/fonts-open/package.json
index f616b893..85323864 100644
--- a/packages/fonts-open/package.json
+++ b/packages/fonts-open/package.json
@@ -121,6 +121,6 @@
"@infolektuell/noto-color-emoji": "0.2.0",
"@narratage/media": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/fonts-open/src/activation.ts b/packages/fonts-open/src/activation.ts
index 1d2a436a..d808d07e 100644
--- a/packages/fonts-open/src/activation.ts
+++ b/packages/fonts-open/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeOpenFontFaceSurface,
@@ -17,14 +17,14 @@ export const svmlPackage = {
specifiers: ["@narratage/fonts-open", "@narratage/fonts-open@1"],
}],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: fontsOpenModuleRef,
surface: "face",
mode: "structured",
implementationDigest: fontsOpenFaceSurfaceImplementationDigest,
handler: decodeOpenFontFaceSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: fontsOpenModuleRef,
surface: "stack",
mode: "structured",
diff --git a/packages/fonts-open/src/surface.ts b/packages/fonts-open/src/surface.ts
index 5a54f3d1..810a37c1 100644
--- a/packages/fonts-open/src/surface.ts
+++ b/packages/fonts-open/src/surface.ts
@@ -8,7 +8,7 @@ import {
mediaTypes,
} from "@narratage/media";
import type { FontArtifactRef, FontStackRef } from "@narratage/media";
-import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/text";
+import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/markup";
import {
openFontFamilies,
diff --git a/packages/fonts-open/test/fonts-open.test.ts b/packages/fonts-open/test/fonts-open.test.ts
index b77f2fbd..7d58eaea 100644
--- a/packages/fonts-open/test/fonts-open.test.ts
+++ b/packages/fonts-open/test/fonts-open.test.ts
@@ -12,7 +12,7 @@ import {
openFontFamilyNames,
} from "@narratage/fonts-open";
import type { FontArtifactRef, FontStackRef } from "@narratage/media";
-import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/text";
+import type { StructuredElement, StructuredSurfaceHandler } from "@narratage/markup";
const require = createRequire(import.meta.url);
const range = { start: 0, end: 80 };
diff --git a/packages/generation/package.json b/packages/generation/package.json
index b941f6b0..d1a992e4 100644
--- a/packages/generation/package.json
+++ b/packages/generation/package.json
@@ -12,7 +12,8 @@
"dependencies": {
"@narratage/artifact": "workspace:*",
"@narratage/component-kit": "workspace:*",
- "@narratage/protocol": "workspace:*"
+ "@narratage/protocol": "workspace:*",
+ "@narratage/text": "workspace:*"
},
"devDependencies": {
"@narratage/driver-node": "workspace:*",
diff --git a/packages/generation/src/index.ts b/packages/generation/src/index.ts
index ddd884f2..e1e723d3 100644
--- a/packages/generation/src/index.ts
+++ b/packages/generation/src/index.ts
@@ -55,6 +55,7 @@ export type {
} from "./ports.js";
export {
bindGenerationMedia,
+ bindGenerationText,
finalizeGenerationRequestDraft,
GENERATION_MEDIA_BINDING_V1,
GENERATION_REQUEST_DRAFT_V1,
diff --git a/packages/generation/src/request.ts b/packages/generation/src/request.ts
index 1d1ee216..1402b1c1 100644
--- a/packages/generation/src/request.ts
+++ b/packages/generation/src/request.ts
@@ -1,5 +1,7 @@
import { canonicalize } from "@narratage/protocol";
import type { BlobRef, ObjectFieldSchema, ValueSchema } from "@narratage/protocol";
+import { verifyText } from "@narratage/text";
+import type { Text } from "@narratage/text";
import { assertGenerationBlobRef, sealGenerationRequest } from "./identity.js";
import { generationBlobRefSchema, generationObjectSchema } from "./schema.js";
@@ -164,11 +166,13 @@ export function requestSchemaFromPorts(table: GenerationPortTable): ValueSchema
/** Structural schema for the model-owned request draft used by graph assembly. */
export function requestDraftSchemaFromPorts(table: GenerationPortTable): ValueSchema {
- const media = table.ports.filter(isMediaPort).map((port) => port.name);
+ const deferred = table.ports
+ .filter((port) => isMediaPort(port) || port.value.kind === "text")
+ .map((port) => port.name);
return generationObjectSchema({
contract: { schema: { kind: "literal", value: GENERATION_REQUEST_DRAFT_V1 } },
model: { schema: { kind: "literal", value: table.model } },
- ports: { schema: portsObjectSchema(table, { defer: media }) },
+ ports: { schema: portsObjectSchema(table, { defer: deferred }) },
});
}
@@ -310,8 +314,10 @@ export function verifyPortsAgainstTable(
}
}
-function mediaPorts(table: GenerationPortTable): readonly GenerationMediaPort[] {
- return table.ports.filter(isMediaPort);
+function deferredPorts(table: GenerationPortTable): readonly string[] {
+ return table.ports
+ .filter((port) => isMediaPort(port) || port.value.kind === "text")
+ .map((port) => port.name);
}
export function verifyRequestDraftAgainstPorts(
@@ -321,7 +327,7 @@ export function verifyRequestDraftAgainstPorts(
const draft = plainObject(value, `${table.model} request draft`);
assert(draft.contract === GENERATION_REQUEST_DRAFT_V1, `${table.model} request draft contract is invalid`);
assert(draft.model === table.model, `${table.model} request draft model is invalid`);
- verifyPortsAgainstTable(table, draft.ports, { defer: mediaPorts(table).map((port) => port.name) });
+ verifyPortsAgainstTable(table, draft.ports, { defer: deferredPorts(table) });
}
export function sealGenerationRequestDraft(
@@ -384,6 +390,24 @@ export function bindGenerationMedia(
});
}
+/** Attach one graph Text edge to an exact text port without hiding it in metadata. */
+export function bindGenerationText(
+ table: GenerationPortTable,
+ draft: GenerationRequestDraft,
+ portName: string,
+ text: Text,
+): GenerationRequestDraft {
+ verifyRequestDraftAgainstPorts(table, draft);
+ verifyText(text);
+ const port = table.ports.find((candidate) =>
+ candidate.name === portName && candidate.value.kind === "text");
+ assert(port !== undefined, `${table.model} has no text port ${portName}`);
+ return sealGenerationRequestDraft(table, {
+ ...draft.ports,
+ [portName]: [...(draft.ports[portName] ?? []), text.value],
+ });
+}
+
export function finalizeGenerationRequestDraft(
table: GenerationPortTable,
draft: GenerationRequestDraft,
diff --git a/packages/gpt-image/package.json b/packages/gpt-image/package.json
index e6d20ffe..1b78ec0a 100644
--- a/packages/gpt-image/package.json
+++ b/packages/gpt-image/package.json
@@ -15,6 +15,7 @@
"@narratage/generation": "workspace:*",
"@narratage/image-transform": "workspace:*",
"@narratage/model-kit": "workspace:*",
- "@narratage/protocol": "workspace:*"
+ "@narratage/protocol": "workspace:*",
+ "@narratage/text": "workspace:*"
}
}
diff --git a/packages/gpt-image/src/fragment.ts b/packages/gpt-image/src/fragment.ts
index 755f979d..8578b87e 100644
--- a/packages/gpt-image/src/fragment.ts
+++ b/packages/gpt-image/src/fragment.ts
@@ -2,9 +2,10 @@ import { artifactTypes } from "@narratage/artifact";
import { sealGraphFragment } from "@narratage/elaborator";
import { generationProducers } from "@narratage/generation";
import { imageTransformProducers, imageTransformTypes } from "@narratage/image-transform";
-import { exactModelMediaInputNames } from "@narratage/model-kit";
-import type { ExactModelMediaInput } from "@narratage/model-kit";
+import { exactModelMediaInputNames, exactModelTextInputName } from "@narratage/model-kit";
+import type { ExactModelMediaInput, ExactModelTextInput } from "@narratage/model-kit";
import type { FragmentOperation } from "@narratage/elaborator";
+import { textTypes } from "@narratage/text";
import { gptImageEndpoints } from "./index.js";
@@ -18,16 +19,31 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
*/
export function createGptImageCleanFragment(
mediaInputs: readonly ExactModelMediaInput[] = [],
+ textInputs: readonly ExactModelTextInput[] = [],
) {
const endpoint = gptImageEndpoints.image!;
- const names = mediaInputs.map((item) => item.name);
- if (new Set(names).size !== names.length) throw new Error("GPT Image media input names must be unique");
+ const names = [...mediaInputs, ...textInputs].map((item) => item.name);
+ if (new Set(names).size !== names.length) throw new Error("GPT Image input names must be unique");
const inputs = [
{ name: "draft", type: endpoint.draftType },
{ name: "cleanup", type: imageTransformTypes.program },
];
const operations: FragmentOperation[] = [];
let draft = input("draft") as ReturnType<typeof input> | ReturnType<typeof operation>;
+ for (const [index, item] of textInputs.entries()) {
+ const binding = endpoint.textBindings[item.port];
+ if (binding === undefined) throw new Error(`gpt-image-2 has no text port ${item.port}`);
+ const name = exactModelTextInputName(item.name);
+ inputs.push({ name, type: textTypes.text });
+ const id = `bind-text:${String(index + 1).padStart(4, "0")}:${item.port}`;
+ operations.push({
+ id,
+ producer: binding.producer,
+ inputs: { draft, text: input(name) },
+ result: { kind: "output", name: "draft" },
+ });
+ draft = operation(id);
+ }
for (const [index, item] of mediaInputs.entries()) {
const binding = endpoint.mediaBindings[item.port];
if (binding === undefined) throw new Error(`gpt-image-2 has no media port ${item.port}`);
@@ -69,7 +85,10 @@ export function createGptImageCleanFragment(
result: { kind: "need", name: "image", accepts: "exact" },
},
);
- const shape = mediaInputs.map((item) => `${item.name}=${item.port}`).join(",") || "no-media";
+ const shape = [
+ ...textInputs.map((item) => `${item.name}=${item.port}:text`),
+ ...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
+ ].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
name: `@narratage/gpt-image/clean[${shape}]@1`,
inputs,
diff --git a/packages/gpt-image/test/broll-graph.test.ts b/packages/gpt-image/test/broll-graph.test.ts
index b40bc12e..dc2552c7 100644
--- a/packages/gpt-image/test/broll-graph.test.ts
+++ b/packages/gpt-image/test/broll-graph.test.ts
@@ -47,6 +47,7 @@ import {
} from "@narratage/seedance";
import { speechManifest } from "@narratage/speech";
import { spatialManifest } from "@narratage/spatial";
+import { textManifest } from "@narratage/text";
const origin = {
kind: "authored" as const,
@@ -64,6 +65,7 @@ const image = (name: string) => ({
function fixture() {
const manifests: ModuleManifest[] = [
artifactManifest,
+ textManifest,
generationManifest,
rasterManifest,
imageTransformManifest,
diff --git a/packages/hyperframes/test/browser-visual.test.ts b/packages/hyperframes/test/browser-visual.test.ts
index 176d371f..70058bd7 100644
--- a/packages/hyperframes/test/browser-visual.test.ts
+++ b/packages/hyperframes/test/browser-visual.test.ts
@@ -37,14 +37,14 @@ import { sealCanvasSpace } from "@narratage/spatial";
import type { SvsRecipe } from "@narratage/svs";
import {
renderTextMaskTrack,
- renderTextTrack,
+ renderTypographyTrack,
sealTextMaskSpec,
sealTextMotion,
sealTextStyle,
- sealTextTrackProgram,
+ sealTypographyTrackProgram,
stillTextMotion,
-} from "@narratage/text-track";
-import type { TextStyle } from "@narratage/text-track";
+} from "@narratage/typography-track";
+import type { TextStyle } from "@narratage/typography-track";
const enabled = process.env.SVML_BROWSER_TESTS === "1";
const localFont = process.env.SVML_TEST_FONT_PATH
@@ -834,8 +834,8 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
contract: "svml.text-motion@1", id: "path-motion", sequences: [],
pathMargin: { keyframes: [{ atFrame: 0, startMarginPx: 20 }, { atFrame: frames, startMarginPx: 150, easing: "ease-in-out" }] },
});
- const textProgram = sealTextTrackProgram({
- contract: "svml.text-track-program@1", id: "complete-text",
+ const textProgram = sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1", id: "complete-text",
items: [
{
id: "point", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "point",
@@ -882,7 +882,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
},
],
});
- const textTrack = renderTextTrack(space, textProgram);
+ const typographyTrack = renderTypographyTrack(space, textProgram);
const maskMaterialBytes = rgbaPng(380, 120, [255, 0, 180, 255]);
const maskMaterialDigest = digest(maskMaterialBytes);
const maskMaterial: CompositableSurfaceRef = {
@@ -898,8 +898,8 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
paints: [{ kind: "fill", paint: { kind: "solid", color: "#ffffff" } }],
area: { ...plain.area, wrap: "none" },
});
- const maskTrack = renderTextMaskTrack(space, sealTextTrackProgram({
- contract: "svml.text-track-program@1", id: "mask-shape",
+ const maskTrack = renderTextMaskTrack(space, sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1", id: "mask-shape",
items: [{
id: "mask", sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: frames }, tieBreak: "mask",
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", xPx: 520, yPx: 500, widthPx: 380, heightPx: 120 } },
@@ -911,7 +911,7 @@ test("complete Text flow, Path, local mask and motion stay exact under parallel
}));
const document = compileHyperframesDocument(sealComposition({
contract: "svml.composition@1", id: "complete-text-browser",
- canvas: { width, height, clearColor: "#000000" }, tracks: [textTrack, maskTrack],
+ canvas: { width, height, clearColor: "#000000" }, tracks: [typographyTrack, maskTrack],
}), space);
assert.match(document.html, /data-svml-text-shrink-scale/u);
assert.match(document.html, /data-svml-text-path-upright/u);
@@ -1057,8 +1057,8 @@ test("Text box targets, rich runs and every sequence direction remain stable acr
{ id: "forward-line", unit: "line", order: "forward", target: "word", continuity: "joined", color: "#0f766e" },
{ id: "reverse-line", unit: "line", order: "reverse", target: "grapheme", continuity: "isolated", color: "#a16207" },
] as const;
- const track = renderTextTrack(space, sealTextTrackProgram({
- contract: "svml.text-track-program@1", id: "text-box-sequence",
+ const track = renderTypographyTrack(space, sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1", id: "text-box-sequence",
items: cases.map((entry, index) => {
const lineUnit = entry.unit === "line";
const document = index === 1
@@ -1225,8 +1225,8 @@ test("vertical Text paints in its authored direction and bounded shrink fails cl
const compile = (id: string, text: string, frame: { xPx: number; yPx: number; widthPx: number; heightPx: number }, textStyle: TextStyle) => compileHyperframesDocument(sealComposition({
contract: "svml.composition@1", id,
canvas: { width, height, clearColor: "#000000" },
- tracks: [renderTextTrack(space, sealTextTrackProgram({
- contract: "svml.text-track-program@1", id,
+ tracks: [renderTypographyTrack(space, sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1", id,
items: [{
id, sourceOccurrenceId: "program", span: { startFrame: 0, endFrameExclusive: 1 }, tieBreak: id,
geometry: { kind: "area", frame: { contract: "svml.spatial-frame@1", ...frame } },
diff --git a/packages/image-compose/package.json b/packages/image-compose/package.json
index f6b89573..fb5e3bbc 100644
--- a/packages/image-compose/package.json
+++ b/packages/image-compose/package.json
@@ -12,6 +12,6 @@
"@narratage/protocol": "workspace:*",
"@narratage/raster": "workspace:*",
"@narratage/spatial": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/image-compose/src/activation.ts b/packages/image-compose/src/activation.ts
index e19f2211..28dd41e6 100644
--- a/packages/image-compose/src/activation.ts
+++ b/packages/image-compose/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeImageComposeSurface,
@@ -13,7 +13,7 @@ export const svmlPackage = {
name: "@narratage/image-compose",
modules: [{ manifest: imageComposeManifest, specifiers: ["@narratage/image-compose", "@narratage/image-compose@1"] }],
components: [imageComposeComponent],
- hostFacets: [{ ...createTextSurfaceHostFacet({
+ hostFacets: [{ ...createMarkupSurfaceHostFacet({
module: imageComposeModuleRef, surface: "image", mode: "structured",
implementationDigest: imageComposeImplementationDigests.surface, handler: decodeImageComposeSurface,
}) }],
diff --git a/packages/image-compose/src/surface.ts b/packages/image-compose/src/surface.ts
index f4cd3e2b..8d535420 100644
--- a/packages/image-compose/src/surface.ts
+++ b/packages/image-compose/src/surface.ts
@@ -1,7 +1,7 @@
import { artifactTypes } from "@narratage/artifact";
import type { CanonicalValue } from "@narratage/protocol";
import { spatialTypes } from "@narratage/spatial";
-import type { StructuredElement, StructuredSurfaceHandler, SurfaceResolvedReference, TextAttributeValue } from "@narratage/text";
+import type { StructuredElement, StructuredSurfaceHandler, SurfaceResolvedReference, MarkupAttributeValue } from "@narratage/markup";
import { createImageComposeFragment } from "./fragment.js";
import { imageComposeTypes } from "./manifest.js";
@@ -29,7 +29,7 @@ function number(element: StructuredElement, name: string, fallback: number): num
return value;
}
function reference(element: StructuredElement, name: string, expected: SurfaceResolvedReference["type"], resolve: (path: string) => SurfaceResolvedReference | undefined): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference") throw new Error(`${element.name}.${name} must be a reference.`);
const result = resolve(raw.path);
if (result === undefined || !sameType(result.type, expected)) throw new Error(`${element.name}.${name} has the wrong Type.`);
diff --git a/packages/image-transform/README.md b/packages/image-transform/README.md
index d5b111e3..7c718d48 100644
--- a/packages/image-transform/README.md
+++ b/packages/image-transform/README.md
@@ -14,7 +14,7 @@ the Need/Receipt records the selected execution endpoint.
chroma 10, 7/21 windows and 1.02 saturation recovery, followed by PNG encoding. It is now an
explicit reusable Program rather than hidden behavior inside GPT Image generation.
-The official Text Surface separates declaration from use:
+The official Markup Surface separates declaration from use:
```xml
<image:Program id="clean-gpt-image">
diff --git a/packages/image-transform/package.json b/packages/image-transform/package.json
index ea9cc972..c158fa10 100644
--- a/packages/image-transform/package.json
+++ b/packages/image-transform/package.json
@@ -15,6 +15,6 @@
"@narratage/elaborator": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/raster": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/image-transform/src/activation.ts b/packages/image-transform/src/activation.ts
index a25b6858..4256cf13 100644
--- a/packages/image-transform/src/activation.ts
+++ b/packages/image-transform/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeImageTransformProgramSurface,
@@ -18,7 +18,7 @@ export const svmlPackage = {
}],
components: [imageTransformComponent],
hostFacets: [{
- ...createTextSurfaceHostFacet({
+ ...createMarkupSurfaceHostFacet({
module: imageTransformModuleRef,
surface: "program",
mode: "structured",
@@ -26,7 +26,7 @@ export const svmlPackage = {
handler: decodeImageTransformProgramSurface,
}),
}, {
- ...createTextSurfaceHostFacet({
+ ...createMarkupSurfaceHostFacet({
module: imageTransformModuleRef,
surface: "transform",
mode: "structured",
diff --git a/packages/image-transform/src/surface.ts b/packages/image-transform/src/surface.ts
index 6c9d1321..d386f057 100644
--- a/packages/image-transform/src/surface.ts
+++ b/packages/image-transform/src/surface.ts
@@ -3,8 +3,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import type { CanonicalValue } from "@narratage/protocol";
import { imageTransformFragment } from "./fragment.js";
@@ -24,7 +24,7 @@ function exact(element: StructuredElement, allowed: readonly string[], required:
}
function text(element: StructuredElement, name: string, fallback?: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (value === undefined && fallback !== undefined) return fallback;
if (typeof value !== "string" || value.trim().length === 0) {
throw new Error(`${element.name}.${name} must be a non-empty string`);
diff --git a/packages/local/README.md b/packages/local/README.md
index cd925b37..fec832dc 100644
--- a/packages/local/README.md
+++ b/packages/local/README.md
@@ -15,7 +15,7 @@ The convenience assembly uses:
- separately selected external Endpoint packages.
Package loading is syntax-neutral. The local Runtime activates only locked deterministic Producer
-and Validator facets; it neither depends on `@narratage/text` nor installs any package Host facet.
+and Validator facets; it neither depends on `@narratage/markup` nor installs any package Host facet.
Normal CLI projects may express the same assembly as closed data:
diff --git a/packages/markup/README.md b/packages/markup/README.md
new file mode 100644
index 00000000..58fb8cc2
--- /dev/null
+++ b/packages/markup/README.md
@@ -0,0 +1,53 @@
+# `@narratage/markup`
+
+Official XML-like Author Frontend normally used by `.svml` source units. The suffix has no parser
+authority; a mandatory `<?svml using="@narratage/markup@1"?>` Header selects this Frontend. It owns only the `<svml>` envelope,
+the leading Import Prologue, namespace binding, generic structured elements and dispatch to
+statically declared module Surfaces.
+
+The package has no built-in Script, media or video vocabulary. `<script>` is accepted only when an
+imported module declares that tag and the Host explicitly registers the locked Surface
+implementation. The current registry is for trusted official/in-process use; it is not a security
+sandbox for third-party parser code.
+
+```svml
+<?svml using="@narratage/markup@1"?>
+<svml>
+ <import from="@narratage/script@1"/>
+ <import as="studio" source="./studio.svs"/>
+
+ <script id="story">
+ <opening><ALICE>Hello.</opening>
+ </script>
+</svml>
+```
+
+Decoding has two passes. `discoverMarkup` reads only the root and complete leading Import Prologue.
+After Driver supplies one immutable resolved closure, `decodeMarkup` freezes the visible Surface
+scope and parses the body. A raw Surface receives the source cursor immediately after its opening
+tag and must return the cursor after its own close; a structured Surface receives Markup's generic
+element tree.
+
+A Surface may contribute three kinds of inert data:
+
+- authored typed Record drafts;
+- parser-independent Author Component drafts;
+- content-addressed Graph Fragments used by those components.
+
+Raw and Structured Surface handlers are asynchronous and receive one narrow `resolveAsset()`
+capability. This is the only way a Surface can turn an author-written asset locator into a
+content-addressed `BlobRef`; Markup never exposes filesystem APIs or a resolved local path. The
+Compiler Host, not the Surface, owns containment, read-once behavior and byte transfer. A handler
+that does not request assets remains unchanged apart from being awaitable.
+
+Markup validates source ranges, duplicate identities, Manifest-declared Record types and complete
+Fragment references. It strips diagnostic ranges before sealing one `svml.author-module@1`, so
+source reflow does not change author semantics. It never expands a Fragment or resolves a component
+input while reading the body. After every declaration has been collected, `@narratage/elaborator`
+resolves forward references and emits the Core Graph.
+
+Direct `decodeMarkup()` calls require every source import to be supplied as an already resolved
+namespace. The reference `compileSourceClosure()` orchestration in `@narratage/elaborator` recursively
+discovers those SourceUnits. Each dependency's own Source Header selects its exact Frontend; Markup
+never chooses a dependency parser. The compiler decodes dependencies first and then calls Markup
+with their locked public exports. Markup itself never reads a file or guesses a Frontend.
diff --git a/packages/prompt-kit/package.json b/packages/markup/package.json
similarity index 51%
rename from packages/prompt-kit/package.json
rename to packages/markup/package.json
index 158b6665..dbd65044 100644
--- a/packages/prompt-kit/package.json
+++ b/packages/markup/package.json
@@ -1,19 +1,19 @@
{
- "name": "@narratage/prompt-kit",
+ "name": "@narratage/markup",
"version": "0.0.0-dev",
"private": true,
"type": "module",
"exports": {
".": "./src/index.ts"
},
- "svml": {
- "activation": "./src/activation.ts"
- },
"dependencies": {
- "@narratage/component-kit": "workspace:*",
"@narratage/core": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/protocol": "workspace:*",
- "@narratage/svs": "workspace:*"
+ "@narratage/host": "workspace:*",
+ "@narratage/protocol": "workspace:*"
+ },
+ "devDependencies": {
+ "@narratage/narrative": "workspace:*",
+ "@narratage/script": "workspace:*"
}
}
diff --git a/packages/text/src/error.ts b/packages/markup/src/error.ts
similarity index 80%
rename from packages/text/src/error.ts
rename to packages/markup/src/error.ts
index 2110131a..87cc638f 100644
--- a/packages/text/src/error.ts
+++ b/packages/markup/src/error.ts
@@ -1,11 +1,11 @@
-export class TextFrontendError extends Error {
+export class MarkupFrontendError extends Error {
readonly code: string;
readonly sourceName: string;
readonly offset: number | undefined;
constructor(code: string, message: string, sourceName: string, offset?: number) {
super(`${code}: ${message}${offset === undefined ? "" : ` (${sourceName}:${offset})`}`);
- this.name = "TextFrontendError";
+ this.name = "MarkupFrontendError";
this.code = code;
this.sourceName = sourceName;
this.offset = offset;
diff --git a/packages/markup/src/frontend.ts b/packages/markup/src/frontend.ts
new file mode 100644
index 00000000..c39bce29
--- /dev/null
+++ b/packages/markup/src/frontend.ts
@@ -0,0 +1,468 @@
+import {
+ canonicalize,
+ canonicalStringify,
+ digestOf,
+ isDigest,
+ sealRecord,
+ sealTypedModule,
+ verifyClosure,
+ verifyRecordStructure,
+} from "@narratage/core";
+import type {
+ CanonicalValue,
+ ModuleRef,
+ ResolvedModule,
+ SurfaceDeclaration,
+ TypedRecord,
+} from "@narratage/protocol";
+import { sealAuthorModule } from "@narratage/elaborator";
+import type {
+ AuthorComponent,
+ AuthorSourceExport,
+ AuthorValueRef,
+ GraphFragment,
+ ResolvedAuthorSourceImport,
+} from "@narratage/elaborator";
+
+import { MarkupFrontendError } from "./error.js";
+import {
+ closeDocument,
+ discoverMarkup,
+ parseOpeningTag,
+ parseStructuredElement,
+ skipTextTrivia,
+} from "./syntax.js";
+import type {
+ RawSurfaceHandler,
+ SourceUnit,
+ StructuredSurfaceHandler,
+ SurfaceComponentDraft,
+ SurfaceDecodeOutput,
+ SurfaceRecordDraft,
+ SurfaceResolvedReference,
+ MarkupDecodeContext,
+ MarkupDecodeResult,
+ MarkupAuthorFrontend,
+ MarkupAuthorFrontendOptions,
+ MarkupImportRequest,
+} from "./types.js";
+
+export const markupFrontendRef = { module: "@narratage/markup", version: "1", name: "markup" } as const;
+export const markupFrontendImplementationDigest = digestOf("@narratage/markup/frontend@1");
+export const markupAuthorFrontendId = "@narratage/markup@1";
+
+type BoundSurface = {
+ readonly tag: string;
+ readonly module: ResolvedModule;
+ readonly declaration: SurfaceDeclaration;
+};
+
+function moduleKey(ref: ModuleRef): string {
+ return `${ref.name}@${ref.version}`;
+}
+
+function sameModule(left: ModuleRef, right: ModuleRef): boolean {
+ return left.name === right.name && left.version === right.version;
+}
+
+function fail(source: SourceUnit, code: string, message: string, offset?: number): never {
+ throw new MarkupFrontendError(code, message, source.name, offset);
+}
+
+function moduleForImport(
+ source: SourceUnit,
+ request: MarkupImportRequest,
+ context: MarkupDecodeContext,
+): ResolvedModule {
+ const ref = context.resolveModule(request);
+ const module = context.closure.modules.find((item) => sameModule(item.ref, ref));
+ if (!module) {
+ fail(source, "MARKUP_IMPORT_CLOSURE", `${moduleKey(ref)} is not present in the resolved closure.`, request.range.start);
+ }
+ return module;
+}
+
+function surfaceScope(
+ source: SourceUnit,
+ imports: readonly MarkupImportRequest[],
+ context: MarkupDecodeContext,
+): Map<string, BoundSurface> {
+ const scope = new Map<string, BoundSurface>();
+ const aliases = new Set<string>();
+ for (const request of imports) {
+ if (request.alias !== undefined) {
+ if (aliases.has(request.alias)) fail(source, "MARKUP_ALIAS_DUPLICATE", `Duplicate import alias "${request.alias}".`, request.range.start);
+ aliases.add(request.alias);
+ }
+ if (request.kind === "source") continue;
+ const module = moduleForImport(source, request, context);
+ for (const declaration of module.manifest.surfaces) {
+ const tag = request.alias === undefined ? declaration.tag : `${request.alias}:${declaration.tag}`;
+ if (scope.has(tag)) fail(source, "MARKUP_SURFACE_COLLISION", `Surface tag <${tag}> is imported more than once.`, request.range.start);
+ scope.set(tag, { tag, module, declaration });
+ }
+ }
+ return scope;
+}
+
+export async function decodeMarkup(source: SourceUnit, context: MarkupDecodeContext): Promise<MarkupDecodeResult> {
+ verifyClosure(context.closure);
+ const discovery = discoverMarkup(source);
+ const sourceImports = context.sourceImports ?? [];
+ const importedBindings = new Map<string, AuthorSourceExport>();
+ const importedReferences = new Map<string, SurfaceResolvedReference>();
+ for (const request of discovery.imports.filter((item) => item.kind === "source")) {
+ const resolved = sourceImports.find((item) =>
+ item.request.from === request.from
+ && item.request.alias === request.alias);
+ if (resolved === undefined) {
+ fail(
+ source,
+ "MARKUP_SOURCE_IMPORT_UNRESOLVED",
+ `Source import "${request.from}" must be decoded before this SourceUnit.`,
+ request.range.start,
+ );
+ }
+ for (const item of resolved.exports) {
+ const name = `${request.alias}.${item.name}`;
+ if (importedBindings.has(name)) {
+ fail(source, "MARKUP_SOURCE_EXPORT_COLLISION", `Imported binding ${name} is duplicated.`, request.range.start);
+ }
+ importedBindings.set(name, item);
+ const recordId = item.ref.kind === "record" ? item.ref.id : undefined;
+ const record = recordId === undefined
+ ? undefined
+ : resolved.records.find((candidate) => candidate.id === recordId);
+ importedReferences.set(name, {
+ path: name,
+ ref: item.ref,
+ type: item.type,
+ ...(record === undefined ? {} : { record }),
+ });
+ }
+ }
+ const scope = surfaceScope(source, discovery.imports, context);
+ const sourceDigest = source.sourceDigest ?? digestOf(source.text);
+ const frontendClosureDigest = digestOf({
+ frontend: markupFrontendImplementationDigest,
+ surfaces: [...scope.values()]
+ .sort((left, right) => left.tag.localeCompare(right.tag))
+ .map((surface) => ({
+ tag: surface.tag,
+ module: surface.module.ref,
+ moduleDigest: surface.module.digest,
+ name: surface.declaration.name,
+ implementationDigest: surface.declaration.implementation.digest,
+ })),
+ sourceImports: sourceImports
+ .map((item) => ({
+ from: item.request.from,
+ alias: item.request.alias,
+ frontend: item.frontend,
+ frontendDigest: item.frontendDigest,
+ source: item.source,
+ exports: item.exports,
+ }))
+ .sort((left, right) => left.alias.localeCompare(right.alias)),
+ });
+ const records: TypedRecord[] = [];
+ const components: AuthorComponent[] = [];
+ const componentRanges = new Map<string, SurfaceComponentDraft["range"]>();
+ const fragments = new Map<string, GraphFragment>();
+ const sourceMaps: CanonicalValue[] = [];
+ const recordIds = new Set<string>();
+ const componentIds = new Set<string>();
+ let cursor = discovery.bodyStart;
+ let closed = false;
+ while (cursor < source.text.length) {
+ cursor = skipTextTrivia(source, cursor);
+ if (source.text.startsWith("</", cursor)) {
+ cursor = closeDocument(source, cursor);
+ closed = true;
+ break;
+ }
+ if (source.text[cursor] !== "<") {
+ fail(source, "MARKUP_BODY_TEXT", "Natural-language text is not allowed directly under <svml>.", cursor);
+ }
+ const opening = parseOpeningTag(source, cursor);
+ if (opening.name === "import") {
+ fail(source, "MARKUP_IMPORT_AFTER_BODY", "All imports must appear in the leading Import Prologue.", cursor);
+ }
+ const bound = scope.get(opening.name);
+ if (!bound) fail(source, "MARKUP_UNKNOWN_SURFACE", `No imported module declares <${opening.name}>.`, cursor);
+ const registered = context.registry.resolve(bound.module.ref, bound.declaration.name);
+ if (!registered) {
+ fail(source, "MARKUP_SURFACE_UNREGISTERED", `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} is not registered.`, cursor);
+ }
+ if (
+ registered.mode !== bound.declaration.mode
+ || registered.implementationDigest !== bound.declaration.implementation.digest
+ ) {
+ fail(source, "MARKUP_SURFACE_MISMATCH", `Registered Surface ${bound.declaration.name} does not match the locked Manifest.`, cursor);
+ }
+ let output: SurfaceDecodeOutput;
+ if (bound.declaration.mode === "raw") {
+ if (opening.selfClosing) fail(source, "MARKUP_RAW_SELF_CLOSING", `Raw Surface <${opening.name}> cannot be self-closing.`, cursor);
+ const rawOutput = await (registered.handler as RawSurfaceHandler)({
+ sourceName: source.name,
+ source: source.text,
+ tag: opening.name,
+ openingStart: opening.start,
+ contentStart: opening.end,
+ attributes: opening.attributes,
+ resolveAsset(request) {
+ if (context.resolveAsset === undefined) {
+ fail(source, "MARKUP_ASSET_RESOLVER_MISSING", `Surface <${opening.name}> requested ${request.from}, but this Markup Host has no asset resolver.`, request.range?.start ?? opening.start);
+ }
+ return context.resolveAsset(request);
+ },
+ });
+ if (!Number.isInteger(rawOutput.nextOffset) || rawOutput.nextOffset <= opening.end || rawOutput.nextOffset > source.text.length) {
+ fail(source, "MARKUP_SURFACE_CURSOR", `Raw Surface <${opening.name}> returned an invalid cursor.`, cursor);
+ }
+ cursor = rawOutput.nextOffset;
+ output = rawOutput;
+ } else {
+ const parsed = parseStructuredElement(source, cursor);
+ output = await (registered.handler as StructuredSurfaceHandler)({
+ sourceName: source.name,
+ element: parsed.element,
+ resolveReference(path) {
+ const imported = importedReferences.get(path);
+ if (imported !== undefined) {
+ return imported.record === undefined
+ ? imported
+ : { ...imported, record: canonicalize(imported.record) as unknown as TypedRecord };
+ }
+ const record = records.find((candidate) => candidate.id === path);
+ if (record !== undefined) {
+ return {
+ path,
+ ref: { kind: "record", id: record.id },
+ type: record.type,
+ record: canonicalize(record) as unknown as TypedRecord,
+ };
+ }
+ for (const component of components) {
+ const output = Object.entries(component.outputs).find(([, publicName]) => publicName === path);
+ if (output === undefined) continue;
+ const fragment = fragments.get(component.fragment);
+ const declaration = fragment?.exports.find((candidate) => candidate.name === output[0]);
+ if (declaration === undefined) continue;
+ return {
+ path,
+ ref: { kind: "component-output", component: component.id, output: output[0] },
+ type: declaration.type,
+ };
+ }
+ return undefined;
+ },
+ resolveAsset(request) {
+ if (context.resolveAsset === undefined) {
+ fail(source, "MARKUP_ASSET_RESOLVER_MISSING", `Surface <${opening.name}> requested ${request.from}, but this Markup Host has no asset resolver.`, request.range?.start ?? opening.start);
+ }
+ return context.resolveAsset(request);
+ },
+ });
+ cursor = parsed.nextOffset;
+ }
+ for (const draft of output.records) {
+ if (
+ !Number.isInteger(draft.range.start)
+ || !Number.isInteger(draft.range.end)
+ || draft.range.start < opening.start
+ || draft.range.end < draft.range.start
+ || draft.range.end > cursor
+ ) {
+ fail(
+ source,
+ "MARKUP_SURFACE_RANGE",
+ `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid source range.`,
+ opening.start,
+ );
+ }
+ if (recordIds.has(draft.id)) fail(source, "MARKUP_RECORD_DUPLICATE", `Duplicate authored record "${draft.id}".`, draft.range.start);
+ if (!bound.declaration.outputs.some((output) => sameModule(output.module, draft.type.module) && output.name === draft.type.name)) {
+ fail(
+ source,
+ "MARKUP_SURFACE_OUTPUT",
+ `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} did not declare output type ${moduleKey(draft.type.module)}#${draft.type.name}.`,
+ draft.range.start,
+ );
+ }
+ recordIds.add(draft.id);
+ const record = sealRecord({
+ id: draft.id,
+ type: draft.type,
+ value: draft.value,
+ conformance: "exact",
+ origin: {
+ kind: "authored",
+ sourceDigest,
+ frontendClosureDigest,
+ sourceName: source.name,
+ range: draft.range,
+ },
+ });
+ verifyRecordStructure(context.closure, record);
+ records.push(record);
+ }
+ for (const draft of output.components) {
+ if (
+ !Number.isInteger(draft.range.start)
+ || !Number.isInteger(draft.range.end)
+ || draft.range.start < opening.start
+ || draft.range.end < draft.range.start
+ || draft.range.end > cursor
+ ) {
+ fail(
+ source,
+ "MARKUP_COMPONENT_RANGE",
+ `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid component source range.`,
+ opening.start,
+ );
+ }
+ if (draft.id.length === 0) {
+ fail(source, "MARKUP_COMPONENT_ID", "Surface returned a component with an empty id.", draft.range.start);
+ }
+ if (componentIds.has(draft.id)) {
+ fail(source, "MARKUP_COMPONENT_DUPLICATE", `Duplicate author component "${draft.id}".`, draft.range.start);
+ }
+ if (!isDigest(draft.fragment)) {
+ fail(source, "MARKUP_COMPONENT_FRAGMENT", `${draft.id} returned an invalid Fragment digest.`, draft.range.start);
+ }
+ componentIds.add(draft.id);
+ componentRanges.set(draft.id, draft.range);
+ components.push({
+ id: draft.id,
+ fragment: draft.fragment,
+ inputs: draft.inputs,
+ outputs: draft.outputs,
+ });
+ }
+ for (const fragment of output.fragments) {
+ if (fragment.format !== "svml.fragment@1" || !isDigest(fragment.id)) {
+ fail(
+ source,
+ "MARKUP_FRAGMENT_IDENTITY",
+ `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid Graph Fragment identity.`,
+ opening.start,
+ );
+ }
+ const existing = fragments.get(fragment.id);
+ if (existing !== undefined && canonicalStringify(existing) !== canonicalStringify(fragment)) {
+ fail(source, "MARKUP_FRAGMENT_CONFLICT", `Graph Fragment ${fragment.id} has conflicting definitions.`, opening.start);
+ }
+ fragments.set(fragment.id, fragment);
+ }
+ sourceMaps.push(...(output.sourceMaps ?? []));
+ }
+ if (!closed) {
+ fail(source, "MARKUP_ROOT_UNCLOSED", "Document is missing </svml>.", source.text.length);
+ }
+ for (const component of components) {
+ if (!fragments.has(component.fragment)) {
+ fail(
+ source,
+ "MARKUP_COMPONENT_FRAGMENT_MISSING",
+ `${component.id} references Fragment ${component.fragment} that no Surface contributed.`,
+ componentRanges.get(component.id)?.start,
+ );
+ }
+ }
+ const resolveImportedRef = (ref: AuthorValueRef): AuthorValueRef => {
+ const path = ref.kind === "record" ? ref.id : `${ref.component}.${ref.output}`;
+ return importedBindings.get(path)?.ref ?? ref;
+ };
+ const resolvedComponents = components.map((component) => ({
+ ...component,
+ inputs: Object.fromEntries(Object.entries(component.inputs).map(([name, ref]) => [
+ name,
+ resolveImportedRef(ref),
+ ])),
+ }));
+ const exports: AuthorSourceExport[] = records.map((record) => ({
+ name: record.id,
+ ref: { kind: "record", id: record.id },
+ type: record.type,
+ }));
+ const exportNames = new Set(exports.map((item) => item.name));
+ for (const component of resolvedComponents) {
+ const fragment = fragments.get(component.fragment) as GraphFragment;
+ for (const [output, name] of Object.entries(component.outputs)) {
+ if (exportNames.has(name)) fail(source, "MARKUP_EXPORT_DUPLICATE", `Duplicate public export ${name}.`);
+ const declaration = fragment.exports.find((item) => item.name === output);
+ if (declaration === undefined) {
+ fail(source, "MARKUP_COMPONENT_EXPORT", `${component.id} binds unknown Fragment export ${output}.`);
+ }
+ exportNames.add(name);
+ exports.push({
+ name,
+ ref: { kind: "component-output", component: component.id, output },
+ type: declaration.type,
+ });
+ }
+ }
+ return {
+ module: sealTypedModule({
+ id: `source:${source.name}`,
+ closureDigest: context.closure.digest,
+ records,
+ }),
+ author: sealAuthorModule({
+ name: `source:${source.name}`,
+ components: resolvedComponents,
+ }),
+ fragments: [...fragments.values()].sort((left, right) => left.id.localeCompare(right.id)),
+ exports: exports.sort((left, right) => left.name.localeCompare(right.name)),
+ imports: discovery.imports,
+ frontendClosureDigest,
+ sourceMaps,
+ };
+}
+
+export const markupFrontend = {
+ id: markupFrontendRef,
+ discover: discoverMarkup,
+ decode: decodeMarkup,
+} as const;
+
+/** Adapt the official Markup decoder to the domain-neutral recursive Source Closure ABI. */
+export function createMarkupAuthorFrontend(options: MarkupAuthorFrontendOptions): MarkupAuthorFrontend {
+ return {
+ id: markupAuthorFrontendId,
+ implementationDigest: markupFrontendImplementationDigest,
+ discover(source) {
+ const discovery = discoverMarkup(source);
+ return {
+ modules: discovery.imports.filter((item) => item.kind === "module").map((item) => item.from),
+ sources: discovery.imports
+ .filter((item): item is MarkupImportRequest & { alias: string; kind: "source" } =>
+ item.kind === "source" && item.alias !== undefined)
+ .map((item) => ({
+ from: item.from,
+ alias: item.alias,
+ range: item.range,
+ })),
+ };
+ },
+ async decode(source, context) {
+ const result = await decodeMarkup(
+ { name: source.name, text: source.text, sourceDigest: source.sourceDigest },
+ {
+ closure: context.closure,
+ registry: options.registry,
+ resolveModule: options.resolveModule,
+ sourceImports: context.imports,
+ resolveAsset: context.resolveAsset,
+ },
+ );
+ return {
+ module: result.module,
+ author: result.author,
+ fragments: result.fragments,
+ exports: result.exports,
+ };
+ },
+ };
+}
diff --git a/packages/text/src/host-facet.ts b/packages/markup/src/host-facet.ts
similarity index 57%
rename from packages/text/src/host-facet.ts
rename to packages/markup/src/host-facet.ts
index 3c59b74e..296be2ae 100644
--- a/packages/text/src/host-facet.ts
+++ b/packages/markup/src/host-facet.ts
@@ -5,12 +5,12 @@ import type { Digest, ModuleRef } from "@narratage/protocol";
import type {
RawSurfaceHandler,
StructuredSurfaceHandler,
- TextSurfaceRegistryLike,
+ MarkupSurfaceRegistryLike,
} from "./types.js";
-export const textSurfaceHostFacetAbi = "svml.text-surface-host@1";
+export const markupSurfaceHostFacetAbi = "svml.markup-surface-host@1";
-export type TextSurfaceHostFacetOptions =
+export type MarkupSurfaceHostFacetOptions =
| {
readonly module: ModuleRef;
readonly surface: string;
@@ -26,7 +26,7 @@ export type TextSurfaceHostFacetOptions =
readonly handler: StructuredSurfaceHandler;
};
-type MutableTextSurfaceRegistry = TextSurfaceRegistryLike & {
+type MutableMarkupSurfaceRegistry = MarkupSurfaceRegistryLike & {
registerRaw(
module: ModuleRef,
surface: string,
@@ -60,16 +60,16 @@ function nonEmptyString(value: unknown, subject: string): string {
return value;
}
-/** Package-owned Text Surface declaration carried through the syntax-neutral package loader. */
-export function createTextSurfaceHostFacet(options: TextSurfaceHostFacetOptions): HostFacet {
+/** Package-owned Markup Surface declaration carried through the syntax-neutral package loader. */
+export function createMarkupSurfaceHostFacet(options: MarkupSurfaceHostFacetOptions): HostFacet {
assert(options.module.name.trim().length > 0 && options.module.version.trim().length > 0,
- "Text Surface module identity is invalid");
- assert(options.surface.trim().length > 0, "Text Surface name is empty");
- assert(isDigest(options.implementationDigest), "Text Surface implementation digest is invalid");
+ "Markup Surface module identity is invalid");
+ assert(options.surface.trim().length > 0, "Markup Surface name is empty");
+ assert(isDigest(options.implementationDigest), "Markup Surface implementation digest is invalid");
return {
- abi: textSurfaceHostFacetAbi,
+ abi: markupSurfaceHostFacetAbi,
identity: {
- contract: "svml.text-surface-host-facet@1",
+ contract: "svml.markup-surface-host-facet@1",
module: options.module,
surface: options.surface,
mode: options.mode,
@@ -79,30 +79,30 @@ export function createTextSurfaceHostFacet(options: TextSurfaceHostFacetOptions)
};
}
-/** Install only facets owned by the Text Host ABI; unrelated Host facets remain inert. */
-export function installTextSurfaceHostFacets(
+/** Install only facets owned by the Markup Host ABI; unrelated Host facets remain inert. */
+export function installMarkupSurfaceHostFacets(
facets: readonly HostFacet[],
- registry: MutableTextSurfaceRegistry,
+ registry: MutableMarkupSurfaceRegistry,
): void {
for (const facet of facets) {
- if (facet.abi !== textSurfaceHostFacetAbi) continue;
- const identity = object(facet.identity, "Text Surface Host facet identity");
+ if (facet.abi !== markupSurfaceHostFacetAbi) continue;
+ const identity = object(facet.identity, "Markup Surface Host facet identity");
exact(identity, ["contract", "module", "surface", "mode", "implementationDigest"],
- "Text Surface Host facet identity");
- assert(identity.contract === "svml.text-surface-host-facet@1", "Text Surface Host facet contract is invalid");
- const module = object(identity.module, "Text Surface Host facet module");
- exact(module, ["name", "version"], "Text Surface Host facet module");
+ "Markup Surface Host facet identity");
+ assert(identity.contract === "svml.markup-surface-host-facet@1", "Markup Surface Host facet contract is invalid");
+ const module = object(identity.module, "Markup Surface Host facet module");
+ exact(module, ["name", "version"], "Markup Surface Host facet module");
const moduleRef = {
- name: nonEmptyString(module.name, "Text Surface Host facet module name"),
- version: nonEmptyString(module.version, "Text Surface Host facet module version"),
+ name: nonEmptyString(module.name, "Markup Surface Host facet module name"),
+ version: nonEmptyString(module.version, "Markup Surface Host facet module version"),
};
- const surface = nonEmptyString(identity.surface, "Text Surface Host facet surface");
+ const surface = nonEmptyString(identity.surface, "Markup Surface Host facet surface");
const implementationDigest = nonEmptyString(
identity.implementationDigest,
- "Text Surface Host facet implementation digest",
+ "Markup Surface Host facet implementation digest",
);
- assert(isDigest(implementationDigest), "Text Surface Host facet implementation digest is invalid");
- assert(typeof facet.implementation === "function", "Text Surface Host facet implementation must be a function");
+ assert(isDigest(implementationDigest), "Markup Surface Host facet implementation digest is invalid");
+ assert(typeof facet.implementation === "function", "Markup Surface Host facet implementation must be a function");
if (identity.mode === "raw") {
registry.registerRaw(
moduleRef,
@@ -111,7 +111,7 @@ export function installTextSurfaceHostFacets(
facet.implementation as RawSurfaceHandler,
);
} else {
- assert(identity.mode === "structured", "Text Surface Host facet mode is invalid");
+ assert(identity.mode === "structured", "Markup Surface Host facet mode is invalid");
registry.registerStructured(
moduleRef,
surface,
diff --git a/packages/markup/src/index.ts b/packages/markup/src/index.ts
new file mode 100644
index 00000000..5aaa9e5b
--- /dev/null
+++ b/packages/markup/src/index.ts
@@ -0,0 +1,24 @@
+export { MarkupFrontendError } from "./error.js";
+export {
+ decodeMarkup,
+ createMarkupAuthorFrontend,
+ markupAuthorFrontendId,
+ markupFrontend,
+ markupFrontendImplementationDigest,
+ markupFrontendRef,
+} from "./frontend.js";
+export { MarkupSurfaceRegistry } from "./registry.js";
+export {
+ createMarkupSurfaceHostFacet,
+ installMarkupSurfaceHostFacets,
+ markupSurfaceHostFacetAbi,
+} from "./host-facet.js";
+export type { MarkupSurfaceHostFacetOptions } from "./host-facet.js";
+export {
+ closeDocument,
+ discoverMarkup,
+ parseOpeningTag,
+ parseStructuredElement,
+ skipTextTrivia,
+} from "./syntax.js";
+export type * from "./types.js";
diff --git a/packages/text/src/registry.ts b/packages/markup/src/registry.ts
similarity index 92%
rename from packages/text/src/registry.ts
rename to packages/markup/src/registry.ts
index a9b2055f..022c39b4 100644
--- a/packages/text/src/registry.ts
+++ b/packages/markup/src/registry.ts
@@ -5,14 +5,14 @@ import type {
RawSurfaceHandler,
RegisteredSurface,
StructuredSurfaceHandler,
- TextSurfaceRegistryLike,
+ MarkupSurfaceRegistryLike,
} from "./types.js";
function key(module: ModuleRef, surface: string): string {
return `${module.name}@${module.version}#${surface}`;
}
-export class TextSurfaceRegistry implements TextSurfaceRegistryLike {
+export class MarkupSurfaceRegistry implements MarkupSurfaceRegistryLike {
readonly #values = new Map<string, RegisteredSurface>();
registerRaw(
diff --git a/packages/text/src/syntax.ts b/packages/markup/src/syntax.ts
similarity index 68%
rename from packages/text/src/syntax.ts
rename to packages/markup/src/syntax.ts
index a783676a..2a26671a 100644
--- a/packages/text/src/syntax.ts
+++ b/packages/markup/src/syntax.ts
@@ -1,13 +1,13 @@
import type { SourceRange } from "@narratage/protocol";
-import { TextFrontendError } from "./error.js";
+import { MarkupFrontendError } from "./error.js";
import type {
SourceUnit,
StructuredElement,
StructuredNode,
- TextAttributeValue,
- TextDiscovery,
- TextImportRequest,
+ MarkupAttributeValue,
+ MarkupDiscovery,
+ MarkupImportRequest,
} from "./types.js";
const NAME = /^[A-Za-z_][A-Za-z0-9_.:-]*/u;
@@ -16,14 +16,14 @@ const REFERENCE = /^[A-Za-z_][A-Za-z0-9_.:-]*(?:\.[A-Za-z_][A-Za-z0-9_.:-]*)*$/u
type OpeningTag = {
readonly name: string;
- readonly attributes: Readonly<Record<string, TextAttributeValue>>;
+ readonly attributes: Readonly<Record<string, MarkupAttributeValue>>;
readonly start: number;
readonly end: number;
readonly selfClosing: boolean;
};
function fail(source: SourceUnit, code: string, message: string, offset?: number): never {
- throw new TextFrontendError(code, message, source.name, offset);
+ throw new MarkupFrontendError(code, message, source.name, offset);
}
function decodeEntities(value: string, source: SourceUnit, offset: number): string {
@@ -34,7 +34,7 @@ function decodeEntities(value: string, source: SourceUnit, offset: number): stri
case "&amp;": return "&";
case "&quot;": return "\"";
case "&apos;": return "'";
- default: fail(source, "TEXT_ENTITY", `Unsupported entity ${entity}.`, offset);
+ default: fail(source, "MARKUP_ENTITY", `Unsupported entity ${entity}.`, offset);
}
});
}
@@ -51,7 +51,7 @@ function skipTrivia(source: SourceUnit, start: number): number {
const next = skipSpace(source.text, cursor);
if (source.text.startsWith("<!--", next)) {
const end = source.text.indexOf("-->", next + 4);
- if (end < 0) fail(source, "TEXT_COMMENT", "Unclosed comment.", next);
+ if (end < 0) fail(source, "MARKUP_COMMENT", "Unclosed comment.", next);
cursor = end + 3;
continue;
}
@@ -62,18 +62,18 @@ function skipTrivia(source: SourceUnit, start: number): number {
function parseName(source: SourceUnit, start: number): { readonly value: string; readonly end: number } {
const match = NAME.exec(source.text.slice(start));
- if (!match) fail(source, "TEXT_NAME", "Expected a name.", start);
+ if (!match) fail(source, "MARKUP_NAME", "Expected a name.", start);
return { value: match[0], end: start + match[0].length };
}
function parseAttributeValue(
source: SourceUnit,
start: number,
-): { readonly value: TextAttributeValue; readonly end: number } {
+): { readonly value: MarkupAttributeValue; readonly end: number } {
const quote = source.text[start];
if (quote === "\"" || quote === "'") {
const close = source.text.indexOf(quote, start + 1);
- if (close < 0) fail(source, "TEXT_ATTRIBUTE", "Unclosed quoted attribute.", start);
+ if (close < 0) fail(source, "MARKUP_ATTRIBUTE", "Unclosed quoted attribute.", start);
return {
value: decodeEntities(source.text.slice(start + 1, close), source, start),
end: close + 1,
@@ -81,21 +81,21 @@ function parseAttributeValue(
}
if (quote === "{") {
const close = source.text.indexOf("}", start + 1);
- if (close < 0) fail(source, "TEXT_REFERENCE", "Unclosed reference attribute.", start);
+ if (close < 0) fail(source, "MARKUP_REFERENCE", "Unclosed reference attribute.", start);
const path = source.text.slice(start + 1, close).trim();
- if (!REFERENCE.test(path)) fail(source, "TEXT_REFERENCE", `Invalid reference "${path}".`, start);
+ if (!REFERENCE.test(path)) fail(source, "MARKUP_REFERENCE", `Invalid reference "${path}".`, start);
return { value: { kind: "reference", path }, end: close + 1 };
}
- fail(source, "TEXT_ATTRIBUTE", "Attribute values must be quoted strings or whole-value references.", start);
+ fail(source, "MARKUP_ATTRIBUTE", "Attribute values must be quoted strings or whole-value references.", start);
}
export function parseOpeningTag(source: SourceUnit, start: number): OpeningTag {
if (source.text[start] !== "<" || source.text[start + 1] === "/") {
- fail(source, "TEXT_OPEN", "Expected an opening tag.", start);
+ fail(source, "MARKUP_OPEN", "Expected an opening tag.", start);
}
const parsedName = parseName(source, start + 1);
let cursor = parsedName.end;
- const attributes: Record<string, TextAttributeValue> = {};
+ const attributes: Record<string, MarkupAttributeValue> = {};
while (cursor < source.text.length) {
cursor = skipSpace(source.text, cursor);
if (source.text.startsWith("/>", cursor)) {
@@ -106,10 +106,10 @@ export function parseOpeningTag(source: SourceUnit, start: number): OpeningTag {
}
const attribute = parseName(source, cursor);
if (Object.hasOwn(attributes, attribute.value)) {
- fail(source, "TEXT_ATTRIBUTE_DUPLICATE", `Duplicate attribute "${attribute.value}".`, cursor);
+ fail(source, "MARKUP_ATTRIBUTE_DUPLICATE", `Duplicate attribute "${attribute.value}".`, cursor);
}
cursor = skipSpace(source.text, attribute.end);
- if (source.text[cursor] !== "=") fail(source, "TEXT_ATTRIBUTE", `Attribute "${attribute.value}" requires =.`, cursor);
+ if (source.text[cursor] !== "=") fail(source, "MARKUP_ATTRIBUTE", `Attribute "${attribute.value}" requires =.`, cursor);
cursor = skipSpace(source.text, cursor + 1);
const value = parseAttributeValue(source, cursor);
Object.defineProperty(attributes, attribute.value, {
@@ -120,14 +120,14 @@ export function parseOpeningTag(source: SourceUnit, start: number): OpeningTag {
});
cursor = value.end;
}
- fail(source, "TEXT_OPEN", `Opening tag <${parsedName.value}> is not closed.`, start);
+ fail(source, "MARKUP_OPEN", `Opening tag <${parsedName.value}> is not closed.`, start);
}
function parseClose(source: SourceUnit, start: number): { readonly name: string; readonly end: number } {
- if (!source.text.startsWith("</", start)) fail(source, "TEXT_CLOSE", "Expected a closing tag.", start);
+ if (!source.text.startsWith("</", start)) fail(source, "MARKUP_CLOSE", "Expected a closing tag.", start);
const name = parseName(source, start + 2);
const cursor = skipSpace(source.text, name.end);
- if (source.text[cursor] !== ">") fail(source, "TEXT_CLOSE", "Malformed closing tag.", start);
+ if (source.text[cursor] !== ">") fail(source, "MARKUP_CLOSE", "Malformed closing tag.", start);
return { name: name.value, end: cursor + 1 };
}
@@ -153,14 +153,14 @@ export function parseStructuredElement(
while (cursor < source.text.length) {
if (source.text.startsWith("<!--", cursor)) {
const end = source.text.indexOf("-->", cursor + 4);
- if (end < 0) fail(source, "TEXT_COMMENT", "Unclosed comment.", cursor);
+ if (end < 0) fail(source, "MARKUP_COMMENT", "Unclosed comment.", cursor);
cursor = end + 3;
continue;
}
if (source.text.startsWith("</", cursor)) {
const close = parseClose(source, cursor);
if (close.name !== opening.name) {
- fail(source, "TEXT_CLOSE_MISMATCH", `<${opening.name}> was closed by </${close.name}>.`, cursor);
+ fail(source, "MARKUP_CLOSE_MISMATCH", `<${opening.name}> was closed by </${close.name}>.`, cursor);
}
return {
element: {
@@ -188,7 +188,7 @@ export function parseStructuredElement(
});
cursor = end;
}
- fail(source, "TEXT_ELEMENT_UNCLOSED", `<${opening.name}> is not closed.`, start);
+ fail(source, "MARKUP_ELEMENT_UNCLOSED", `<${opening.name}> is not closed.`, start);
}
function stringAttribute(
@@ -199,28 +199,28 @@ function stringAttribute(
): string | undefined {
const value = opening.attributes[name];
if (value === undefined) {
- if (required) fail(source, "TEXT_IMPORT", `<import> requires ${name}.`, opening.start);
+ if (required) fail(source, "MARKUP_IMPORT", `<import> requires ${name}.`, opening.start);
return undefined;
}
- if (typeof value !== "string") fail(source, "TEXT_IMPORT", `<import> ${name} must be a string.`, opening.start);
+ if (typeof value !== "string") fail(source, "MARKUP_IMPORT", `<import> ${name} must be a string.`, opening.start);
return value;
}
-function importRequest(source: SourceUnit, opening: OpeningTag): TextImportRequest {
+function importRequest(source: SourceUnit, opening: OpeningTag): MarkupImportRequest {
if (opening.name !== "import" || !opening.selfClosing) {
- fail(source, "TEXT_IMPORT", "Imports must use <import .../>.", opening.start);
+ fail(source, "MARKUP_IMPORT", "Imports must use <import .../>.", opening.start);
}
const unknown = Object.keys(opening.attributes).filter((name) => !["from", "source", "as"].includes(name));
- if (unknown.length) fail(source, "TEXT_IMPORT", `Unknown import attribute "${unknown[0]}".`, opening.start);
+ if (unknown.length) fail(source, "MARKUP_IMPORT", `Unknown import attribute "${unknown[0]}".`, opening.start);
const alias = stringAttribute(source, opening, "as");
- if (alias !== undefined && !ALIAS.test(alias)) fail(source, "TEXT_IMPORT_ALIAS", `Invalid alias "${alias}".`, opening.start);
+ if (alias !== undefined && !ALIAS.test(alias)) fail(source, "MARKUP_IMPORT_ALIAS", `Invalid alias "${alias}".`, opening.start);
const module = stringAttribute(source, opening, "from");
const importedSource = stringAttribute(source, opening, "source");
if ((module === undefined) === (importedSource === undefined)) {
- fail(source, "TEXT_IMPORT_KIND", "<import> requires exactly one of from or source.", opening.start);
+ fail(source, "MARKUP_IMPORT_KIND", "<import> requires exactly one of from or source.", opening.start);
}
if (importedSource !== undefined && alias === undefined) {
- fail(source, "TEXT_IMPORT_SOURCE_ALIAS", "A source import requires an alias.", opening.start);
+ fail(source, "MARKUP_IMPORT_SOURCE_ALIAS", "A source import requires an alias.", opening.start);
}
return {
kind: importedSource === undefined ? "module" : "source",
@@ -230,13 +230,13 @@ function importRequest(source: SourceUnit, opening: OpeningTag): TextImportReque
};
}
-export function discoverText(source: SourceUnit): TextDiscovery {
+export function discoverMarkup(source: SourceUnit): MarkupDiscovery {
let cursor = skipTrivia(source, 0);
const root = parseOpeningTag(source, cursor);
- if (root.name !== "svml" || root.selfClosing) fail(source, "TEXT_ROOT", "Document must open with <svml>.", cursor);
- if (Object.keys(root.attributes).length) fail(source, "TEXT_ROOT_ATTRIBUTE", "<svml> declares no attributes.", cursor);
+ if (root.name !== "svml" || root.selfClosing) fail(source, "MARKUP_ROOT", "Document must open with <svml>.", cursor);
+ if (Object.keys(root.attributes).length) fail(source, "MARKUP_ROOT_ATTRIBUTE", "<svml> declares no attributes.", cursor);
cursor = root.end;
- const imports: TextImportRequest[] = [];
+ const imports: MarkupImportRequest[] = [];
while (true) {
cursor = skipTrivia(source, cursor);
if (source.text.startsWith("</", cursor) || source.text[cursor] !== "<") break;
@@ -250,9 +250,9 @@ export function discoverText(source: SourceUnit): TextDiscovery {
export function closeDocument(source: SourceUnit, start: number): number {
const close = parseClose(source, start);
- if (close.name !== "svml") fail(source, "TEXT_ROOT_CLOSE", `Expected </svml>, received </${close.name}>.`, start);
+ if (close.name !== "svml") fail(source, "MARKUP_ROOT_CLOSE", `Expected </svml>, received </${close.name}>.`, start);
const end = skipTrivia(source, close.end);
- if (end !== source.text.length) fail(source, "TEXT_TRAILING", "Only trivia may follow </svml>.", end);
+ if (end !== source.text.length) fail(source, "MARKUP_TRAILING", "Only trivia may follow </svml>.", end);
return end;
}
diff --git a/packages/markup/src/types.ts b/packages/markup/src/types.ts
new file mode 100644
index 00000000..d36266d0
--- /dev/null
+++ b/packages/markup/src/types.ts
@@ -0,0 +1,157 @@
+import type {
+ CanonicalValue,
+ Digest,
+ ModuleRef,
+ ResolvedModuleClosure,
+ SourceRange,
+ StoredValue,
+ SurfaceDeclaration,
+ TypeRef,
+ TypedModule,
+ TypedRecord,
+} from "@narratage/protocol";
+import type {
+ AuthorComponent,
+ AuthorFrontend,
+ AuthorModule,
+ AuthorSourceAssetRequest,
+ AuthorSourceExport,
+ AuthorValueRef,
+ Awaitable,
+ GraphFragment,
+ ResolvedAuthorSourceImport,
+} from "@narratage/elaborator";
+
+export type SourceUnit = {
+ readonly name: string;
+ readonly text: string;
+ /** Whole unmasked source digest supplied by Source Closure compilation. */
+ readonly sourceDigest?: Digest;
+};
+
+export type MarkupImportRequest = {
+ readonly kind: "module" | "source";
+ readonly from: string;
+ readonly alias?: string;
+ readonly range: SourceRange;
+};
+
+export type MarkupDiscovery = {
+ readonly imports: readonly MarkupImportRequest[];
+ readonly bodyStart: number;
+};
+
+export type MarkupReference = {
+ readonly kind: "reference";
+ readonly path: string;
+};
+
+export type MarkupAttributeValue = string | MarkupReference;
+
+export type StructuredText = {
+ readonly kind: "text";
+ readonly value: string;
+ readonly range: SourceRange;
+};
+
+export type StructuredElement = {
+ readonly kind: "element";
+ readonly name: string;
+ readonly attributes: Readonly<Record<string, MarkupAttributeValue>>;
+ readonly children: readonly StructuredNode[];
+ readonly range: SourceRange;
+};
+
+export type StructuredNode = StructuredText | StructuredElement;
+
+export type SurfaceRecordDraft = {
+ readonly id: string;
+ readonly type: TypeRef;
+ readonly value: StoredValue;
+ readonly range: SourceRange;
+};
+
+/** Source-local diagnostics are removed before the component enters the semantic AuthorModule. */
+export type SurfaceComponentDraft = AuthorComponent & {
+ readonly range: SourceRange;
+};
+
+export type SurfaceDecodeOutput = {
+ readonly records: readonly SurfaceRecordDraft[];
+ readonly components: readonly SurfaceComponentDraft[];
+ readonly fragments: readonly GraphFragment[];
+ readonly sourceMaps?: readonly CanonicalValue[];
+};
+
+export type RawSurfaceInput = {
+ readonly sourceName: string;
+ readonly source: string;
+ readonly tag: string;
+ readonly openingStart: number;
+ readonly contentStart: number;
+ readonly attributes: Readonly<Record<string, MarkupAttributeValue>>;
+ readonly resolveAsset: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
+};
+
+export type RawSurfaceOutput = SurfaceDecodeOutput & {
+ readonly nextOffset: number;
+};
+
+export type StructuredSurfaceInput = {
+ readonly sourceName: string;
+ readonly element: StructuredElement;
+ /**
+ * Resolve an explicitly written author reference. Imported record values are
+ * available because their SourceUnit has already been compiled and admitted.
+ * A component output has a ref and Type but no compile-time Record value.
+ */
+ readonly resolveReference: (path: string) => SurfaceResolvedReference | undefined;
+ readonly resolveAsset: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
+};
+
+export type SurfaceResolvedReference = {
+ readonly path: string;
+ readonly ref: AuthorValueRef;
+ readonly type: TypeRef;
+ readonly record?: TypedRecord;
+};
+
+export type RawSurfaceHandler = (input: RawSurfaceInput) => Awaitable<RawSurfaceOutput>;
+export type StructuredSurfaceHandler = (input: StructuredSurfaceInput) => Awaitable<SurfaceDecodeOutput>;
+
+export type RegisteredSurface = {
+ readonly module: ModuleRef;
+ readonly surface: string;
+ readonly implementationDigest: Digest;
+ readonly mode: SurfaceDeclaration["mode"];
+ readonly handler: RawSurfaceHandler | StructuredSurfaceHandler;
+};
+
+export type MarkupDecodeContext = {
+ readonly closure: ResolvedModuleClosure;
+ readonly registry: MarkupSurfaceRegistryLike;
+ readonly resolveModule: (request: MarkupImportRequest) => ModuleRef;
+ readonly sourceImports?: readonly ResolvedAuthorSourceImport[];
+ readonly resolveAsset?: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
+};
+
+export type MarkupDecodeResult = {
+ readonly module: TypedModule;
+ readonly author: AuthorModule;
+ readonly fragments: readonly GraphFragment[];
+ readonly exports: readonly AuthorSourceExport[];
+ readonly imports: readonly MarkupImportRequest[];
+ readonly frontendClosureDigest: Digest;
+ readonly sourceMaps: readonly CanonicalValue[];
+};
+
+export type MarkupAuthorFrontendOptions = {
+ readonly registry: MarkupSurfaceRegistryLike;
+ readonly resolveModule: (request: MarkupImportRequest) => ModuleRef;
+};
+
+export type MarkupAuthorFrontend = AuthorFrontend;
+
+export interface MarkupSurfaceRegistryLike {
+ resolve(module: ModuleRef, surface: string): RegisteredSurface | undefined;
+}
diff --git a/packages/text/test/author-integration.test.ts b/packages/markup/test/author-integration.test.ts
similarity index 92%
rename from packages/text/test/author-integration.test.ts
rename to packages/markup/test/author-integration.test.ts
index a22b9bb7..d825574e 100644
--- a/packages/text/test/author-integration.test.ts
+++ b/packages/markup/test/author-integration.test.ts
@@ -20,14 +20,14 @@ import type {
TypeRef,
} from "@narratage/protocol";
import {
- TextFrontendError,
- TextSurfaceRegistry,
- decodeText,
-} from "@narratage/text";
+ MarkupFrontendError,
+ MarkupSurfaceRegistry,
+ decodeMarkup,
+} from "@narratage/markup";
import type {
StructuredElement,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
const laboratory = { name: "example.text-laboratory", version: "1" } as const;
const sampleType = { module: laboratory, name: "Sample" } satisfies TypeRef;
@@ -162,7 +162,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referenceAttribute(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
throw new Error(`${element.name}.${name} must be a reference`);
}
@@ -175,8 +175,8 @@ function componentOutput(path: string): { readonly component: string; readonly o
return { component: path.slice(0, separator), output: path.slice(separator + 1) };
}
-function registry(options: { readonly omitMeasureFragment?: boolean } = {}): TextSurfaceRegistry {
- const values = new TextSurfaceRegistry();
+function registry(options: { readonly omitMeasureFragment?: boolean } = {}): MarkupSurfaceRegistry {
+ const values = new MarkupSurfaceRegistry();
values.registerStructured(laboratory, "sample", sampleSurfaceDigest, ({ element }) => ({
records: [{
id: stringAttribute(element, "id"),
@@ -228,7 +228,7 @@ function registry(options: { readonly omitMeasureFragment?: boolean } = {}): Tex
const closure = createResolvedClosure([manifest]);
function decode(text: string, surfaceRegistry = registry()) {
- return decodeText(
+ return decodeMarkup(
{ name: "laboratory.svml", text },
{
closure,
@@ -238,7 +238,7 @@ function decode(text: string, surfaceRegistry = registry()) {
);
}
-test("Text Surfaces compile forward author references into a Core BuildPlan", async () => {
+test("Markup Surfaces compile forward author references into a Core BuildPlan", async () => {
const decoded = await decode(`<svml>
<import as="lab" from="example.text-laboratory@1"/>
<lab:Sample id="soil" value="soil"/>
@@ -286,15 +286,15 @@ test("component source reflow does not change AuthorModule semantic identity", a
assert.equal(compact.author.id, multiline.author.id);
});
-test("Text rejects a component whose Surface omits its Fragment definition", async () => {
+test("Markup rejects a component whose Surface omits its Fragment definition", async () => {
await assert.rejects(
decode(`<svml>
<import as="lab" from="example.text-laboratory@1"/>
<lab:Sample id="soil" value="soil"/>
<lab:Measure id="measurement" sample={soil}/>
</svml>`, registry({ omitMeasureFragment: true })),
- (error: unknown) => error instanceof TextFrontendError
- && error.code === "TEXT_COMPONENT_FRAGMENT_MISSING",
+ (error: unknown) => error instanceof MarkupFrontendError
+ && error.code === "MARKUP_COMPONENT_FRAGMENT_MISSING",
);
});
@@ -312,7 +312,7 @@ test("unknown component references remain inert until whole-document Author link
);
});
-test("Text rejects duplicate component identities before Author linking", async () => {
+test("Markup rejects duplicate component identities before Author linking", async () => {
await assert.rejects(
decode(`<svml>
<import as="lab" from="example.text-laboratory@1"/>
@@ -320,7 +320,7 @@ test("Text rejects duplicate component identities before Author linking", async
<lab:Measure id="measurement" sample={soil}/>
<lab:Measure id="measurement" sample={soil}/>
</svml>`),
- (error: unknown) => error instanceof TextFrontendError
- && error.code === "TEXT_COMPONENT_DUPLICATE",
+ (error: unknown) => error instanceof MarkupFrontendError
+ && error.code === "MARKUP_COMPONENT_DUPLICATE",
);
});
diff --git a/packages/markup/test/markup.test.ts b/packages/markup/test/markup.test.ts
new file mode 100644
index 00000000..63607c1f
--- /dev/null
+++ b/packages/markup/test/markup.test.ts
@@ -0,0 +1,258 @@
+import { narrativeManifest } from "@narratage/narrative";
+import type { Narrative, NarrativeExcerpt } from "@narratage/narrative";
+import { textManifest } from "@narratage/text";
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { createResolvedClosure, digestOf, isDigest } from "@narratage/core";
+import type { ModuleManifest } from "@narratage/protocol";
+import {
+ decodeScriptSurface,
+ scriptManifest,
+ scriptModuleRef,
+ scriptSurfaceImplementationDigest,
+} from "@narratage/script";
+import {
+ MarkupFrontendError,
+ MarkupSurfaceRegistry,
+ decodeMarkup,
+ parseStructuredElement,
+} from "@narratage/markup";
+
+function scriptContext() {
+ const closure = createResolvedClosure([narrativeManifest, textManifest, scriptManifest]);
+ const registry = new MarkupSurfaceRegistry();
+ registry.registerRaw(
+ scriptModuleRef,
+ "script",
+ scriptSurfaceImplementationDigest,
+ decodeScriptSurface,
+ );
+ return {
+ closure,
+ registry,
+ resolveModule: () => scriptModuleRef,
+ } as const;
+}
+
+test("Markup learns <script> only from an imported Script Manifest", async () => {
+ const result = await decodeMarkup(
+ {
+ name: "talk.svml",
+ text: `<svml>
+ <import from="@narratage/script@1"/>
+
+ <script id="story">
+ <opening>
+ <ALICE>Hello.
+ <BOB>Hi.
+ </opening>
+ </script>
+ </svml>`,
+ },
+ scriptContext(),
+ );
+
+ assert.equal(result.module.records.length, 6);
+ assert.equal(result.module.records[0]?.id, "story");
+ assert.equal(result.module.records[0]?.type.name, "Narrative");
+ assert.equal(result.module.records.some((record) =>
+ record.id === "story.segment.opening" && record.type.name === "NarrativeExcerpt"), true);
+ assert.equal(result.module.records.some((record) =>
+ record.id === "story.segment.opening.dialogue" && record.type.name === "Text"), true);
+ assert.equal(result.module.records.some((record) =>
+ record.id === "story.segment.opening.speech" && record.type.name === "Text"), true);
+ assert.equal(result.module.records.some((record) =>
+ record.id === "story.caption" && record.type.name === "CaptionDisplaySequence"), true);
+ assert.equal(result.module.records.some((record) =>
+ record.id === "story.caption.correspondence" && record.type.name === "CaptionCorrespondence"), true);
+ assert.equal(result.sourceMaps.length, 1);
+});
+
+test("the same Script meaning has the same authored Record digest across reflow", async () => {
+ const compact = await decodeMarkup(
+ {
+ name: "compact.svml",
+ text: `<svml><import from="@narratage/script"/><script id="story"><opening><ALICE>Hello.<BOB>Hi.</opening></script></svml>`,
+ },
+ scriptContext(),
+ );
+ const multiline = await decodeMarkup(
+ {
+ name: "multiline.svml",
+ text: `<svml>
+ <import from="@narratage/script"/>
+ <script id="story">
+ <opening>
+ <ALICE>Hello.
+ <BOB>Hi.
+ </opening>
+ </script>
+ </svml>`,
+ },
+ scriptContext(),
+ );
+
+ assert.equal(compact.module.records[0]?.digest, multiline.module.records[0]?.digest);
+ assert.equal(compact.module.records[1]?.digest, multiline.module.records[1]?.digest);
+ assert.notEqual(
+ compact.module.records[0]?.origin.kind === "authored" ? compact.module.records[0].origin.sourceDigest : undefined,
+ multiline.module.records[0]?.origin.kind === "authored" ? multiline.module.records[0].origin.sourceDigest : undefined,
+ );
+});
+
+test("without the import, Markup has no hard-coded knowledge of Script", async () => {
+ await assert.rejects(
+ decodeMarkup(
+ { name: "unknown.svml", text: "<svml><script><opening>Hello.</opening></script></svml>" },
+ scriptContext(),
+ ),
+ (error: unknown) => error instanceof MarkupFrontendError && error.code === "MARKUP_UNKNOWN_SURFACE",
+ );
+});
+
+test("a raw Surface cannot consume the Markup document close", async () => {
+ const closure = createResolvedClosure([narrativeManifest, textManifest, scriptManifest]);
+ const registry = new MarkupSurfaceRegistry();
+ registry.registerRaw(
+ scriptModuleRef,
+ "script",
+ scriptSurfaceImplementationDigest,
+ (input) => ({
+ nextOffset: input.source.length,
+ records: [],
+ components: [],
+ fragments: [],
+ }),
+ );
+ await assert.rejects(
+ decodeMarkup(
+ {
+ name: "swallowed.svml",
+ text: `<svml><import from="@narratage/script"/><script><opening>Hello.</opening></script></svml>`,
+ },
+ { closure, registry, resolveModule: () => scriptModuleRef },
+ ),
+ (error: unknown) => error instanceof MarkupFrontendError && error.code === "MARKUP_ROOT_UNCLOSED",
+ );
+});
+
+test("imports are frozen before body decoding", async () => {
+ await assert.rejects(
+ decodeMarkup(
+ {
+ name: "late.svml",
+ text: `<svml>
+ <import from="@narratage/script"/>
+ <script><opening>Hello.</opening></script>
+ <import from="@narratage/script"/>
+ </svml>`,
+ },
+ scriptContext(),
+ ),
+ (error: unknown) => error instanceof MarkupFrontendError && error.code === "MARKUP_IMPORT_AFTER_BODY",
+ );
+});
+
+test("a body tag whose name merely starts with import is not treated as an import", async () => {
+ await assert.rejects(
+ decodeMarkup(
+ { name: "important.svml", text: "<svml><important/></svml>" },
+ scriptContext(),
+ ),
+ (error: unknown) => error instanceof MarkupFrontendError && error.code === "MARKUP_UNKNOWN_SURFACE",
+ );
+});
+
+test("Markup also exposes a generic structured Surface tree", () => {
+ const source = {
+ name: "structured.svml",
+ text: `<card title="Hello" target={story}><line>World</line></card>`,
+ };
+ const parsed = parseStructuredElement(source, 0);
+ assert.equal(parsed.nextOffset, source.text.length);
+ assert.equal(parsed.element.name, "card");
+ assert.deepEqual(parsed.element.attributes.target, { kind: "reference", path: "story" });
+ assert.equal(parsed.element.children[0]?.kind, "element");
+});
+
+test("a module can use Markup's generic structured parser without adding another parser", async () => {
+ const module = { name: "example.card", version: "1" } as const;
+ const type = { module, name: "Card" } as const;
+ const implementationDigest = digestOf("example.card/surface@1");
+ const manifest: ModuleManifest = {
+ format: "svml.module@1",
+ name: module.name,
+ version: module.version,
+ dependencies: [],
+ types: [
+ {
+ name: type.name,
+ schema: {
+ kind: "object",
+ fields: { tag: { schema: { kind: "literal", value: "card" } } },
+ },
+ },
+ ],
+ capabilities: [],
+ surfaces: [
+ {
+ name: "card",
+ tag: "card",
+ mode: "structured",
+ outputs: [type],
+ implementation: {
+ kind: "trusted-frontend-surface",
+ locator: "example.card/surface",
+ digest: implementationDigest,
+ },
+ },
+ ],
+ producers: [],
+ };
+ const closure = createResolvedClosure([manifest]);
+ const registry = new MarkupSurfaceRegistry();
+ registry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
+ records: [
+ {
+ id: "card",
+ type,
+ value: { kind: "inline", value: { tag: element.name } },
+ range: element.range,
+ },
+ ],
+ components: [],
+ fragments: [],
+ }));
+ const result = await decodeMarkup(
+ {
+ name: "card.svml",
+ text: `<svml><import from="example.card@1"/><card title="Hello"><line>World</line></card></svml>`,
+ },
+ { closure, registry, resolveModule: () => module },
+ );
+
+ assert.equal(result.module.records[0]?.id, "card");
+ assert.equal(isDigest(result.module.records[0]?.digest ?? ""), true);
+
+ const overreachingRegistry = new MarkupSurfaceRegistry();
+ overreachingRegistry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
+ records: [
+ {
+ id: "other",
+ type: { module, name: "Other" },
+ value: { kind: "inline", value: { tag: element.name } },
+ range: element.range,
+ },
+ ],
+ components: [],
+ fragments: [],
+ }));
+ await assert.rejects(
+ decodeMarkup(
+ { name: "overreach.svml", text: `<svml><import from="example.card@1"/><card/></svml>` },
+ { closure, registry: overreachingRegistry, resolveModule: () => module },
+ ),
+ (error: unknown) => error instanceof MarkupFrontendError && error.code === "MARKUP_SURFACE_OUTPUT",
+ );
+});
diff --git a/packages/media-pipeline/package.json b/packages/media-pipeline/package.json
index 4e8db81b..62f0d78e 100644
--- a/packages/media-pipeline/package.json
+++ b/packages/media-pipeline/package.json
@@ -19,7 +19,7 @@
"@narratage/program-space": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/speech": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/core": "workspace:*",
diff --git a/packages/media-pipeline/src/activation.ts b/packages/media-pipeline/src/activation.ts
index 240a2155..7bfe1cb0 100644
--- a/packages/media-pipeline/src/activation.ts
+++ b/packages/media-pipeline/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeSynchronizedMediaSurface,
mediaPipelineComponent,
@@ -12,7 +12,7 @@ export const svmlPackage = {
name: "@narratage/media-pipeline",
modules: [{ manifest: mediaPipelineManifest, specifiers: [mediaPipelineModuleRef.name, `${mediaPipelineModuleRef.name}@1`] }],
components: [mediaPipelineComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: mediaPipelineModuleRef,
surface: "synchronized-media",
mode: "structured",
diff --git a/packages/media-pipeline/src/surface.ts b/packages/media-pipeline/src/surface.ts
index 600b52bd..d1c71622 100644
--- a/packages/media-pipeline/src/surface.ts
+++ b/packages/media-pipeline/src/surface.ts
@@ -1,5 +1,5 @@
import { artifactTypes } from "@narratage/artifact";
-import type { StructuredElement, StructuredSurfaceHandler, SurfaceResolvedReference, TextAttributeValue } from "@narratage/text";
+import type { StructuredElement, StructuredSurfaceHandler, SurfaceResolvedReference, MarkupAttributeValue } from "@narratage/markup";
import { synchronizedMediaFragment } from "./fragment.js";
import { mediaPipelineTypes } from "./manifest.js";
@@ -17,7 +17,7 @@ function text(element: StructuredElement, name: string): string {
}
function ref(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
resolve: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
diff --git a/packages/media-track/package.json b/packages/media-track/package.json
index e74e19eb..45ecd41a 100644
--- a/packages/media-track/package.json
+++ b/packages/media-track/package.json
@@ -21,7 +21,7 @@
"@narratage/semantic-map": "workspace:*",
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*",
"@narratage/temporal": "workspace:*"
}
}
diff --git a/packages/media-track/src/activation.ts b/packages/media-track/src/activation.ts
index b2fa5864..249d5ca8 100644
--- a/packages/media-track/src/activation.ts
+++ b/packages/media-track/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeMediaTrackSurface,
mediaTrackComponent,
@@ -12,7 +12,7 @@ export const svmlPackage = {
name: "@narratage/media-track",
modules: [{ manifest: mediaTrackManifest, specifiers: [mediaTrackModuleRef.name, `${mediaTrackModuleRef.name}@1`] }],
components: [mediaTrackComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: mediaTrackModuleRef,
surface: "track",
mode: "structured",
diff --git a/packages/media-track/src/surface.ts b/packages/media-track/src/surface.ts
index 50dd746c..c924c504 100644
--- a/packages/media-track/src/surface.ts
+++ b/packages/media-track/src/surface.ts
@@ -15,8 +15,8 @@ import type {
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import type {
OccurrenceExpansion,
TemporalDuration,
@@ -96,7 +96,7 @@ function numberValue(element: StructuredElement, name: string, fallback?: number
}
function reference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: TypeRef,
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -108,7 +108,7 @@ function reference(
}
function oneOfReferences(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: readonly TypeRef[],
resolve: (path: string) => SurfaceResolvedReference | undefined,
diff --git a/packages/media-track/test/media-track.test.ts b/packages/media-track/test/media-track.test.ts
index b59a656c..ce479db0 100644
--- a/packages/media-track/test/media-track.test.ts
+++ b/packages/media-track/test/media-track.test.ts
@@ -59,7 +59,7 @@ import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
-import type { StructuredElement, StructuredNode, SurfaceResolvedReference, TextAttributeValue } from "@narratage/text";
+import type { StructuredElement, StructuredNode, SurfaceResolvedReference, MarkupAttributeValue } from "@narratage/markup";
const space = sealProgramSpace({
contract: "svml.program-space@1",
@@ -680,8 +680,8 @@ test("the graph witness keeps every source, extent, fit, frame, time and appeara
test("the Media author Surface emits explicit graph edges for layers, semantic time, Sequence topology and sound", async () => {
const range = { source: "media-surface.svml", start: 0, end: 1 };
- const ref = (path: string): TextAttributeValue => ({ kind: "reference", path });
- const node = (name: string, attributes: Record<string, TextAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({
+ const ref = (path: string): MarkupAttributeValue => ({ kind: "reference", path });
+ const node = (name: string, attributes: Record<string, MarkupAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({
kind: "element", name, attributes, children, range,
});
const appearance = (path: string, properties: SvsRecipe["properties"]): SurfaceResolvedReference => ({
diff --git a/packages/media/package.json b/packages/media/package.json
index 435c1bac..7fb83046 100644
--- a/packages/media/package.json
+++ b/packages/media/package.json
@@ -13,6 +13,6 @@
"@narratage/artifact": "workspace:*",
"@narratage/component-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/media/src/activation.ts b/packages/media/src/activation.ts
index 01cb4bbd..1c25a7b4 100644
--- a/packages/media/src/activation.ts
+++ b/packages/media/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeMediaAudioSurface, decodeMediaFontSurface, decodeMediaImageSurface, mediaComponent,
@@ -13,21 +13,21 @@ export const svmlPackage = {
modules: [{ manifest: mediaManifest, specifiers: ["@narratage/media", "@narratage/media@1"] }],
components: [mediaComponent],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mediaModuleRef,
surface: "image",
mode: "structured",
implementationDigest: mediaSurfaceImplementationDigests.image,
handler: decodeMediaImageSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mediaModuleRef,
surface: "audio",
mode: "structured",
implementationDigest: mediaSurfaceImplementationDigests.audio,
handler: decodeMediaAudioSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mediaModuleRef,
surface: "font",
mode: "structured",
diff --git a/packages/media/src/surface.ts b/packages/media/src/surface.ts
index a4228deb..d85ac030 100644
--- a/packages/media/src/surface.ts
+++ b/packages/media/src/surface.ts
@@ -2,7 +2,7 @@ import { artifactTypes } from "@narratage/artifact";
import type {
StructuredElement,
StructuredSurfaceHandler,
-} from "@narratage/text";
+} from "@narratage/markup";
import { assertFontArtifactRef } from "./render.js";
import { mediaTypes } from "./manifest.js";
diff --git a/packages/mimo-tts/README.md b/packages/mimo-tts/README.md
index 19be45f0..b737e76c 100644
--- a/packages/mimo-tts/README.md
+++ b/packages/mimo-tts/README.md
@@ -11,6 +11,8 @@ The package owns the three distinct model shapes:
It contains no API URL, credential, retry, queue or Xiaomi wire encoding. Those belong to a Runtime
Endpoint such as `@narratage/provider-xiaomi-mimo`. Every model returns the shared
`GeneratedAudioSet`; author Surfaces expose its primary member as an ordinary `BlobArtifact`.
+The `speech` attribute is an ordinary `Text` edge attached through the exact model's `text` port at
+execution time; the Frontend never copies Script words into a request draft.
`optimize_text_preview` is intentionally absent: MiMo may not rewrite Script's exact speech truth.
diff --git a/packages/mimo-tts/package.json b/packages/mimo-tts/package.json
index 11396de8..4fb50edf 100644
--- a/packages/mimo-tts/package.json
+++ b/packages/mimo-tts/package.json
@@ -14,8 +14,8 @@
"@narratage/elaborator": "workspace:*",
"@narratage/generation": "workspace:*",
"@narratage/model-kit": "workspace:*",
- "@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/mimo-tts/src/activation.ts b/packages/mimo-tts/src/activation.ts
index c1dafee2..11adaf28 100644
--- a/packages/mimo-tts/src/activation.ts
+++ b/packages/mimo-tts/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeMimoPresetSurface,
@@ -16,15 +16,15 @@ export const svmlPackage = {
modules: [{ manifest: mimoTtsManifest, specifiers: ["@narratage/mimo-tts", "@narratage/mimo-tts@1"] }],
components: [mimoTtsComponent],
hostFacets: [
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mimoTtsModuleRef, surface: "preset", mode: "structured",
implementationDigest: mimoTtsSurfaceDigests.preset, handler: decodeMimoPresetSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mimoTtsModuleRef, surface: "voiceDesign", mode: "structured",
implementationDigest: mimoTtsSurfaceDigests.voiceDesign, handler: decodeMimoVoiceDesignSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: mimoTtsModuleRef, surface: "voiceClone", mode: "structured",
implementationDigest: mimoTtsSurfaceDigests.voiceClone, handler: decodeMimoVoiceCloneSurface,
}),
diff --git a/packages/mimo-tts/src/fragment.ts b/packages/mimo-tts/src/fragment.ts
index 281ad31d..b4c4b2fe 100644
--- a/packages/mimo-tts/src/fragment.ts
+++ b/packages/mimo-tts/src/fragment.ts
@@ -1,10 +1,11 @@
import { createExactModelPrimaryGenerationFragment } from "@narratage/model-kit";
-import type { ExactModelEndpoint, ExactModelMediaInput } from "@narratage/model-kit";
+import type { ExactModelEndpoint, ExactModelMediaInput, ExactModelTextInput } from "@narratage/model-kit";
/** Model result projection over the same graph-native request assembly as every exact model. */
export function createMimoTtsAudioFragment(
endpoint: ExactModelEndpoint,
mediaInputs: readonly ExactModelMediaInput[] = [],
+ textInputs: readonly ExactModelTextInput[] = [],
) {
- return createExactModelPrimaryGenerationFragment(endpoint, mediaInputs);
+ return createExactModelPrimaryGenerationFragment(endpoint, mediaInputs, textInputs);
}
diff --git a/packages/mimo-tts/src/index.ts b/packages/mimo-tts/src/index.ts
index d685387d..30c6092e 100644
--- a/packages/mimo-tts/src/index.ts
+++ b/packages/mimo-tts/src/index.ts
@@ -1,7 +1,6 @@
import { sealGenerationPortRequest, sealGenerationRequestDraft, sealGenerationPortTable } from "@narratage/generation";
import type { GenerationPortTable, GenerationPortValue, GenerationRequest } from "@narratage/generation";
import { defineExactModelModule } from "@narratage/model-kit";
-import { narrativeDependency } from "@narratage/narrative";
import { digestOf } from "@narratage/protocol";
export const mimoTtsModuleRef = { name: "@narratage/mimo-tts", version: "1" } as const;
@@ -99,7 +98,6 @@ export const mimoTtsSurfaceDigests = {
export const mimoTtsManifest = {
...base.manifest,
- dependencies: [...base.manifest.dependencies, narrativeDependency],
surfaces: [
{
name: "preset", tag: "Preset", mode: "structured",
diff --git a/packages/mimo-tts/src/surface.ts b/packages/mimo-tts/src/surface.ts
index a35e86e6..af2b8a00 100644
--- a/packages/mimo-tts/src/surface.ts
+++ b/packages/mimo-tts/src/surface.ts
@@ -4,16 +4,16 @@ import {
sealGenerationMediaBinding,
} from "@narratage/generation";
import type { GenerationMediaPort, GenerationPortValue } from "@narratage/generation";
-import { exactModelMediaInputNames } from "@narratage/model-kit";
-import type { ExactModelMediaInput } from "@narratage/model-kit";
-import { narrativeTypes } from "@narratage/narrative";
+import { exactModelMediaInputNames, exactModelTextInputName } from "@narratage/model-kit";
+import type { ExactModelMediaInput, ExactModelTextInput } from "@narratage/model-kit";
import type { CanonicalValue } from "@narratage/protocol";
+import { textTypes, verifyText } from "@narratage/text";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { createMimoTtsAudioFragment } from "./fragment.js";
import {
@@ -45,7 +45,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referencePath(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
@@ -63,21 +63,16 @@ function resolved(
return value;
}
-function inline(reference: SurfaceResolvedReference, subject: string): CanonicalValue {
- if (reference.record?.value.kind !== "inline") throw new Error(`${subject} must reference an authored inline value`);
- return reference.record.value.value;
-}
-
-function speechText(reference: SurfaceResolvedReference, subject: string): string {
- if (!sameType(reference.type, narrativeTypes.speechExcerpt)) {
- throw new Error(`${subject} must reference a NarrativeSpeechExcerpt`);
+function speechText(reference: SurfaceResolvedReference, subject: string): SurfaceResolvedReference {
+ if (!sameType(reference.type, textTypes.text)) {
+ throw new Error(`${subject} must reference Text`);
}
- const value = inline(reference, subject) as unknown as Record<string, unknown>;
- if (value.contract !== "svml.narrative-speech-excerpt@1" || typeof value.speech !== "string"
- || value.speech.trim().length === 0) {
- throw new Error(`${subject} NarrativeSpeechExcerpt is invalid`);
+ const value = reference.record?.value;
+ if (value !== undefined) {
+ if (value.kind !== "inline") throw new Error(`${subject} has an invalid authored Text value`);
+ verifyText(value.value);
}
- return value.speech;
+ return reference;
}
function sample(reference: SurfaceResolvedReference, subject: string): SurfaceResolvedReference {
@@ -113,6 +108,7 @@ function output(
element: StructuredElement,
endpoint: (typeof mimoTtsEndpoints)[keyof typeof mimoTtsEndpoints],
draft: ReturnType<typeof sealMimoTtsRequestDraft>,
+ text: readonly { readonly input: ExactModelTextInput; readonly source: SurfaceResolvedReference }[],
media: readonly { readonly input: ExactModelMediaInput; readonly source: SurfaceResolvedReference }[] = [],
) {
const id = stringAttribute(element, "id");
@@ -131,6 +127,7 @@ function output(
const inputs: Record<string, SurfaceResolvedReference["ref"] | { readonly kind: "record"; readonly id: string }> = {
draft: { kind: "record", id: draftId },
};
+ for (const item of text) inputs[exactModelTextInputName(item.input.name)] = item.source.ref;
for (const item of media) {
const binding = endpoint.mediaBindings[item.input.port];
if (binding === undefined) throw new Error(`${endpoint.ports.model} has no media port ${item.input.port}`);
@@ -150,7 +147,11 @@ function output(
inputs[names.binding] = { kind: "record", id: bindingId };
inputs[names.artifact] = item.source.ref;
}
- const fragment = createMimoTtsAudioFragment(endpoint, media.map((item) => item.input));
+ const fragment = createMimoTtsAudioFragment(
+ endpoint,
+ media.map((item) => item.input),
+ text.map((item) => item.input),
+ );
return {
records,
components: [{
@@ -164,11 +165,14 @@ function output(
};
}
-function common(
+function speechInput(
element: StructuredElement,
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
-): readonly GenerationPortValue[] {
- return [speechText(resolved(element, "speech", resolveReference), `${element.name}.speech`)];
+) {
+ return {
+ input: { name: "speech", port: "text" },
+ source: speechText(resolved(element, "speech", resolveReference), `${element.name}.speech`),
+ } as const;
}
export const decodeMimoPresetSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
@@ -176,31 +180,34 @@ export const decodeMimoPresetSurface: StructuredSurfaceHandler = ({ element, res
const voice = stringAttribute(element, "voice") as MimoPresetVoice;
if (!mimoPresetVoices.includes(voice)) throw new Error(`${element.name}.voice is not a MiMo preset voice`);
const instruction = body(element, false);
- const ports: Record<string, readonly GenerationPortValue[]> = { text: common(element, resolveReference), voice: [voice] };
+ const ports: Record<string, readonly GenerationPortValue[]> = { voice: [voice] };
if (instruction !== undefined) ports.instruction = [instruction];
- return output(element, mimoTtsEndpoints.preset, sealMimoTtsRequestDraft("mimo-v2.5-tts", ports));
+ return output(
+ element,
+ mimoTtsEndpoints.preset,
+ sealMimoTtsRequestDraft("mimo-v2.5-tts", ports),
+ [speechInput(element, resolveReference)],
+ );
};
export const decodeMimoVoiceDesignSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
attributes(element, ["id", "speech"]);
return output(element, mimoTtsEndpoints.voiceDesign, sealMimoTtsRequestDraft("mimo-v2.5-tts-voicedesign", {
- text: common(element, resolveReference),
voiceDescription: [body(element, true)!],
- }));
+ }), [speechInput(element, resolveReference)]);
};
export const decodeMimoVoiceCloneSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
attributes(element, ["id", "speech", "sample"]);
const instruction = body(element, false);
const source = sample(resolved(element, "sample", resolveReference), `${element.name}.sample`);
- const ports: Record<string, readonly GenerationPortValue[]> = {
- text: common(element, resolveReference),
- };
+ const ports: Record<string, readonly GenerationPortValue[]> = {};
if (instruction !== undefined) ports.instruction = [instruction];
return output(
element,
mimoTtsEndpoints.voiceClone,
sealMimoTtsRequestDraft("mimo-v2.5-tts-voiceclone", ports),
+ [speechInput(element, resolveReference)],
[{ input: { name: "sample", port: "sample" }, source }],
);
};
diff --git a/packages/mimo-tts/test/mimo-tts.test.ts b/packages/mimo-tts/test/mimo-tts.test.ts
index 2f98c039..7d5a891c 100644
--- a/packages/mimo-tts/test/mimo-tts.test.ts
+++ b/packages/mimo-tts/test/mimo-tts.test.ts
@@ -3,10 +3,10 @@ import test from "node:test";
import { artifactTypes } from "@narratage/artifact";
import { generationProducers, generationTypes } from "@narratage/generation";
-import { narrativeTypes } from "@narratage/narrative";
import { digestOf } from "@narratage/protocol";
-import { parseStructuredElement } from "@narratage/text";
-import type { SurfaceResolvedReference } from "@narratage/text";
+import { sealText, textTypes } from "@narratage/text";
+import { parseStructuredElement } from "@narratage/markup";
+import type { SurfaceResolvedReference } from "@narratage/markup";
import mimoNodePackage from "../src/activation.js";
import {
@@ -40,17 +40,10 @@ function authored(path: string, type: SurfaceResolvedReference["type"], value: u
};
}
-const speech = {
- contract: "svml.narrative-speech-excerpt@1",
- kind: "segment",
- id: "opening",
- tokenStart: 0,
- tokenEndExclusive: 4,
- speech: "Exact authored words stay exact.",
-};
+const speech = sealText("Exact authored words stay exact.");
const sample = { kind: "blob" as const, digest: digestOf("voice-sample"), size: 4, mediaType: "audio/wav" };
const refs = new Map<string, SurfaceResolvedReference>([
- ["story.segment.opening.speech", authored("story.segment.opening.speech", narrativeTypes.speechExcerpt, speech)],
+ ["story.segment.opening.speech", authored("story.segment.opening.speech", textTypes.text, speech)],
["voice", authored("voice", artifactTypes.blob, sample)],
]);
const context = (source: string) => ({
@@ -100,12 +93,16 @@ test("the three author Surfaces are separate components with one ordinary audio
assert.deepEqual(Object.keys(result.components[0]!.outputs), ["audio"]);
assert.deepEqual(result.fragments[0]!.operations.map((operation) => operation.producer.name), index === 2
? [
+ "bind-request-mimo-v2.5-tts-voiceclone-text-text",
"bind-request-mimo-v2.5-tts-voiceclone-sample",
"finalize-request-mimo-v2.5-tts-voiceclone",
"request-mimo-v2.5-tts-voiceclone",
generationProducers.primaryAudio.name,
]
: [
+ index === 0
+ ? "bind-request-mimo-v2.5-tts-text-text"
+ : "bind-request-mimo-v2.5-tts-voicedesign-text-text",
index === 0 ? "finalize-request-mimo-v2.5-tts" : "finalize-request-mimo-v2.5-tts-voicedesign",
index === 0 ? "request-mimo-v2.5-tts" : "request-mimo-v2.5-tts-voicedesign",
generationProducers.primaryAudio.name,
@@ -113,7 +110,11 @@ test("the three author Surfaces are separate components with one ordinary audio
assert.equal(result.records[0]!.value.kind, "inline");
const request = result.records[0]!.value.kind === "inline"
? result.records[0]!.value.value as Record<string, unknown> : {};
- assert.equal((request.ports as Record<string, unknown[]>).text?.[0], speech.speech);
+ assert.equal((request.ports as Record<string, unknown[]>).text, undefined);
+ assert.deepEqual(result.components[0]!.inputs["speech:text"], {
+ kind: "record",
+ id: "story.segment.opening.speech",
+ });
assert.equal(JSON.stringify(request).includes("optimize_text_preview"), false);
}
});
diff --git a/packages/model-kit/package.json b/packages/model-kit/package.json
index daab26f7..635e0ffe 100644
--- a/packages/model-kit/package.json
+++ b/packages/model-kit/package.json
@@ -10,6 +10,7 @@
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
"@narratage/generation": "workspace:*",
- "@narratage/protocol": "workspace:*"
+ "@narratage/protocol": "workspace:*",
+ "@narratage/text": "workspace:*"
}
}
diff --git a/packages/model-kit/src/index.ts b/packages/model-kit/src/index.ts
index 1e642b6b..757defc5 100644
--- a/packages/model-kit/src/index.ts
+++ b/packages/model-kit/src/index.ts
@@ -8,6 +8,7 @@ import { artifactDependency, artifactTypes } from "@narratage/artifact";
import { sealGraphFragment } from "@narratage/elaborator";
import {
bindGenerationMedia,
+ bindGenerationText,
finalizeGenerationRequestDraft,
generationManifestDigest,
generationModuleRef,
@@ -26,6 +27,8 @@ import type {
GenerationPortTable,
GenerationRequestDraft,
} from "@narratage/generation";
+import { textDependency, textTypes } from "@narratage/text";
+import type { Text } from "@narratage/text";
import {
canonicalize,
digestOf,
@@ -66,6 +69,7 @@ export type ExactModelEndpoint = {
readonly finalizeProducer: ProducerRef;
readonly finalizeImplementationDigest: Digest;
readonly mediaBindings: Readonly<Record<string, ExactModelMediaBindingEndpoint>>;
+ readonly textBindings: Readonly<Record<string, ExactModelTextBindingEndpoint>>;
readonly ports: GenerationPortTable;
readonly fragment: ReturnType<typeof sealGraphFragment>;
};
@@ -77,6 +81,12 @@ export type ExactModelMediaBindingEndpoint = {
readonly implementationDigest: Digest;
};
+export type ExactModelTextBindingEndpoint = {
+ readonly port: string;
+ readonly producer: ProducerRef;
+ readonly implementationDigest: Digest;
+};
+
export type ExactModelMediaInput = {
/** Stable local input name inside this Fragment shape. */
readonly name: string;
@@ -84,6 +94,13 @@ export type ExactModelMediaInput = {
readonly port: string;
};
+export type ExactModelTextInput = {
+ /** Stable local input name inside this Fragment shape. */
+ readonly name: string;
+ /** Exact model text port receiving the Text value. */
+ readonly port: string;
+};
+
export type ExactModelModule<Key extends string = string> = {
readonly module: ModuleRef;
readonly manifest: ModuleManifest;
@@ -126,6 +143,13 @@ function endpointRef(module: ModuleRef, spec: ExactModelEndpointSpec) {
producer: { module, name: `bind-${spec.producerName}-${port.name}` },
implementationDigest: digestOf(`${module.name}/bind-${spec.producerName}-${port.name}@1`),
} satisfies ExactModelMediaBindingEndpoint]));
+ const textBindings = Object.fromEntries(spec.ports.ports
+ .filter((port) => port.value.kind === "text")
+ .map((port) => [port.name, {
+ port: port.name,
+ producer: { module, name: `bind-${spec.producerName}-${port.name}-text` },
+ implementationDigest: digestOf(`${module.name}/bind-${spec.producerName}-${port.name}-text@1`),
+ } satisfies ExactModelTextBindingEndpoint]));
return {
requestType,
draftType,
@@ -138,6 +162,7 @@ function endpointRef(module: ModuleRef, spec: ExactModelEndpointSpec) {
finalizeProducer,
finalizeImplementationDigest,
mediaBindings,
+ textBindings,
};
}
@@ -184,6 +209,7 @@ export function defineExactModelModule<const Key extends string>(
dependencies: [
{ module: generationModuleRef, digest: generationManifestDigest },
artifactDependency,
+ textDependency,
],
types: endpointData.flatMap((item) => [
{
@@ -253,6 +279,20 @@ export function defineExactModelModule<const Key extends string>(
digest: binding.implementationDigest,
},
})),
+ ...Object.values(item.textBindings).map((binding) => ({
+ name: binding.producer.name,
+ inputs: [
+ { name: "draft", type: item.draftType },
+ { name: "text", type: textTypes.text },
+ ],
+ outputs: [{ name: "draft", type: item.draftType }],
+ needs: [],
+ implementation: {
+ kind: "registered" as const,
+ locator: `${options.module.name}/${item.spec.key}/bind-${binding.port}-text`,
+ digest: binding.implementationDigest,
+ },
+ })),
{
name: item.finalizeProducer.name,
inputs: [{ name: "draft", type: item.draftType }],
@@ -298,6 +338,7 @@ export function defineExactModelModule<const Key extends string>(
finalizeProducer: item.finalizeProducer,
finalizeImplementationDigest: item.finalizeImplementationDigest,
mediaBindings: item.mediaBindings,
+ textBindings: item.textBindings,
ports: item.spec.ports,
fragment,
} satisfies ExactModelEndpoint];
@@ -358,6 +399,23 @@ export function defineExactModelModule<const Key extends string>(
};
},
})),
+ ...Object.values(item.textBindings).map((binding) => ({
+ producer: binding.producer,
+ implementationDigest: binding.implementationDigest,
+ handler: ({ inputs }: ProducerHandlerContext) => {
+ const draft = inlineValue<GenerationRequestDraft>(inputs.draft!.value, `${item.spec.key} draft`);
+ const text = inlineValue<Text>(inputs.text!.value, `${binding.port} Text`);
+ return {
+ outputs: {
+ draft: {
+ kind: "inline" as const,
+ value: canonicalize(bindGenerationText(item.spec.ports, draft, binding.port, text)),
+ },
+ },
+ needs: {},
+ };
+ },
+ })),
{
producer: item.finalizeProducer,
implementationDigest: item.finalizeImplementationDigest,
@@ -387,6 +445,11 @@ export function exactModelMediaInputNames(name: string): {
return { artifact: `${name}:artifact`, binding: `${name}:binding` };
}
+export function exactModelTextInputName(name: string): string {
+ assert(name.trim().length > 0, "Exact model text input name is empty");
+ return `${name}:text`;
+}
+
/**
* Expand one exact-model invocation into a deterministic request-assembly
* graph. Every runtime-produced media artifact remains a real Fragment input;
@@ -396,9 +459,10 @@ export function exactModelMediaInputNames(name: string): {
export function createExactModelPrimaryGenerationFragment(
endpoint: ExactModelEndpoint,
mediaInputs: readonly ExactModelMediaInput[] = [],
+ textInputs: readonly ExactModelTextInput[] = [],
) {
- const names = mediaInputs.map((item) => item.name);
- assert(new Set(names).size === names.length, "Exact model media input names must be unique");
+ const names = [...mediaInputs, ...textInputs].map((item) => item.name);
+ assert(new Set(names).size === names.length, "Exact model input names must be unique");
const inputs = [{ name: "draft", type: endpoint.draftType }];
const operations: Array<{
readonly id: string;
@@ -410,6 +474,21 @@ export function createExactModelPrimaryGenerationFragment(
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
let draft = input("draft") as ReturnType<typeof input> | ReturnType<typeof operation>;
+ for (const [index, item] of textInputs.entries()) {
+ const binding = endpoint.textBindings[item.port];
+ assert(binding !== undefined, `${endpoint.ports.model} has no text port ${item.port}`);
+ const inputName = exactModelTextInputName(item.name);
+ inputs.push({ name: inputName, type: textTypes.text });
+ const id = `bind-text:${String(index + 1).padStart(4, "0")}:${item.port}`;
+ operations.push({
+ id,
+ producer: binding.producer,
+ inputs: { draft, text: input(inputName) },
+ result: { kind: "output", name: "draft" },
+ });
+ draft = operation(id);
+ }
+
for (const [index, item] of mediaInputs.entries()) {
const binding = endpoint.mediaBindings[item.port];
assert(binding !== undefined, `${endpoint.ports.model} has no media port ${item.port}`);
@@ -453,7 +532,10 @@ export function createExactModelPrimaryGenerationFragment(
result: { kind: "output", name: result },
});
const semanticInputs = inputs.map((entry) => entry.name);
- const shape = mediaInputs.map((item) => `${item.name}=${item.port}`).join(",") || "no-media";
+ const shape = [
+ ...textInputs.map((item) => `${item.name}=${item.port}:text`),
+ ...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
+ ].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
name: `${endpoint.producer.module.name}/${endpoint.key}-assembled-primary-${result}[${shape}]@1`,
inputs,
diff --git a/packages/model-kit/test/model-kit.test.ts b/packages/model-kit/test/model-kit.test.ts
index 84c88661..109675aa 100644
--- a/packages/model-kit/test/model-kit.test.ts
+++ b/packages/model-kit/test/model-kit.test.ts
@@ -11,6 +11,7 @@ import {
defineExactModelModule,
} from "@narratage/model-kit";
import { digestOf } from "@narratage/protocol";
+import { sealText } from "@narratage/text";
const ports = sealGenerationPortTable({
contract: "svml.generation-ports@1",
@@ -37,6 +38,7 @@ test("one exact model definition owns draft, media binding, finalization and gen
const endpoint = definition.endpoints.image!;
assert.equal(endpoint.draftType.name, "GraphNativeImageRequestDraft");
assert.equal(endpoint.mediaBindings.images?.type.name, "GraphNativeImageRequestImagesBinding");
+ assert.equal(endpoint.textBindings.prompt?.producer.name, "bind-request-graph-native-image-prompt-text");
assert.ok(definition.manifest.producers.some((producer) => producer.name === endpoint.finalizeProducer.name));
const artifact = {
@@ -65,15 +67,31 @@ test("one exact model definition owns draft, media binding, finalization and gen
assert.equal(request.contract, "svml.generation-request@1");
});
-test("the dynamic Fragment exposes every media artifact as an explicit semantic input", () => {
+test("one graph Text edge fills the exact model prompt before finalization", async () => {
+ const endpoint = definition.endpoints.image!;
+ const textFacet = definition.component.producers.find((facet) =>
+ facet.producer.name === endpoint.textBindings.prompt?.producer.name);
+ assert.ok(textFacet);
+ const draft = sealGenerationRequestDraft(ports, {});
+ const bound = await textFacet.handler({ inputs: {
+ draft: { value: { kind: "inline", value: draft } },
+ text: { value: { kind: "inline", value: sealText("draw it") } },
+ } } as never);
+ assert.equal(bound.outputs.draft?.kind, "inline");
+ if (bound.outputs.draft?.kind !== "inline") return;
+ assert.deepEqual((bound.outputs.draft.value as { ports: unknown }).ports, { prompt: ["draw it"] });
+});
+
+test("the dynamic Fragment exposes every Text and media edge as an explicit semantic input", () => {
const fragment = createExactModelPrimaryGenerationFragment(definition.endpoints.image!, [
{ name: "first", port: "images" },
{ name: "second", port: "images" },
- ]);
+ ], [{ name: "prompt", port: "prompt" }]);
assert.deepEqual(fragment.inputs.map((input) => input.name), [
- "draft", "first:artifact", "first:binding", "second:artifact", "second:binding",
+ "draft", "first:artifact", "first:binding", "prompt:text", "second:artifact", "second:binding",
]);
assert.deepEqual(fragment.operations.map((operation) => operation.producer.name), [
+ "bind-request-graph-native-image-prompt-text",
"bind-request-graph-native-image-images",
"bind-request-graph-native-image-images",
"finalize-request-graph-native-image",
@@ -81,6 +99,6 @@ test("the dynamic Fragment exposes every media artifact as an explicit semantic
"select-primary-image",
]);
assert.deepEqual(fragment.exports[0]?.semanticInputs, [
- "draft", "first:artifact", "first:binding", "second:artifact", "second:binding",
+ "draft", "first:artifact", "first:binding", "prompt:text", "second:artifact", "second:binding",
]);
});
diff --git a/packages/narrative/src/index.ts b/packages/narrative/src/index.ts
index 4004ce89..9dafecef 100644
--- a/packages/narrative/src/index.ts
+++ b/packages/narrative/src/index.ts
@@ -1,3 +1,3 @@
export { narrativeDependency, narrativeManifest, narrativeManifestDigest, narrativeModuleRef, narrativeTypes } from "./manifest.js";
-export { captionCorrespondenceSchema, captionDisplaySequenceSchema, captionDisplayWordSubsetSchema, narrativeDialogueExcerptSchema, narrativeExcerptSchema, narrativeMomentSchema, narrativeSchema, narrativeSelectionSchema, narrativeSpeechExcerptSchema } from "./schema.js";
+export { captionCorrespondenceSchema, captionDisplaySequenceSchema, captionDisplayWordSubsetSchema, narrativeExcerptSchema, narrativeMomentSchema, narrativeSchema, narrativeSelectionSchema } from "./schema.js";
export type * from "./types.js";
diff --git a/packages/narrative/src/manifest.ts b/packages/narrative/src/manifest.ts
index 063a8f2e..6fb90733 100644
--- a/packages/narrative/src/manifest.ts
+++ b/packages/narrative/src/manifest.ts
@@ -4,20 +4,16 @@ import {
captionCorrespondenceSchema,
captionDisplaySequenceSchema,
captionDisplayWordSubsetSchema,
- narrativeDialogueExcerptSchema,
narrativeExcerptSchema,
narrativeSchema,
narrativeMomentSchema,
narrativeSelectionSchema,
- narrativeSpeechExcerptSchema,
} from "./schema.js";
export const narrativeModuleRef = { name: "@narratage/narrative", version: "1" } as const;
export const narrativeTypes = {
narrative: { module: narrativeModuleRef, name: "Narrative" },
excerpt: { module: narrativeModuleRef, name: "NarrativeExcerpt" },
- dialogueExcerpt: { module: narrativeModuleRef, name: "NarrativeDialogueExcerpt" },
- speechExcerpt: { module: narrativeModuleRef, name: "NarrativeSpeechExcerpt" },
selection: { module: narrativeModuleRef, name: "NarrativeSelection" },
moment: { module: narrativeModuleRef, name: "NarrativeMoment" },
captionDisplay: { module: narrativeModuleRef, name: "CaptionDisplaySequence" },
@@ -30,8 +26,6 @@ export const narrativeManifest: ModuleManifest = {
types: [
{ name: narrativeTypes.narrative.name, schema: narrativeSchema },
{ name: narrativeTypes.excerpt.name, schema: narrativeExcerptSchema },
- { name: narrativeTypes.dialogueExcerpt.name, schema: narrativeDialogueExcerptSchema },
- { name: narrativeTypes.speechExcerpt.name, schema: narrativeSpeechExcerptSchema },
{ name: narrativeTypes.selection.name, schema: narrativeSelectionSchema },
{ name: narrativeTypes.moment.name, schema: narrativeMomentSchema },
{ name: narrativeTypes.captionDisplay.name, schema: captionDisplaySequenceSchema },
diff --git a/packages/narrative/src/schema.ts b/packages/narrative/src/schema.ts
index fa2382ef..e3f2fde1 100644
--- a/packages/narrative/src/schema.ts
+++ b/packages/narrative/src/schema.ts
@@ -39,26 +39,12 @@ export const narrativeSchema: ValueSchema = object({
segmentTokenIndex: { schema: integer, optional: true },
}) } },
}) },
- serializations: { schema: object({
- dialogue: { schema: { kind: "string" } }, speech: { schema: { kind: "string" } },
- }) },
});
export const narrativeExcerptSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.narrative-excerpt@1" } },
kind: { schema: { kind: "literal", value: "segment" } }, id: { schema: string },
tokenStart: { schema: integer }, tokenEndExclusive: { schema: integer },
- serializations: { schema: object({ dialogue: { schema: string }, speech: { schema: string } }) },
-});
-export const narrativeDialogueExcerptSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.narrative-dialogue-excerpt@1" } },
- kind: { schema: { kind: "literal", value: "segment" } }, id: { schema: string },
- tokenStart: { schema: integer }, tokenEndExclusive: { schema: integer }, dialogue: { schema: string },
-});
-export const narrativeSpeechExcerptSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.narrative-speech-excerpt@1" } },
- kind: { schema: { kind: "literal", value: "segment" } }, id: { schema: string },
- tokenStart: { schema: integer }, tokenEndExclusive: { schema: integer }, speech: { schema: string },
});
const captionDisplayWord = object({
id: { schema: string }, index: { schema: integer }, atomId: { schema: string }, segmentId: { schema: string },
diff --git a/packages/narrative/src/types.ts b/packages/narrative/src/types.ts
index c9d2038b..20eed54b 100644
--- a/packages/narrative/src/types.ts
+++ b/packages/narrative/src/types.ts
@@ -125,10 +125,6 @@ export type Narrative = {
readonly contract: "svml.semantic-index@1";
readonly anchors: readonly SemanticAnchor[];
};
- readonly serializations: {
- readonly dialogue: string;
- readonly speech: string;
- };
};
/**
@@ -142,28 +138,4 @@ export type NarrativeExcerpt = {
readonly id: string;
readonly tokenStart: number;
readonly tokenEndExclusive: number;
- readonly serializations: {
- readonly dialogue: string;
- readonly speech: string;
- };
-};
-
-/** The exact dialogue prompt for one Segment, including only explicitly authored Role prefixes. */
-export type NarrativeDialogueExcerpt = {
- readonly contract: "svml.narrative-dialogue-excerpt@1";
- readonly kind: "segment";
- readonly id: string;
- readonly tokenStart: number;
- readonly tokenEndExclusive: number;
- readonly dialogue: string;
-};
-
-/** The exact spoken wording for one Segment, without Role prefixes. */
-export type NarrativeSpeechExcerpt = {
- readonly contract: "svml.narrative-speech-excerpt@1";
- readonly kind: "segment";
- readonly id: string;
- readonly tokenStart: number;
- readonly tokenEndExclusive: number;
- readonly speech: string;
};
diff --git a/packages/package-loader-node/README.md b/packages/package-loader-node/README.md
index 54aad93e..3894d3d8 100644
--- a/packages/package-loader-node/README.md
+++ b/packages/package-loader-node/README.md
@@ -6,8 +6,8 @@ Validator identities. Loading verifies all artifacts and checks deterministic co
against their static Manifests before returning verified `NodePackageContribution` values.
This package does not select an author syntax. Syntax-specific executable facets remain inert until
-an exact Host ABI installs them. `@narratage/compiler-text-node` selects the official Text Surface ABI;
-`@narratage/local` can load the same package's deterministic compute facets without depending on Text.
+an exact Host ABI installs them. `@narratage/compiler-markup-node` selects the official Markup Surface ABI;
+`@narratage/local` can load the same package's deterministic compute facets without depending on Markup.
Run Fragment libraries use the ordinary `svml.run-fragment-host@1` Host facet; the Loader has no
Run-specific fragment field or interpretation branch.
diff --git a/packages/package-loader-node/test/loader.test.ts b/packages/package-loader-node/test/loader.test.ts
index 94b0179d..312bc8f7 100644
--- a/packages/package-loader-node/test/loader.test.ts
+++ b/packages/package-loader-node/test/loader.test.ts
@@ -130,9 +130,9 @@ async function fixture(): Promise<{
specifiers: ["example.card@1"],
}],
hostFacets: [{
- abi: "svml.text-surface-host@1",
+ abi: "svml.markup-surface-host@1",
identity: {
- contract: "svml.text-surface-host-facet@1",
+ contract: "svml.markup-surface-host-facet@1",
module,
surface: "card",
mode: "structured",
@@ -178,7 +178,7 @@ async function fixture(): Promise<{
};
`, "utf8");
const source = join(root, "main.svml");
- await writeFile(source, `<?svml using="@narratage/text@1"?>
+ await writeFile(source, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="example" from="example.card@1"/>
<example:Card/>
@@ -194,7 +194,7 @@ test("an installed locked package carries inert Host facets and activatable comp
const packages = await loadNodePackageContributions(item.lock, item.root);
assert.equal(packages[0]?.name, "example-card");
- assert.equal(packages[0]?.hostFacets?.[0]?.abi, "svml.text-surface-host@1");
+ assert.equal(packages[0]?.hostFacets?.[0]?.abi, "svml.markup-surface-host@1");
const registered: Array<{ readonly producer: ProducerRef; readonly digest: string }> = [];
installNodePackageComponents(packages, {
diff --git a/packages/prompt-kit/README.md b/packages/prompt-kit/README.md
deleted file mode 100644
index 5170a794..00000000
--- a/packages/prompt-kit/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# `@narratage/prompt-kit`
-
-Optional author-time compiler from a declarative Prompt Kit Spec and one Invocation to an ordered,
-inspectable Prompt Program. It is reusable beyond video, but is not part of the domain-neutral
-Core.
-
-It recognizes only four bounded block forms: fixed text, one parameter axis, a finite conditional
-variant and a required/optional text slot. It has no network, Provider, model, video or Speaker
-knowledge and cannot execute arbitrary expressions.
-
-The self-described `@narratage/prompt-kit/svs@1` Frontend reads ordinary SVS syntax and exports one
-authored `PromptKitSpec`. SVS does not execute a Kit. A Surface supplies the domain binding and
-invokes this pure compiler while lowering author source; no Prompt Kit Producer, Need, queue task or
-Provider call exists in the Run Graph.
diff --git a/packages/prompt-kit/src/activation.ts b/packages/prompt-kit/src/activation.ts
deleted file mode 100644
index 61f3b4c7..00000000
--- a/packages/prompt-kit/src/activation.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {
- promptKitComponent,
- promptKitManifest,
- promptKitSvsFrontend,
-} from "./index.js";
-
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
- name: "@narratage/prompt-kit",
- modules: [{
- manifest: promptKitManifest,
- specifiers: ["@narratage/prompt-kit", "@narratage/prompt-kit@1"],
- }],
- authorFrontends: [promptKitSvsFrontend],
- components: [promptKitComponent],
-};
-
-export default svmlPackage;
diff --git a/packages/prompt-kit/src/component.ts b/packages/prompt-kit/src/component.ts
deleted file mode 100644
index 40743048..00000000
--- a/packages/prompt-kit/src/component.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ComponentPackage } from "@narratage/component-kit";
-import type { StoredValue } from "@narratage/protocol";
-
-import {
- promptKitImplementationDigests,
- promptKitTypes,
-} from "./manifest.js";
-import {
- verifyPromptKitInvocation,
- verifyPromptKitSpec,
- verifyPromptProgram,
-} from "./program.js";
-function inline<T>(value: StoredValue | undefined, subject: string): T {
- if (value?.kind !== "inline") throw new Error(`${subject} must be inline`);
- return value.value as unknown as T;
-}
-
-export const promptKitComponent = {
- name: "@narratage/prompt-kit",
- validators: [
- {
- type: promptKitTypes.spec,
- implementationDigest: promptKitImplementationDigests.specValidator,
- handler: ({ value }) => verifyPromptKitSpec(inline(value, "PromptKitSpec")),
- },
- {
- type: promptKitTypes.invocation,
- implementationDigest: promptKitImplementationDigests.invocationValidator,
- handler: ({ value }) => verifyPromptKitInvocation(inline(value, "PromptKitInvocation")),
- },
- {
- type: promptKitTypes.program,
- implementationDigest: promptKitImplementationDigests.programValidator,
- handler: ({ value }) => verifyPromptProgram(inline(value, "PromptProgram")),
- },
- ],
-} satisfies ComponentPackage;
diff --git a/packages/prompt-kit/src/frontend.ts b/packages/prompt-kit/src/frontend.ts
deleted file mode 100644
index 1f3a7a2a..00000000
--- a/packages/prompt-kit/src/frontend.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import {
- sealRecord,
- sealTypedModule,
- verifyClosure,
- verifyRecordStructure,
-} from "@narratage/core";
-import { sealAuthorModule } from "@narratage/elaborator";
-import type { AuthorFrontend, AuthorSourceExport } from "@narratage/elaborator";
-import { parseSvs } from "@narratage/svs";
-
-import {
- promptKitImplementationDigests,
- promptKitModuleRef,
- promptKitTypes,
-} from "./manifest.js";
-import { promptKitSpecFromSvsRecipes } from "./svs.js";
-
-export const promptKitSvsFrontendId = "@narratage/prompt-kit/svs@1";
-
-/**
- * A self-described Prompt Kit source is ordinary SVS syntax with Prompt Kit semantics.
- * It compiles one complete Kit into one authored PromptKitSpec and never enters the Run Graph.
- */
-export const promptKitSvsFrontend: AuthorFrontend = {
- id: promptKitSvsFrontendId,
- implementationDigest: promptKitImplementationDigests.svsFrontend,
- discover() {
- return {
- modules: [`${promptKitModuleRef.name}@${promptKitModuleRef.version}`],
- sources: [],
- };
- },
- decode(source, context) {
- verifyClosure(context.closure);
- const parsed = parseSvs(source.name, source.text);
- const recipes = parsed.recipes.map((item) => item.value);
- const candidates = recipes
- .map((recipe) => /^prompt-kit\.([a-z][a-z0-9-]{0,95})$/u.exec(recipe.path)?.[1])
- .filter((id): id is string => id !== undefined);
- if (candidates.length !== 1) {
- throw new Error(`${source.name} must declare exactly one prompt-kit.<id> metadata Recipe`);
- }
- const spec = promptKitSpecFromSvsRecipes(recipes, candidates[0]!);
- const record = sealRecord({
- id: spec.id,
- type: promptKitTypes.spec,
- value: { kind: "inline", value: spec as unknown as import("@narratage/protocol").CanonicalValue },
- conformance: "exact",
- origin: {
- kind: "authored",
- sourceDigest: source.sourceDigest,
- frontendClosureDigest: promptKitImplementationDigests.svsFrontend,
- sourceName: source.name,
- },
- });
- verifyRecordStructure(context.closure, record);
- const exports: AuthorSourceExport[] = [{
- name: spec.id,
- ref: { kind: "record", id: record.id },
- type: record.type,
- }];
- return {
- module: sealTypedModule({
- id: `source:${source.name}`,
- closureDigest: context.closure.digest,
- records: [record],
- }),
- author: sealAuthorModule({ name: `source:${source.name}`, components: [] }),
- fragments: [],
- exports,
- };
- },
-};
diff --git a/packages/prompt-kit/src/index.ts b/packages/prompt-kit/src/index.ts
deleted file mode 100644
index 82aa67a1..00000000
--- a/packages/prompt-kit/src/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export { promptKitComponent } from "./component.js";
-export {
- promptKitImplementationDigests,
- promptKitManifest,
- promptKitManifestDigest,
- promptKitModuleRef,
- promptKitTypes,
-} from "./manifest.js";
-export {
- promptKitSvsFrontend,
- promptKitSvsFrontendId,
-} from "./frontend.js";
-export {
- compilePromptKit,
- sealPromptKitInvocation,
- sealPromptKitSpec,
- verifyPromptKitInvocation,
- verifyPromptKitSpec,
- verifyPromptProgram,
-} from "./program.js";
-export { promptKitSpecFromSvsRecipes } from "./svs.js";
-export type * from "./types.js";
diff --git a/packages/prompt-kit/src/manifest.ts b/packages/prompt-kit/src/manifest.ts
deleted file mode 100644
index f968ca8f..00000000
--- a/packages/prompt-kit/src/manifest.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { digestOf } from "@narratage/protocol";
-import type { Digest, ModuleManifest, TypeRef, ValueSchema } from "@narratage/protocol";
-
-export const promptKitModuleRef = { name: "@narratage/prompt-kit", version: "1" } as const;
-export const promptKitTypes = {
- spec: { module: promptKitModuleRef, name: "PromptKitSpec" },
- invocation: { module: promptKitModuleRef, name: "PromptKitInvocation" },
- program: { module: promptKitModuleRef, name: "PromptProgram" },
-} satisfies Record<string, TypeRef>;
-export const promptKitImplementationDigests = {
- svsFrontend: digestOf("@narratage/prompt-kit/svs-frontend@1"),
- specValidator: digestOf("@narratage/prompt-kit/validate-spec@1"),
- invocationValidator: digestOf("@narratage/prompt-kit/validate-invocation@1"),
- programValidator: digestOf("@narratage/prompt-kit/validate-program@1"),
-} as const;
-
-const openObject: ValueSchema = { kind: "object", fields: {}, allowUnknown: true };
-const block: ValueSchema = { kind: "object", fields: {}, allowUnknown: true };
-const specSchema: ValueSchema = {
- kind: "object",
- fields: {
- contract: { schema: { kind: "literal", value: "svml.prompt-kit-spec@1" } },
- id: { schema: { kind: "string", minLength: 1 } },
- separator: { schema: { kind: "literal", value: "\n\n" } },
- defaults: { schema: openObject },
- blocks: { schema: { kind: "array", minItems: 1, items: block } },
- },
-};
-const invocationSchema: ValueSchema = {
- kind: "object",
- fields: {
- contract: { schema: { kind: "literal", value: "svml.prompt-kit-invocation@1" } },
- parameters: { schema: openObject },
- selectors: { schema: openObject },
- slots: { schema: openObject },
- },
-};
-const programSchema: ValueSchema = {
- kind: "object",
- fields: {
- contract: { schema: { kind: "literal", value: "svml.prompt-program@1" } },
- separator: { schema: { kind: "literal", value: "\n\n" } },
- blocks: { schema: { kind: "array", minItems: 1, items: block } },
- },
-};
-
-function validatedType(name: string, schema: ValueSchema, locator: string, validatorDigest: Digest) {
- return {
- name,
- schema,
- validator: {
- abi: "svml.type-validator@1" as const,
- implementation: { kind: "registered" as const, locator, digest: validatorDigest },
- },
- };
-}
-
-export const promptKitManifest: ModuleManifest = {
- format: "svml.module@1",
- name: promptKitModuleRef.name,
- version: promptKitModuleRef.version,
- dependencies: [],
- types: [
- validatedType(promptKitTypes.spec.name, specSchema, "@narratage/prompt-kit/validate-spec", promptKitImplementationDigests.specValidator),
- validatedType(promptKitTypes.invocation.name, invocationSchema, "@narratage/prompt-kit/validate-invocation", promptKitImplementationDigests.invocationValidator),
- validatedType(promptKitTypes.program.name, programSchema, "@narratage/prompt-kit/validate-program", promptKitImplementationDigests.programValidator),
- ],
- capabilities: [],
- surfaces: [],
- producers: [],
-};
-
-export const promptKitManifestDigest = digestOf(promptKitManifest);
diff --git a/packages/prompt-kit/src/program.ts b/packages/prompt-kit/src/program.ts
deleted file mode 100644
index 1c59405a..00000000
--- a/packages/prompt-kit/src/program.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import { canonicalize } from "@narratage/protocol";
-
-import type {
- PromptKitAxisBlock,
- PromptKitBlockSpec,
- PromptKitChoice,
- PromptKitInvocation,
- PromptKitScalar,
- PromptKitSpec,
- PromptProgram,
- PromptProgramBlock,
-} from "./types.js";
-
-const ID = /^[a-z][a-z0-9-]{0,95}$/u;
-
-function object(value: unknown, subject: string): Record<string, unknown> {
- if (value === null || typeof value !== "object" || Array.isArray(value)) {
- throw new Error(`${subject} must be an object`);
- }
- return value as Record<string, unknown>;
-}
-
-function scalar(value: unknown, subject: string): asserts value is PromptKitScalar {
- if (
- typeof value !== "string"
- && typeof value !== "boolean"
- && !(typeof value === "number" && Number.isFinite(value))
- ) {
- throw new Error(`${subject} must be a finite scalar`);
- }
-}
-
-function scalarMap(value: unknown, subject: string): asserts value is Readonly<Record<string, PromptKitScalar>> {
- const record = object(value, subject);
- for (const [name, item] of Object.entries(record)) {
- if (!ID.test(name)) throw new Error(`${subject} contains invalid key ${name}`);
- scalar(item, `${subject}.${name}`);
- }
-}
-
-function stringMap(value: unknown, subject: string): asserts value is Readonly<Record<string, string>> {
- const record = object(value, subject);
- for (const [name, item] of Object.entries(record)) {
- if (!ID.test(name) || typeof item !== "string" || item.length === 0) {
- throw new Error(`${subject}.${name} must be a non-empty string`);
- }
- }
-}
-
-function choice(value: unknown, subject: string): asserts value is PromptKitChoice {
- const item = object(value, subject);
- if (!ID.test(String(item.id ?? "")) || typeof item.text !== "string" || item.text.length === 0) {
- throw new Error(`${subject} identity or text is invalid`);
- }
- const when = object(item.when, `${subject}.when`);
- scalarMap(when.parameters, `${subject}.when.parameters`);
- stringMap(when.selectors, `${subject}.when.selectors`);
-}
-
-function block(value: unknown, subject: string): asserts value is PromptKitBlockSpec {
- const item = object(value, subject);
- if (!ID.test(String(item.id ?? "")) || !Number.isSafeInteger(item.order) || Number(item.order) < 0) {
- throw new Error(`${subject} identity or order is invalid`);
- }
- if (item.kind === "fixed") {
- if (typeof item.text !== "string" || item.text.length === 0) throw new Error(`${subject}.text is empty`);
- return;
- }
- if (item.kind === "axis") {
- if (!ID.test(String(item.parameter ?? "")) || !Array.isArray(item.choices) || item.choices.length === 0) {
- throw new Error(`${subject} axis is invalid`);
- }
- item.choices.forEach((entry, index) => choice(entry, `${subject}.choices[${index}]`));
- const choices = item.choices as readonly PromptKitChoice[];
- if (choices.some((entry) => Object.keys(entry.when.parameters).length > 0 || Object.keys(entry.when.selectors).length > 0)) {
- throw new Error(`${subject} axis choices cannot carry conditions`);
- }
- return;
- }
- if (item.kind === "variant") {
- if (!Array.isArray(item.choices) || item.choices.length === 0) throw new Error(`${subject} variant has no choices`);
- item.choices.forEach((entry, index) => choice(entry, `${subject}.choices[${index}]`));
- return;
- }
- if (item.kind === "slot") {
- if (!ID.test(String(item.slot ?? "")) || typeof item.optional !== "boolean") {
- throw new Error(`${subject} slot is invalid`);
- }
- if (item.label !== undefined && (typeof item.label !== "string" || item.label.length === 0)) {
- throw new Error(`${subject}.label must be a non-empty string`);
- }
- return;
- }
- throw new Error(`${subject}.kind is invalid`);
-}
-
-export function sealPromptKitSpec(value: PromptKitSpec): PromptKitSpec {
- const result = canonicalize(value) as unknown as PromptKitSpec;
- verifyPromptKitSpec(result);
- return result;
-}
-
-export function verifyPromptKitSpec(value: unknown): asserts value is PromptKitSpec {
- const spec = object(value, "PromptKitSpec") as PromptKitSpec;
- if (
- spec.contract !== "svml.prompt-kit-spec@1"
- || !ID.test(spec.id)
- || spec.separator !== "\n\n"
- || !Array.isArray(spec.blocks)
- || spec.blocks.length === 0
- ) {
- throw new Error("PromptKitSpec header is invalid");
- }
- scalarMap(spec.defaults, "PromptKitSpec.defaults");
- spec.blocks.forEach((item, index) => block(item, `PromptKitSpec.blocks[${index}]`));
- const ids = spec.blocks.map((item) => item.id);
- const orders = spec.blocks.map((item) => item.order);
- if (new Set(ids).size !== ids.length || new Set(orders).size !== orders.length) {
- throw new Error("PromptKitSpec block ids and orders must be unique");
- }
- if (spec.blocks.some((item, index) => index > 0 && item.order <= spec.blocks[index - 1]!.order)) {
- throw new Error("PromptKitSpec blocks must be ordered strictly by order");
- }
- for (const item of spec.blocks) {
- if ((item.kind === "axis" || item.kind === "variant") && new Set(item.choices.map((entry: PromptKitChoice) => entry.id)).size !== item.choices.length) {
- throw new Error(`PromptKitSpec block ${item.id} has duplicate choices`);
- }
- }
-}
-
-export function sealPromptKitInvocation(
- value: PromptKitInvocation,
-): PromptKitInvocation {
- const result = canonicalize(value) as unknown as PromptKitInvocation;
- verifyPromptKitInvocation(result);
- return result;
-}
-
-export function verifyPromptKitInvocation(value: unknown): asserts value is PromptKitInvocation {
- const invocation = object(value, "PromptKitInvocation") as PromptKitInvocation;
- if (
- invocation.contract !== "svml.prompt-kit-invocation@1"
- ) {
- throw new Error("PromptKitInvocation header is invalid");
- }
- scalarMap(invocation.parameters, "PromptKitInvocation.parameters");
- stringMap(invocation.selectors, "PromptKitInvocation.selectors");
- stringMap(invocation.slots, "PromptKitInvocation.slots");
-}
-
-export function verifyPromptProgram(value: unknown): asserts value is PromptProgram {
- const program = object(value, "PromptProgram") as PromptProgram;
- if (
- program.contract !== "svml.prompt-program@1"
- || program.separator !== "\n\n"
- || !Array.isArray(program.blocks)
- || program.blocks.length === 0
- ) {
- throw new Error("PromptProgram header is invalid");
- }
- for (const [index, item] of program.blocks.entries()) {
- if (!ID.test(item.id) || typeof item.text !== "string" || item.text.length === 0) {
- throw new Error(`PromptProgram.blocks[${index}] is invalid`);
- }
- }
- if (new Set(program.blocks.map((item) => item.id)).size !== program.blocks.length) {
- throw new Error("PromptProgram block ids must be unique");
- }
-}
-
-function conditionsMatch(
- choice: PromptKitChoice,
- parameters: Readonly<Record<string, PromptKitScalar>>,
- selectors: Readonly<Record<string, string>>,
-): boolean {
- return Object.entries(choice.when.parameters).every(([name, value]) => parameters[name] === value)
- && Object.entries(choice.when.selectors).every(([name, value]) => selectors[name] === value);
-}
-
-function knownInputs(spec: PromptKitSpec) {
- const parameters = new Set(Object.keys(spec.defaults));
- const selectors = new Set<string>();
- const slots = new Set<string>();
- for (const item of spec.blocks) {
- if (item.kind === "axis") parameters.add(item.parameter);
- if (item.kind === "variant") {
- for (const option of item.choices) {
- Object.keys(option.when.parameters).forEach((name) => parameters.add(name));
- Object.keys(option.when.selectors).forEach((name) => selectors.add(name));
- }
- }
- if (item.kind === "slot") slots.add(item.slot);
- }
- return { parameters, selectors, slots };
-}
-
-function axisBlock(
- item: PromptKitAxisBlock,
- parameters: Readonly<Record<string, PromptKitScalar>>,
-): PromptProgramBlock {
- const value = parameters[item.parameter];
- if (value === undefined) throw new Error(`Prompt Kit parameter ${item.parameter} is required`);
- const selected = item.choices.filter((option) => option.id === String(value));
- if (selected.length !== 1) throw new Error(`Prompt Kit axis ${item.parameter} has no unique choice for ${String(value)}`);
- return { id: item.id, text: selected[0]!.text };
-}
-
-export function compilePromptKit(spec: PromptKitSpec, invocation: PromptKitInvocation): PromptProgram {
- verifyPromptKitSpec(spec);
- verifyPromptKitInvocation(invocation);
- const known = knownInputs(spec);
- for (const name of Object.keys(invocation.parameters)) {
- if (!known.parameters.has(name)) throw new Error(`Prompt Kit parameter ${name} is not declared`);
- }
- for (const name of Object.keys(invocation.selectors)) {
- if (!known.selectors.has(name)) throw new Error(`Prompt Kit selector ${name} is not declared`);
- }
- for (const name of Object.keys(invocation.slots)) {
- if (!known.slots.has(name)) throw new Error(`Prompt Kit slot ${name} is not declared`);
- }
- const parameters = { ...spec.defaults, ...invocation.parameters };
- const blocks: PromptProgramBlock[] = [];
- for (const item of spec.blocks) {
- if (item.kind === "fixed") {
- blocks.push({ id: item.id, text: item.text });
- continue;
- }
- if (item.kind === "axis") {
- blocks.push(axisBlock(item, parameters));
- continue;
- }
- if (item.kind === "variant") {
- const selected = item.choices.filter((option) => conditionsMatch(option, parameters, invocation.selectors));
- if (selected.length !== 1) throw new Error(`Prompt Kit variant ${item.id} matched ${selected.length} choices`);
- blocks.push({ id: item.id, text: selected[0]!.text });
- continue;
- }
- const value = invocation.slots[item.slot]?.trim();
- if (value === undefined || value.length === 0) {
- if (!item.optional) throw new Error(`Prompt Kit slot ${item.slot} is required`);
- continue;
- }
- blocks.push({
- id: item.id,
- text: item.label === undefined ? value : `${item.label}\n${value}`,
- });
- }
- const program: PromptProgram = {
- contract: "svml.prompt-program@1",
- separator: spec.separator,
- blocks,
- };
- verifyPromptProgram(program);
- return program;
-}
diff --git a/packages/prompt-kit/src/svs.ts b/packages/prompt-kit/src/svs.ts
deleted file mode 100644
index fa1c7f96..00000000
--- a/packages/prompt-kit/src/svs.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import type { SvsRecipe } from "@narratage/svs";
-
-import { sealPromptKitSpec } from "./program.js";
-import type {
- PromptKitBlockSpec,
- PromptKitChoice,
- PromptKitConditions,
- PromptKitScalar,
- PromptKitSpec,
-} from "./types.js";
-
-function text(recipe: SvsRecipe, name: string, fallback?: string): string {
- const value = recipe.properties[name] ?? fallback;
- if (typeof value !== "string" || value.length === 0) {
- throw new Error(`${recipe.path}.${name} must be a non-empty string`);
- }
- return value;
-}
-
-function integer(recipe: SvsRecipe, name: string): number {
- const value = recipe.properties[name];
- if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
- throw new Error(`${recipe.path}.${name} must be a non-negative integer`);
- }
- return value;
-}
-
-function boolean(recipe: SvsRecipe, name: string, fallback: boolean): boolean {
- const value = recipe.properties[name] ?? fallback;
- if (typeof value !== "boolean") throw new Error(`${recipe.path}.${name} must be boolean`);
- return value;
-}
-
-function exactProperties(recipe: SvsRecipe, allowed: ReadonlySet<string>, prefixes: readonly string[] = []): void {
- const unknown = Object.keys(recipe.properties).filter(
- (name) => !allowed.has(name) && !prefixes.some((prefix) => name.startsWith(prefix)),
- );
- if (unknown.length > 0) throw new Error(`${recipe.path} contains unknown property ${unknown[0]}`);
-}
-
-function choice(recipe: SvsRecipe, id: string): PromptKitChoice {
- exactProperties(recipe, new Set(["text"]), ["when-param-", "when-select-"]);
- const conditions: { parameters: Record<string, PromptKitScalar>; selectors: Record<string, string> } = {
- parameters: {},
- selectors: {},
- };
- for (const [name, value] of Object.entries(recipe.properties)) {
- if (name.startsWith("when-param-")) {
- conditions.parameters[name.slice("when-param-".length)] = value as PromptKitScalar;
- }
- if (name.startsWith("when-select-")) {
- if (typeof value !== "string" || value.length === 0) throw new Error(`${recipe.path}.${name} must be a string`);
- conditions.selectors[name.slice("when-select-".length)] = value;
- }
- }
- return { id, text: text(recipe, "text"), when: conditions satisfies PromptKitConditions };
-}
-
-/**
- * Decodes a bounded Prompt Kit data convention from ordinary flat SVS Recipes.
- * SVS itself remains a generic named-value language; it does not execute this specification.
- */
-export function promptKitSpecFromSvsRecipes(
- recipes: readonly SvsRecipe[],
- kitId: string,
-): PromptKitSpec {
- const prefix = `prompt-kit.${kitId}`;
- const meta = recipes.find((recipe) => recipe.path === prefix);
- if (meta === undefined) throw new Error(`Missing ${prefix} metadata Recipe`);
- exactProperties(meta, new Set(["separator"]), ["default-"]);
- if (text(meta, "separator", "paragraph") !== "paragraph") {
- throw new Error(`${prefix}.separator must be paragraph`);
- }
- const defaults: Record<string, PromptKitScalar> = {};
- for (const [name, value] of Object.entries(meta.properties)) {
- if (name.startsWith("default-")) defaults[name.slice("default-".length)] = value as PromptKitScalar;
- }
- const blockPrefix = `${prefix}.block.`;
- const choicePrefix = `${prefix}.choice.`;
- const blocks: PromptKitBlockSpec[] = recipes
- .filter((recipe) => recipe.path.startsWith(blockPrefix))
- .map((recipe): PromptKitBlockSpec => {
- const id = recipe.path.slice(blockPrefix.length);
- if (id.includes(".")) throw new Error(`${recipe.path} block id cannot contain '.'`);
- const kind = text(recipe, "kind");
- const order = integer(recipe, "order");
- if (kind === "fixed") {
- exactProperties(recipe, new Set(["kind", "order", "text"]));
- return { kind, id, order, text: text(recipe, "text") };
- }
- if (kind === "axis" || kind === "variant") {
- exactProperties(recipe, new Set(["kind", "order", ...(kind === "axis" ? ["parameter"] : [])]));
- const options = recipes
- .filter((item) => item.path.startsWith(`${choicePrefix}${id}.`))
- .map((item) => choice(item, item.path.slice(`${choicePrefix}${id}.`.length)));
- return kind === "axis"
- ? { kind, id, order, parameter: text(recipe, "parameter"), choices: options }
- : { kind, id, order, choices: options };
- }
- if (kind === "slot") {
- exactProperties(recipe, new Set(["kind", "order", "slot", "optional", "label"]));
- const label = recipe.properties.label;
- return {
- kind,
- id,
- order,
- slot: text(recipe, "slot"),
- optional: boolean(recipe, "optional", false),
- ...(label === undefined ? {} : { label: text(recipe, "label") }),
- };
- }
- throw new Error(`${recipe.path}.kind ${kind} is unsupported`);
- })
- .sort((left, right) => left.order - right.order);
- const consumed = new Set([
- meta.path,
- ...blocks.map((item) => `${blockPrefix}${item.id}`),
- ...recipes.filter((recipe) => recipe.path.startsWith(choicePrefix)).map((recipe) => recipe.path),
- ]);
- const stray = recipes.find((recipe) => recipe.path.startsWith(`${prefix}.`) && !consumed.has(recipe.path));
- if (stray !== undefined) throw new Error(`Unrecognized Prompt Kit Recipe ${stray.path}`);
- return sealPromptKitSpec({
- contract: "svml.prompt-kit-spec@1",
- id: kitId,
- separator: "\n\n",
- defaults,
- blocks,
- });
-}
diff --git a/packages/prompt-kit/src/types.ts b/packages/prompt-kit/src/types.ts
deleted file mode 100644
index 060ec835..00000000
--- a/packages/prompt-kit/src/types.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-export type PromptKitScalar = string | number | boolean;
-
-export type PromptKitConditions = {
- readonly parameters: Readonly<Record<string, PromptKitScalar>>;
- readonly selectors: Readonly<Record<string, string>>;
-};
-
-export type PromptKitChoice = {
- readonly id: string;
- readonly text: string;
- readonly when: PromptKitConditions;
-};
-
-export type PromptKitFixedBlock = {
- readonly kind: "fixed";
- readonly id: string;
- readonly order: number;
- readonly text: string;
-};
-
-export type PromptKitAxisBlock = {
- readonly kind: "axis";
- readonly id: string;
- readonly order: number;
- readonly parameter: string;
- readonly choices: readonly PromptKitChoice[];
-};
-
-export type PromptKitVariantBlock = {
- readonly kind: "variant";
- readonly id: string;
- readonly order: number;
- readonly choices: readonly PromptKitChoice[];
-};
-
-export type PromptKitSlotBlock = {
- readonly kind: "slot";
- readonly id: string;
- readonly order: number;
- readonly slot: string;
- readonly optional: boolean;
- readonly label?: string;
-};
-
-export type PromptKitBlockSpec =
- | PromptKitFixedBlock
- | PromptKitAxisBlock
- | PromptKitVariantBlock
- | PromptKitSlotBlock;
-
-export type PromptKitSpec = {
- readonly contract: "svml.prompt-kit-spec@1";
- readonly id: string;
- readonly separator: "\n\n";
- readonly defaults: Readonly<Record<string, PromptKitScalar>>;
- readonly blocks: readonly PromptKitBlockSpec[];
-};
-
-export type PromptKitInvocation = {
- readonly contract: "svml.prompt-kit-invocation@1";
- readonly parameters: Readonly<Record<string, PromptKitScalar>>;
- readonly selectors: Readonly<Record<string, string>>;
- readonly slots: Readonly<Record<string, string>>;
-};
-
-export type PromptProgramBlock = {
- readonly id: string;
- readonly text: string;
-};
-
-export type PromptProgram = {
- readonly contract: "svml.prompt-program@1";
- readonly separator: "\n\n";
- readonly blocks: readonly PromptProgramBlock[];
-};
diff --git a/packages/prompt-kit/test/program.test.ts b/packages/prompt-kit/test/program.test.ts
deleted file mode 100644
index 4ec3f35f..00000000
--- a/packages/prompt-kit/test/program.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import {
- compilePromptKit,
- sealPromptKitInvocation,
- sealPromptKitSpec,
- verifyPromptProgram,
-} from "@narratage/prompt-kit";
-
-const emptyWhen = { parameters: {}, selectors: {} } as const;
-
-const spec = sealPromptKitSpec({
- contract: "svml.prompt-kit-spec@1",
- id: "demo-v1",
- separator: "\n\n",
- defaults: { tone: "calm" },
- blocks: [
- { kind: "fixed", id: "base", order: 10, text: "BASE" },
- {
- kind: "axis", id: "tone", order: 20, parameter: "tone",
- choices: [
- { id: "calm", text: "CALM", when: emptyWhen },
- { id: "loud", text: "LOUD", when: emptyWhen },
- ],
- },
- {
- kind: "variant", id: "evidence", order: 30,
- choices: [
- { id: "none", text: "NO EVIDENCE", when: { parameters: {}, selectors: { evidence: "none" } } },
- { id: "present", text: "USE EVIDENCE", when: { parameters: {}, selectors: { evidence: "present" } } },
- ],
- },
- { kind: "slot", id: "subject", order: 40, slot: "subject", optional: false, label: "SUBJECT:" },
- { kind: "slot", id: "extra", order: 50, slot: "extra", optional: true },
- ],
-});
-
-function invocation(parameters: Record<string, string> = {}) {
- return sealPromptKitInvocation({
- contract: "svml.prompt-kit-invocation@1",
- parameters,
- selectors: { evidence: "present" },
- slots: { subject: "a toothbrush" },
- });
-}
-
-test("generic Prompt Kit resolves defaults, finite variants and required slots", () => {
- const program = compilePromptKit(spec, invocation());
- verifyPromptProgram(program);
- assert.deepEqual(program.blocks.map((block) => block.text), [
- "BASE", "CALM", "USE EVIDENCE", "SUBJECT:\na toothbrush",
- ]);
-});
-
-test("Invocation parameters override Spec defaults without changing the Spec", () => {
- const program = compilePromptKit(spec, invocation({ tone: "loud" }));
- assert.equal(program.blocks[1]?.text, "LOUD");
- assert.equal(spec.defaults.tone, "calm");
-});
-
-test("unknown inputs and non-unique finite branches fail closed", () => {
- assert.throws(
- () => compilePromptKit(spec, invocation({ typo: "loud" })),
- /parameter typo is not declared/u,
- );
- const ambiguous = sealPromptKitSpec({
- contract: "svml.prompt-kit-spec@1",
- id: "ambiguous-v1",
- separator: "\n\n",
- defaults: {},
- blocks: [{
- kind: "variant", id: "branch", order: 10,
- choices: [
- { id: "first", text: "FIRST", when: emptyWhen },
- { id: "second", text: "SECOND", when: emptyWhen },
- ],
- }],
- });
- const call = sealPromptKitInvocation({
- contract: "svml.prompt-kit-invocation@1",
- parameters: {}, selectors: {}, slots: {},
- });
- assert.throws(() => compilePromptKit(ambiguous, call), /matched 2 choices/u);
-});
diff --git a/packages/provider-kie/test/models.test.ts b/packages/provider-kie/test/models.test.ts
index 4469aa1f..27e671af 100644
--- a/packages/provider-kie/test/models.test.ts
+++ b/packages/provider-kie/test/models.test.ts
@@ -45,6 +45,7 @@ import {
sealSeedreamRequest,
} from "@narratage/seedream";
import type { CapabilityRef, LinkedProgram } from "@narratage/protocol";
+import { textManifest } from "@narratage/text";
/**
* Every exact model this repository ships, paired with the Capability it publishes.
@@ -121,6 +122,7 @@ test("all model manifests close over the shared generation contract and every Fr
];
const closure = createResolvedClosure([
...videoContractManifests,
+ textManifest,
generationManifest,
seedanceManifest,
minimaxH3Manifest,
diff --git a/packages/ranking/README.md b/packages/ranking/README.md
index c2b88ecc..fd7d0453 100644
--- a/packages/ranking/README.md
+++ b/packages/ranking/README.md
@@ -16,4 +16,23 @@ Each `*Style` declaration compiles one SVS Recipe and exact font reference into
plus a private named `.sound` Style output. A Ranking component connects both outputs when authored
sound exists; no sound produces no audio branch.
+Visible author copy may be literal or an ordinary graph `Text` reference. Column and TopThree use
+`label={copy}`, while Typewriter uses `title={copy}` and `text={copy}`. When a reference is used, the
+graph first materializes the package-owned item shell from that exact Text and then shares the one
+result across schedule, event and render work. Tier row names remain Style configuration because
+they define the board vocabulary rather than dynamic item copy.
+
+```svml
+<import as="copy" from="@narratage/text@1"/>
+
+<copy:Value id="winner">No hidden runtime choice</copy:Value>
+
+<ranking:Column id="priorities" map={timing.map} space={speech.space}
+ frame={layout.ranking} during={story.selection.ranking}
+ triggers={story.moment.ranking-items} terminal={story.moment.ranking-end}
+ style={ranking-style}>
+ <ranking:ColumnItem label={winner}/>
+</ranking:Column>
+```
+
See [`../../spec/ranking-track.md`](../../spec/ranking-track.md) for the normative pre-release model.
diff --git a/packages/ranking/package.json b/packages/ranking/package.json
index 91cdbd3b..9737ae52 100644
--- a/packages/ranking/package.json
+++ b/packages/ranking/package.json
@@ -22,6 +22,7 @@
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/ranking/src/activation.ts b/packages/ranking/src/activation.ts
index 5b15ab63..774a26d6 100644
--- a/packages/ranking/src/activation.ts
+++ b/packages/ranking/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeColumnStyleSurface,
@@ -34,7 +34,7 @@ export const svmlPackage = {
specifiers: [rankingModuleRef.name, `${rankingModuleRef.name}@1`],
}],
components: [rankingComponent],
- hostFacets: facets.map(([surface, implementationDigest, handler]) => createTextSurfaceHostFacet({
+ hostFacets: facets.map(([surface, implementationDigest, handler]) => createMarkupSurfaceHostFacet({
module: rankingModuleRef,
surface,
mode: "structured",
diff --git a/packages/ranking/src/component.ts b/packages/ranking/src/component.ts
index 69357157..794bb734 100644
--- a/packages/ranking/src/component.ts
+++ b/packages/ranking/src/component.ts
@@ -6,6 +6,7 @@ import { canonicalize } from "@narratage/protocol";
import type { BlobRef, StoredValue } from "@narratage/protocol";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { SpatialFrame } from "@narratage/spatial";
+import type { Text } from "@narratage/text";
import { rankingProducers, rankingTypes } from "./manifest.js";
import {
@@ -38,6 +39,7 @@ import {
createTypewriterItemSet,
rankingImplementationDigests,
rankingValidatorDigests,
+ materializeRankingTextItem,
} from "./schedule.js";
import {
renderColumn,
@@ -54,6 +56,7 @@ import type {
RankingHeader,
RankingItemSpec,
RankingItemSpecSet,
+ RankingTextItemShell,
RankingSchedule,
RankingSoundEventPlan,
RankingSoundSet,
@@ -90,6 +93,14 @@ function programInputs(inputs: ProducerHandlerContext["inputs"]) {
export const rankingComponent = {
name: "@narratage/ranking",
producers: [
+ {
+ producer: rankingProducers.materializeTextItem,
+ implementationDigest: rankingImplementationDigests.materializeTextItem,
+ handler: ({ inputs }) => ({ outputs: { spec: output(materializeRankingTextItem(
+ inline<RankingTextItemShell>(inputs.shell?.value, "RankingTextItemShell"),
+ inline<Text>(inputs.content?.value, "Text"),
+ )) }, needs: {} }),
+ },
{
producer: rankingProducers.createSpecs,
implementationDigest: rankingImplementationDigests.createSpecs,
@@ -192,7 +203,7 @@ export const rankingComponent = {
implementationDigest: rankingImplementationDigests.typewriterProgram,
handler: ({ inputs }) => {
const common = programInputs(inputs);
- const title = inline<{ readonly contract: "svml.ranking-title@1"; readonly value: string }>(inputs.title?.value, "RankingTitle");
+ const title = inline<Text>(inputs.title?.value, "Text");
return { outputs: { program: output(buildTypewriterListProgram(common.header, title.value, common.frame, common.schedule,
inline<TypewriterListStyle>(inputs.style?.value, "TypewriterListStyle"), inline<TypewriterItemSet>(inputs.set?.value, "TypewriterItemSet"))) }, needs: {} };
},
diff --git a/packages/ranking/src/fragment.ts b/packages/ranking/src/fragment.ts
index 2e2054ac..32e7d926 100644
--- a/packages/ranking/src/fragment.ts
+++ b/packages/ranking/src/fragment.ts
@@ -6,6 +6,7 @@ import { narrativeTypes } from "@narratage/narrative";
import { programSpaceTypes } from "@narratage/program-space";
import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
+import { textTypes } from "@narratage/text";
import { rankingProducers, rankingTypes } from "./manifest.js";
import type { RankingVariant } from "./types.js";
@@ -17,6 +18,7 @@ export type RankingFragmentItem = {
readonly suffix: string;
readonly specName: string;
readonly iconName?: string;
+ readonly contentName?: string;
};
export type RankingFragmentSound = {
@@ -69,7 +71,7 @@ export function createRankingFragment(
{ name: "frame", type: spatialTypes.frame },
{ name: "style", type: selected.style },
];
- if (variant === "typewriter-list") inputs.push({ name: "title", type: rankingTypes.title });
+ if (variant === "typewriter-list") inputs.push({ name: "title", type: textTypes.text });
const operations: FragmentOperation[] = [
{ id: "specs", producer: rankingProducers.createSpecs, inputs: { header: input("header") }, result: { kind: "output", name: "set" } },
{ id: "resolved", producer: selected.create, inputs: {}, result: { kind: "output", name: "set" } },
@@ -77,13 +79,22 @@ export function createRankingFragment(
let specs = operation("specs");
let resolved = operation("resolved");
for (const item of items) {
- inputs.push({ name: item.specName, type: rankingTypes.itemSpec });
+ inputs.push({ name: item.specName, type: item.contentName === undefined ? rankingTypes.itemSpec : rankingTypes.textItemShell });
+ if (item.contentName !== undefined) inputs.push({ name: item.contentName, type: textTypes.text });
if (item.iconName !== undefined) inputs.push({ name: item.iconName, type: mediaTypes.blobArtifact });
+ const materializedId = `materialize-${item.suffix}`;
+ if (item.contentName !== undefined) operations.push({
+ id: materializedId,
+ producer: rankingProducers.materializeTextItem,
+ inputs: { shell: input(item.specName), content: input(item.contentName) },
+ result: { kind: "output", name: "spec" },
+ });
+ const resolvedSpec = item.contentName === undefined ? input(item.specName) : operation(materializedId);
const semanticId = `spec-${item.suffix}`;
operations.push({
id: semanticId,
producer: rankingProducers.appendSpec,
- inputs: { set: specs, spec: input(item.specName) },
+ inputs: { set: specs, spec: resolvedSpec },
result: { kind: "output", name: "set" },
});
specs = operation(semanticId);
@@ -93,7 +104,7 @@ export function createRankingFragment(
producer: item.iconName === undefined ? selected.append : selected.appendIcon,
inputs: {
set: resolved,
- spec: input(item.specName),
+ spec: resolvedSpec,
...(item.iconName === undefined ? {} : { icon: input(item.iconName) }),
},
result: { kind: "output", name: "set" },
diff --git a/packages/ranking/src/index.ts b/packages/ranking/src/index.ts
index ab2e53c8..5c97b0c9 100644
--- a/packages/ranking/src/index.ts
+++ b/packages/ranking/src/index.ts
@@ -10,6 +10,7 @@ export {
assertRankingHeader,
assertRankingItemSpec,
assertRankingItemSpecSet,
+ assertRankingTextItemShell,
assertRankingSchedule,
assertRankingSoundEventPlan,
assertRankingSoundStyle,
@@ -38,6 +39,8 @@ export {
rankingImplementationDigests,
rankingValidatorDigests,
sealRankingHeader,
+ sealRankingTextItemShell,
+ materializeRankingTextItem,
} from "./schedule.js";
export {
decodeColumnStyle,
@@ -59,6 +62,7 @@ export {
rankingDependency,
rankingHeaderSchema,
rankingItemSpecSchema,
+ rankingTextItemShellSchema,
rankingItemSpecSetSchema,
rankingManifest,
rankingManifestDigest,
@@ -69,7 +73,6 @@ export {
rankingSoundSetSchema,
rankingSoundStyleSchema,
rankingSurfaceImplementationDigests,
- rankingTitleSchema,
rankingTypes,
} from "./manifest.js";
export {
diff --git a/packages/ranking/src/manifest.ts b/packages/ranking/src/manifest.ts
index 159518e3..305010e6 100644
--- a/packages/ranking/src/manifest.ts
+++ b/packages/ranking/src/manifest.ts
@@ -8,6 +8,7 @@ import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narrata
import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
import { spatialDependency, spatialFrameSchema, spatialTypes } from "@narratage/spatial";
import { temporalDependency } from "@narratage/temporal";
+import { textDependency, textTypes } from "@narratage/text";
import { rankingImplementationDigests, rankingValidatorDigests } from "./schedule.js";
@@ -15,6 +16,7 @@ export const rankingModuleRef = { name: "@narratage/ranking", version: "1" } as
export const rankingTypes = {
header: { module: rankingModuleRef, name: "RankingHeader" },
itemSpec: { module: rankingModuleRef, name: "RankingItemSpec" },
+ textItemShell: { module: rankingModuleRef, name: "RankingTextItemShell" },
itemSpecs: { module: rankingModuleRef, name: "RankingItemSpecSet" },
schedule: { module: rankingModuleRef, name: "RankingSchedule" },
soundStyle: { module: rankingModuleRef, name: "RankingSoundStyle" },
@@ -32,7 +34,6 @@ export const rankingTypes = {
columnProgram: { module: rankingModuleRef, name: "ColumnProgram" },
topThreeProgram: { module: rankingModuleRef, name: "TopThreeProgram" },
typewriterProgram: { module: rankingModuleRef, name: "TypewriterListProgram" },
- title: { module: rankingModuleRef, name: "RankingTitle" },
} satisfies Record<string, TypeRef>;
export const rankingProducers = {
@@ -65,6 +66,7 @@ export const rankingProducers = {
renderColumn: { module: rankingModuleRef, name: "render-column" },
renderTopThree: { module: rankingModuleRef, name: "render-top-three" },
renderTypewriter: { module: rankingModuleRef, name: "render-typewriter-list" },
+ materializeTextItem: { module: rankingModuleRef, name: "materialize-text-item" },
} satisfies Record<string, ProducerRef>;
const string = { kind: "string", minLength: 1 } as const;
@@ -90,6 +92,14 @@ export const rankingItemSpecSchema: ValueSchema = { kind: "oneOf", variants: [
emphasis: { optional: true, schema: object({ start: { schema: unsigned }, endExclusive: { schema: unsigned } }) },
}),
] };
+export const rankingTextItemShellSchema: ValueSchema = { kind: "oneOf", variants: [
+ object({ contract: { schema: { kind: "literal", value: "svml.column-text-item-shell@1" } }, variant: { schema: { kind: "literal", value: "column" } }, ...itemBase }),
+ object({ contract: { schema: { kind: "literal", value: "svml.top-three-text-item-shell@1" } }, variant: { schema: { kind: "literal", value: "top-three" } }, ...itemBase }),
+ object({ contract: { schema: { kind: "literal", value: "svml.typewriter-text-item-shell@1" } }, variant: { schema: { kind: "literal", value: "typewriter-list" } }, ...itemBase,
+ winner: { schema: { kind: "boolean" } },
+ emphasis: { optional: true, schema: object({ start: { schema: unsigned }, endExclusive: { schema: unsigned } }) },
+ }),
+] };
export const rankingItemSpecSetSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.ranking-item-spec-set@1" } },
variant: { schema: variants }, items: { schema: { kind: "array", items: rankingItemSpecSchema } },
@@ -120,10 +130,6 @@ export const rankingSoundSetSchema: ValueSchema = object({
contract: { schema: { kind: "literal", value: "svml.ranking-sound-set@1" } },
appear: { schema: object({}, true), optional: true }, move: { schema: object({}, true), optional: true },
});
-export const rankingTitleSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.ranking-title@1" } }, value: { schema: string },
-});
-
export const rankingSurfaceImplementationDigests = {
tierStyle: digestOf("@narratage/ranking/tier-board-style-surface@1"),
columnStyle: digestOf("@narratage/ranking/column-style-surface@1"),
@@ -146,10 +152,11 @@ const programDefinitions = [
export const rankingManifest: ModuleManifest = {
format: "svml.module@1", name: rankingModuleRef.name, version: rankingModuleRef.version,
- dependencies: [artifactDependency, mediaDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency],
+ dependencies: [artifactDependency, mediaDependency, narrativeDependency, semanticMapDependency, programSpaceDependency, spatialDependency, temporalDependency, compositionDependency, textDependency],
types: [
{ name: rankingTypes.header.name, schema: rankingHeaderSchema },
{ name: rankingTypes.itemSpec.name, schema: rankingItemSpecSchema },
+ { name: rankingTypes.textItemShell.name, schema: rankingTextItemShellSchema },
{ name: rankingTypes.itemSpecs.name, schema: rankingItemSpecSetSchema },
{ name: rankingTypes.schedule.name, schema: rankingScheduleSchema, validator: validator("@narratage/ranking/validate-schedule", rankingValidatorDigests.schedule) },
{ name: rankingTypes.soundStyle.name, schema: rankingSoundStyleSchema },
@@ -167,7 +174,6 @@ export const rankingManifest: ModuleManifest = {
{ name: rankingTypes.columnProgram.name, schema: programSchema("svml.column-program@1"), validator: validator("@narratage/ranking/validate-column-program", rankingValidatorDigests.columnProgram) },
{ name: rankingTypes.topThreeProgram.name, schema: programSchema("svml.top-three-program@1"), validator: validator("@narratage/ranking/validate-top-three-program", rankingValidatorDigests.topThreeProgram) },
{ name: rankingTypes.typewriterProgram.name, schema: programSchema("svml.typewriter-list-program@1"), validator: validator("@narratage/ranking/validate-typewriter-list-program", rankingValidatorDigests.typewriterProgram) },
- { name: rankingTypes.title.name, schema: rankingTitleSchema },
],
capabilities: [],
surfaces: [
@@ -176,11 +182,12 @@ export const rankingManifest: ModuleManifest = {
{ name: "top-three-style", tag: "TopThreeStyle", mode: "structured", outputs: [rankingTypes.topThreeStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/top-three-style-surface", digest: rankingSurfaceImplementationDigests.topThreeStyle } },
{ name: "typewriter-style", tag: "TypewriterListStyle", mode: "structured", outputs: [rankingTypes.typewriterStyle, rankingTypes.soundStyle], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/typewriter-list-style-surface", digest: rankingSurfaceImplementationDigests.typewriterStyle } },
{ name: "tier", tag: "TierBoard", mode: "structured", outputs: [rankingTypes.schedule, rankingTypes.tierProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/tier-board-surface", digest: rankingSurfaceImplementationDigests.tier } },
- { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/column-surface", digest: rankingSurfaceImplementationDigests.column } },
- { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/top-three-surface", digest: rankingSurfaceImplementationDigests.topThree } },
- { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/typewriter-list-surface", digest: rankingSurfaceImplementationDigests.typewriter } },
+ { name: "column", tag: "Column", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.columnProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/column-surface", digest: rankingSurfaceImplementationDigests.column } },
+ { name: "top-three", tag: "TopThree", mode: "structured", outputs: [rankingTypes.textItemShell, rankingTypes.schedule, rankingTypes.topThreeProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/top-three-surface", digest: rankingSurfaceImplementationDigests.topThree } },
+ { name: "typewriter", tag: "TypewriterList", mode: "structured", outputs: [rankingTypes.textItemShell, textTypes.text, rankingTypes.schedule, rankingTypes.typewriterProgram, compositionTypes.visualTrack, compositionTypes.audioTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/ranking/typewriter-list-surface", digest: rankingSurfaceImplementationDigests.typewriter } },
],
producers: [
+ { name: rankingProducers.materializeTextItem.name, inputs: [{ name: "shell", type: rankingTypes.textItemShell }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: rankingTypes.itemSpec }], needs: [], implementation: registered("@narratage/ranking/materialize-text-item", rankingImplementationDigests.materializeTextItem) },
{ name: rankingProducers.createSpecs.name, inputs: [{ name: "header", type: rankingTypes.header }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [], implementation: registered("@narratage/ranking/create-item-specs", rankingImplementationDigests.createSpecs) },
{ name: rankingProducers.appendSpec.name, inputs: [{ name: "set", type: rankingTypes.itemSpecs }, { name: "spec", type: rankingTypes.itemSpec }], outputs: [{ name: "set", type: rankingTypes.itemSpecs }], needs: [], implementation: registered("@narratage/ranking/append-item-spec", rankingImplementationDigests.appendSpec) },
{ name: rankingProducers.schedule.name, inputs: [
@@ -213,7 +220,7 @@ export const rankingManifest: ModuleManifest = {
...programDefinitions.flatMap(([name, programType, styleType, setType, programProducer, eventProducer, renderProducer, programDigest, eventDigest, renderDigest]) => [
{ name: programProducer.name, inputs: [
{ name: "header", type: rankingTypes.header },
- ...(name === "typewriter" ? [{ name: "title", type: rankingTypes.title }] : []),
+ ...(name === "typewriter" ? [{ name: "title", type: textTypes.text }] : []),
{ name: "frame", type: spatialTypes.frame }, { name: "schedule", type: rankingTypes.schedule },
{ name: "style", type: styleType }, { name: "set", type: setType },
], outputs: [{ name: "program", type: programType }], needs: [], implementation: registered(`@narratage/ranking/build-${name}-program`, programDigest) },
diff --git a/packages/ranking/src/schedule.ts b/packages/ranking/src/schedule.ts
index 148380d8..3faf0630 100644
--- a/packages/ranking/src/schedule.ts
+++ b/packages/ranking/src/schedule.ts
@@ -13,6 +13,8 @@ import {
} from "@narratage/program-space";
import type { ProgramSpace } from "@narratage/program-space";
import { canonicalize, digestOf, isDigest } from "@narratage/protocol";
+import { verifyText } from "@narratage/text";
+import type { Text } from "@narratage/text";
import type { CompleteSemanticMap } from "@narratage/semantic-map";
import { assertSpatialFrame } from "@narratage/spatial";
import {
@@ -31,6 +33,7 @@ import type {
RankingHeader,
RankingItemSpec,
RankingItemSpecSet,
+ RankingTextItemShell,
RankingMotionStyle,
RankingSchedule,
RankingSoundEvent,
@@ -86,6 +89,7 @@ export const rankingImplementationDigests = {
renderColumn: digestOf("@narratage/ranking/render-column@1"),
renderTopThree: digestOf("@narratage/ranking/render-top-three@1"),
renderTypewriter: digestOf("@narratage/ranking/render-typewriter-list@1"),
+ materializeTextItem: digestOf("@narratage/ranking/materialize-text-item@1"),
} as const;
export const rankingValidatorDigests = {
@@ -305,6 +309,51 @@ export function assertRankingItemSpec(value: RankingItemSpec): void {
if (value.stackingOrder !== undefined) stacking(value.stackingOrder, `RankingItemSpec.${value.id}.stackingOrder`);
}
+export function assertRankingTextItemShell(value: RankingTextItemShell): void {
+ identity(value.id, "RankingTextItemShell.id");
+ if (value.variant === "column") {
+ assert(value.contract === "svml.column-text-item-shell@1", "Column Text Item Shell contract is invalid.");
+ } else if (value.variant === "top-three") {
+ assert(value.contract === "svml.top-three-text-item-shell@1", "TopThree Text Item Shell contract is invalid.");
+ } else {
+ assert(value.variant === "typewriter-list" && value.contract === "svml.typewriter-text-item-shell@1",
+ "Typewriter Text Item Shell contract is invalid.");
+ assert(typeof value.winner === "boolean", `RankingTextItemShell.${value.id}.winner is invalid.`);
+ if (value.emphasis !== undefined) {
+ integer(value.emphasis.start, `RankingTextItemShell.${value.id}.emphasis.start`);
+ integer(value.emphasis.endExclusive, `RankingTextItemShell.${value.id}.emphasis.endExclusive`, 1);
+ assert(value.emphasis.endExclusive > value.emphasis.start,
+ `RankingTextItemShell.${value.id}.emphasis is empty.`);
+ }
+ }
+ if (value.stackingOrder !== undefined) stacking(value.stackingOrder, `RankingTextItemShell.${value.id}.stackingOrder`);
+}
+
+export function sealRankingTextItemShell(value: RankingTextItemShell): RankingTextItemShell {
+ const result = canonicalize(value) as unknown as RankingTextItemShell;
+ assertRankingTextItemShell(result);
+ return result;
+}
+
+export function materializeRankingTextItem(shell: RankingTextItemShell, content: Text): RankingItemSpec {
+ assertRankingTextItemShell(shell);
+ verifyText(content);
+ assert(content.value.trim().length > 0, `Ranking Text Item ${shell.id} content is empty.`);
+ let result: RankingItemSpec;
+ if (shell.variant === "column") {
+ const { contract: _contract, ...common } = shell;
+ result = { ...common, contract: "svml.column-item-spec@1", label: content.value };
+ } else if (shell.variant === "top-three") {
+ const { contract: _contract, ...common } = shell;
+ result = { ...common, contract: "svml.top-three-item-spec@1", label: content.value };
+ } else {
+ const { contract: _contract, ...common } = shell;
+ result = { ...common, contract: "svml.typewriter-item-spec@1", text: content.value };
+ }
+ assertRankingItemSpec(result);
+ return canonicalize(result) as unknown as RankingItemSpec;
+}
+
export function createRankingItemSpecSet(header: RankingHeader): RankingItemSpecSet {
assertRankingHeader(header);
return { contract: "svml.ranking-item-spec-set@1", variant: header.variant, items: [] };
diff --git a/packages/ranking/src/surface.ts b/packages/ranking/src/surface.ts
index c03f6d0d..14b509d5 100644
--- a/packages/ranking/src/surface.ts
+++ b/packages/ranking/src/surface.ts
@@ -7,13 +7,14 @@ import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
+import { sealText, textTypes } from "@narratage/text";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { createRankingFragment } from "./fragment.js";
import type { RankingFragmentItem, RankingFragmentSound } from "./fragment.js";
@@ -21,6 +22,7 @@ import { rankingTypes } from "./manifest.js";
import {
assertRankingItemSpec,
sealRankingHeader,
+ sealRankingTextItemShell,
} from "./schedule.js";
import {
decodeColumnStyle,
@@ -32,6 +34,7 @@ import type {
ColumnItemSpec,
RankingItemSpec,
RankingSoundStyle,
+ RankingTextItemShell,
RankingVariant,
TierBoardItemSpec,
TopThreeItemSpec,
@@ -87,7 +90,7 @@ function boolean(element: StructuredElement, name: string, fallback: boolean): b
}
function reference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: TypeRef,
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -99,7 +102,7 @@ function reference(
}
function oneOfReference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: readonly TypeRef[],
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -160,11 +163,25 @@ function plainChildText(element: StructuredElement): string {
return value;
}
+function textValue(
+ raw: MarkupAttributeValue | undefined,
+ label: string,
+ resolve: (path: string) => SurfaceResolvedReference | undefined,
+): string | SurfaceResolvedReference {
+ if (typeof raw === "string" && raw.trim().length > 0) return raw.trim();
+ return reference(raw, label, textTypes.text, resolve);
+}
+
function itemIdentity(element: StructuredElement, suffix: string): string {
return optionalText(element, "id") ?? `${localName(element).replace(/Item$/u, "").toLowerCase()}-${suffix}`;
}
-function itemSpec(element: StructuredElement, variant: RankingVariant, suffix: string): RankingItemSpec {
+function itemSpec(
+ element: StructuredElement,
+ variant: RankingVariant,
+ suffix: string,
+ resolve: (path: string) => SurfaceResolvedReference | undefined,
+): { readonly spec: RankingItemSpec | RankingTextItemShell; readonly content?: SurfaceResolvedReference } {
const id = itemIdentity(element, suffix);
const stackingOrder = integer(element, "stack");
let value: RankingItemSpec;
@@ -177,37 +194,54 @@ function itemSpec(element: StructuredElement, variant: RankingVariant, suffix: s
contract: "svml.tier-board-item-spec@1", variant, id, tier: text(element, "tier"), entry,
...(stackingOrder === undefined ? {} : { stackingOrder }),
} satisfies TierBoardItemSpec;
+ assertRankingItemSpec(value);
+ return { spec: value };
} else if (variant === "column") {
allowed(element, ["id", "label", "icon", "stack"]);
empty(element);
- value = {
- contract: "svml.column-item-spec@1", variant, id, label: text(element, "label"),
+ const label = textValue(element.attributes.label, `${element.name}.label`, resolve);
+ if (typeof label === "string") value = {
+ contract: "svml.column-item-spec@1", variant, id, label,
...(stackingOrder === undefined ? {} : { stackingOrder }),
} satisfies ColumnItemSpec;
+ else return { spec: sealRankingTextItemShell({
+ contract: "svml.column-text-item-shell@1", variant, id,
+ ...(stackingOrder === undefined ? {} : { stackingOrder }),
+ }), content: label };
} else if (variant === "top-three") {
allowed(element, ["id", "label", "icon", "stack"]);
empty(element);
- value = {
- contract: "svml.top-three-item-spec@1", variant, id, label: text(element, "label"),
+ const label = textValue(element.attributes.label, `${element.name}.label`, resolve);
+ if (typeof label === "string") value = {
+ contract: "svml.top-three-item-spec@1", variant, id, label,
...(stackingOrder === undefined ? {} : { stackingOrder }),
} satisfies TopThreeItemSpec;
+ else return { spec: sealRankingTextItemShell({
+ contract: "svml.top-three-text-item-shell@1", variant, id,
+ ...(stackingOrder === undefined ? {} : { stackingOrder }),
+ }), content: label };
} else {
allowed(element, ["id", "text", "winner", "emphasis-start", "emphasis-end", "stack"]);
- const authoredText = optionalText(element, "text");
- const content = authoredText ?? plainChildText(element);
- if (authoredText !== undefined) empty(element);
+ const raw = element.attributes.text;
+ const content = raw === undefined ? plainChildText(element) : textValue(raw, `${element.name}.text`, resolve);
+ if (raw !== undefined) empty(element);
const start = integer(element, "emphasis-start");
const endExclusive = integer(element, "emphasis-end");
if ((start === undefined) !== (endExclusive === undefined)) throw new Error(`${element.name} emphasis requires both emphasis-start and emphasis-end.`);
- value = {
- contract: "svml.typewriter-item-spec@1", variant, id, text: content,
- winner: boolean(element, "winner", false),
+ const rest = {
+ variant, id, winner: boolean(element, "winner", false),
...(start === undefined || endExclusive === undefined ? {} : { emphasis: { start, endExclusive } }),
...(stackingOrder === undefined ? {} : { stackingOrder }),
+ } as const;
+ if (typeof content === "string") value = {
+ contract: "svml.typewriter-item-spec@1", ...rest, text: content,
} satisfies TypewriterItemSpec;
+ else return { spec: sealRankingTextItemShell({
+ contract: "svml.typewriter-text-item-shell@1", ...rest,
+ }), content };
}
assertRankingItemSpec(value);
- return value;
+ return { spec: value };
}
const variantDefinition = {
@@ -243,9 +277,12 @@ function rankingSurface(variant: RankingVariant): StructuredSurfaceHandler {
outer: outer.ref, triggers: triggers.ref, terminal: terminal.ref, style: style.ref,
};
if (variant === "typewriter-list") {
- const titleId = `${id}.title`;
- records.push({ id: titleId, type: rankingTypes.title, value: { kind: "inline", value: { contract: "svml.ranking-title@1", value: text(element, "title") } }, range: element.range });
- inputs.title = { kind: "record", id: titleId };
+ const title = textValue(element.attributes.title, `${element.name}.title`, resolveReference);
+ if (typeof title === "string") {
+ const titleId = `${id}.title`;
+ records.push({ id: titleId, type: textTypes.text, value: { kind: "inline", value: sealText(title) }, range: element.range });
+ inputs.title = { kind: "record", id: titleId };
+ } else inputs.title = title.ref;
}
const items: RankingFragmentItem[] = [];
const itemIds = new Set<string>();
@@ -260,22 +297,25 @@ function rankingSurface(variant: RankingVariant): StructuredSurfaceHandler {
if (localName(child) !== selected.tag) throw new Error(`${element.name} accepts ${selected.tag} children only.`);
index += 1;
const suffix = String(index).padStart(4, "0");
- const spec = itemSpec(child, variant, suffix);
+ const authored = itemSpec(child, variant, suffix, resolveReference);
+ const spec = authored.spec;
if (itemIds.has(spec.id)) throw new Error(`${element.name} has duplicate Item id ${spec.id}.`);
itemIds.add(spec.id);
hasStage ||= spec.variant === "tier-board" && spec.entry === "stage";
hasWinner ||= spec.variant === "typewriter-list" && spec.winner;
const specId = `${id}.item.${suffix}.spec`;
const specName = `item-${suffix}-spec`;
- records.push({ id: specId, type: rankingTypes.itemSpec, value: { kind: "inline", value: spec as unknown as CanonicalValue }, range: child.range });
+ records.push({ id: specId, type: authored.content === undefined ? rankingTypes.itemSpec : rankingTypes.textItemShell, value: { kind: "inline", value: spec as unknown as CanonicalValue }, range: child.range });
inputs[specName] = { kind: "record", id: specId };
+ const contentName = authored.content === undefined ? undefined : `item-${suffix}-content`;
+ if (authored.content !== undefined) inputs[contentName!] = authored.content.ref;
let iconName: string | undefined;
if (variant === "tier-board" || child.attributes.icon !== undefined) {
const icon = reference(child.attributes.icon, `${child.name}.icon`, mediaTypes.blobArtifact, resolveReference);
iconName = `item-${suffix}-icon`;
inputs[iconName] = icon.ref;
}
- items.push({ suffix, specName, ...(iconName === undefined ? {} : { iconName }) });
+ items.push({ suffix, specName, ...(contentName === undefined ? {} : { contentName }), ...(iconName === undefined ? {} : { iconName }) });
}
if (items.length === 0) throw new Error(`${element.name} requires at least one ${selected.tag}.`);
const sound: RankingFragmentSound = {
diff --git a/packages/ranking/src/types.ts b/packages/ranking/src/types.ts
index bd168a58..ba6eff58 100644
--- a/packages/ranking/src/types.ts
+++ b/packages/ranking/src/types.ts
@@ -188,6 +188,12 @@ export type TypewriterItemSpec = {
export type RankingItemSpec = TierBoardItemSpec | ColumnItemSpec | TopThreeItemSpec | TypewriterItemSpec;
+/** Structural half of an Item whose visible copy arrives on a Text graph edge. */
+export type RankingTextItemShell =
+ | Omit<ColumnItemSpec, "contract" | "label"> & { readonly contract: "svml.column-text-item-shell@1" }
+ | Omit<TopThreeItemSpec, "contract" | "label"> & { readonly contract: "svml.top-three-text-item-shell@1" }
+ | Omit<TypewriterItemSpec, "contract" | "text"> & { readonly contract: "svml.typewriter-text-item-shell@1" };
+
export type RankingItemSpecSet = {
readonly contract: "svml.ranking-item-spec-set@1";
readonly variant: RankingVariant;
diff --git a/packages/ranking/test/ranking.test.ts b/packages/ranking/test/ranking.test.ts
index 7495edd1..650c97d8 100644
--- a/packages/ranking/test/ranking.test.ts
+++ b/packages/ranking/test/ranking.test.ts
@@ -53,6 +53,7 @@ import {
renderTopThree,
renderTypewriterList,
rankingManifest,
+ rankingProducers,
rankingTypes,
sealRankingHeader,
} from "@narratage/ranking";
@@ -70,12 +71,13 @@ import { programSpaceTypes } from "@narratage/program-space";
import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
import { svsRecipeType } from "@narratage/svs";
+import { sealText, textManifest, textTypes } from "@narratage/text";
import type {
StructuredElement,
StructuredNode,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
const space = sealProgramSpace({
contract: "svml.program-space@1",
@@ -340,10 +342,10 @@ test("each component owns a distinct event law and repeated lowering is canonica
});
test("all four author Surfaces preserve explicit semantic, spatial, font, image and optional sound graph edges", async () => {
- createResolvedClosure([...videoContractManifests, rankingManifest]);
+ createResolvedClosure([...videoContractManifests, textManifest, rankingManifest]);
const range = { source: "ranking.svml", start: 0, end: 1 };
- const ref = (path: string): TextAttributeValue => ({ kind: "reference", path });
- const node = (name: string, attributes: Record<string, TextAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({ kind: "element", name, attributes, children, range });
+ const ref = (path: string): MarkupAttributeValue => ({ kind: "reference", path });
+ const node = (name: string, attributes: Record<string, MarkupAttributeValue>, children: StructuredNode[] = []): StructuredElement => ({ kind: "element", name, attributes, children, range });
const plain = (path: string, type: SurfaceResolvedReference["type"]): SurfaceResolvedReference => ({ path, ref: { kind: "record", id: path }, type });
const inlineReference = (path: string, type: SurfaceResolvedReference["type"], value: unknown): SurfaceResolvedReference => ({
path, ref: { kind: "record", id: path }, type,
@@ -361,6 +363,7 @@ test("all four author Surfaces preserve explicit semantic, spatial, font, image
["appear", plain("appear", mediaTypes.synchronized)],
["move", plain("move", mediaTypes.synchronized)],
["font", inlineReference("font", mediaTypes.fontArtifact, font)],
+ ["copy", inlineReference("copy", textTypes.text, sealText("Dynamic ranking copy"))],
]);
const styleCases = [
["tier-style", rankingTypes.tierStyle, decodeTierBoardStyleSurface, { rows: "s:S:#ef4444|a:A:#22c55e" }],
@@ -391,7 +394,7 @@ test("all four author Surfaces preserve explicit semantic, spatial, font, image
id: "column", map: ref("map"), space: ref("space"), frame: ref("frame"), during: ref("outer"),
triggers: ref("triggers"), terminal: ref("terminal"), style: ref("column-style"),
"appear-sound": ref("appear"), "move-sound": ref("move"),
- }, [node("ranking:ColumnItem", { id: "column-one", label: "One" }), node("ranking:ColumnItem", { id: "column-two", label: "Two", icon: ref("icon-2") })])],
+ }, [node("ranking:ColumnItem", { id: "column-one", label: ref("copy") }), node("ranking:ColumnItem", { id: "column-two", label: "Two", icon: ref("icon-2") })])],
[decodeTopThreeSurface, node("ranking:TopThree", {
id: "top", map: ref("map"), space: ref("space"), frame: ref("frame"), during: ref("outer"),
triggers: ref("triggers"), terminal: ref("terminal"), style: ref("top-style"),
@@ -421,6 +424,7 @@ test("all four author Surfaces preserve explicit semantic, spatial, font, image
resolveAsset: async () => { throw new Error("no asset resolution expected"); },
});
const audio = column.fragments[0]!.exports.find((output) => output.name === "audio");
+ assert.ok(column.fragments[0]!.operations.some((operation) => operation.producer.name === rankingProducers.materializeTextItem.name));
assert(audio !== undefined);
assert.equal(audio.semanticInputs.includes("frame"), false);
assert.equal(audio.semanticInputs.some((name) => name.endsWith("icon")), false);
@@ -429,7 +433,7 @@ test("all four author Surfaces preserve explicit semantic, spatial, font, image
test("Ranking author Surfaces fail closed on impossible image and sound combinations", async () => {
const range = { source: "ranking.svml", start: 0, end: 1 };
- const ref = (path: string): TextAttributeValue => ({ kind: "reference", path });
+ const ref = (path: string): MarkupAttributeValue => ({ kind: "reference", path });
const plain = (path: string, type: SurfaceResolvedReference["type"]): SurfaceResolvedReference => ({ path, ref: { kind: "record", id: path }, type });
const references = new Map<string, SurfaceResolvedReference>([
["map", plain("map", semanticMapTypes.complete)], ["space", plain("space", programSpaceTypes.programSpace)],
diff --git a/packages/render-hyperframes/package.json b/packages/render-hyperframes/package.json
index 0267ea09..33b201f5 100644
--- a/packages/render-hyperframes/package.json
+++ b/packages/render-hyperframes/package.json
@@ -18,7 +18,7 @@
"@narratage/media-pipeline": "workspace:*",
"@narratage/program-space": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/core": "workspace:*",
diff --git a/packages/render-hyperframes/src/activation.ts b/packages/render-hyperframes/src/activation.ts
index 6c3cde69..77696c92 100644
--- a/packages/render-hyperframes/src/activation.ts
+++ b/packages/render-hyperframes/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeHyperframesRenderSurface, renderHyperframesComponent, renderHyperframesManifest,
renderHyperframesModuleRef, renderHyperframesSurfaceImplementationDigest,
@@ -9,7 +9,7 @@ export const svmlPackage = {
name: "@narratage/render-hyperframes",
modules: [{ manifest: renderHyperframesManifest, specifiers: ["@narratage/render-hyperframes", "@narratage/render-hyperframes@1"] }],
components: [renderHyperframesComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: renderHyperframesModuleRef, surface: "video", mode: "structured",
implementationDigest: renderHyperframesSurfaceImplementationDigest,
handler: decodeHyperframesRenderSurface,
diff --git a/packages/render-hyperframes/src/surface.ts b/packages/render-hyperframes/src/surface.ts
index 864838a9..fd036358 100644
--- a/packages/render-hyperframes/src/surface.ts
+++ b/packages/render-hyperframes/src/surface.ts
@@ -5,8 +5,8 @@ import type { Composition } from "@narratage/composition";
import type {
StructuredElement,
StructuredSurfaceHandler,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { renderHyperframesFragment } from "./fragment.js";
@@ -17,7 +17,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referenceAttribute(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference") {
throw new Error(`${element.name}.${name} must be a reference`);
}
diff --git a/packages/render-hyperframes/test/render.test.ts b/packages/render-hyperframes/test/render.test.ts
index dc181fdd..0d3a6048 100644
--- a/packages/render-hyperframes/test/render.test.ts
+++ b/packages/render-hyperframes/test/render.test.ts
@@ -70,9 +70,9 @@ import type {
TypedRecord,
} from "@narratage/protocol";
import {
- createTextAuthorFrontend,
- TextSurfaceRegistry,
-} from "@narratage/text";
+ createMarkupAuthorFrontend,
+ MarkupSurfaceRegistry,
+} from "@narratage/markup";
const space = sealProgramSpace({
contract: "svml.program-space@1",
@@ -383,7 +383,7 @@ function source(text: string): AuthorSourceUnit {
return {
id: "/project/main.svml",
name: "main.svml",
- text: `<?svml using="@narratage/text@1"?>\n${text}`,
+ text: `<?svml using="@narratage/markup@1"?>\n${text}`,
};
}
@@ -395,7 +395,7 @@ test("the official render Surface lowers real author source to the same BuildPla
renderHyperframesManifest,
fixtureManifest,
]);
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(fixtureModule, "composition", fixtureSurfaceDigest, ({ element }) => ({
records: [
{ id: "composition", type: compositionTypes.composition, value: stored(composition), range: element.range },
@@ -411,7 +411,7 @@ test("the official render Surface lowers real author source to the same BuildPla
decodeHyperframesRenderSurface,
);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request) {
return request.from.startsWith("@narratage/render-hyperframes")
diff --git a/packages/run-text/README.md b/packages/run-markup/README.md
similarity index 95%
rename from packages/run-text/README.md
rename to packages/run-markup/README.md
index ebb8fc88..21209a85 100644
--- a/packages/run-text/README.md
+++ b/packages/run-markup/README.md
@@ -1,11 +1,11 @@
-# `@narratage/run-text`
+# `@narratage/run-markup`
Official human-readable Frontend for `@narratage/run`.
One Run Source is self-described and names one Author Source explicitly:
```xml
-<?svml using="@narratage/run-text@1"?>
+<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="delivery">
<author source="./main.svml"/>
diff --git a/packages/run-text/package.json b/packages/run-markup/package.json
similarity index 78%
rename from packages/run-text/package.json
rename to packages/run-markup/package.json
index 094b127e..61d463bc 100644
--- a/packages/run-text/package.json
+++ b/packages/run-markup/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/run-text",
+ "name": "@narratage/run-markup",
"version": "0.0.0-dev",
"private": true,
"type": "module",
@@ -12,6 +12,6 @@
"dependencies": {
"@narratage/protocol": "workspace:*",
"@narratage/run": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/run-markup/src/activation.ts b/packages/run-markup/src/activation.ts
new file mode 100644
index 00000000..41b01ef0
--- /dev/null
+++ b/packages/run-markup/src/activation.ts
@@ -0,0 +1,9 @@
+import { runMarkupFrontend } from "./index.js";
+
+export const svmlPackage = {
+ format: "svml.node-package@1" as const,
+ name: "@narratage/run-markup",
+ runFrontends: [runMarkupFrontend],
+};
+
+export default svmlPackage;
diff --git a/packages/run-text/src/frontend.ts b/packages/run-markup/src/frontend.ts
similarity index 57%
rename from packages/run-text/src/frontend.ts
rename to packages/run-markup/src/frontend.ts
index 658cf971..b9cb28a7 100644
--- a/packages/run-text/src/frontend.ts
+++ b/packages/run-markup/src/frontend.ts
@@ -3,12 +3,12 @@ import type { RunFrontend } from "@narratage/run";
import { parseRunDocument } from "./syntax.js";
-export const runTextFrontendId = "@narratage/run-text@1";
-export const runTextFrontendImplementationDigest = digestOf("@narratage/run-text/frontend@1");
+export const runMarkupFrontendId = "@narratage/run-markup@1";
+export const runMarkupFrontendImplementationDigest = digestOf("@narratage/run-markup/frontend@1");
-export const runTextFrontend: RunFrontend = {
- id: runTextFrontendId,
- implementationDigest: runTextFrontendImplementationDigest,
+export const runMarkupFrontend: RunFrontend = {
+ id: runMarkupFrontendId,
+ implementationDigest: runMarkupFrontendImplementationDigest,
discover(source) {
const document = parseRunDocument(source.name, source.text);
return { author: document.author, imports: document.imports };
diff --git a/packages/run-text/src/index.ts b/packages/run-markup/src/index.ts
similarity index 58%
rename from packages/run-text/src/index.ts
rename to packages/run-markup/src/index.ts
index 74293e0f..453b4de3 100644
--- a/packages/run-text/src/index.ts
+++ b/packages/run-markup/src/index.ts
@@ -1,7 +1,7 @@
export {
- runTextFrontend,
- runTextFrontendId,
- runTextFrontendImplementationDigest,
+ runMarkupFrontend,
+ runMarkupFrontendId,
+ runMarkupFrontendImplementationDigest,
} from "./frontend.js";
export {
parseRunDocument,
diff --git a/packages/run-text/src/syntax.ts b/packages/run-markup/src/syntax.ts
similarity index 99%
rename from packages/run-text/src/syntax.ts
rename to packages/run-markup/src/syntax.ts
index 05804ec4..5c5d4645 100644
--- a/packages/run-text/src/syntax.ts
+++ b/packages/run-markup/src/syntax.ts
@@ -12,11 +12,11 @@ import type {
import {
parseStructuredElement,
skipTextTrivia,
-} from "@narratage/text";
+} from "@narratage/markup";
import type {
SourceUnit,
StructuredElement,
-} from "@narratage/text";
+} from "@narratage/markup";
export class RunSyntaxError extends Error {
readonly code: string;
diff --git a/packages/run-text/src/activation.ts b/packages/run-text/src/activation.ts
deleted file mode 100644
index 48d5ec88..00000000
--- a/packages/run-text/src/activation.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { runTextFrontend } from "./index.js";
-
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
- name: "@narratage/run-text",
- runFrontends: [runTextFrontend],
-};
-
-export default svmlPackage;
diff --git a/packages/run/README.md b/packages/run/README.md
index 80e4a542..81785cbc 100644
--- a/packages/run/README.md
+++ b/packages/run/README.md
@@ -19,5 +19,5 @@ CLI flags.
semantic meaning. `RunFragmentRegistry` accepts trusted Fragment packages only through the
`svml.run-fragment-host@1` Host-facet installer. Package loading does not interpret Fragment code.
-The optional official XML-like syntax lives in `@narratage/run-text`. Another trusted Frontend can emit
+The optional official XML-like syntax lives in `@narratage/run-markup`. Another trusted Frontend can emit
the same `RunDocument` without changing this package or Core.
diff --git a/packages/run/package.json b/packages/run/package.json
index 77cc2dd4..e67d1eaa 100644
--- a/packages/run/package.json
+++ b/packages/run/package.json
@@ -14,7 +14,7 @@
"@narratage/source": "workspace:*"
},
"devDependencies": {
- "@narratage/run-text": "workspace:*",
+ "@narratage/run-markup": "workspace:*",
"@narratage/validation": "workspace:*"
}
}
diff --git a/packages/run/test/run.test.ts b/packages/run/test/run.test.ts
index 9491bc24..1f5e66ce 100644
--- a/packages/run/test/run.test.ts
+++ b/packages/run/test/run.test.ts
@@ -28,7 +28,7 @@ import {
RunSourceError,
verifyRunSourceClosure,
} from "@narratage/run";
-import { parseRunDocument, runTextFrontend } from "@narratage/run-text";
+import { parseRunDocument, runMarkupFrontend } from "@narratage/run-markup";
const moduleRef = { name: "example.run", version: "1" } as const;
const promptType = { module: moduleRef, name: "Prompt" } satisfies TypeRef;
@@ -155,11 +155,11 @@ test("Run Fragments enter the Host only through the locked Run facet ABI", () =>
async function compileDocument(body: string) {
const frontends = new RunFrontendRegistry();
- frontends.register(runTextFrontend);
+ frontends.register(runMarkupFrontend);
return await compileRunSource({
id: "/project/build.svrun",
name: "build.svrun",
- text: `<?svml using="@narratage/run-text@1"?>\n${body}`,
+ text: `<?svml using="@narratage/run-markup@1"?>\n${body}`,
}, frontends);
}
@@ -374,7 +374,7 @@ test("Run Source Closure binds source bytes, Frontend implementation and semanti
);
const alternate = {
- ...runTextFrontend,
+ ...runMarkupFrontend,
id: "example.run-text-compatible@1",
implementationDigest: digestOf("example.run-text-compatible/implementation@1"),
};
diff --git a/packages/screen-overlay/package.json b/packages/screen-overlay/package.json
index 042d93ab..3e9bd10b 100644
--- a/packages/screen-overlay/package.json
+++ b/packages/screen-overlay/package.json
@@ -15,6 +15,6 @@
"@narratage/semantic-map": "workspace:*",
"@narratage/spatial": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/screen-overlay/src/activation.ts b/packages/screen-overlay/src/activation.ts
index 8a3db42d..67f64b67 100644
--- a/packages/screen-overlay/src/activation.ts
+++ b/packages/screen-overlay/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeScreenOverlaySurface, screenOverlayComponent, screenOverlayManifest, screenOverlayModuleRef,
screenOverlaySurfaceImplementationDigest,
@@ -7,7 +7,7 @@ export const svmlPackage = {
format: "svml.node-package@1" as const, name: "@narratage/screen-overlay",
modules: [{ manifest: screenOverlayManifest, specifiers: [screenOverlayModuleRef.name, `${screenOverlayModuleRef.name}@1`] }],
components: [screenOverlayComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: screenOverlayModuleRef, surface: "track", mode: "structured",
implementationDigest: screenOverlaySurfaceImplementationDigest, handler: decodeScreenOverlaySurface,
})],
diff --git a/packages/screen-overlay/src/surface.ts b/packages/screen-overlay/src/surface.ts
index 33030e14..dc3accaa 100644
--- a/packages/screen-overlay/src/surface.ts
+++ b/packages/screen-overlay/src/surface.ts
@@ -2,7 +2,7 @@ import { narrativeTypes } from "@narratage/narrative";
import { programSpaceTypes } from "@narratage/program-space";
import { semanticMapTypes } from "@narratage/semantic-map";
import { spatialTypes } from "@narratage/spatial";
-import type { StructuredElement, StructuredSurfaceHandler, SurfaceRecordDraft, SurfaceResolvedReference, TextAttributeValue } from "@narratage/text";
+import type { StructuredElement, StructuredSurfaceHandler, SurfaceRecordDraft, SurfaceResolvedReference, MarkupAttributeValue } from "@narratage/markup";
import type { TemporalDuration, TemporalPointExpression } from "@narratage/temporal";
import { createScreenOverlayFragment } from "./fragment.js";
import { screenOverlayTypes } from "./manifest.js";
@@ -25,7 +25,7 @@ function optionalText(element: StructuredElement, name: string): string | undefi
const value = element.attributes[name]; if (value === undefined) return undefined;
if (typeof value !== "string" || !value.trim()) throw new Error(`${element.name}.${name} must be text.`); return value.trim();
}
-function ref(raw: TextAttributeValue | undefined, label: string, expected: SurfaceResolvedReference["type"], resolve: (path: string) => SurfaceResolvedReference | undefined): SurfaceResolvedReference {
+function ref(raw: MarkupAttributeValue | undefined, label: string, expected: SurfaceResolvedReference["type"], resolve: (path: string) => SurfaceResolvedReference | undefined): SurfaceResolvedReference {
if (typeof raw !== "object" || raw.kind !== "reference") throw new Error(`${label} must be a reference.`);
const value = resolve(raw.path); if (value === undefined || !sameType(value.type, expected)) throw new Error(`${label} has the wrong Type.`); return value;
}
diff --git a/packages/screen-overlay/test/screen-overlay.test.ts b/packages/screen-overlay/test/screen-overlay.test.ts
index c4bd32fc..ba1614d3 100644
--- a/packages/screen-overlay/test/screen-overlay.test.ts
+++ b/packages/screen-overlay/test/screen-overlay.test.ts
@@ -32,7 +32,7 @@ import { speechEvidenceManifest } from "@narratage/speech-evidence";
import { speechManifest } from "@narratage/speech";
import { sealCanvasSpace, spatialComponent, spatialDependency, spatialManifest, spatialTypes } from "@narratage/spatial";
import { temporalManifest } from "@narratage/temporal";
-import { TextSurfaceRegistry, createTextAuthorFrontend } from "@narratage/text";
+import { MarkupSurfaceRegistry, createMarkupAuthorFrontend } from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
import { visualIrManifest } from "@narratage/visual-ir";
@@ -164,7 +164,7 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
screenOverlayManifest,
fixtureManifest,
]);
- const registry = new TextSurfaceRegistry();
+ const registry = new MarkupSurfaceRegistry();
registry.registerStructured(fixtureModule, "inputs", fixtureSurfaceDigest, ({ element }) => ({
records: [
{ id: "canvas", type: spatialTypes.canvas, value: { kind: "inline", value: canvas }, range: element.range },
@@ -180,7 +180,7 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
decodeScreenOverlaySurface,
);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry,
resolveModule: (request) => request.from === "example.screen-inputs@1" ? fixtureModule : screenOverlayModuleRef,
}));
@@ -190,7 +190,7 @@ test("the self-described Screen Surface parses into a finite peer-Track graph",
entry: {
id: "/project/screen.svml",
name: "screen.svml",
- text: `<?svml using="@narratage/text@1"?>
+ text: `<?svml using="@narratage/markup@1"?>
<svml>
<import as="fixture" from="example.screen-inputs@1"/>
<import as="screen" from="@narratage/screen-overlay@1"/>
diff --git a/packages/script/README.md b/packages/script/README.md
index 9336b1d8..09ff8fb0 100644
--- a/packages/script/README.md
+++ b/packages/script/README.md
@@ -1,6 +1,6 @@
# `@narratage/script`
-Official raw Script Surface for the Text Frontend. It parses prose-first named Segment blocks,
+Official raw Script Surface for the Markup Frontend. It parses prose-first named Segment blocks,
newline-independent Role Cues, Dual Text, Selection, Moment and Slot syntax, and lowers them to a
canonical authored Narrative value with exactly `2M + 2N` semantic anchor identities.
@@ -37,15 +37,16 @@ components without importing Script internals.
The Surface exports one full Narrative plus narrow, immutable views:
-- `script.segment.<id>` is a `NarrativeExcerpt` used to associate a generated Take with one Segment;
-- `script.segment.<id>.dialogue` is display-independent dialogue, including optional Role cues and
- right-side Dual Text pronunciation, for a speech-video model;
-- `script.segment.<id>.speech` is pronunciation-only text for duration estimation;
+- `script.segment.<id>` is a narrow `NarrativeExcerpt` used to associate a generated Take with one Segment;
+- `script.segment.<id>.dialogue` is ordinary `Text`: display-independent dialogue, including optional
+ Role cues and right-side Dual Text pronunciation, for a speech-video model;
+- `script.segment.<id>.speech` is ordinary pronunciation-only `Text` for duration estimation or TTS;
- `script.caption` is the complete left-side `CaptionDisplaySequence`;
- `script.caption.correspondence` maps each whole display Atom to its authored speech-token range;
- `script.caption.selection.<id>` is the display-word subset wholly owned by one Selection;
- `script.selection.<id>` is a reusable explicit Selection.
-Seedance consumes the dialogue excerpt, Speech Spine consumes the Segment excerpt, and Caption
-consumes the explicit display and correspondence edges. None imports Script's parser AST. Another
-authoring package may produce the same contracts.
+Seedance consumes dialogue `Text`, Estimate and TTS consume speech `Text`, Speech Spine consumes the
+Segment excerpt, and Caption consumes the explicit display and correspondence edges. None imports
+Script's parser AST. Another authoring package may produce the same ordinary Text and structured
+Narrative contracts.
diff --git a/packages/script/package.json b/packages/script/package.json
index 9273bccc..5163ef7f 100644
--- a/packages/script/package.json
+++ b/packages/script/package.json
@@ -13,6 +13,7 @@
"@narratage/core": "workspace:*",
"@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/script/src/activation.ts b/packages/script/src/activation.ts
index 2e5e1644..3eef4374 100644
--- a/packages/script/src/activation.ts
+++ b/packages/script/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeScriptSurface,
@@ -11,7 +11,7 @@ export const svmlPackage = {
format: "svml.node-package@1" as const,
name: "@narratage/script",
modules: [{ manifest: scriptManifest, specifiers: ["@narratage/script", "@narratage/script@1"] }],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: scriptModuleRef,
surface: "script",
mode: "raw",
diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts
index 59a17b6f..ccc55106 100644
--- a/packages/script/src/index.ts
+++ b/packages/script/src/index.ts
@@ -4,12 +4,10 @@ export {
captionCorrespondenceType,
captionDisplayType,
captionDisplayWordSubsetType,
- narrativeDialogueExcerptType,
narrativeExcerptType,
narrativeMomentType,
narrativeSelectionType,
narrativeSchema,
- narrativeSpeechExcerptType,
narrativeType,
scriptManifest,
scriptModuleRef,
@@ -22,11 +20,11 @@ export {
captionDisplaySequenceValue,
captionSelectionWordSubset,
captionSelectionWordSubsetValue,
- narrativeDialogueExcerptValue,
+ narrativeDialogueTextValue,
narrativeSegmentExcerptValue,
narrativeMomentValue,
narrativeSelectionValue,
- narrativeSpeechExcerptValue,
+ narrativeSpeechTextValue,
narrativeSourceMap,
narrativeValue,
serializeCaption,
diff --git a/packages/script/src/manifest.ts b/packages/script/src/manifest.ts
index 33fc53db..0797c6b9 100644
--- a/packages/script/src/manifest.ts
+++ b/packages/script/src/manifest.ts
@@ -1,12 +1,11 @@
import { narrativeDependency, narrativeSchema, narrativeTypes } from "@narratage/narrative";
+import { textDependency, textTypes } from "@narratage/text";
import { digestOf } from "@narratage/core";
import type { ModuleManifest, TypeRef } from "@narratage/protocol";
export const scriptModuleRef = { name: "@narratage/script", version: "1" } as const;
export const narrativeType: TypeRef = narrativeTypes.narrative;
export const narrativeExcerptType: TypeRef = narrativeTypes.excerpt;
-export const narrativeDialogueExcerptType: TypeRef = narrativeTypes.dialogueExcerpt;
-export const narrativeSpeechExcerptType: TypeRef = narrativeTypes.speechExcerpt;
export const narrativeSelectionType: TypeRef = narrativeTypes.selection;
export const narrativeMomentType: TypeRef = narrativeTypes.moment;
export const captionDisplayType: TypeRef = narrativeTypes.captionDisplay;
@@ -20,7 +19,7 @@ export const scriptManifest: ModuleManifest = {
format: "svml.module@1",
name: scriptModuleRef.name,
version: scriptModuleRef.version,
- dependencies: [narrativeDependency],
+ dependencies: [narrativeDependency, textDependency],
types: [],
capabilities: [],
surfaces: [
@@ -31,8 +30,7 @@ export const scriptManifest: ModuleManifest = {
outputs: [
narrativeType,
narrativeExcerptType,
- narrativeDialogueExcerptType,
- narrativeSpeechExcerptType,
+ textTypes.text,
narrativeSelectionType,
narrativeMomentType,
captionDisplayType,
diff --git a/packages/script/src/narrative.ts b/packages/script/src/narrative.ts
index ab378f2a..429d6bd3 100644
--- a/packages/script/src/narrative.ts
+++ b/packages/script/src/narrative.ts
@@ -7,6 +7,7 @@ import type {
CaptionDisplayWord,
CaptionDisplayWordSubset,
} from "@narratage/narrative";
+import { sealText } from "@narratage/text";
import type { ParsedCaptionRegion, ParsedNarrative } from "./types.js";
@@ -226,29 +227,6 @@ function segmentSerializations(segment: ParsedNarrative["segments"][number]): {
return { dialogue: dialogue.join("\n"), speech: joinProjection(speechParts) };
}
-function excerptContent(
- segment: ParsedNarrative["segments"][number],
- projection: "dialogue" | "speech",
-): {
- readonly kind: "segment";
- readonly id: string;
- readonly tokenStart: number;
- readonly tokenEndExclusive: number;
- readonly dialogue?: string;
- readonly speech?: string;
-} {
- const serializations = segmentSerializations(segment);
- return {
- kind: "segment",
- id: segment.id,
- tokenStart: segment.tokenStart,
- tokenEndExclusive: segment.tokenEndExclusive,
- ...(projection === "dialogue"
- ? { dialogue: serializations.dialogue }
- : { speech: serializations.speech }),
- };
-}
-
export function narrativeSegmentExcerptValue(
parsed: ParsedNarrative,
segment: ParsedNarrative["segments"][number],
@@ -259,29 +237,20 @@ export function narrativeSegmentExcerptValue(
id: segment.id,
tokenStart: segment.tokenStart,
tokenEndExclusive: segment.tokenEndExclusive,
- serializations: segmentSerializations(segment),
} as const;
return canonicalize(content);
}
-export function narrativeDialogueExcerptValue(
+export function narrativeDialogueTextValue(
segment: ParsedNarrative["segments"][number],
): CanonicalValue {
- const content = {
- contract: "svml.narrative-dialogue-excerpt@1",
- ...excerptContent(segment, "dialogue"),
- } as const;
- return canonicalize(content);
+ return sealText(segmentSerializations(segment).dialogue) as unknown as CanonicalValue;
}
-export function narrativeSpeechExcerptValue(
+export function narrativeSpeechTextValue(
segment: ParsedNarrative["segments"][number],
): CanonicalValue {
- const content = {
- contract: "svml.narrative-speech-excerpt@1",
- ...excerptContent(segment, "speech"),
- } as const;
- return canonicalize(content);
+ return sealText(segmentSerializations(segment).speech) as unknown as CanonicalValue;
}
export function narrativeSelectionValue(selection: ParsedNarrative["selections"][number]): CanonicalValue {
@@ -353,7 +322,6 @@ export function narrativeValue(parsed: ParsedNarrative): CanonicalValue {
})),
})),
semanticIndex: parsed.semanticIndex,
- serializations: parsed.serializations,
});
}
diff --git a/packages/script/src/surface.ts b/packages/script/src/surface.ts
index b37de41b..03d302ff 100644
--- a/packages/script/src/surface.ts
+++ b/packages/script/src/surface.ts
@@ -7,11 +7,11 @@ import {
captionDisplaySequence,
captionDisplaySequenceValue,
captionSelectionWordSubsetValue,
- narrativeDialogueExcerptValue,
+ narrativeDialogueTextValue,
narrativeSegmentExcerptValue,
narrativeMomentValue,
narrativeSelectionValue,
- narrativeSpeechExcerptValue,
+ narrativeSpeechTextValue,
narrativeSourceMap,
narrativeValue,
} from "./narrative.js";
@@ -19,13 +19,12 @@ import {
captionCorrespondenceType,
captionDisplayType,
captionDisplayWordSubsetType,
- narrativeDialogueExcerptType,
narrativeExcerptType,
narrativeMomentType,
narrativeSelectionType,
- narrativeSpeechExcerptType,
narrativeType,
} from "./manifest.js";
+import { textTypes } from "@narratage/text";
import { parseScript } from "./parser.js";
import type { ScriptSurfaceInput, ScriptSurfaceOutput } from "./types.js";
@@ -104,14 +103,14 @@ export function decodeScriptSurface(input: ScriptSurfaceInput): ScriptSurfaceOut
...parsed.segments.flatMap((segment) => [
{
id: `${rawId}.segment.${segment.id}.dialogue`,
- type: narrativeDialogueExcerptType,
- value: { kind: "inline" as const, value: narrativeDialogueExcerptValue(segment) },
+ type: textTypes.text,
+ value: { kind: "inline" as const, value: narrativeDialogueTextValue(segment) },
range: segment.range,
},
{
id: `${rawId}.segment.${segment.id}.speech`,
- type: narrativeSpeechExcerptType,
- value: { kind: "inline" as const, value: narrativeSpeechExcerptValue(segment) },
+ type: textTypes.text,
+ value: { kind: "inline" as const, value: narrativeSpeechTextValue(segment) },
range: segment.range,
},
]),
diff --git a/packages/script/src/types.ts b/packages/script/src/types.ts
index 429ea71e..d5136e02 100644
--- a/packages/script/src/types.ts
+++ b/packages/script/src/types.ts
@@ -78,6 +78,11 @@ export type ParsedNarrative = Omit<
readonly turns: readonly ParsedTurn[];
readonly selections: readonly ParsedSelection[];
readonly moments: readonly ParsedMoment[];
+ /** Script-private renderings used to emit independent public Text values. */
+ readonly serializations: {
+ readonly dialogue: string;
+ readonly speech: string;
+ };
readonly captionProjection: {
readonly text: string;
readonly regions: readonly ParsedCaptionRegion[];
diff --git a/packages/seedance-speaker/README.md b/packages/seedance-speaker/README.md
index eb791779..b4339c11 100644
--- a/packages/seedance-speaker/README.md
+++ b/packages/seedance-speaker/README.md
@@ -3,41 +3,41 @@
Official deterministic UGC talking-head author module for Seedance. It is currently an internal
private workspace unit, not a commitment to publish one npm package per Seedance author module.
-The package consumes an inert project SVS Recipe, one explicitly imported PromptKitSpec, one Script
-dialogue excerpt and explicit image/audio references. Its Surface binds them into a generic Prompt
-Kit Invocation and compiles an inspectable ordered `PromptProgram` during author compilation. The
-same Surface renders the low-level `@narratage/seedance` `SpeechProgram`; the Run Graph then reuses the
-exact Seedance request and generation contracts. The official Kit source is
+The package consumes an inert project SVS Recipe, one explicitly imported `TextTemplate`, one Script
+dialogue `Text` and explicit image/audio references. Its Surface connects that authored `Text`
+directly to a visible `@narratage/text` render component in the graph. Optional per-Take `action`
+and `extra` values are also ordinary Text edges; they are not
+hidden Recipe strings. The rendered `Text` output is wired to Seedance's exact `prompt` port. The
+same Surface authors the low-level
+`@narratage/seedance` `SpeechProgram`; generation reuses the exact Seedance request contracts. The
+official Text Template source is
[`official-ugc-v1.svs`](./kits/official-ugc-v1.svs).
It owns no Provider, credentials, queue or HTTP behavior. KIE, Volcengine or another explicitly
bound Endpoint only receives the already compiled exact Seedance request.
-The official `official-ugc-v1` Kit contains a fixed base, reference contract, script contract,
+The official `official-ugc-v1` template contains a fixed base, reference contract, script contract,
texture and visible-text exclusion plus six configurable axes: composition stability, camera
motion, edit rhythm, performance, gesture and voice mapping. Project SVS selects values. The
-official Kit SVS declares defaults, block order, value-to-Prompt choices and finite conditions. SVS
-itself executes neither conditions nor concatenation; the generic Prompt Kit compiler does that.
+official SVS declares defaults, block order, value-to-text choices and finite conditions. SVS
+itself executes neither conditions nor concatenation; the domain-neutral Text component does that.
## Compilation boundary
```text
-Script dialogue + authored Blob references + SVS Recipe + PromptKitSpec
- │
- │ Speaker Surface: pure author-time lowering
- ▼
- ordered PromptProgram + Seedance SpeechProgram
- │ existing Runtime-graph model compiler
- ▼
- exact Seedance generation Need
+Script dialogue Text ──────────────────────────┐
+optional action/extra Text ────────────────────┼──► render Text
+SVS-selected TextBindings + TextTemplate ──────┘ │
+ │ exact prompt edge
+authored Blob references + Seedance SpeechProgram ──────┼──► generation Need
```
-`take.prompt` and `take.program` are authored compile artifacts; `take.video` is the ordinary
-Logical Output. The Prompt Program retains every ordered block and its origin; flattening is exactly
-`blocks.map(block => block.text).join("\n\n")`. No Prompt assembly Operation appears in a BuildPlan.
+`take.prompt` and `take.video` are ordinary Logical Outputs; `take.program` is authored configuration.
+Prompt assembly is the deterministic `@narratage/text#render` Operation in the BuildPlan, so the text
+can be targeted or satisfied by another compatible Candidate without a Seedance-specific rule.
-The author imports this logical module and imports the selected Kit as an ordinary Source Module.
-The Host package lock activates `@narratage/prompt-kit` and low-level `@narratage/seedance` independently. A
+The author imports this logical module and imports the selected template as an ordinary Source Module.
+The Host package lock activates `@narratage/text` and low-level `@narratage/seedance` independently. A
future public distribution may offer an optional install bundle, but the current repository keeps
their activations separate.
@@ -63,5 +63,7 @@ lip-sync, coherent reference identity, photoreal texture and no generated readab
requests generated audio. One to nine image references are required; zero to three audio references
are allowed. With an audio reference, `@audio1` supplies the visible speaker's voice timbre.
-`action` and `extra` are optional escape hatches appended as separate attributable blocks. They do
-not alter Kit control flow.
+`action` and `extra` are optional per-Take Text inputs appended as separate attributable blocks.
+They do not alter Kit control flow. Recipe files select method and style axes only; putting content
+in `recipe.action` or `recipe.extra` is rejected so content dependencies cannot disappear into
+Frontend lowering.
diff --git a/packages/seedance-speaker/kits/official-ugc-v1.svs b/packages/seedance-speaker/kits/official-ugc-v1.svs
index fe4b1074..263f9f11 100644
--- a/packages/seedance-speaker/kits/official-ugc-v1.svs
+++ b/packages/seedance-speaker/kits/official-ugc-v1.svs
@@ -1,7 +1,7 @@
-<?svml using="@narratage/prompt-kit/svs@1"?>
+<?svml using="@narratage/text/svs@1"?>
<sheet version="1" id="official-ugc-v1">
- prompt-kit.official-ugc-v1 {
+ text-template.official-ugc-v1 {
separator: paragraph;
default-composition-stability: soft-locked;
default-camera-motion: none;
@@ -11,177 +11,177 @@
default-voice-mode: single-speaker;
}
- prompt-kit.official-ugc-v1.block.base {
+ text-template.official-ugc-v1.block.base {
kind: fixed;
order: 10;
text: "Create a realistic vertical iPhone UGC talking-head video using @image1 as the character-and-scene reference.";
}
- prompt-kit.official-ugc-v1.block.reference-contract {
+ text-template.official-ugc-v1.block.reference-contract {
kind: variant;
order: 20;
}
- prompt-kit.official-ugc-v1.choice.reference-contract.one {
+ text-template.official-ugc-v1.choice.reference-contract.one {
when-select-image-count: one;
text: "REFERENCE CONTRACT: preserve @image1's visible person, face identity, outfit, room, lighting, lens feel, and broad camera style.";
}
- prompt-kit.official-ugc-v1.choice.reference-contract.many {
+ text-template.official-ugc-v1.choice.reference-contract.many {
when-select-image-count: many;
text: "REFERENCE CONTRACT: use @image1 as the primary character-and-scene reference. Use @image2 and later image references only as supplementary identity, wardrobe, product, or environment evidence; preserve one coherent person and scene.";
}
- prompt-kit.official-ugc-v1.block.script-contract {
+ text-template.official-ugc-v1.block.script-contract {
kind: fixed;
order: 30;
text: "SCRIPT: deliver the scripted lines exactly in order, with clear lip-sync for the visible speaker's spoken lines.";
}
- prompt-kit.official-ugc-v1.block.voice-map {
+ text-template.official-ugc-v1.block.voice-map {
kind: variant;
order: 40;
}
- prompt-kit.official-ugc-v1.choice.voice-map.single-without-audio {
+ text-template.official-ugc-v1.choice.voice-map.single-without-audio {
when-param-voice-mode: single-speaker;
when-select-audio-count: zero;
text: "VOICE MAP: the visible person in @image1 delivers the full script on camera with a natural voice matching the character.";
}
- prompt-kit.official-ugc-v1.choice.voice-map.single-with-audio {
+ text-template.official-ugc-v1.choice.voice-map.single-with-audio {
when-param-voice-mode: single-speaker;
when-select-audio-count: one;
text: "VOICE MAP: the visible person in @image1 delivers the full script on camera. @audio1 is the voice-timbre reference for the visible speaker.";
}
- prompt-kit.official-ugc-v1.choice.voice-map.single-with-many-audios {
+ text-template.official-ugc-v1.choice.voice-map.single-with-many-audios {
when-param-voice-mode: single-speaker;
when-select-audio-count: many;
text: "VOICE MAP: the visible person in @image1 delivers the full script on camera. @audio1 is the voice-timbre reference for the visible speaker. Additional audio references provide supplementary voice evidence only.";
}
- prompt-kit.official-ugc-v1.choice.voice-map.roles-without-audio {
+ text-template.official-ugc-v1.choice.voice-map.roles-without-audio {
when-param-voice-mode: role-tagged-lines;
when-select-audio-count: zero;
text: "VOICE MAP: the script uses role labels such as HOST: and NARRATOR:. The visible person in @image1 delivers the first speaking role on camera; lines assigned to the second role play as an off-camera narrator voice while the visible speaker stays present and reacts naturally.";
}
- prompt-kit.official-ugc-v1.choice.voice-map.roles-with-one-audio {
+ text-template.official-ugc-v1.choice.voice-map.roles-with-one-audio {
when-param-voice-mode: role-tagged-lines;
when-select-audio-count: one;
text: "VOICE MAP: the script uses role labels such as HOST: and NARRATOR:. The visible person in @image1 delivers the first speaking role on camera; lines assigned to the second role play as an off-camera narrator voice while the visible speaker stays present and reacts naturally. @audio1 is the visible speaker's voice-timbre reference.";
}
- prompt-kit.official-ugc-v1.choice.voice-map.roles-with-many-audios {
+ text-template.official-ugc-v1.choice.voice-map.roles-with-many-audios {
when-param-voice-mode: role-tagged-lines;
when-select-audio-count: many;
text: "VOICE MAP: the script uses role labels such as HOST: and NARRATOR:. The visible person in @image1 delivers the first speaking role on camera; lines assigned to the second role play as an off-camera narrator voice while the visible speaker stays present and reacts naturally. @audio1 is the visible speaker's voice-timbre reference. @audio2 is the narrator voice-timbre reference.";
}
- prompt-kit.official-ugc-v1.block.composition-stability {
+ text-template.official-ugc-v1.block.composition-stability {
kind: axis;
order: 50;
parameter: composition-stability;
}
- prompt-kit.official-ugc-v1.choice.composition-stability.flexible-ugc {
+ text-template.official-ugc-v1.choice.composition-stability.flexible-ugc {
text: "COMPOSITION STABILITY: preserve @image1's visible person and overall reference setup while allowing normal short-form UGC framing variation for a lively creator video.";
}
- prompt-kit.official-ugc-v1.choice.composition-stability.soft-locked {
+ text-template.official-ugc-v1.choice.composition-stability.soft-locked {
text: "COMPOSITION STABILITY: keep the speaker in the same general region and maintain the reference composition, allowing natural posture changes and only tiny crop or scale breathing.";
}
- prompt-kit.official-ugc-v1.choice.composition-stability.strict-locked {
+ text-template.official-ugc-v1.choice.composition-stability.strict-locked {
text: "COMPOSITION STABILITY: treat @image1 as a locked spatial stage. Preserve the same subject placement, perspective, left-right orientation, background relationship, and framing envelope so persistent overlays stay spatially meaningful.";
}
- prompt-kit.official-ugc-v1.block.camera-motion {
+ text-template.official-ugc-v1.block.camera-motion {
kind: axis;
order: 60;
parameter: camera-motion;
}
- prompt-kit.official-ugc-v1.choice.camera-motion.none {
+ text-template.official-ugc-v1.choice.camera-motion.none {
text: "CAMERA MOTION: hold the framing steady in a fixed shot, keeping the selected composition envelope stable from start to finish.";
}
- prompt-kit.official-ugc-v1.choice.camera-motion.subtle-punch-in-return {
+ text-template.official-ugc-v1.choice.camera-motion.subtle-punch-in-return {
text: "CAMERA MOTION: use one subtle push-in on the most important phrase along the same optical axis, then return smoothly to the original framing while preserving the same subject placement and background relationship.";
}
- prompt-kit.official-ugc-v1.block.edit-rhythm {
+ text-template.official-ugc-v1.block.edit-rhythm {
kind: axis;
order: 70;
parameter: edit-rhythm;
}
- prompt-kit.official-ugc-v1.choice.edit-rhythm.continuous-take {
+ text-template.official-ugc-v1.choice.edit-rhythm.continuous-take {
text: "EDIT RHYTHM: make the clip feel like a continuous creator explanation, with natural breath timing and polished short-form pacing.";
}
- prompt-kit.official-ugc-v1.choice.edit-rhythm.pause-trim-jump-cuts {
+ text-template.official-ugc-v1.choice.edit-rhythm.pause-trim-jump-cuts {
text: "EDIT RHYTHM: use pause-trim jump cuts. The final clip feels tightly edited because silent gaps between spoken phrases have been removed; framing stays locked, with only tiny temporal jumps in expression, mouth position, gaze, hands, and posture at phrase boundaries.";
}
- prompt-kit.official-ugc-v1.block.performance {
+ text-template.official-ugc-v1.block.performance {
kind: axis;
order: 80;
parameter: performance;
}
- prompt-kit.official-ugc-v1.choice.performance.natural-explainer {
+ text-template.official-ugc-v1.choice.performance.natural-explainer {
text: "PERFORMANCE: natural explainer energy. The speaker uses clear eye focus, expressive eyebrows, small nods, and a friendly teaching rhythm that matches each idea.";
}
- prompt-kit.official-ugc-v1.choice.performance.high-energy-ugc {
+ text-template.official-ugc-v1.choice.performance.high-energy-ugc {
text: "PERFORMANCE: high-energy short-form UGC delivery. The speaker feels magnetic, quick, vivid, and excited, with expressive face changes on key words.";
}
- prompt-kit.official-ugc-v1.choice.performance.calm-authority {
+ text-template.official-ugc-v1.choice.performance.calm-authority {
text: "PERFORMANCE: calm authority. The speaker is composed, confident, precise, and trustworthy, with deliberate emphasis.";
}
- prompt-kit.official-ugc-v1.choice.performance.reactive-playful {
+ text-template.official-ugc-v1.choice.performance.reactive-playful {
text: "PERFORMANCE: reactive and playful. The speaker responds visibly to the idea with amused looks, quick smiles, skeptical eyebrows, and lively conversational timing.";
}
- prompt-kit.official-ugc-v1.block.gesture {
+ text-template.official-ugc-v1.block.gesture {
kind: axis;
order: 90;
parameter: gesture;
}
- prompt-kit.official-ugc-v1.choice.gesture.restrained {
+ text-template.official-ugc-v1.choice.gesture.restrained {
text: "GESTURE: restrained body language. Let face, eye focus, and voice carry most of the meaning, with small posture shifts and very light hand beats.";
}
- prompt-kit.official-ugc-v1.choice.gesture.compact {
+ text-template.official-ugc-v1.choice.gesture.compact {
text: "GESTURE: compact explanatory gestures. Keep hand movement close to the torso and inside the frame, using small semantic beats that support the words without competing with persistent overlays.";
}
- prompt-kit.official-ugc-v1.choice.gesture.natural {
+ text-template.official-ugc-v1.choice.gesture.natural {
text: "GESTURE: natural creator gestures. Use open palms, small pointing beats, nods, and posture shifts where the script naturally calls for them.";
}
- prompt-kit.official-ugc-v1.choice.gesture.expressive {
+ text-template.official-ugc-v1.choice.gesture.expressive {
text: "GESTURE: expressive embodied delivery. Use richer hand, shoulder, and posture changes that clearly visualize the idea while staying coherent with the spoken line.";
}
- prompt-kit.official-ugc-v1.block.texture {
+ text-template.official-ugc-v1.block.texture {
kind: fixed;
order: 100;
text: "TEXTURE: crisp real-shot phone footage with stable face, hands, skin texture, lighting, and photoreal motion.";
}
- prompt-kit.official-ugc-v1.block.visible-text {
+ text-template.official-ugc-v1.block.visible-text {
kind: fixed;
order: 110;
text: "No subtitles, captions, labels, logos, UI text, floating words, or any readable on-screen text inside the generated video.";
}
- prompt-kit.official-ugc-v1.block.dialogue {
+ text-template.official-ugc-v1.block.dialogue {
kind: slot;
order: 120;
slot: dialogue;
@@ -189,14 +189,14 @@
label: "SCRIPT TO DELIVER:";
}
- prompt-kit.official-ugc-v1.block.action {
+ text-template.official-ugc-v1.block.action {
kind: slot;
order: 130;
slot: action;
optional: true;
}
- prompt-kit.official-ugc-v1.block.extra {
+ text-template.official-ugc-v1.block.extra {
kind: slot;
order: 140;
slot: extra;
diff --git a/packages/seedance-speaker/package.json b/packages/seedance-speaker/package.json
index c10c6166..5269418f 100644
--- a/packages/seedance-speaker/package.json
+++ b/packages/seedance-speaker/package.json
@@ -14,12 +14,11 @@
"@narratage/elaborator": "workspace:*",
"@narratage/generation": "workspace:*",
"@narratage/model-kit": "workspace:*",
- "@narratage/narrative": "workspace:*",
- "@narratage/prompt-kit": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/seedance": "workspace:*",
"@narratage/speech": "workspace:*",
"@narratage/svs": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/seedance-speaker/src/activation.ts b/packages/seedance-speaker/src/activation.ts
index f3beb717..444e1bfa 100644
--- a/packages/seedance-speaker/src/activation.ts
+++ b/packages/seedance-speaker/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeSeedanceSpeakerTakeSurface,
@@ -14,7 +14,7 @@ export const svmlPackage = {
manifest: seedanceSpeakerManifest,
specifiers: ["@narratage/seedance-speaker", "@narratage/seedance-speaker@1"],
}],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: seedanceSpeakerModuleRef,
surface: "take",
mode: "structured",
diff --git a/packages/seedance-speaker/src/fragment.ts b/packages/seedance-speaker/src/fragment.ts
index 972a79a9..a5d77e0f 100644
--- a/packages/seedance-speaker/src/fragment.ts
+++ b/packages/seedance-speaker/src/fragment.ts
@@ -12,5 +12,10 @@ export function createSeedanceSpeakerTakeFragment(
compileRequestProducer: ProducerRef,
mediaInputs: readonly ExactModelMediaInput[] = [],
) {
- return createSeedanceSpeechGenerationFragment(endpoint, compileRequestProducer, mediaInputs);
+ return createSeedanceSpeechGenerationFragment(
+ endpoint,
+ compileRequestProducer,
+ mediaInputs,
+ [{ name: "prompt", port: "prompt" }],
+ );
}
diff --git a/packages/seedance-speaker/src/index.ts b/packages/seedance-speaker/src/index.ts
index 7e38725f..8b760015 100644
--- a/packages/seedance-speaker/src/index.ts
+++ b/packages/seedance-speaker/src/index.ts
@@ -1,7 +1,7 @@
export { createSeedanceSpeakerTakeFragment } from "./fragment.js";
export {
- bindSpeakerPromptKit,
- renderSpeakerSpeechProgram,
+ createSpeakerSpeechProgram,
+ createSpeakerTextBindings,
sealSpeakerTakeIntent,
speakerMethodDefaults,
verifySpeakerTakeIntent,
diff --git a/packages/seedance-speaker/src/kit.ts b/packages/seedance-speaker/src/kit.ts
index 8b8ae7d8..df56f2b6 100644
--- a/packages/seedance-speaker/src/kit.ts
+++ b/packages/seedance-speaker/src/kit.ts
@@ -1,9 +1,5 @@
-import {
- sealPromptKitInvocation,
- verifyPromptKitInvocation,
- verifyPromptProgram,
-} from "@narratage/prompt-kit";
-import type { PromptKitInvocation, PromptKitScalar, PromptProgram } from "@narratage/prompt-kit";
+import { sealTextBindings } from "@narratage/text";
+import type { TextBindings, TextScalar } from "@narratage/text";
import {
sealSeedanceSpeechProgram,
seedanceModels,
@@ -49,10 +45,8 @@ export function verifySpeakerTakeIntent(value: unknown): asserts value is Speake
|| intent.promptParameters === null
|| typeof intent.promptParameters !== "object"
|| Array.isArray(intent.promptParameters)
- || typeof intent.segment?.dialogue !== "string"
- || intent.segment.dialogue.trim().length === 0
) {
- throw new Error("Speaker TakeIntent identity, parameters or dialogue is invalid");
+ throw new Error("Speaker TakeIntent identity or parameters are invalid");
}
for (const [name, item] of Object.entries(intent.promptParameters)) {
if (!/^[a-z][a-z0-9-]{0,95}$/u.test(name)) throw new Error(`Speaker prompt parameter ${name} is invalid`);
@@ -77,40 +71,25 @@ function audioCount(intent: SpeakerTakeIntent): "zero" | "one" | "many" {
return count === 0 ? "zero" : count === 1 ? "one" : "many";
}
-export function bindSpeakerPromptKit(intent: SpeakerTakeIntent): PromptKitInvocation {
+export function createSpeakerTextBindings(intent: SpeakerTakeIntent): TextBindings {
verifySpeakerTakeIntent(intent);
- const parameters: Record<string, PromptKitScalar> = {};
+ const values: Record<string, TextScalar> = {};
for (const [name, value] of Object.entries(intent.promptParameters)) {
- parameters[name] = value as PromptKitScalar;
+ values[name] = value as TextScalar;
}
- const invocation = sealPromptKitInvocation({
- contract: "svml.prompt-kit-invocation@1",
- parameters,
- selectors: {
- "image-count": intent.references.filter((item) => item.kind === "image").length === 1 ? "one" : "many",
- "audio-count": audioCount(intent),
- },
- slots: {
- dialogue: intent.segment.dialogue,
- ...(intent.actionPrompt === undefined ? {} : { action: intent.actionPrompt }),
- ...(intent.extraPrompt === undefined ? {} : { extra: intent.extraPrompt }),
- },
+ return sealTextBindings({
+ ...values,
+ "image-count": intent.references.filter((item) => item.kind === "image").length === 1 ? "one" : "many",
+ "audio-count": audioCount(intent),
});
- verifyPromptKitInvocation(invocation);
- return invocation;
}
-export function renderSpeakerSpeechProgram(
- program: PromptProgram,
- intent: SpeakerTakeIntent,
-): SeedanceSpeechProgram {
- verifyPromptProgram(program);
+export function createSpeakerSpeechProgram(intent: SpeakerTakeIntent): SeedanceSpeechProgram {
verifySpeakerTakeIntent(intent);
return sealSeedanceSpeechProgram({
contract: "svml.seedance-speech-spine@1",
model: intent.model,
ports: {
- prompt: [program.blocks.map((item) => item.text).join(program.separator)],
resolution: [intent.resolution],
aspectRatio: [intent.aspectRatio],
generateAudio: [true],
diff --git a/packages/seedance-speaker/src/manifest.ts b/packages/seedance-speaker/src/manifest.ts
index e772c620..7639229c 100644
--- a/packages/seedance-speaker/src/manifest.ts
+++ b/packages/seedance-speaker/src/manifest.ts
@@ -1,12 +1,7 @@
import { artifactDependency } from "@narratage/artifact";
-import { narrativeDependency } from "@narratage/narrative";
import { speechDependency } from "@narratage/speech";
import { artifactTypes } from "@narratage/artifact";
-import {
- promptKitManifestDigest,
- promptKitModuleRef,
- promptKitTypes,
-} from "@narratage/prompt-kit";
+import { textDependency, textTypes } from "@narratage/text";
import { digestOf } from "@narratage/protocol";
import type { ModuleManifest } from "@narratage/protocol";
import {
@@ -29,9 +24,8 @@ export const seedanceSpeakerManifest: ModuleManifest = {
version: seedanceSpeakerModuleRef.version,
dependencies: [
artifactDependency,
- narrativeDependency,
speechDependency,
- { module: promptKitModuleRef, digest: promptKitManifestDigest },
+ textDependency,
{ module: seedanceModuleRef, digest: seedanceManifestDigest },
{ module: svsRecipeType.module, digest: digestOf(svsManifest) },
],
@@ -42,7 +36,9 @@ export const seedanceSpeakerManifest: ModuleManifest = {
tag: "Take",
mode: "structured",
outputs: [
- promptKitTypes.program,
+ textTypes.bindings,
+ textTypes.binding,
+ textTypes.text,
seedanceTypes.speechSpine,
artifactTypes.blob,
...Object.values(seedanceEndpointsByModel).flatMap((endpoint) =>
diff --git a/packages/seedance-speaker/src/surface.ts b/packages/seedance-speaker/src/surface.ts
index 3e53b3fe..282ea7af 100644
--- a/packages/seedance-speaker/src/surface.ts
+++ b/packages/seedance-speaker/src/surface.ts
@@ -1,19 +1,19 @@
-import { narrativeTypes } from "@narratage/narrative";
-import type { NarrativeDialogueExcerpt } from "@narratage/narrative";
import { speechTypes } from "@narratage/speech";
import type { SpeechDuration } from "@narratage/speech";
import { artifactTypes } from "@narratage/artifact";
import type { CanonicalValue, StoredValue } from "@narratage/protocol";
import { generationPort, sealGenerationMediaBinding } from "@narratage/generation";
import type { GenerationMediaPort } from "@narratage/generation";
-import { exactModelMediaInputNames } from "@narratage/model-kit";
+import { exactModelMediaInputNames, exactModelTextInputName } from "@narratage/model-kit";
import type { ExactModelEndpoint, ExactModelMediaInput } from "@narratage/model-kit";
import {
- compilePromptKit,
- promptKitTypes,
- verifyPromptKitSpec,
-} from "@narratage/prompt-kit";
-import type { PromptKitSpec } from "@narratage/prompt-kit";
+ createTextRenderFragment,
+ sealTextBinding,
+ textTypes,
+ verifyText,
+ verifyTextTemplate,
+} from "@narratage/text";
+import type { TextTemplate } from "@narratage/text";
import {
seedanceEndpointsByModel,
seedanceSpeechCompileProducers,
@@ -26,13 +26,13 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { createSeedanceSpeakerTakeFragment } from "./fragment.js";
import {
- bindSpeakerPromptKit,
- renderSpeakerSpeechProgram,
+ createSpeakerSpeechProgram,
+ createSpeakerTextBindings,
sealSpeakerTakeIntent,
speakerMethodDefaults,
} from "./kit.js";
@@ -68,7 +68,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referencePath(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
@@ -119,42 +119,49 @@ function recipeValue(
function kitValue(
element: StructuredElement,
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
-): PromptKitSpec {
+): { readonly reference: SurfaceResolvedReference; readonly template: TextTemplate } {
const reference = resolved(element, "kit", resolveReference);
- if (!sameType(reference.type, promptKitTypes.spec)) {
- throw new Error(`${element.name}.kit must reference a PromptKitSpec`);
+ if (!sameType(reference.type, textTypes.template)) {
+ throw new Error(`${element.name}.kit must reference a TextTemplate`);
}
- const spec = inline<PromptKitSpec>(reference, `${element.name}.kit`);
- verifyPromptKitSpec(spec);
- return spec;
+ const template = inline<TextTemplate>(reference, `${element.name}.kit`);
+ verifyTextTemplate(template);
+ return { reference, template };
}
-function dialogueValue(
+function optionalTextValue(
element: StructuredElement,
+ name: string,
+ resolveReference: (path: string) => SurfaceResolvedReference | undefined,
+): SurfaceResolvedReference | undefined {
+ if (element.attributes[name] === undefined) return undefined;
+ const reference = resolved(element, name, resolveReference);
+ if (!sameType(reference.type, textTypes.text)) {
+ throw new Error(`${element.name}.${name} must reference Text`);
+ }
+ const value = reference.record?.value;
+ if (value !== undefined) {
+ if (value.kind !== "inline") throw new Error(`${element.name}.${name} has an invalid authored Text value`);
+ verifyText(value.value);
+ }
+ return reference;
+}
+
+function requiredTextValue(
+ element: StructuredElement,
+ name: string,
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
) {
- const reference = resolved(element, "dialogue", resolveReference);
- if (!sameType(reference.type, narrativeTypes.dialogueExcerpt)) {
- throw new Error(`${element.name}.dialogue must reference a NarrativeDialogueExcerpt`);
+ const reference = resolved(element, name, resolveReference);
+ if (!sameType(reference.type, textTypes.text)) {
+ throw new Error(`${element.name}.${name} must reference Text`);
}
- const value = inline<{
- readonly contract: string;
- readonly id: string;
- readonly tokenStart: number;
- readonly tokenEndExclusive: number;
- readonly dialogue: string;
- }>(reference, `${element.name}.dialogue`);
- if (
- value.contract !== "svml.narrative-dialogue-excerpt@1"
- || typeof value.id !== "string"
- || !Number.isSafeInteger(value.tokenStart)
- || !Number.isSafeInteger(value.tokenEndExclusive)
- || typeof value.dialogue !== "string"
- || value.dialogue.trim().length === 0
- ) {
- throw new Error(`${element.name}.dialogue is invalid`);
+ const value = reference.record?.value;
+ if (value !== undefined) {
+ if (value.kind !== "inline") throw new Error(`${element.name}.${name} has an invalid authored Text value`);
+ verifyText(value.value);
}
- return value;
+ return reference;
}
type ResolvedSpeakerReference = SpeakerReference & { readonly source: SurfaceResolvedReference };
@@ -252,7 +259,7 @@ function model(recipe: SvsRecipe): SeedanceModel {
}
export const decodeSeedanceSpeakerTakeSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
- attributes(element, ["id", "dialogue", "duration", "recipe", "kit"]);
+ attributes(element, ["id", "dialogue", "duration", "recipe", "kit"], ["action", "extra"]);
const id = stringAttribute(element, "id");
const kit = kitValue(element, resolveReference);
const recipe = recipeValue(element, resolveReference);
@@ -263,18 +270,15 @@ export const decodeSeedanceSpeakerTakeSurface: StructuredSurfaceHandler = ({ ele
throw new Error(`Speaker Recipe ${recipe.path}.kind must be ugc-talking-head`);
}
const selectedModel = model(recipe);
- const dialogue = dialogueValue(element, resolveReference);
+ const dialogue = requiredTextValue(element, "dialogue", resolveReference);
+ const action = optionalTextValue(element, "action", resolveReference);
+ const extra = optionalTextValue(element, "extra", resolveReference);
const refs = references(element, resolveReference);
- const optionalPrompt = (name: "action" | "extra") => {
- const value = recipe.properties[name];
- if (value === undefined) return undefined;
- if (typeof value !== "string" || value.trim().length === 0) {
- throw new Error(`Speaker Recipe ${recipe.path}.${name} must be a non-empty string`);
+ for (const name of ["action", "extra"] as const) {
+ if (recipe.properties[name] !== undefined) {
+ throw new Error(`Speaker Recipe ${recipe.path}.${name} is content; pass it through ${element.name}.${name} as Text`);
}
- return value.trim();
- };
- const actionPrompt = optionalPrompt("action");
- const extraPrompt = optionalPrompt("extra");
+ }
const promptParameters: Record<string, CanonicalValue> = {};
for (const [name, value] of Object.entries(recipe.properties)) {
if (reserved.has(name)) continue;
@@ -285,54 +289,82 @@ export const decodeSeedanceSpeakerTakeSurface: StructuredSurfaceHandler = ({ ele
}
const intent = sealSpeakerTakeIntent({
contract: "svml.seedance-speaker-take-intent@1",
- kit: kit.id,
+ kit: kit.reference.path.split(".").at(-1) ?? "speaker-kit",
recipe: { path: recipe.path },
model: selectedModel,
resolution: recipeString(recipe, "resolution", speakerMethodDefaults.resolution) as "480p" | "720p" | "1080p",
aspectRatio: recipeString(recipe, "aspect-ratio", speakerMethodDefaults.aspectRatio) as "1:1" | "4:3" | "3:4" | "16:9" | "9:16" | "21:9" | "adaptive",
webSearch: recipeBoolean(recipe, "web-search", speakerMethodDefaults.webSearch),
promptParameters,
- segment: {
- dialogue: dialogue.dialogue,
- },
references: refs.map(({ source: _source, ...reference }) => reference),
- ...(actionPrompt === undefined ? {} : { actionPrompt }),
- ...(extraPrompt === undefined ? {} : { extraPrompt }),
});
- // All static Kit semantics are lowered here; Runtime never sees axes, defaults or branches.
- const prompt = compilePromptKit(kit, bindSpeakerPromptKit(intent));
- const program = renderSpeakerSpeechProgram(prompt, intent);
+ const bindings = createSpeakerTextBindings(intent);
+ // Static template semantics remain an ordinary deterministic graph step.
+ const program = createSpeakerSpeechProgram(intent);
const duration = resolved(element, "duration", resolveReference);
if (!sameType(duration.type, speechTypes.duration)) {
throw new Error(`${element.name}.duration must reference a SpeechDuration`);
}
- const promptId = `${id}.prompt`;
+ const bindingsId = `${id}.bindings`;
const programId = `${id}.program`;
const endpoint = seedanceEndpointsByModel[selectedModel];
const assembled = assembledReferences(id, endpoint, refs, element.range);
- const fragment = createSeedanceSpeakerTakeFragment(
+ const dynamicText = [
+ { name: "dialogue", source: dialogue.ref },
+ ...(action === undefined ? [] : [{ name: "action", source: action.ref }]),
+ ...(extra === undefined ? [] : [{ name: "extra", source: extra.ref }]),
+ ];
+ const promptFragment = createTextRenderFragment(dynamicText.map(({ name }) => ({ name })));
+ const generationFragment = createSeedanceSpeakerTakeFragment(
endpoint,
seedanceSpeechCompileProducers[selectedModel],
assembled.mediaInputs,
);
return {
records: [{
- id: promptId,
- type: promptKitTypes.program,
- value: { kind: "inline", value: prompt as unknown as CanonicalValue },
+ id: bindingsId,
+ type: textTypes.bindings,
+ value: { kind: "inline", value: bindings as unknown as CanonicalValue },
range: element.range,
}, {
id: programId,
type: seedanceTypes.speechSpine,
value: { kind: "inline", value: program as unknown as CanonicalValue },
range: element.range,
- }, ...assembled.records],
+ }, ...dynamicText.map(({ name }) => ({
+ id: `${id}.${name}-binding`,
+ type: textTypes.binding,
+ value: {
+ kind: "inline" as const,
+ value: sealTextBinding({ name, mode: "set" }) as unknown as CanonicalValue,
+ },
+ range: element.range,
+ })), ...assembled.records],
components: [{
+ id: `${id}.render-prompt`,
+ fragment: promptFragment.id,
+ inputs: {
+ template: kit.reference.ref,
+ bindings: { kind: "record", id: bindingsId },
+ ...Object.fromEntries(dynamicText.flatMap(({ name, source }) => [[
+ `binding:${name}:spec`, { kind: "record" as const, id: `${id}.${name}-binding` },
+ ], [
+ `binding:${name}:text`, source,
+ ]])),
+ },
+ outputs: { text: `${id}.prompt` },
+ range: element.range,
+ }, {
id,
- fragment: fragment.id,
+ fragment: generationFragment.id,
inputs: {
program: { kind: "record", id: programId },
duration: duration.ref,
+ [exactModelTextInputName("prompt")]: {
+ kind: "component-output",
+ component: `${id}.render-prompt`,
+ output: "text",
+ },
...assembled.inputs,
},
outputs: {
@@ -340,6 +372,6 @@ export const decodeSeedanceSpeakerTakeSurface: StructuredSurfaceHandler = ({ ele
},
range: element.range,
}],
- fragments: [fragment],
+ fragments: [promptFragment, generationFragment],
};
};
diff --git a/packages/seedance-speaker/src/types.ts b/packages/seedance-speaker/src/types.ts
index 245af86d..8a436e8c 100644
--- a/packages/seedance-speaker/src/types.ts
+++ b/packages/seedance-speaker/src/types.ts
@@ -15,10 +15,5 @@ export type SpeakerTakeIntent = {
readonly aspectRatio: "1:1" | "4:3" | "3:4" | "16:9" | "9:16" | "21:9" | "adaptive";
readonly webSearch: boolean;
readonly promptParameters: Readonly<Record<string, CanonicalValue>>;
- readonly segment: {
- readonly dialogue: string;
- };
readonly references: readonly SpeakerReference[];
- readonly actionPrompt?: string;
- readonly extraPrompt?: string;
};
diff --git a/packages/seedance-speaker/test/kit.test.ts b/packages/seedance-speaker/test/kit.test.ts
index 863010be..6a0b9d87 100644
--- a/packages/seedance-speaker/test/kit.test.ts
+++ b/packages/seedance-speaker/test/kit.test.ts
@@ -3,14 +3,17 @@ import { readFileSync } from "node:fs";
import test from "node:test";
import {
- compilePromptKit,
- promptKitSpecFromSvsRecipes,
- verifyPromptProgram,
-} from "@narratage/prompt-kit";
+ bindText,
+ renderText,
+ sealText,
+ sealTextBinding,
+ textTemplateFromSvsRecipes,
+ verifyText,
+} from "@narratage/text";
import { parseSvs } from "@narratage/svs";
import {
- bindSpeakerPromptKit,
- renderSpeakerSpeechProgram,
+ createSpeakerSpeechProgram,
+ createSpeakerTextBindings,
sealSpeakerTakeIntent,
speakerMethodDefaults,
} from "@narratage/seedance-speaker";
@@ -20,7 +23,7 @@ const officialUgcV1Parsed = parseSvs(
"official-ugc-v1.svs",
officialUgcV1SvsSource.slice(officialUgcV1SvsSource.indexOf("<sheet")),
);
-const officialUgcV1KitSpec = promptKitSpecFromSvsRecipes(
+const officialUgcV1Template = textTemplateFromSvsRecipes(
officialUgcV1Parsed.recipes.map((item) => item.value),
"official-ugc-v1",
);
@@ -35,9 +38,6 @@ function intent() {
aspectRatio: speakerMethodDefaults.aspectRatio,
webSearch: speakerMethodDefaults.webSearch,
promptParameters: {},
- segment: {
- dialogue: "HOST: Say exactly these words.",
- },
references: [
{ kind: "image", role: "character-and-scene" },
{ kind: "audio", role: "voice-timbre" },
@@ -46,46 +46,38 @@ function intent() {
}
test("published official Kit SVS is the exact package resource compiled by the module", () => {
- assert.match(officialUgcV1SvsSource, /^<\?svml using="@narratage\/prompt-kit\/svs@1"\?>/u);
- assert.equal(officialUgcV1KitSpec.id, "official-ugc-v1");
- assert.equal(officialUgcV1KitSpec.defaults.performance, "natural-explainer");
+ assert.match(officialUgcV1SvsSource, /^<\?svml using="@narratage\/text\/svs@1"\?>/u);
+ assert.equal(officialUgcV1Template.contract, "svml.text-template@1");
+ assert.equal(officialUgcV1Template.defaults?.performance, "natural-explainer");
});
-test("official UGC Kit emits an ordered generic Prompt Program", () => {
- const invocation = bindSpeakerPromptKit(intent());
- const prompt = compilePromptKit(officialUgcV1KitSpec, invocation);
- verifyPromptProgram(prompt);
- assert.deepEqual(prompt.blocks.map((item) => item.id), [
- "base",
- "reference-contract",
- "script-contract",
- "voice-map",
- "composition-stability",
- "camera-motion",
- "edit-rhythm",
- "performance",
- "gesture",
- "texture",
- "visible-text",
- "dialogue",
- ]);
- assert.match(prompt.blocks[3]?.text ?? "", /@audio1/u);
+test("official UGC Kit renders one ordinary ordered Text value", () => {
+ const bindings = bindText(
+ createSpeakerTextBindings(intent()),
+ sealTextBinding({ name: "dialogue", mode: "set" }),
+ sealText("HOST: Say exactly these words."),
+ );
+ const prompt = renderText(officialUgcV1Template, bindings);
+ verifyText(prompt);
+ assert.match(prompt.value, /^Create a realistic vertical iPhone UGC/u);
+ assert.match(prompt.value, /@audio1/u);
+ assert.match(prompt.value, /SCRIPT TO DELIVER:\nHOST: Say exactly these words\./u);
+ assert.ok(prompt.value.indexOf("COMPOSITION STABILITY") < prompt.value.indexOf("CAMERA MOTION"));
});
-test("rendering the generic Prompt Program preserves exact Seedance method while media stays on graph edges", () => {
+test("Speaker method preserves exact Seedance settings while prompt and media stay on graph edges", () => {
const take = intent();
- const prompt = compilePromptKit(officialUgcV1KitSpec, bindSpeakerPromptKit(take));
- const program = renderSpeakerSpeechProgram(prompt, take);
+ const program = createSpeakerSpeechProgram(take);
assert.equal(program.model, "seedance-2-mini");
assert.deepEqual(program.ports.resolution, ["720p"]);
assert.deepEqual(program.ports.aspectRatio, ["9:16"]);
assert.equal(program.ports.referenceImage, undefined);
assert.equal(program.ports.referenceAudio, undefined);
- assert.deepEqual(program.ports.prompt, [prompt.blocks.map((item) => item.text).join("\n\n")]);
+ assert.equal(program.ports.prompt, undefined, "prompt arrives from an explicit Text edge");
assert.equal(program.ports.duration, undefined, "duration arrives from speech estimation");
});
-test("Speaker rejects invalid media while Prompt Kit rejects unknown parameters", () => {
+test("Speaker rejects invalid media while Text Template rejects unknown parameters", () => {
const base = intent();
assert.throws(() => sealSpeakerTakeIntent({
...base,
@@ -94,7 +86,7 @@ test("Speaker rejects invalid media while Prompt Kit rejects unknown parameters"
assert.throws(() => sealSpeakerTakeIntent({ ...base, resolution: "1080p" }), /at most 720p/u);
const unknown = sealSpeakerTakeIntent({ ...base, promptParameters: { "imaginary-axis": "value" } });
assert.throws(
- () => compilePromptKit(officialUgcV1KitSpec, bindSpeakerPromptKit(unknown)),
- /parameter imaginary-axis is not declared/u,
+ () => renderText(officialUgcV1Template, createSpeakerTextBindings(unknown)),
+ /binding imaginary-axis is not declared/u,
);
});
diff --git a/packages/seedance/README.md b/packages/seedance/README.md
index 1e918fb0..3132ca83 100644
--- a/packages/seedance/README.md
+++ b/packages/seedance/README.md
@@ -4,9 +4,9 @@ Exact Seedance author model module. It owns the request schema and the namespace
and `Speech` Surfaces; it does not contain KIE credentials, HTTP code, queues or runtime routing.
`Video` and `Speech` preserve the remote result as one atomic `GeneratedVideoSet`, then expose its
-first ordered member through the shared deterministic primary-video projection. `Speech` consumes a
-shared `NarrativeDialogueExcerpt`, so a third-party narrative Surface can feed it without importing the
-official Script parser.
+first ordered member through the shared deterministic primary-video projection. Their prompt ports
+consume ordinary `Text`, so Script, a generic Text Template or any third-party author Surface can
+feed them without importing the official Script parser.
Duration is explicit in this low-level model Surface. A later Speech scheduling package may wrap it
with estimation without changing Core or the exact Seedance/KIE contracts.
diff --git a/packages/seedance/package.json b/packages/seedance/package.json
index 2125bfe4..349e5d6b 100644
--- a/packages/seedance/package.json
+++ b/packages/seedance/package.json
@@ -17,6 +17,7 @@
"@narratage/narrative": "workspace:*",
"@narratage/protocol": "workspace:*",
"@narratage/speech": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/seedance/src/activation.ts b/packages/seedance/src/activation.ts
index 24a3db66..e90a8abf 100644
--- a/packages/seedance/src/activation.ts
+++ b/packages/seedance/src/activation.ts
@@ -1,7 +1,6 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
- decodeSeedancePromptSurface,
decodeSeedanceSpeechSurface,
decodeSeedanceVideoSurface,
seedanceComponent,
@@ -16,21 +15,14 @@ export const svmlPackage = {
modules: [{ manifest: seedanceManifest, specifiers: ["@narratage/seedance", "@narratage/seedance@1"] }],
components: [seedanceComponent],
hostFacets: [
- createTextSurfaceHostFacet({
- module: seedanceModuleRef,
- surface: "prompt",
- mode: "structured",
- implementationDigest: seedanceSurfaceImplementationDigests.prompt,
- handler: decodeSeedancePromptSurface,
- }),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: seedanceModuleRef,
surface: "speech",
mode: "structured",
implementationDigest: seedanceSurfaceImplementationDigests.speech,
handler: decodeSeedanceSpeechSurface,
}),
- createTextSurfaceHostFacet({
+ createMarkupSurfaceHostFacet({
module: seedanceModuleRef,
surface: "video",
mode: "structured",
diff --git a/packages/seedance/src/fragment.ts b/packages/seedance/src/fragment.ts
index cdc3d83a..74371564 100644
--- a/packages/seedance/src/fragment.ts
+++ b/packages/seedance/src/fragment.ts
@@ -5,8 +5,10 @@ import { generationProducers } from "@narratage/generation";
import {
createExactModelPrimaryGenerationFragment,
exactModelMediaInputNames,
+ exactModelTextInputName,
} from "@narratage/model-kit";
-import type { ExactModelEndpoint, ExactModelMediaInput } from "@narratage/model-kit";
+import type { ExactModelEndpoint, ExactModelMediaInput, ExactModelTextInput } from "@narratage/model-kit";
+import { textTypes } from "@narratage/text";
import type { ProducerRef } from "@narratage/protocol";
const input = (name: string) => ({ kind: "fragment-input" as const, name });
@@ -48,14 +50,16 @@ export function createSeedanceGenerationFragment(endpoint: ExactModelEndpoint) {
export function createSeedanceAssembledGenerationFragment(
endpoint: ExactModelEndpoint,
mediaInputs: readonly ExactModelMediaInput[] = [],
+ textInputs: readonly ExactModelTextInput[] = [],
) {
- return createExactModelPrimaryGenerationFragment(endpoint, mediaInputs);
+ return createExactModelPrimaryGenerationFragment(endpoint, mediaInputs, textInputs);
}
export function createSeedanceSpeechGenerationFragment(
endpoint: ExactModelEndpoint,
compileProducer: ProducerRef,
mediaInputs: readonly ExactModelMediaInput[] = [],
+ textInputs: readonly ExactModelTextInput[] = [],
) {
const inputs = [
{ name: "program", type: { module: endpoint.producer.module, name: "SpeechProgram" } },
@@ -68,6 +72,20 @@ export function createSeedanceSpeechGenerationFragment(
result: { kind: "output", name: "draft" },
}];
let draft = operation("compile-draft") as ReturnType<typeof input> | ReturnType<typeof operation>;
+ for (const [index, item] of textInputs.entries()) {
+ const binding = endpoint.textBindings[item.port];
+ if (binding === undefined) throw new Error(`${endpoint.ports.model} has no text port ${item.port}`);
+ const name = exactModelTextInputName(item.name);
+ inputs.push({ name, type: textTypes.text });
+ const id = `bind-text:${String(index + 1).padStart(4, "0")}:${item.port}`;
+ operations.push({
+ id,
+ producer: binding.producer,
+ inputs: { draft, text: input(name) },
+ result: { kind: "output", name: "draft" },
+ });
+ draft = operation(id);
+ }
for (const [index, item] of mediaInputs.entries()) {
const binding = endpoint.mediaBindings[item.port];
if (binding === undefined) throw new Error(`${endpoint.ports.model} has no media port ${item.port}`);
@@ -102,7 +120,10 @@ export function createSeedanceSpeechGenerationFragment(
result: { kind: "output", name: "video" },
},
);
- const shape = mediaInputs.map((item) => `${item.name}=${item.port}`).join(",") || "no-media";
+ const shape = [
+ ...textInputs.map((item) => `${item.name}=${item.port}:text`),
+ ...mediaInputs.map((item) => `${item.name}=${item.port}:media`),
+ ].join(",") || "no-dynamic-inputs";
return sealGraphFragment({
name: `@narratage/seedance/${endpoint.key}-speech-assembled-primary-video[${shape}]@1`,
inputs,
diff --git a/packages/seedance/src/index.ts b/packages/seedance/src/index.ts
index f88a8d91..a077e756 100644
--- a/packages/seedance/src/index.ts
+++ b/packages/seedance/src/index.ts
@@ -1,6 +1,5 @@
import {
generationObjectSchema,
- generationPromptSchema,
portsObjectSchema,
sealGenerationPortRequest,
sealGenerationRequestDraft,
@@ -14,7 +13,6 @@ import type {
GenerationRequestDraft,
} from "@narratage/generation";
import { defineExactModelModule } from "@narratage/model-kit";
-import { narrativeDependency } from "@narratage/narrative";
import { assertSpeechDurationIdentity, speechDependency, speechTypes } from "@narratage/speech";
import type { SpeechDuration } from "@narratage/speech";
import { canonicalize, digestOf } from "@narratage/protocol";
@@ -88,11 +86,6 @@ export function sealSeedanceRequest(model: SeedanceModel, ports: SeedancePortMap
return sealGenerationPortRequest(seedancePorts[model], ports);
}
-export type SeedancePrompt = {
- readonly contract: "svml.seedance-prompt@1";
- readonly text: string;
-};
-
/** One authored generation minus the duration only speech estimation can supply. */
export type SeedanceSpeechProgram = {
readonly contract: "svml.seedance-speech-spine@1";
@@ -101,7 +94,6 @@ export type SeedanceSpeechProgram = {
};
export const seedanceTypes = {
- prompt: { module: seedanceModuleRef, name: "Prompt" },
speechSpine: { module: seedanceModuleRef, name: "SpeechProgram" },
} satisfies Record<string, TypeRef>;
@@ -117,7 +109,6 @@ export const seedanceSpeechCompileImplementationDigests = Object.fromEntries(
) as Record<SeedanceModel, Digest>;
export const seedanceSurfaceImplementationDigests = {
- prompt: digestOf("@narratage/seedance/prompt-surface@1"),
speech: digestOf("@narratage/seedance/speech-surface@1"),
video: digestOf("@narratage/seedance/video-surface@1"),
} as const;
@@ -128,21 +119,6 @@ function assertObject(value: unknown): asserts value is Record<string, unknown>
}
}
-export function sealSeedancePrompt(text: string): SeedancePrompt {
- const normalized = text.trim();
- if (normalized.length === 0 || normalized.length > 20_000) {
- throw new Error("Seedance Prompt must contain 1 to 20,000 characters");
- }
- return { contract: "svml.seedance-prompt@1" as const, text: normalized };
-}
-
-export function verifySeedancePrompt(value: unknown): asserts value is SeedancePrompt {
- assertObject(value);
- if (value.contract !== "svml.seedance-prompt@1" || typeof value.text !== "string" || value.text.length === 0) {
- throw new Error("Seedance Prompt is invalid");
- }
-}
-
export function verifySeedanceSpeechProgram(value: unknown): asserts value is SeedanceSpeechProgram {
assertObject(value);
if (value.contract !== "svml.seedance-speech-spine@1"
@@ -150,8 +126,10 @@ export function verifySeedanceSpeechProgram(value: unknown): asserts value is Se
throw new Error("Seedance SpeechProgram identity is invalid");
}
const table = seedancePorts[value.model as SeedanceModel];
- const media = table.ports.filter((port) => port.value.kind === "media").map((port) => port.name);
- verifyPortsAgainstTable(table, value.ports, { omit: ["duration", ...media] });
+ const later = table.ports
+ .filter((port) => port.value.kind === "media" || port.value.kind === "text")
+ .map((port) => port.name);
+ verifyPortsAgainstTable(table, value.ports, { omit: ["duration", ...later] });
const generateAudio = (value.ports as SeedancePortMap).generateAudio;
if (generateAudio?.[0] !== true) throw new Error("Seedance SpeechProgram must generate audio");
}
@@ -179,7 +157,12 @@ const speechSpineSchema = (model: SeedanceModel): ValueSchema => generationObjec
model: { schema: { kind: "literal", value: model } },
ports: {
schema: portsObjectSchema(seedancePorts[model], {
- omit: ["duration", ...seedancePorts[model].ports.filter((port) => port.value.kind === "media").map((port) => port.name)],
+ omit: [
+ "duration",
+ ...seedancePorts[model].ports
+ .filter((port) => port.value.kind === "media" || port.value.kind === "text")
+ .map((port) => port.name),
+ ],
}),
},
});
@@ -209,7 +192,6 @@ export const seedanceManifest = {
...seedanceBaseDefinition.manifest,
dependencies: [
...seedanceBaseDefinition.manifest.dependencies,
- narrativeDependency,
speechDependency,
],
types: [
@@ -218,26 +200,8 @@ export const seedanceManifest = {
name: seedanceTypes.speechSpine.name,
schema: { kind: "oneOf", variants: seedanceModels.map(speechSpineSchema) } satisfies ValueSchema,
},
- {
- name: seedanceTypes.prompt.name,
- schema: generationObjectSchema({
- contract: { schema: { kind: "literal", value: "svml.seedance-prompt@1" } },
- text: { schema: generationPromptSchema },
- }),
- },
],
surfaces: [
- {
- name: "prompt",
- tag: "Prompt",
- mode: "structured",
- outputs: [seedanceTypes.prompt],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "@narratage/seedance/prompt-surface",
- digest: seedanceSurfaceImplementationDigests.prompt,
- },
- },
{
name: "speech",
tag: "Speech",
@@ -327,7 +291,6 @@ export {
createSeedanceSpeechGenerationFragment,
} from "./fragment.js";
export {
- decodeSeedancePromptSurface,
decodeSeedanceSpeechSurface,
decodeSeedanceVideoSurface,
} from "./surface.js";
diff --git a/packages/seedance/src/surface.ts b/packages/seedance/src/surface.ts
index fe6b13b1..5ef23869 100644
--- a/packages/seedance/src/surface.ts
+++ b/packages/seedance/src/surface.ts
@@ -1,15 +1,12 @@
-import { narrativeTypes } from "@narratage/narrative";
-import type { NarrativeDialogueExcerpt } from "@narratage/narrative";
import { speechTypes } from "@narratage/speech";
-import type { SpeechDuration } from "@narratage/speech";
import { artifactTypes } from "@narratage/artifact";
import type { CanonicalValue } from "@narratage/protocol";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import {
createSeedanceAssembledGenerationFragment,
@@ -21,29 +18,25 @@ import {
sealGenerationRequestDraft,
} from "@narratage/generation";
import type { GenerationMediaPort, GenerationMediaRole, GenerationPortTable } from "@narratage/generation";
-import { exactModelMediaInputNames } from "@narratage/model-kit";
+import { exactModelMediaInputNames, exactModelTextInputName } from "@narratage/model-kit";
import type { ExactModelEndpoint, ExactModelMediaInput } from "@narratage/model-kit";
+import { textTypes, verifyText } from "@narratage/text";
import {
- sealSeedancePrompt,
sealSeedanceSpeechProgram,
seedanceEndpoints,
seedancePorts,
seedanceSpeechCompileProducers,
seedanceTypes,
- verifySeedancePrompt,
} from "./index.js";
import type {
SeedanceModel,
SeedancePortMap,
- SeedancePrompt,
} from "./index.js";
-/** `role` is the media kind the port accepts; `label` is the author's own note about it. */
type ReferenceInput = {
readonly role: GenerationMediaRole;
readonly source: SurfaceResolvedReference;
- readonly label?: string;
};
function localName(value: string): string {
@@ -83,7 +76,7 @@ function optionalStringAttribute(element: StructuredElement, name: string): stri
}
function referenceAttribute(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
@@ -113,11 +106,13 @@ function inline(reference: SurfaceResolvedReference, subject: string): Canonical
return value.value;
}
-function prompt(reference: SurfaceResolvedReference, subject: string): SeedancePrompt {
- if (!sameType(reference.type, seedanceTypes.prompt)) throw new Error(`${subject} must reference a Seedance Prompt`);
- const value = inline(reference, subject);
- verifySeedancePrompt(value);
- return value;
+function prompt(reference: SurfaceResolvedReference, subject: string): void {
+ if (!sameType(reference.type, textTypes.text)) throw new Error(`${subject} must reference Text`);
+ const value = reference.record?.value;
+ if (value !== undefined) {
+ if (value.kind !== "inline") throw new Error(`${subject} has an invalid authored Text value`);
+ verifyText(value.value);
+ }
}
function mediaReference(reference: SurfaceResolvedReference, role: GenerationMediaRole, subject: string): SurfaceResolvedReference {
@@ -129,19 +124,6 @@ function mediaReference(reference: SurfaceResolvedReference, role: GenerationMed
return reference;
}
-function normalizedText(element: StructuredElement): string {
- if (element.children.some((child) => child.kind === "element")) {
- throw new Error(`${element.name} accepts text only`);
- }
- const raw = element.children.map((child) => child.kind === "text" ? child.value : "").join("");
- const lines = raw.replaceAll("\r\n", "\n").split("\n");
- while (lines[0]?.trim() === "") lines.shift();
- while (lines.at(-1)?.trim() === "") lines.pop();
- const indents = lines.filter((line) => line.trim()).map((line) => /^\s*/u.exec(line)?.[0].length ?? 0);
- const indent = indents.length === 0 ? 0 : Math.min(...indents);
- return lines.map((line) => line.slice(indent).trimEnd()).join("\n").trim();
-}
-
function modelSelection(element: StructuredElement) {
const requested = stringAttribute(element, "model");
if (requested === "standard" || requested === "seedance-2") {
@@ -228,13 +210,12 @@ function references(
continue;
}
if (localName(child.name) !== "Reference") throw new Error(`${element.name} accepts only Reference children`);
- attributes(child, [], [...accepted, "role"]);
+ attributes(child, [], accepted);
const kinds = accepted.filter((kind) => child.attributes[kind] !== undefined);
if (kinds.length !== 1) throw new Error(`${child.name} requires exactly one of ${accepted.join(", ")}`);
const role = kinds[0]!;
const source = mediaReference(resolved(child, role, resolveReference), role, `${child.name}.${role}`);
- const label = optionalStringAttribute(child, "role");
- result.push({ role, source, ...(label === undefined ? {} : { label }) });
+ result.push({ role, source });
}
// Every bound below is read from the model's own port table, never repeated here.
for (const role of accepted) {
@@ -247,13 +228,6 @@ function references(
return result;
}
-function referencePrompt(values: readonly ReferenceInput[]): string {
- const roles = values.flatMap((item, index) => item.label === undefined
- ? []
- : [`Reference ${item.role} ${index + 1} is the ${item.label}.`]);
- return roles.length === 0 ? "" : `\n\nReference roles:\n${roles.join("\n")}`;
-}
-
type AssembledReferences = {
readonly mediaInputs: readonly ExactModelMediaInput[];
readonly records: readonly {
@@ -299,28 +273,6 @@ function assembleReferences(
return { mediaInputs, records, inputs };
}
-function dialogueExcerpt(reference: SurfaceResolvedReference, subject: string): { readonly dialogue: string } {
- if (!sameType(reference.type, narrativeTypes.dialogueExcerpt)) {
- throw new Error(`${subject} must reference a NarrativeDialogueExcerpt such as script.segment.opening.dialogue`);
- }
- const value = inline(reference, subject) as unknown as {
- readonly contract: string;
- readonly dialogue?: string;
- readonly [key: string]: CanonicalValue | undefined;
- };
- if (
- value.contract !== "svml.narrative-dialogue-excerpt@1"
- || typeof value.dialogue !== "string"
- || typeof value.id !== "string"
- || !Number.isSafeInteger(value.tokenStart)
- || !Number.isSafeInteger(value.tokenEndExclusive)
- ) {
- throw new Error(`${subject} NarrativeDialogueExcerpt is invalid`);
- }
- if (value.dialogue.trim().length === 0) throw new Error(`${subject} contains no spoken text`);
- return { dialogue: value.dialogue };
-}
-
function speechDurationReference(
element: StructuredElement,
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
@@ -337,12 +289,17 @@ function generationOutput(
element: StructuredElement,
endpoint: ExactModelEndpoint,
draft: ReturnType<typeof sealGenerationRequestDraft>,
+ promptSource: SurfaceResolvedReference,
references: readonly ReferenceInput[],
output: string,
) {
const id = stringAttribute(element, "id");
const assembled = assembleReferences(id, endpoint, references, element.range);
- const fragment = createSeedanceAssembledGenerationFragment(endpoint, assembled.mediaInputs);
+ const fragment = createSeedanceAssembledGenerationFragment(
+ endpoint,
+ assembled.mediaInputs,
+ [{ name: "prompt", port: "prompt" }],
+ );
const draftId = `${id}.draft`;
return {
records: [{
@@ -354,7 +311,11 @@ function generationOutput(
components: [{
id,
fragment: fragment.id,
- inputs: { draft: { kind: "record" as const, id: draftId }, ...assembled.inputs },
+ inputs: {
+ draft: { kind: "record" as const, id: draftId },
+ [exactModelTextInputName("prompt")]: promptSource.ref,
+ ...assembled.inputs,
+ },
outputs: { video: output },
range: element.range,
}],
@@ -362,54 +323,36 @@ function generationOutput(
};
}
-export const decodeSeedancePromptSurface: StructuredSurfaceHandler = ({ element }) => {
- attributes(element, ["id"]);
- const id = stringAttribute(element, "id");
- const value = sealSeedancePrompt(normalizedText(element));
- return {
- records: [{
- id,
- type: seedanceTypes.prompt,
- value: { kind: "inline", value: value as unknown as CanonicalValue },
- range: element.range,
- }],
- components: [],
- fragments: [],
- };
-};
-
export const decodeSeedanceVideoSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
attributes(element, ["id", "model", "prompt", "duration"], [
"resolution", "aspect-ratio", "generate-audio", "web-search",
]);
const selected = modelSelection(element);
- const declaredPrompt = prompt(resolved(element, "prompt", resolveReference), `${element.name}.prompt`);
+ const promptSource = resolved(element, "prompt", resolveReference);
+ prompt(promptSource, `${element.name}.prompt`);
const refs = references(element, selected.model, resolveReference);
const draft = sealGenerationRequestDraft(seedancePorts[selected.model], {
- prompt: [declaredPrompt.text + referencePrompt(refs)],
...generationSettings(element, selected.model),
generateAudio: [booleanAttribute(element, "generate-audio", false)],
});
- return generationOutput(element, selected.endpoint, draft, refs, `${stringAttribute(element, "id")}.video`);
+ return generationOutput(element, selected.endpoint, draft, promptSource, refs, `${stringAttribute(element, "id")}.video`);
};
export const decodeSeedanceSpeechSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
- attributes(element, ["id", "model", "dialogue", "prompt", "duration"], [
+ attributes(element, ["id", "model", "prompt", "duration"], [
"resolution", "aspect-ratio", "web-search",
]);
const selected = modelSelection(element);
- const declaredPrompt = prompt(resolved(element, "prompt", resolveReference), `${element.name}.prompt`);
- const spoken = dialogueExcerpt(resolved(element, "dialogue", resolveReference), `${element.name}.dialogue`);
+ const promptSource = resolved(element, "prompt", resolveReference);
+ prompt(promptSource, `${element.name}.prompt`);
const refs = references(element, selected.model, resolveReference);
const duration = speechDurationReference(element, resolveReference);
- const promptText = `${declaredPrompt.text}${referencePrompt(refs)}\n\nSpoken dialogue — say exactly:\n${spoken.dialogue}`;
if (duration !== undefined) {
const { duration: _later, ...settings } = generationSettings(element, selected.model, 4);
const program = sealSeedanceSpeechProgram({
contract: "svml.seedance-speech-spine@1",
model: selected.model,
ports: {
- prompt: [promptText],
...settings,
generateAudio: [true],
},
@@ -421,6 +364,7 @@ export const decodeSeedanceSpeechSurface: StructuredSurfaceHandler = ({ element,
selected.endpoint,
seedanceSpeechCompileProducers[selected.model],
assembled.mediaInputs,
+ [{ name: "prompt", port: "prompt" }],
);
return {
records: [{
@@ -435,6 +379,7 @@ export const decodeSeedanceSpeechSurface: StructuredSurfaceHandler = ({ element,
inputs: {
program: { kind: "record", id: programId },
duration: duration.ref,
+ [exactModelTextInputName("prompt")]: promptSource.ref,
...assembled.inputs,
},
outputs: { video: id },
@@ -444,9 +389,8 @@ export const decodeSeedanceSpeechSurface: StructuredSurfaceHandler = ({ element,
};
}
const draft = sealGenerationRequestDraft(seedancePorts[selected.model], {
- prompt: [promptText],
...generationSettings(element, selected.model),
generateAudio: [true],
});
- return generationOutput(element, selected.endpoint, draft, refs, stringAttribute(element, "id"));
+ return generationOutput(element, selected.endpoint, draft, promptSource, refs, stringAttribute(element, "id"));
};
diff --git a/packages/seedance/test/surface.test.ts b/packages/seedance/test/surface.test.ts
index 39f37a8d..76028ec0 100644
--- a/packages/seedance/test/surface.test.ts
+++ b/packages/seedance/test/surface.test.ts
@@ -2,37 +2,26 @@ import assert from "node:assert/strict";
import test from "node:test";
import { artifactTypes } from "@narratage/artifact";
-import { digestOf } from "@narratage/protocol";
-import { parseStructuredElement } from "@narratage/text";
-import type { SurfaceResolvedReference } from "@narratage/text";
+import { parseStructuredElement } from "@narratage/markup";
+import type { SurfaceResolvedReference } from "@narratage/markup";
+import { textTypes } from "@narratage/text";
import {
decodeSeedanceVideoSurface,
- sealSeedancePrompt,
- seedanceTypes,
} from "../src/index.js";
-test("Seedance keeps an upstream generated image as a graph edge", async () => {
+test("Seedance keeps upstream generated Text and image as graph edges", async () => {
const element = parseStructuredElement({
name: "dynamic-reference.svml",
text: `<seedance:Video id="motion" model="mini" prompt={direction} duration="6" resolution="720p" aspect-ratio="9:16">
- <seedance:Reference image={generated.image} role="montage reference"/>
+ <seedance:Reference image={generated.image}/>
</seedance:Video>`,
}, 0).element;
- const prompt = sealSeedancePrompt("Create a coherent montage.");
const refs = new Map<string, SurfaceResolvedReference>([
["direction", {
path: "direction",
- ref: { kind: "record", id: "direction" },
- type: seedanceTypes.prompt,
- record: {
- id: "direction",
- type: seedanceTypes.prompt,
- value: { kind: "inline", value: prompt },
- digest: digestOf(prompt),
- conformance: "exact",
- origin: { kind: "authored", sourceDigest: digestOf("source"), frontendClosureDigest: digestOf("frontend") },
- },
+ ref: { kind: "component-output", component: "assembled-direction", output: "text" },
+ type: textTypes.text,
}],
["generated.image", {
path: "generated.image",
@@ -51,6 +40,9 @@ test("Seedance keeps an upstream generated image as a graph edge", async () => {
kind: "component-output", component: "generated", output: "image",
});
assert.equal(component.inputs["media-0001:binding"]?.kind, "record");
+ assert.deepEqual(component.inputs["prompt:text"], {
+ kind: "component-output", component: "assembled-direction", output: "text",
+ });
const draft = result.records.find((record) => record.id === "motion.draft");
assert.ok(draft?.value.kind === "inline");
assert.equal(JSON.stringify(draft.value).includes("referenceImage"), false);
diff --git a/packages/source/README.md b/packages/source/README.md
index e926be07..44e4e09c 100644
--- a/packages/source/README.md
+++ b/packages/source/README.md
@@ -5,7 +5,7 @@ The smallest source bootstrap shared by Author and Run compilation.
It recognizes exactly one mandatory bounded Header:
```xml
-<?svml using="@narratage/text@1"?>
+<?svml using="@narratage/markup@1"?>
```
The Header selects an exact trusted Frontend. There is no suffix dispatch and no default parser.
diff --git a/packages/source/test/header.test.ts b/packages/source/test/header.test.ts
index 4c2074ec..bc2cf7fd 100644
--- a/packages/source/test/header.test.ts
+++ b/packages/source/test/header.test.ts
@@ -8,9 +8,9 @@ import {
} from "@narratage/source";
test("Source Header explicitly selects one Frontend and masking preserves offsets", () => {
- const text = '<?svml using="@narratage/text@1"?>\n\n<svml/>\n';
+ const text = '<?svml using="@narratage/markup@1"?>\n\n<svml/>\n';
const header = parseSourceHeader("main.svml", text);
- assert.equal(header.using, "@narratage/text@1");
+ assert.equal(header.using, "@narratage/markup@1");
const masked = maskSourceHeader(text, header);
assert.equal(masked.length, text.length);
assert.equal(masked.indexOf("<svml/>"), text.indexOf("<svml/>"));
diff --git a/packages/spatial/package.json b/packages/spatial/package.json
index e47c63ad..c327e012 100644
--- a/packages/spatial/package.json
+++ b/packages/spatial/package.json
@@ -13,7 +13,7 @@
"@narratage/component-kit": "workspace:*",
"@narratage/elaborator": "workspace:*",
"@narratage/protocol": "workspace:*",
- "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*",
"@narratage/validation": "workspace:*"
}
}
diff --git a/packages/spatial/src/activation.ts b/packages/spatial/src/activation.ts
index f4e6d3ec..25aeb08b 100644
--- a/packages/spatial/src/activation.ts
+++ b/packages/spatial/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeAnchoredFrameSurface,
@@ -22,13 +22,13 @@ export const svmlPackage = {
modules: [{ manifest: spatialManifest, specifiers: ["@narratage/spatial", "@narratage/spatial@1"] }],
components: [spatialComponent],
hostFacets: [
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "canvas", mode: "structured", implementationDigest: spatialSurfaceDigests.canvas, handler: decodeCanvasSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "point", mode: "structured", implementationDigest: spatialSurfaceDigests.point, handler: decodePointSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "path", mode: "structured", implementationDigest: spatialSurfaceDigests.path, handler: decodePathSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "extent", mode: "structured", implementationDigest: spatialSurfaceDigests.extent, handler: decodeExtentSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "frame", mode: "structured", implementationDigest: spatialSurfaceDigests.frame, handler: decodeFrameSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "anchored-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.anchoredFrame, handler: decodeAnchoredFrameSurface }),
- createTextSurfaceHostFacet({ module: spatialModuleRef, surface: "aspect-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.aspectFrame, handler: decodeAspectFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "canvas", mode: "structured", implementationDigest: spatialSurfaceDigests.canvas, handler: decodeCanvasSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "point", mode: "structured", implementationDigest: spatialSurfaceDigests.point, handler: decodePointSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "path", mode: "structured", implementationDigest: spatialSurfaceDigests.path, handler: decodePathSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "extent", mode: "structured", implementationDigest: spatialSurfaceDigests.extent, handler: decodeExtentSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "frame", mode: "structured", implementationDigest: spatialSurfaceDigests.frame, handler: decodeFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "anchored-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.anchoredFrame, handler: decodeAnchoredFrameSurface }),
+ createMarkupSurfaceHostFacet({ module: spatialModuleRef, surface: "aspect-frame", mode: "structured", implementationDigest: spatialSurfaceDigests.aspectFrame, handler: decodeAspectFrameSurface }),
],
};
export default svmlPackage;
diff --git a/packages/spatial/src/surface.ts b/packages/spatial/src/surface.ts
index 4849cdc4..c1774c67 100644
--- a/packages/spatial/src/surface.ts
+++ b/packages/spatial/src/surface.ts
@@ -5,8 +5,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import {
anchoredFrameFragment,
@@ -81,7 +81,7 @@ function reference(
name: string,
resolve: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference") throw new Error(`${element.name}.${name} must be a reference.`);
const result = resolve(value.path);
if (result === undefined) throw new Error(`${element.name}.${name} cannot resolve ${value.path}.`);
diff --git a/packages/spatial/test/spatial.test.ts b/packages/spatial/test/spatial.test.ts
index d710114a..5863681a 100644
--- a/packages/spatial/test/spatial.test.ts
+++ b/packages/spatial/test/spatial.test.ts
@@ -6,9 +6,9 @@ import { createResolvedClosure, sealBuildRequest, start } from "@narratage/core"
import { AuthorFrontendRegistry, compileSourceClosure, resolveCompiledSourceExport } from "@narratage/elaborator";
import type { AuthorSourceUnit } from "@narratage/elaborator";
import {
- TextSurfaceRegistry,
- createTextAuthorFrontend,
-} from "@narratage/text";
+ MarkupSurfaceRegistry,
+ createMarkupAuthorFrontend,
+} from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
import {
@@ -196,12 +196,12 @@ test("SpatialPath is typed geometry and rejects an empty or stateful command str
});
function source(text: string): AuthorSourceUnit {
- return { id: "/project/main.svml", name: "main.svml", text: `<?svml using="@narratage/text@1"?>\n${text}` };
+ return { id: "/project/main.svml", name: "main.svml", text: `<?svml using="@narratage/markup@1"?>\n${text}` };
}
test("self-described Spatial Surfaces produce an explicit Canvas edge and finite Frame graph", async () => {
const closure = createResolvedClosure([spatialManifest]);
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(spatialModuleRef, "canvas", spatialSurfaceDigests.canvas, decodeCanvasSurface);
surfaces.registerStructured(spatialModuleRef, "point", spatialSurfaceDigests.point, decodePointSurface);
surfaces.registerStructured(spatialModuleRef, "path", spatialSurfaceDigests.path, decodePathSurface);
@@ -209,7 +209,7 @@ test("self-described Spatial Surfaces produce an explicit Canvas edge and finite
surfaces.registerStructured(spatialModuleRef, "anchored-frame", spatialSurfaceDigests.anchoredFrame, decodeAnchoredFrameSurface);
surfaces.registerStructured(spatialModuleRef, "aspect-frame", spatialSurfaceDigests.aspectFrame, decodeAspectFrameSurface);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({ registry: surfaces, resolveModule: () => spatialModuleRef }));
+ frontends.register(createMarkupAuthorFrontend({ registry: surfaces, resolveModule: () => spatialModuleRef }));
const validators = new TypeValidatorRegistry();
registerTypeValidatorFacets(validators, spatialComponent.validators ?? []);
const compiled = await compileSourceClosure({
diff --git a/packages/speech-spine/package.json b/packages/speech-spine/package.json
index f2359d4e..161ce210 100644
--- a/packages/speech-spine/package.json
+++ b/packages/speech-spine/package.json
@@ -22,7 +22,7 @@
"@narratage/speech": "workspace:*",
"@narratage/speech-basis": "workspace:*",
"@narratage/spatial": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/caption": "workspace:*",
diff --git a/packages/speech-spine/src/activation.ts b/packages/speech-spine/src/activation.ts
index 408f10f5..c62e012c 100644
--- a/packages/speech-spine/src/activation.ts
+++ b/packages/speech-spine/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeSpeechSpineSurface, speechSpineComponent, speechSpineManifest,
speechSpineModuleRef, speechSpineSurfaceImplementationDigest,
@@ -12,7 +12,7 @@ export const svmlPackage = {
specifiers: ["@narratage/speech-spine", "@narratage/speech-spine@1"],
}],
components: [speechSpineComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: speechSpineModuleRef, surface: "spine", mode: "structured",
implementationDigest: speechSpineSurfaceImplementationDigest, handler: decodeSpeechSpineSurface,
})],
diff --git a/packages/speech-spine/src/surface.ts b/packages/speech-spine/src/surface.ts
index 7f51b5ca..82ccd0c6 100644
--- a/packages/speech-spine/src/surface.ts
+++ b/packages/speech-spine/src/surface.ts
@@ -8,8 +8,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { createSpeechSpineFragment } from "./fragment.js";
import { speechSpineTypes } from "./manifest.js";
@@ -33,7 +33,7 @@ function stringAttribute(element: StructuredElement, name: string): string {
}
function referencePath(element: StructuredElement, name: string): string {
- const value: TextAttributeValue | undefined = element.attributes[name];
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof value !== "object" || value.kind !== "reference" || !value.path) {
throw new Error(`${element.name}.${name} must be a whole-value reference`);
}
diff --git a/packages/speech-spine/test/surface.test.ts b/packages/speech-spine/test/surface.test.ts
index 01dbcd69..a3199b92 100644
--- a/packages/speech-spine/test/surface.test.ts
+++ b/packages/speech-spine/test/surface.test.ts
@@ -27,6 +27,7 @@ import {
scriptSurfaceImplementationDigest,
} from "@narratage/script";
import { speechBasisManifest, speechBasisProducers } from "@narratage/speech-basis";
+import { textComponent, textManifest } from "@narratage/text";
import { mediaTrackManifest } from "@narratage/media-track";
import {
decodeSpeechSpineSurface,
@@ -42,9 +43,9 @@ import {
spatialSurfaceDigests,
} from "@narratage/spatial";
import {
- TextSurfaceRegistry,
- createTextAuthorFrontend,
-} from "@narratage/text";
+ MarkupSurfaceRegistry,
+ createMarkupAuthorFrontend,
+} from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
const fixtureModule = { name: "example.speech-media", version: "1" } as const;
@@ -65,7 +66,7 @@ function source(text: string): AuthorSourceUnit {
return {
id: "/project/main.svml",
name: "main.svml",
- text: `<?svml using="@narratage/text@1"?>\n${text}`,
+ text: `<?svml using="@narratage/markup@1"?>\n${text}`,
};
}
@@ -76,10 +77,11 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
mediaTrackManifest,
speechBasisManifest,
speechSpineManifest,
+ textManifest,
scriptManifest,
fixtureManifest,
]);
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerRaw(scriptModuleRef, "script", scriptSurfaceImplementationDigest, decodeScriptSurface);
surfaces.registerStructured(speechSpineModuleRef, "spine", speechSpineSurfaceImplementationDigest, decodeSpeechSpineSurface);
surfaces.registerStructured(spatialModuleRef, "canvas", spatialSurfaceDigests.canvas, decodeCanvasSurface);
@@ -92,7 +94,7 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
components: [], fragments: [],
}));
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
resolveModule(request) {
if (request.from.startsWith("@narratage/script")) return scriptModuleRef;
@@ -104,6 +106,7 @@ test("Speech Spine lowers ordered Takes into media normalization, one audio plan
const validators = new TypeValidatorRegistry();
registerTypeValidatorFacets(validators, mediaPipelineComponent.validators ?? []);
registerTypeValidatorFacets(validators, spatialComponent.validators ?? []);
+ registerTypeValidatorFacets(validators, textComponent.validators ?? []);
const compiled = await compileSourceClosure({
entry: source(`<svml>
<import from="@narratage/script@1"/>
diff --git a/packages/speech-spine/test/video-pipeline-fixture.ts b/packages/speech-spine/test/video-pipeline-fixture.ts
index e528d200..ddcef5d7 100644
--- a/packages/speech-spine/test/video-pipeline-fixture.ts
+++ b/packages/speech-spine/test/video-pipeline-fixture.ts
@@ -10,6 +10,7 @@ import {
} from "@narratage/caption";
import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
import { speechDependency, speechTypes } from "@narratage/speech";
+import { sealText, textDependency, textImplementationDigests, textManifest, textTypes } from "@narratage/text";
import {
createResolvedClosure,
canonicalize,
@@ -95,6 +96,7 @@ export const videoManifest: ModuleManifest = {
dependencies: [
narrativeDependency,
speechDependency,
+ textDependency,
],
types: [
{ name: videoTypes.estimate.name, schema: object({ durationSec: { schema: number } }) },
@@ -116,7 +118,7 @@ export const videoManifest: ModuleManifest = {
producers: [
{
name: videoProducers.requestEstimate.name,
- inputs: [{ name: "narrative", type: narrativeTypes.narrative }],
+ inputs: [{ name: "speech", type: textTypes.text }],
outputs: [],
needs: [{
name: "estimate",
@@ -132,7 +134,7 @@ export const videoManifest: ModuleManifest = {
{
name: videoProducers.requestSeedanceMini.name,
inputs: [
- { name: "narrative", type: narrativeTypes.narrative },
+ { name: "dialogue", type: textTypes.text },
{ name: "estimate", type: videoTypes.estimate },
],
outputs: [],
@@ -149,7 +151,7 @@ export const videoManifest: ModuleManifest = {
},
{
name: videoProducers.placeholderEstimate.name,
- inputs: [{ name: "narrative", type: narrativeTypes.narrative }],
+ inputs: [{ name: "speech", type: textTypes.text }],
outputs: [{ name: "estimate", type: videoTypes.estimate }],
needs: [],
implementation: {
@@ -183,18 +185,18 @@ const operation = (id: string) => ({ kind: "fragment-operation" as const, operat
const durationEstimateFragment = sealGraphFragment({
name: "example.video-pipeline/duration-estimate@1",
- inputs: [{ name: "narrative", type: narrativeTypes.narrative }],
+ inputs: [{ name: "speech", type: textTypes.text }],
operations: [{
id: "estimate",
producer: videoProducers.requestEstimate,
- inputs: { narrative: input("narrative") },
+ inputs: { speech: input("speech") },
result: { kind: "need", name: "estimate", accepts: "exact" },
}],
exports: [{
name: "estimate",
type: videoTypes.estimate,
root: operation("estimate"),
- semanticInputs: ["narrative"],
+ semanticInputs: ["speech"],
fidelity: "exact",
}],
});
@@ -203,13 +205,14 @@ const speechBasisGenerationFragment = sealGraphFragment({
name: "example.video-pipeline/seedance-mini-speech-basis@1",
inputs: [
{ name: "narrative", type: narrativeTypes.narrative },
+ { name: "dialogue", type: textTypes.text },
{ name: "estimate", type: videoTypes.estimate },
],
operations: [
{
id: "request-seedance-mini",
producer: videoProducers.requestSeedanceMini,
- inputs: { narrative: input("narrative"), estimate: input("estimate") },
+ inputs: { dialogue: input("dialogue"), estimate: input("estimate") },
result: { kind: "need", name: "media", accepts: "exact" },
},
{
@@ -223,25 +226,25 @@ const speechBasisGenerationFragment = sealGraphFragment({
name: "take",
type: speechTypes.basis,
root: operation("assemble-take"),
- semanticInputs: ["narrative", "estimate"],
+ semanticInputs: ["narrative", "dialogue", "estimate"],
fidelity: "exact",
}],
});
const placeholderEstimateFragment = sealGraphFragment({
name: "example.video-pipeline/placeholder-estimate@1",
- inputs: [{ name: "narrative", type: narrativeTypes.narrative }],
+ inputs: [{ name: "speech", type: textTypes.text }],
operations: [{
id: "placeholder",
producer: videoProducers.placeholderEstimate,
- inputs: { narrative: input("narrative") },
+ inputs: { speech: input("speech") },
result: { kind: "output", name: "estimate" },
}],
exports: [{
name: "estimate",
type: videoTypes.estimate,
root: operation("placeholder"),
- semanticInputs: ["narrative"],
+ semanticInputs: ["speech"],
fidelity: "substitute",
}],
});
@@ -263,6 +266,7 @@ export type VideoOutputName = keyof typeof videoOutputs;
export const videoClosure = createResolvedClosure([
...videoContractManifests,
+ textManifest,
videoManifest,
mediaTrackManifest,
speechBasisManifest,
@@ -307,6 +311,30 @@ function authorProgram(): LinkedProgram {
conformance: "exact",
origin,
});
+ const rawSpeech = sealRecord({
+ id: "narrative:speech",
+ type: textTypes.text,
+ value: { kind: "inline", value: sealText(parsed.serializations.speech) as never },
+ conformance: "exact",
+ origin,
+ });
+ const speech = { ...rawSpeech, validation: sealTypeValidationReceipt({
+ type: rawSpeech.type,
+ recordDigest: rawSpeech.digest,
+ validatorDigest: textImplementationDigests.validateText,
+ }) };
+ const rawDialogue = sealRecord({
+ id: "narrative:dialogue",
+ type: textTypes.text,
+ value: { kind: "inline", value: sealText(parsed.serializations.dialogue) as never },
+ conformance: "exact",
+ origin,
+ });
+ const dialogue = { ...rawDialogue, validation: sealTypeValidationReceipt({
+ type: rawDialogue.type,
+ recordDigest: rawDialogue.digest,
+ validatorDigest: textImplementationDigests.validateText,
+ }) };
const programRecord = sealRecord({ id: "caption:program", type: captionTypes.program,
value: { kind: "inline", value: canonicalize(captionProgram) }, conformance: "exact", origin });
const planRecord = sealRecord({ id: "caption:plan", type: captionTypes.plan,
@@ -353,22 +381,25 @@ function authorProgram(): LinkedProgram {
return link(videoClosure, [sealTypedModule({
id: "author:video-pipeline",
closureDigest: videoClosure.digest,
- records: [narrative, canvas, ...captionRecords],
+ records: [narrative, speech, dialogue, canvas, ...captionRecords],
})]);
}
export function createVideoGraph(program: LinkedProgram): CompiledGraph {
const narrative = { kind: "record" as const, id: "narrative:root" };
+ const speech = { kind: "record" as const, id: "narrative:speech" };
+ const dialogue = { kind: "record" as const, id: "narrative:dialogue" };
const estimate = elaborateGraphFragment(program, durationEstimateFragment, {
id: "opening.estimate",
fragment: durationEstimateFragment.id,
- inputs: { narrative },
+ inputs: { speech },
});
const take = elaborateGraphFragment(program, speechBasisGenerationFragment, {
id: "opening.seedance-mini",
fragment: speechBasisGenerationFragment.id,
inputs: {
narrative,
+ dialogue,
estimate: { kind: "logical-output", id: videoOutputs.estimate },
},
});
@@ -441,7 +472,7 @@ export function createVideoFixture(options: VideoBuildOptions = {}): VideoFixtur
const placeholder = elaborateGraphFragment(program, placeholderEstimateFragment, {
id: "opening.placeholder-estimate",
fragment: placeholderEstimateFragment.id,
- inputs: { narrative: { kind: "record", id: "narrative:root" } },
+ inputs: { speech: { kind: "record", id: "narrative:speech" } },
});
const contribution = bindCandidateFragment(placeholder, { estimate: videoOutputs.estimate });
const overlay = sealRealizationOverlay({
diff --git a/packages/speech-spine/test/video-pipeline.test.ts b/packages/speech-spine/test/video-pipeline.test.ts
index b9960f78..d3fb05b1 100644
--- a/packages/speech-spine/test/video-pipeline.test.ts
+++ b/packages/speech-spine/test/video-pipeline.test.ts
@@ -9,6 +9,7 @@ import {
} from "@narratage/caption";
import type { TimedCaptionProjection } from "@narratage/caption";
import type { Narrative } from "@narratage/narrative";
+import type { Text } from "@narratage/text";
import { sealProgramSpace } from "@narratage/program-space";
import { sealSpeechBasis, sealSpeechEvidenceAudio, speechTypes } from "@narratage/speech";
import type { SpeechAudioBasis, SpeechBasis, SpeechEvidenceAudio } from "@narratage/speech";
@@ -123,23 +124,23 @@ test("the Speech Spine pipeline resumes without repeating paid calls", async ()
host.registerProducer(videoProducers.requestEstimate, videoImplementations.requestEstimate, ({ inputs }) => {
calls.estimate += 1;
- assert.equal(inputs.narrative?.value.kind, "inline");
- const narrative = inlineValue<Narrative>(inputs.narrative.value.value);
+ assert.equal(inputs.speech?.value.kind, "inline");
+ const speech = inlineValue<Text>(inputs.speech.value.value);
return {
outputs: {},
needs: {
estimate: {
contract: "example.official-speech-estimate-request@1",
- speech: narrative.serializations.speech,
+ speech: speech.value,
},
},
};
});
host.registerProducer(videoProducers.requestSeedanceMini, videoImplementations.requestSeedanceMini, ({ inputs }) => {
calls.seedance += 1;
- assert.equal(inputs.narrative?.value.kind, "inline");
+ assert.equal(inputs.dialogue?.value.kind, "inline");
assert.equal(inputs.estimate?.value.kind, "inline");
- const narrative = inlineValue<Narrative>(inputs.narrative.value.value);
+ const dialogue = inlineValue<Text>(inputs.dialogue.value.value);
const estimate = inlineObject(inputs.estimate.value.value);
return {
outputs: {},
@@ -147,7 +148,7 @@ test("the Speech Spine pipeline resumes without repeating paid calls", async ()
media: {
contract: "example.seedance-mini-speech-request@1",
model: "mini",
- script: narrative.serializations.speech,
+ script: dialogue.value,
durationSec: estimate.durationSec as number,
},
},
diff --git a/packages/svs/package.json b/packages/svs/package.json
index 7413da36..c0b485ca 100644
--- a/packages/svs/package.json
+++ b/packages/svs/package.json
@@ -16,6 +16,6 @@
},
"devDependencies": {
"@narratage/source": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
}
}
diff --git a/packages/svs/test/source-closure.test.ts b/packages/svs/test/source-closure.test.ts
index 972586a8..20d91c19 100644
--- a/packages/svs/test/source-closure.test.ts
+++ b/packages/svs/test/source-closure.test.ts
@@ -34,10 +34,10 @@ import {
} from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
import {
- TextSurfaceRegistry,
- createTextAuthorFrontend,
-} from "@narratage/text";
-import type { StructuredElement } from "@narratage/text";
+ MarkupSurfaceRegistry,
+ createMarkupAuthorFrontend,
+} from "@narratage/markup";
+import type { StructuredElement } from "@narratage/markup";
const laboratory = { name: "example.recipe-card", version: "1" } as const;
const cardType = { module: laboratory, name: "Card" } satisfies TypeRef;
@@ -133,8 +133,8 @@ function recipeValue(record: TypedRecord | undefined): SvsRecipe {
return record.value.value as SvsRecipe;
}
-function sourceRegistry(): TextSurfaceRegistry {
- const registry = new TextSurfaceRegistry();
+function sourceRegistry(): MarkupSurfaceRegistry {
+ const registry = new MarkupSurfaceRegistry();
registry.registerStructured(laboratory, "card", cardSurfaceDigest, ({ element, resolveReference }) => {
const id = stringAttribute(element, "id");
const appearancePath = referenceAttribute(element, "appearance");
@@ -185,7 +185,7 @@ function sourceRegistry(): TextSurfaceRegistry {
const closure = createResolvedClosure([svsManifest, manifest]);
function unit(id: string, text: string, frontend?: string): AuthorSourceUnit {
- const selected = frontend ?? (id.endsWith(".svs") ? "@narratage/svs@1" : "@narratage/text@1");
+ const selected = frontend ?? (id.endsWith(".svs") ? "@narratage/svs@1" : "@narratage/markup@1");
return {
id,
name: id.split("/").at(-1) ?? id,
@@ -202,7 +202,7 @@ const styleText = `<sheet version="1" id="studio">
async function compileMain(alias: string, root = "/project", styles = styleText) {
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: sourceRegistry(),
resolveModule: () => laboratory,
}));
@@ -330,8 +330,8 @@ test("Source Closure binds every recursive SourceUnit digest", async () => {
test("Source Closure rejects recursive source import cycles", async () => {
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
- registry: new TextSurfaceRegistry(),
+ frontends.register(createMarkupAuthorFrontend({
+ registry: new MarkupSurfaceRegistry(),
resolveModule: () => laboratory,
}));
const a = unit("/project/a.svml", `<svml><import as="b" source="./b.svml"/></svml>`);
@@ -351,8 +351,8 @@ test("Source Closure rejects recursive source import cycles", async () => {
test("Source Closure rejects duplicate aliases and unknown Frontends before decode", async () => {
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
- registry: new TextSurfaceRegistry(),
+ frontends.register(createMarkupAuthorFrontend({
+ registry: new MarkupSurfaceRegistry(),
resolveModule: () => laboratory,
}));
const duplicate = unit("/project/duplicate.svml", `<svml>
diff --git a/packages/text-track/README.md b/packages/text-track/README.md
deleted file mode 100644
index 0c2ddad0..00000000
--- a/packages/text-track/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# `@narratage/text-track`
-
-Official provider-free Text overlay package. It owns a typed `TextTrackProgram` and lowers every
-item into an independently timed and stacked Present in the public VisualTrack contract.
-
-The current `TextTrackProgram@1` implements the complete pre-release Point/Area/Path author model:
-bounded rich documents, exact font stacks, ordered Paint, frame/content/paragraph/line/run/word/
-grapheme boxes, deterministic overflow and Unicode-aware local motion. Its author Surface remains
-pre-release even though the repository-internal Track and Visual IR waist is now frozen.
-
-An item spanning the complete ProgramSpace is a persistent overlay; a shorter item is timed. They
-are not different Track kinds. Timing is projected through `@narratage/temporal`, and placement is
-an explicit `SpatialFrame` input from `@narratage/spatial`; neither is hidden in the appearance
-Recipe. The package exposes semantic typography rather than a rendering callback, arbitrary CSS or
-cross-Track access.
-
-The provider-free `<text:Track>` Surface validates `.svs` Recipes, accepts Program, Selection,
-Moment or explicit point-expression timing plus explicit Point/Frame/Path edges, and produces the
-same TextTrackProgram without changing Core or Film. `<text:Mask>` is a separate component that
-consumes one authored Text Program and one owned still Surface; advanced/multiline/Path masks fail
-closed and materialize through an independent package.
diff --git a/packages/text-track/src/activation.ts b/packages/text-track/src/activation.ts
deleted file mode 100644
index 9c867d78..00000000
--- a/packages/text-track/src/activation.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
-import {
- decodeTextMotionSurface,
- decodeTextMaskSurface,
- decodeTextStyleSurface,
- decodeTextTrackSurface,
- textTrackComponent,
- textTrackManifest,
- textTrackModuleRef,
- textTrackSurfaceImplementationDigests,
-} from "./index.js";
-
-export const svmlPackage = {
- format: "svml.node-package@1" as const,
- name: "@narratage/text-track",
- modules: [{ manifest: textTrackManifest, specifiers: ["@narratage/text-track", "@narratage/text-track@1"] }],
- components: [textTrackComponent],
- hostFacets: [
- createTextSurfaceHostFacet({
- module: textTrackModuleRef, surface: "style", mode: "structured",
- implementationDigest: textTrackSurfaceImplementationDigests.style, handler: decodeTextStyleSurface,
- }),
- createTextSurfaceHostFacet({
- module: textTrackModuleRef, surface: "motion", mode: "structured",
- implementationDigest: textTrackSurfaceImplementationDigests.motion, handler: decodeTextMotionSurface,
- }),
- createTextSurfaceHostFacet({
- module: textTrackModuleRef, surface: "track", mode: "structured",
- implementationDigest: textTrackSurfaceImplementationDigests.track, handler: decodeTextTrackSurface,
- }),
- createTextSurfaceHostFacet({
- module: textTrackModuleRef, surface: "mask", mode: "structured",
- implementationDigest: textTrackSurfaceImplementationDigests.mask, handler: decodeTextMaskSurface,
- }),
- ],
-};
-export default svmlPackage;
diff --git a/packages/text-track/src/index.ts b/packages/text-track/src/index.ts
deleted file mode 100644
index e76b28f2..00000000
--- a/packages/text-track/src/index.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-export { textTrackFragment } from "./fragment.js";
-export { textTrackComponent } from "./component.js";
-export {
- textTrackManifest,
- textTrackManifestDigest,
- textTrackModuleRef,
- textTrackProducers,
- textTrackProgramSchema,
- textTrackSurfaceImplementationDigests,
- textTrackTypes,
-} from "./manifest.js";
-export {
- appendMomentTextItem,
- appendMomentTextItemImplementationDigest,
- appendProgramTextItem,
- appendProgramTextItemImplementationDigest,
- appendSelectionTextItem,
- appendSelectionTextItemImplementationDigest,
- bindAreaTextPlacement,
- bindAreaTextPlacementImplementationDigest,
- bindPathTextPlacement,
- bindPathTextPlacementImplementationDigest,
- bindPointTextPlacement,
- bindPointTextPlacementImplementationDigest,
- assertTextItemSpec,
- assertTextMaskSpec,
- assertTextMotion,
- assertTextPlacement,
- assertTextStyle,
- assertTextTrackHeader,
- assertTextTrackProgramIdentity,
- assertTextTrackSet,
- createTextTrackSet,
- createTextTrackSetImplementationDigest,
- finalizeTextTrack,
- finalizeTextTrackImplementationDigest,
- renderTextTrack,
- renderTextTrackImplementationDigest,
- renderTextMaskTrack,
- renderTextMaskTrackImplementationDigest,
- sealTextTrackProgram,
- sealTextTrackHeader,
- sealTextItemSpec,
- sealTextMotion,
- sealTextMaskSpec,
- sealTextPlacement,
- sealTextStyle,
- stillTextMotion,
-} from "./program.js";
-export {
- decodeTextMotionSurface,
- decodeTextStyleSurface,
- decodeTextTrackSurface,
- decodeTextMaskSurface,
-} from "./surface.js";
-export type * from "./types.js";
diff --git a/packages/text-track/src/manifest.ts b/packages/text-track/src/manifest.ts
deleted file mode 100644
index ad414fc8..00000000
--- a/packages/text-track/src/manifest.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
-import { programSpaceDependency, programSpaceTypes } from "@narratage/program-space";
-import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
-import {
- compositionDependency,
- compositionTypes,
- visualTextDocumentSchema,
- visualTextFlowSchema,
- visualTextPaintSchema,
- visualTextSequenceSchema,
- visualTextTypographySchema,
-} from "@narratage/composition";
-import {
- spatialDependency,
- spatialFrameSchema,
- spatialPathSchema,
- spatialPointSchema,
- spatialTypes,
-} from "@narratage/spatial";
-import { VISUAL_STYLE_ENUM_VALUES_V1, VISUAL_STYLE_NAMES_V1 } from "@narratage/visual-ir";
-import { mediaDependency, mediaTypes } from "@narratage/media";
-import { digestOf } from "@narratage/protocol";
-import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
-
-import {
- appendMomentTextItemImplementationDigest,
- appendProgramTextItemImplementationDigest,
- appendSelectionTextItemImplementationDigest,
- bindAreaTextPlacementImplementationDigest,
- bindPathTextPlacementImplementationDigest,
- bindPointTextPlacementImplementationDigest,
- createTextTrackSetImplementationDigest,
- finalizeTextTrackImplementationDigest,
- renderTextTrackImplementationDigest,
- renderTextMaskTrackImplementationDigest,
-} from "./program.js";
-
-export const textTrackModuleRef = { name: "@narratage/text-track", version: "1" } as const;
-export const textTrackTypes = {
- style: { module: textTrackModuleRef, name: "TextStyle" },
- motion: { module: textTrackModuleRef, name: "TextMotion" },
- placement: { module: textTrackModuleRef, name: "TextPlacement" },
- program: { module: textTrackModuleRef, name: "TextTrackProgram" },
- header: { module: textTrackModuleRef, name: "TextTrackHeader" },
- itemSpec: { module: textTrackModuleRef, name: "TextItemSpec" },
- set: { module: textTrackModuleRef, name: "TextTrackSet" },
- maskSpec: { module: textTrackModuleRef, name: "TextMaskSpec" },
-} satisfies Record<string, TypeRef>;
-
-export const textTrackProducers = {
- bindPoint: { module: textTrackModuleRef, name: "bind-point-placement" },
- bindArea: { module: textTrackModuleRef, name: "bind-area-placement" },
- bindPath: { module: textTrackModuleRef, name: "bind-path-placement" },
- createSet: { module: textTrackModuleRef, name: "create-text-track-set" },
- appendProgram: { module: textTrackModuleRef, name: "append-program-text-item" },
- appendSelection: { module: textTrackModuleRef, name: "append-selection-text-item" },
- appendMoment: { module: textTrackModuleRef, name: "append-moment-text-item" },
- finalize: { module: textTrackModuleRef, name: "finalize-text-track" },
- render: { module: textTrackModuleRef, name: "render-text-track" },
- renderMask: { module: textTrackModuleRef, name: "render-text-mask-track" },
-} satisfies Record<string, ProducerRef>;
-
-const string = { kind: "string", minLength: 1 } as const;
-const number = { kind: "number" } as const;
-const positive = { kind: "number", minimum: 0.000001 } as const;
-const integer = { kind: "number", integer: true, minimum: 0 } as const;
-const positiveInteger = { kind: "number", integer: true, minimum: 1 } as const;
-const signedInteger = { kind: "number", integer: true } as const;
-const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>): ValueSchema => ({ kind: "object", fields });
-const enumString = (values: readonly string[]): ValueSchema => ({ kind: "string", enum: values });
-
-const duration: ValueSchema = { kind: "oneOf", variants: [
- object({ unit: { schema: { kind: "literal", value: "frames" } }, value: { schema: integer } }),
- object({ unit: { schema: { kind: "literal", value: "milliseconds" } }, value: { schema: number } }),
- object({ unit: { schema: { kind: "literal", value: "seconds" } }, numerator: { schema: signedInteger }, denominator: { schema: positiveInteger } }),
-] };
-const point: ValueSchema = { kind: "oneOf", variants: [
- ...["program.start", "program.end", "selection.start", "selection.end", "moment.cue"].map((ref) => object({ ref: { schema: { kind: "literal", value: ref } }, offset: { schema: duration, optional: true } })),
- object({ ref: { schema: { kind: "literal", value: "absolute" } }, at: { schema: duration } }),
-] };
-const projection = object({ start: { schema: point }, end: { schema: point } });
-const expansion: ValueSchema = { kind: "oneOf", variants: [
- object({ kind: { schema: { kind: "literal", value: "one" } } }),
- object({ kind: { schema: { kind: "literal", value: "each" } } }),
-] };
-
-const styleDeclaration: ValueSchema = { kind: "oneOf", variants: VISUAL_STYLE_NAMES_V1.map((name) => object({
- name: { schema: { kind: "literal", value: name } },
- value: { schema: Object.hasOwn(VISUAL_STYLE_ENUM_VALUES_V1, name)
- ? { kind: "string", enum: VISUAL_STYLE_ENUM_VALUES_V1[name as keyof typeof VISUAL_STYLE_ENUM_VALUES_V1] }
- : { kind: "oneOf", variants: [{ kind: "string" }, { kind: "number" }] } },
-})) };
-const visualKeyframe = object({
- atFrame: { schema: integer },
- easing: { schema: enumString(["linear", "ease-in", "ease-out", "ease-in-out"]), optional: true },
- style: { schema: { kind: "array", minItems: 1, items: styleDeclaration } },
-});
-const visualAnimation = object({ keyframes: { schema: { kind: "array", minItems: 2, items: visualKeyframe } } });
-
-const areaFlow = (() => {
- const schema = visualTextFlowSchema;
- if (schema.kind !== "object") throw new Error("Visual Text flow schema must be an object.");
- const { form: _form, ...fields } = schema.fields;
- return object(fields);
-})();
-
-export const textStyleSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-style@1" } },
- id: { schema: string }, stackingOrder: { schema: signedInteger },
- typography: { schema: visualTextTypographySchema },
- paints: { schema: { kind: "array", items: visualTextPaintSchema } },
- area: { schema: areaFlow },
- point: { schema: object({ anchorInline: { schema: enumString(["start", "center", "end"]) }, anchorBlock: { schema: enumString(["start", "center", "end"]) } }) },
- path: { schema: object({
- side: { schema: enumString(["left", "right"]) }, orientation: { schema: enumString(["follow", "upright"]) },
- startMarginPx: { schema: { kind: "number", minimum: 0 } }, endMarginPx: { schema: { kind: "number", minimum: 0 } },
- align: { schema: enumString(["start", "center", "end"]) }, reverse: { schema: { kind: "boolean" } },
- overflow: { schema: enumString(["visible", "clip"]) },
- }) },
-});
-
-export const textMotionSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-motion@1" } }, id: { schema: string },
- item: { schema: visualAnimation, optional: true },
- sequences: { schema: { kind: "array", items: visualTextSequenceSchema } },
- pathMargin: { schema: object({ keyframes: { schema: { kind: "array", minItems: 2, items: object({
- atFrame: { schema: integer }, startMarginPx: { schema: { kind: "number", minimum: 0 } },
- easing: { schema: enumString(["linear", "ease-in", "ease-out", "ease-in-out"]), optional: true },
- }) } } }), optional: true },
-});
-
-const geometry: ValueSchema = { kind: "oneOf", variants: [
- object({ kind: { schema: { kind: "literal", value: "point" } }, point: { schema: spatialPointSchema } }),
- object({ kind: { schema: { kind: "literal", value: "area" } }, frame: { schema: spatialFrameSchema } }),
- object({ kind: { schema: { kind: "literal", value: "path" } }, path: { schema: spatialPathSchema } }),
-] };
-export const textPlacementSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-placement@1" } }, geometry: { schema: geometry },
-});
-export const textItemSpecSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-item-spec@1" } }, id: { schema: string },
- document: { schema: visualTextDocumentSchema },
- projection: { schema: projection }, expansion: { schema: expansion },
-});
-const span = object({ startFrame: { schema: integer }, endFrameExclusive: { schema: positiveInteger } });
-const item = object({
- id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: span }, geometry: { schema: geometry },
- document: { schema: visualTextDocumentSchema }, style: { schema: textStyleSchema }, motion: { schema: textMotionSchema },
- tieBreak: { schema: string },
-});
-export const textTrackProgramSchema: ValueSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-track-program@1" } }, id: { schema: string },
- items: { schema: { kind: "array", minItems: 1, items: item } },
-});
-const textTrackHeaderSchema = object({ contract: { schema: { kind: "literal", value: "svml.text-track-header@1" } }, id: { schema: string } });
-const textTrackSetSchema = object({ contract: { schema: { kind: "literal", value: "svml.text-track-set@1" } }, items: { schema: { kind: "array", items: item } } });
-const textMaskSpecSchema = object({
- contract: { schema: { kind: "literal", value: "svml.text-mask-spec@1" } },
- id: { schema: string }, mode: { schema: enumString(["alpha", "luminance"]) },
- materialFit: { schema: enumString(["contain", "cover", "fill"]) },
-});
-
-export const textTrackSurfaceImplementationDigests = {
- style: digestOf("@narratage/text-track/style-surface@1"),
- motion: digestOf("@narratage/text-track/motion-surface@1"),
- track: digestOf("@narratage/text-track/complete-track-surface@1"),
- mask: digestOf("@narratage/text-track/owned-mask-surface@1"),
-} as const;
-
-const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
-
-export const textTrackManifest: ModuleManifest = {
- format: "svml.module@1",
- name: textTrackModuleRef.name,
- version: textTrackModuleRef.version,
- dependencies: [programSpaceDependency, narrativeDependency, semanticMapDependency, spatialDependency, mediaDependency, compositionDependency],
- types: [
- { name: textTrackTypes.style.name, schema: textStyleSchema },
- { name: textTrackTypes.motion.name, schema: textMotionSchema },
- { name: textTrackTypes.placement.name, schema: textPlacementSchema },
- { name: textTrackTypes.program.name, schema: textTrackProgramSchema },
- { name: textTrackTypes.header.name, schema: textTrackHeaderSchema },
- { name: textTrackTypes.itemSpec.name, schema: textItemSpecSchema },
- { name: textTrackTypes.set.name, schema: textTrackSetSchema },
- { name: textTrackTypes.maskSpec.name, schema: textMaskSpecSchema },
- ],
- capabilities: [],
- surfaces: [
- { name: "style", tag: "Style", mode: "structured", outputs: [textTrackTypes.style], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/text-track/style-surface", digest: textTrackSurfaceImplementationDigests.style } },
- { name: "motion", tag: "Motion", mode: "structured", outputs: [textTrackTypes.motion], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/text-track/motion-surface", digest: textTrackSurfaceImplementationDigests.motion } },
- { name: "track", tag: "Track", mode: "structured", outputs: [textTrackTypes.header, textTrackTypes.itemSpec, textTrackTypes.motion, textTrackTypes.set, textTrackTypes.placement, textTrackTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/text-track/complete-track-surface", digest: textTrackSurfaceImplementationDigests.track } },
- { name: "mask", tag: "Mask", mode: "structured", outputs: [textTrackTypes.maskSpec, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/text-track/owned-mask-surface", digest: textTrackSurfaceImplementationDigests.mask } },
- ],
- producers: [
- { name: textTrackProducers.bindPoint.name, inputs: [{ name: "point", type: spatialTypes.point }], outputs: [{ name: "placement", type: textTrackTypes.placement }], needs: [], implementation: registered("@narratage/text-track/bind-point-placement", bindPointTextPlacementImplementationDigest) },
- { name: textTrackProducers.bindArea.name, inputs: [{ name: "frame", type: spatialTypes.frame }], outputs: [{ name: "placement", type: textTrackTypes.placement }], needs: [], implementation: registered("@narratage/text-track/bind-area-placement", bindAreaTextPlacementImplementationDigest) },
- { name: textTrackProducers.bindPath.name, inputs: [{ name: "path", type: spatialTypes.path }], outputs: [{ name: "placement", type: textTrackTypes.placement }], needs: [], implementation: registered("@narratage/text-track/bind-path-placement", bindPathTextPlacementImplementationDigest) },
- { name: textTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: textTrackTypes.set }], needs: [], implementation: registered("@narratage/text-track/create-set", createTextTrackSetImplementationDigest) },
- { name: textTrackProducers.appendProgram.name, inputs: [{ name: "set", type: textTrackTypes.set }, { name: "header", type: textTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: textTrackTypes.placement }, { name: "spec", type: textTrackTypes.itemSpec }, { name: "style", type: textTrackTypes.style }, { name: "motion", type: textTrackTypes.motion }], outputs: [{ name: "set", type: textTrackTypes.set }], needs: [], implementation: registered("@narratage/text-track/append-program", appendProgramTextItemImplementationDigest) },
- { name: textTrackProducers.appendSelection.name, inputs: [{ name: "set", type: textTrackTypes.set }, { name: "header", type: textTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: textTrackTypes.placement }, { name: "spec", type: textTrackTypes.itemSpec }, { name: "style", type: textTrackTypes.style }, { name: "motion", type: textTrackTypes.motion }], outputs: [{ name: "set", type: textTrackTypes.set }], needs: [], implementation: registered("@narratage/text-track/append-selection", appendSelectionTextItemImplementationDigest) },
- { name: textTrackProducers.appendMoment.name, inputs: [{ name: "set", type: textTrackTypes.set }, { name: "header", type: textTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: textTrackTypes.placement }, { name: "spec", type: textTrackTypes.itemSpec }, { name: "style", type: textTrackTypes.style }, { name: "motion", type: textTrackTypes.motion }], outputs: [{ name: "set", type: textTrackTypes.set }], needs: [], implementation: registered("@narratage/text-track/append-moment", appendMomentTextItemImplementationDigest) },
- { name: textTrackProducers.finalize.name, inputs: [{ name: "header", type: textTrackTypes.header }, { name: "set", type: textTrackTypes.set }], outputs: [{ name: "program", type: textTrackTypes.program }], needs: [], implementation: registered("@narratage/text-track/finalize", finalizeTextTrackImplementationDigest) },
- { name: textTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: textTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered("@narratage/text-track/render", renderTextTrackImplementationDigest) },
- { name: textTrackProducers.renderMask.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: textTrackTypes.program }, { name: "material", type: mediaTypes.compositableSurface }, { name: "spec", type: textTrackTypes.maskSpec }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered("@narratage/text-track/render-mask", renderTextMaskTrackImplementationDigest) },
- ],
-};
-
-export const textTrackManifestDigest = digestOf(textTrackManifest);
diff --git a/packages/text/README.md b/packages/text/README.md
index 05bcb988..06f2eac9 100644
--- a/packages/text/README.md
+++ b/packages/text/README.md
@@ -1,53 +1,50 @@
# `@narratage/text`
-Official XML-like Author Frontend normally used by `.svml` source units. The suffix has no parser
-authority; a mandatory `<?svml using="@narratage/text@1"?>` Header selects this Frontend. It owns only the `<svml>` envelope,
-the leading Import Prologue, namespace binding, generic structured elements and dispatch to
-statically declared module Surfaces.
+Domain-neutral text values and deterministic text programs.
-The package has no built-in Script, media or video vocabulary. `<script>` is accepted only when an
-imported module declares that tag and the Host explicitly registers the locked Surface
-implementation. The current registry is for trusted official/in-process use; it is not a security
-sandbox for third-party parser code.
+This package does not own the `.svml` grammar, call models, or know what a prompt
+is. A `TextTemplate` plus explicit `TextBindings` renders one ordinary `Text`
+graph output. Dynamic text enters through normal graph edges, so the output can
+be a Target or be satisfied by any compatible Candidate like every other value.
+
+Its optional Markup vocabulary exposes literal and assembled values without
+hiding the graph:
```svml
-<?svml using="@narratage/text@1"?>
-<svml>
- <import from="@narratage/script@1"/>
- <import as="studio" source="./studio.svs"/>
-
- <script id="story">
- <opening><ALICE>Hello.</opening>
- </script>
-</svml>
+<import as="text" from="@narratage/text@1"/>
+<import as="ugc" source="./ugc-template.svs"/>
+
+<text:Value id="extra">Keep the product readable.</text:Value>
+<text:Render id="prompt" template={ugc.product-shot}>
+ <text:Param name="camera" value="handheld"/>
+ <text:Param name="strict" value="true" type="boolean"/>
+ <text:Set name="dialogue" text={story.segment.hook.dialogue}/>
+ <text:Append name="constraints" text={extra}/>
+</text:Render>
```
-Decoding has two passes. `discoverText` reads only the root and complete leading Import Prologue.
-After Driver supplies one immutable resolved closure, `decodeText` freezes the visible Surface
-scope and parses the body. A raw Surface receives the source cursor immediately after its opening
-tag and must return the cursor after its own close; a structured Surface receives Text's generic
-element tree.
-
-A Surface may contribute three kinds of inert data:
-
-- authored typed Record drafts;
-- parser-independent Author Component drafts;
-- content-addressed Graph Fragments used by those components.
-
-Raw and Structured Surface handlers are asynchronous and receive one narrow `resolveAsset()`
-capability. This is the only way a Surface can turn an author-written asset locator into a
-content-addressed `BlobRef`; Text never exposes filesystem APIs or a resolved local path. The
-Compiler Host, not the Surface, owns containment, read-once behavior and byte transfer. A handler
-that does not request assets remains unchanged apart from being awaitable.
-
-Text validates source ranges, duplicate identities, Manifest-declared Record types and complete
-Fragment references. It strips diagnostic ranges before sealing one `svml.author-module@1`, so
-source reflow does not change author semantics. It never expands a Fragment or resolves a component
-input while reading the body. After every declaration has been collected, `@narratage/elaborator`
-resolves forward references and emits the Core Graph.
-
-Direct `decodeText()` calls require every source import to be supplied as an already resolved
-namespace. The reference `compileSourceClosure()` orchestration in `@narratage/elaborator` recursively
-discovers those SourceUnits. Each dependency's own Source Header selects its exact Frontend; Text
-never chooses a dependency parser. The compiler decodes dependencies first and then calls Text with
-their locked public exports. Text itself never reads a file or guesses a Frontend.
+`Value` authors `Text`; `Render` authors text, number or boolean Params and connects each
+`Set`/`Append` Text reference as an explicit graph edge. The output `{prompt}`
+can feed any model's declared text port.
+
+`@narratage/markup` is the XML-like authoring Frontend and
+`@narratage/typography-track` renders text into video. They are deliberately
+separate packages.
+
+## Graph consumers
+
+`Text` is a small domain-neutral graph value, not a prompt-only type. Current consumers include:
+
+- exact model prompt ports;
+- `@narratage/typography-track` Point, Area and Path content;
+- Ranking Column/TopThree labels and Typewriter title/rows;
+- Comment Sticker comment, author, header and metadata copy;
+- Deck Card labels.
+
+Each consumer declares an ordinary `Text` input in its own Fragment. No consumer registry, prompt
+registry or video-specific branch exists in Core. A static literal may still be written inline for
+convenience; a value produced elsewhere stays an explicit graph edge all the way to the consumer.
+
+Consumer-owned structure does not move into this package. Rich typography, Ranking layout, Sticker
+fields and Deck label appearance remain in their respective packages. Caption's ordered display
+Atoms/Words also remain Caption author truth rather than being flattened into generic `Text`.
diff --git a/packages/text/package.json b/packages/text/package.json
index b61a13c1..c9cb7707 100644
--- a/packages/text/package.json
+++ b/packages/text/package.json
@@ -6,14 +6,15 @@
"exports": {
".": "./src/index.ts"
},
+ "svml": {
+ "activation": "./src/activation.ts"
+ },
"dependencies": {
+ "@narratage/component-kit": "workspace:*",
"@narratage/core": "workspace:*",
"@narratage/elaborator": "workspace:*",
- "@narratage/host": "workspace:*",
- "@narratage/protocol": "workspace:*"
- },
- "devDependencies": {
- "@narratage/narrative": "workspace:*",
- "@narratage/script": "workspace:*"
+ "@narratage/markup": "workspace:*",
+ "@narratage/protocol": "workspace:*",
+ "@narratage/svs": "workspace:*"
}
}
diff --git a/packages/text/src/activation.ts b/packages/text/src/activation.ts
new file mode 100644
index 00000000..770042db
--- /dev/null
+++ b/packages/text/src/activation.ts
@@ -0,0 +1,37 @@
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
+
+import {
+ decodeTextRenderSurface,
+ decodeTextValueSurface,
+ textComponent,
+ textImplementationDigests,
+ textManifest,
+ textModuleRef,
+ textSvsFrontend,
+} from "./index.js";
+
+export const svmlPackage = {
+ format: "svml.node-package@1" as const,
+ name: "@narratage/text",
+ modules: [{ manifest: textManifest, specifiers: ["@narratage/text", "@narratage/text@1"] }],
+ authorFrontends: [textSvsFrontend],
+ components: [textComponent],
+ hostFacets: [
+ createMarkupSurfaceHostFacet({
+ module: textModuleRef,
+ surface: "value",
+ mode: "structured",
+ implementationDigest: textImplementationDigests.valueSurface,
+ handler: decodeTextValueSurface,
+ }),
+ createMarkupSurfaceHostFacet({
+ module: textModuleRef,
+ surface: "render",
+ mode: "structured",
+ implementationDigest: textImplementationDigests.renderSurface,
+ handler: decodeTextRenderSurface,
+ }),
+ ],
+};
+
+export default svmlPackage;
diff --git a/packages/text/src/component.ts b/packages/text/src/component.ts
new file mode 100644
index 00000000..a2ab4b42
--- /dev/null
+++ b/packages/text/src/component.ts
@@ -0,0 +1,77 @@
+import type { ComponentPackage, ProducerHandlerContext } from "@narratage/component-kit";
+import type { StoredValue } from "@narratage/protocol";
+
+import {
+ textImplementationDigests,
+ textProducers,
+ textTypes,
+} from "./manifest.js";
+import {
+ bindText,
+ renderText,
+ sealTextBindings,
+ verifyText,
+ verifyTextBinding,
+ verifyTextBindings,
+ verifyTextTemplate,
+} from "./program.js";
+import type { Text, TextBinding, TextBindings, TextTemplate } from "./types.js";
+
+function inline<T>(value: StoredValue | undefined, subject: string): T {
+ if (value?.kind !== "inline") throw new Error(`${subject} must be inline`);
+ return value.value as unknown as T;
+}
+
+export const textComponent = {
+ name: "@narratage/text",
+ validators: [
+ { type: textTypes.text, implementationDigest: textImplementationDigests.validateText,
+ handler: ({ value }) => verifyText(inline(value, "Text")) },
+ { type: textTypes.template, implementationDigest: textImplementationDigests.validateTemplate,
+ handler: ({ value }) => verifyTextTemplate(inline(value, "TextTemplate")) },
+ { type: textTypes.bindings, implementationDigest: textImplementationDigests.validateBindings,
+ handler: ({ value }) => verifyTextBindings(inline(value, "TextBindings")) },
+ { type: textTypes.binding, implementationDigest: textImplementationDigests.validateBinding,
+ handler: ({ value }) => verifyTextBinding(inline(value, "TextBinding")) },
+ ],
+ producers: [
+ {
+ producer: textProducers.emptyBindings,
+ implementationDigest: textImplementationDigests.emptyBindings,
+ handler: () => ({ outputs: { bindings: { kind: "inline", value: sealTextBindings() } }, needs: {} }),
+ },
+ {
+ producer: textProducers.bindText,
+ implementationDigest: textImplementationDigests.bindText,
+ handler: ({ inputs }: ProducerHandlerContext) => ({
+ outputs: {
+ bindings: {
+ kind: "inline",
+ value: bindText(
+ inline<TextBindings>(inputs.bindings?.value, "Text bindings"),
+ inline<TextBinding>(inputs.binding?.value, "Text binding"),
+ inline<Text>(inputs.text?.value, "Text input"),
+ ),
+ },
+ },
+ needs: {},
+ }),
+ },
+ {
+ producer: textProducers.render,
+ implementationDigest: textImplementationDigests.render,
+ handler: ({ inputs }: ProducerHandlerContext) => ({
+ outputs: {
+ text: {
+ kind: "inline",
+ value: renderText(
+ inline<TextTemplate>(inputs.template?.value, "Text template"),
+ inline<TextBindings>(inputs.bindings?.value, "Text bindings"),
+ ),
+ },
+ },
+ needs: {},
+ }),
+ },
+ ],
+} satisfies ComponentPackage;
diff --git a/packages/text/src/fragment.ts b/packages/text/src/fragment.ts
new file mode 100644
index 00000000..5975b9de
--- /dev/null
+++ b/packages/text/src/fragment.ts
@@ -0,0 +1,60 @@
+import { sealGraphFragment } from "@narratage/elaborator";
+
+import { textProducers, textTypes } from "./manifest.js";
+
+export type TextFragmentBinding = {
+ readonly name: string;
+};
+
+/**
+ * A reusable graph shape for Template + initial Bindings + explicit Text edges.
+ * The caller supplies one authored TextBinding record and one Text value for
+ * every entry; no binding is discovered through metadata.
+ */
+export function createTextRenderFragment(entries: readonly TextFragmentBinding[] = []) {
+ const names = entries.map((entry) => entry.name);
+ if (new Set(names).size !== names.length) throw new Error("Text Fragment binding names must be unique");
+ const input = (name: string) => ({ kind: "fragment-input" as const, name });
+ const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
+ const inputs = [
+ { name: "template", type: textTypes.template },
+ { name: "bindings", type: textTypes.bindings },
+ ];
+ const operations: Array<import("@narratage/elaborator").FragmentOperation> = [];
+ let bindings = input("bindings") as ReturnType<typeof input> | ReturnType<typeof operation>;
+ entries.forEach((entry, index) => {
+ const prefix = `binding:${entry.name}`;
+ inputs.push({ name: `${prefix}:spec`, type: textTypes.binding });
+ inputs.push({ name: `${prefix}:text`, type: textTypes.text });
+ const id = `bind:${String(index + 1).padStart(4, "0")}:${entry.name}`;
+ operations.push({
+ id,
+ producer: textProducers.bindText,
+ inputs: {
+ bindings,
+ binding: input(`${prefix}:spec`),
+ text: input(`${prefix}:text`),
+ },
+ result: { kind: "output", name: "bindings" },
+ });
+ bindings = operation(id);
+ });
+ operations.push({
+ id: "render",
+ producer: textProducers.render,
+ inputs: { template: input("template"), bindings },
+ result: { kind: "output", name: "text" },
+ });
+ return sealGraphFragment({
+ name: `@narratage/text/render[${names.join(",") || "no-dynamic-bindings"}]@1`,
+ inputs,
+ operations,
+ exports: [{
+ name: "text",
+ type: textTypes.text,
+ root: operation("render"),
+ semanticInputs: inputs.map((entry) => entry.name),
+ fidelity: "exact",
+ }],
+ });
+}
diff --git a/packages/text/src/frontend.ts b/packages/text/src/frontend.ts
index 759516eb..b3d5723d 100644
--- a/packages/text/src/frontend.ts
+++ b/packages/text/src/frontend.ts
@@ -1,468 +1,53 @@
import {
- canonicalize,
- canonicalStringify,
- digestOf,
- isDigest,
sealRecord,
sealTypedModule,
verifyClosure,
verifyRecordStructure,
} from "@narratage/core";
-import type {
- CanonicalValue,
- ModuleRef,
- ResolvedModule,
- SurfaceDeclaration,
- TypedRecord,
-} from "@narratage/protocol";
import { sealAuthorModule } from "@narratage/elaborator";
-import type {
- AuthorComponent,
- AuthorSourceExport,
- AuthorValueRef,
- GraphFragment,
- ResolvedAuthorSourceImport,
-} from "@narratage/elaborator";
-
-import { TextFrontendError } from "./error.js";
-import {
- closeDocument,
- discoverText,
- parseOpeningTag,
- parseStructuredElement,
- skipTextTrivia,
-} from "./syntax.js";
-import type {
- RawSurfaceHandler,
- SourceUnit,
- StructuredSurfaceHandler,
- SurfaceComponentDraft,
- SurfaceDecodeOutput,
- SurfaceRecordDraft,
- SurfaceResolvedReference,
- TextDecodeContext,
- TextDecodeResult,
- TextAuthorFrontend,
- TextAuthorFrontendOptions,
- TextImportRequest,
-} from "./types.js";
-
-export const textFrontendRef = { module: "@narratage/text", version: "1", name: "text" } as const;
-export const textFrontendImplementationDigest = digestOf("@narratage/text/frontend@1");
-export const textAuthorFrontendId = "@narratage/text@1";
-
-type BoundSurface = {
- readonly tag: string;
- readonly module: ResolvedModule;
- readonly declaration: SurfaceDeclaration;
-};
-
-function moduleKey(ref: ModuleRef): string {
- return `${ref.name}@${ref.version}`;
-}
-
-function sameModule(left: ModuleRef, right: ModuleRef): boolean {
- return left.name === right.name && left.version === right.version;
-}
-
-function fail(source: SourceUnit, code: string, message: string, offset?: number): never {
- throw new TextFrontendError(code, message, source.name, offset);
-}
-
-function moduleForImport(
- source: SourceUnit,
- request: TextImportRequest,
- context: TextDecodeContext,
-): ResolvedModule {
- const ref = context.resolveModule(request);
- const module = context.closure.modules.find((item) => sameModule(item.ref, ref));
- if (!module) {
- fail(source, "TEXT_IMPORT_CLOSURE", `${moduleKey(ref)} is not present in the resolved closure.`, request.range.start);
- }
- return module;
-}
-
-function surfaceScope(
- source: SourceUnit,
- imports: readonly TextImportRequest[],
- context: TextDecodeContext,
-): Map<string, BoundSurface> {
- const scope = new Map<string, BoundSurface>();
- const aliases = new Set<string>();
- for (const request of imports) {
- if (request.alias !== undefined) {
- if (aliases.has(request.alias)) fail(source, "TEXT_ALIAS_DUPLICATE", `Duplicate import alias "${request.alias}".`, request.range.start);
- aliases.add(request.alias);
- }
- if (request.kind === "source") continue;
- const module = moduleForImport(source, request, context);
- for (const declaration of module.manifest.surfaces) {
- const tag = request.alias === undefined ? declaration.tag : `${request.alias}:${declaration.tag}`;
- if (scope.has(tag)) fail(source, "TEXT_SURFACE_COLLISION", `Surface tag <${tag}> is imported more than once.`, request.range.start);
- scope.set(tag, { tag, module, declaration });
- }
- }
- return scope;
-}
-
-export async function decodeText(source: SourceUnit, context: TextDecodeContext): Promise<TextDecodeResult> {
- verifyClosure(context.closure);
- const discovery = discoverText(source);
- const sourceImports = context.sourceImports ?? [];
- const importedBindings = new Map<string, AuthorSourceExport>();
- const importedReferences = new Map<string, SurfaceResolvedReference>();
- for (const request of discovery.imports.filter((item) => item.kind === "source")) {
- const resolved = sourceImports.find((item) =>
- item.request.from === request.from
- && item.request.alias === request.alias);
- if (resolved === undefined) {
- fail(
- source,
- "TEXT_SOURCE_IMPORT_UNRESOLVED",
- `Source import "${request.from}" must be decoded before this SourceUnit.`,
- request.range.start,
- );
- }
- for (const item of resolved.exports) {
- const name = `${request.alias}.${item.name}`;
- if (importedBindings.has(name)) {
- fail(source, "TEXT_SOURCE_EXPORT_COLLISION", `Imported binding ${name} is duplicated.`, request.range.start);
- }
- importedBindings.set(name, item);
- const recordId = item.ref.kind === "record" ? item.ref.id : undefined;
- const record = recordId === undefined
- ? undefined
- : resolved.records.find((candidate) => candidate.id === recordId);
- importedReferences.set(name, {
- path: name,
- ref: item.ref,
- type: item.type,
- ...(record === undefined ? {} : { record }),
- });
- }
- }
- const scope = surfaceScope(source, discovery.imports, context);
- const sourceDigest = source.sourceDigest ?? digestOf(source.text);
- const frontendClosureDigest = digestOf({
- frontend: textFrontendImplementationDigest,
- surfaces: [...scope.values()]
- .sort((left, right) => left.tag.localeCompare(right.tag))
- .map((surface) => ({
- tag: surface.tag,
- module: surface.module.ref,
- moduleDigest: surface.module.digest,
- name: surface.declaration.name,
- implementationDigest: surface.declaration.implementation.digest,
- })),
- sourceImports: sourceImports
- .map((item) => ({
- from: item.request.from,
- alias: item.request.alias,
- frontend: item.frontend,
- frontendDigest: item.frontendDigest,
- source: item.source,
- exports: item.exports,
- }))
- .sort((left, right) => left.alias.localeCompare(right.alias)),
- });
- const records: TypedRecord[] = [];
- const components: AuthorComponent[] = [];
- const componentRanges = new Map<string, SurfaceComponentDraft["range"]>();
- const fragments = new Map<string, GraphFragment>();
- const sourceMaps: CanonicalValue[] = [];
- const recordIds = new Set<string>();
- const componentIds = new Set<string>();
- let cursor = discovery.bodyStart;
- let closed = false;
- while (cursor < source.text.length) {
- cursor = skipTextTrivia(source, cursor);
- if (source.text.startsWith("</", cursor)) {
- cursor = closeDocument(source, cursor);
- closed = true;
- break;
- }
- if (source.text[cursor] !== "<") {
- fail(source, "TEXT_BODY_TEXT", "Natural-language text is not allowed directly under <svml>.", cursor);
- }
- const opening = parseOpeningTag(source, cursor);
- if (opening.name === "import") {
- fail(source, "TEXT_IMPORT_AFTER_BODY", "All imports must appear in the leading Import Prologue.", cursor);
- }
- const bound = scope.get(opening.name);
- if (!bound) fail(source, "TEXT_UNKNOWN_SURFACE", `No imported module declares <${opening.name}>.`, cursor);
- const registered = context.registry.resolve(bound.module.ref, bound.declaration.name);
- if (!registered) {
- fail(source, "TEXT_SURFACE_UNREGISTERED", `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} is not registered.`, cursor);
- }
- if (
- registered.mode !== bound.declaration.mode
- || registered.implementationDigest !== bound.declaration.implementation.digest
- ) {
- fail(source, "TEXT_SURFACE_MISMATCH", `Registered Surface ${bound.declaration.name} does not match the locked Manifest.`, cursor);
- }
- let output: SurfaceDecodeOutput;
- if (bound.declaration.mode === "raw") {
- if (opening.selfClosing) fail(source, "TEXT_RAW_SELF_CLOSING", `Raw Surface <${opening.name}> cannot be self-closing.`, cursor);
- const rawOutput = await (registered.handler as RawSurfaceHandler)({
- sourceName: source.name,
- source: source.text,
- tag: opening.name,
- openingStart: opening.start,
- contentStart: opening.end,
- attributes: opening.attributes,
- resolveAsset(request) {
- if (context.resolveAsset === undefined) {
- fail(source, "TEXT_ASSET_RESOLVER_MISSING", `Surface <${opening.name}> requested ${request.from}, but this Text Host has no asset resolver.`, request.range?.start ?? opening.start);
- }
- return context.resolveAsset(request);
- },
- });
- if (!Number.isInteger(rawOutput.nextOffset) || rawOutput.nextOffset <= opening.end || rawOutput.nextOffset > source.text.length) {
- fail(source, "TEXT_SURFACE_CURSOR", `Raw Surface <${opening.name}> returned an invalid cursor.`, cursor);
- }
- cursor = rawOutput.nextOffset;
- output = rawOutput;
- } else {
- const parsed = parseStructuredElement(source, cursor);
- output = await (registered.handler as StructuredSurfaceHandler)({
+import type { AuthorFrontend, AuthorSourceExport } from "@narratage/elaborator";
+import { parseSvs } from "@narratage/svs";
+
+import { textImplementationDigests, textModuleRef, textTypes } from "./manifest.js";
+import { textTemplateFromSvsRecipes } from "./svs.js";
+
+export const textSvsFrontendId = "@narratage/text/svs@1";
+
+export const textSvsFrontend: AuthorFrontend = {
+ id: textSvsFrontendId,
+ implementationDigest: textImplementationDigests.svsFrontend,
+ discover() {
+ return { modules: [`${textModuleRef.name}@${textModuleRef.version}`], sources: [] };
+ },
+ decode(source, context) {
+ verifyClosure(context.closure);
+ const parsed = parseSvs(source.name, source.text);
+ const recipes = parsed.recipes.map((item) => item.value);
+ const candidates = recipes
+ .map((recipe) => /^text-template\.([a-z][a-z0-9-]{0,95})$/u.exec(recipe.path)?.[1])
+ .filter((id): id is string => id !== undefined);
+ if (candidates.length !== 1) throw new Error(`${source.name} must declare exactly one text-template.<id> metadata Recipe`);
+ const id = candidates[0]!;
+ const template = textTemplateFromSvsRecipes(recipes, id);
+ const record = sealRecord({
+ id,
+ type: textTypes.template,
+ value: { kind: "inline", value: template as unknown as import("@narratage/protocol").CanonicalValue },
+ conformance: "exact",
+ origin: {
+ kind: "authored",
+ sourceDigest: source.sourceDigest,
+ frontendClosureDigest: textImplementationDigests.svsFrontend,
sourceName: source.name,
- element: parsed.element,
- resolveReference(path) {
- const imported = importedReferences.get(path);
- if (imported !== undefined) {
- return imported.record === undefined
- ? imported
- : { ...imported, record: canonicalize(imported.record) as unknown as TypedRecord };
- }
- const record = records.find((candidate) => candidate.id === path);
- if (record !== undefined) {
- return {
- path,
- ref: { kind: "record", id: record.id },
- type: record.type,
- record: canonicalize(record) as unknown as TypedRecord,
- };
- }
- for (const component of components) {
- const output = Object.entries(component.outputs).find(([, publicName]) => publicName === path);
- if (output === undefined) continue;
- const fragment = fragments.get(component.fragment);
- const declaration = fragment?.exports.find((candidate) => candidate.name === output[0]);
- if (declaration === undefined) continue;
- return {
- path,
- ref: { kind: "component-output", component: component.id, output: output[0] },
- type: declaration.type,
- };
- }
- return undefined;
- },
- resolveAsset(request) {
- if (context.resolveAsset === undefined) {
- fail(source, "TEXT_ASSET_RESOLVER_MISSING", `Surface <${opening.name}> requested ${request.from}, but this Text Host has no asset resolver.`, request.range?.start ?? opening.start);
- }
- return context.resolveAsset(request);
- },
- });
- cursor = parsed.nextOffset;
- }
- for (const draft of output.records) {
- if (
- !Number.isInteger(draft.range.start)
- || !Number.isInteger(draft.range.end)
- || draft.range.start < opening.start
- || draft.range.end < draft.range.start
- || draft.range.end > cursor
- ) {
- fail(
- source,
- "TEXT_SURFACE_RANGE",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid source range.`,
- opening.start,
- );
- }
- if (recordIds.has(draft.id)) fail(source, "TEXT_RECORD_DUPLICATE", `Duplicate authored record "${draft.id}".`, draft.range.start);
- if (!bound.declaration.outputs.some((output) => sameModule(output.module, draft.type.module) && output.name === draft.type.name)) {
- fail(
- source,
- "TEXT_SURFACE_OUTPUT",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} did not declare output type ${moduleKey(draft.type.module)}#${draft.type.name}.`,
- draft.range.start,
- );
- }
- recordIds.add(draft.id);
- const record = sealRecord({
- id: draft.id,
- type: draft.type,
- value: draft.value,
- conformance: "exact",
- origin: {
- kind: "authored",
- sourceDigest,
- frontendClosureDigest,
- sourceName: source.name,
- range: draft.range,
- },
- });
- verifyRecordStructure(context.closure, record);
- records.push(record);
- }
- for (const draft of output.components) {
- if (
- !Number.isInteger(draft.range.start)
- || !Number.isInteger(draft.range.end)
- || draft.range.start < opening.start
- || draft.range.end < draft.range.start
- || draft.range.end > cursor
- ) {
- fail(
- source,
- "TEXT_COMPONENT_RANGE",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid component source range.`,
- opening.start,
- );
- }
- if (draft.id.length === 0) {
- fail(source, "TEXT_COMPONENT_ID", "Surface returned a component with an empty id.", draft.range.start);
- }
- if (componentIds.has(draft.id)) {
- fail(source, "TEXT_COMPONENT_DUPLICATE", `Duplicate author component "${draft.id}".`, draft.range.start);
- }
- if (!isDigest(draft.fragment)) {
- fail(source, "TEXT_COMPONENT_FRAGMENT", `${draft.id} returned an invalid Fragment digest.`, draft.range.start);
- }
- componentIds.add(draft.id);
- componentRanges.set(draft.id, draft.range);
- components.push({
- id: draft.id,
- fragment: draft.fragment,
- inputs: draft.inputs,
- outputs: draft.outputs,
- });
- }
- for (const fragment of output.fragments) {
- if (fragment.format !== "svml.fragment@1" || !isDigest(fragment.id)) {
- fail(
- source,
- "TEXT_FRAGMENT_IDENTITY",
- `Surface ${moduleKey(bound.module.ref)}#${bound.declaration.name} returned an invalid Graph Fragment identity.`,
- opening.start,
- );
- }
- const existing = fragments.get(fragment.id);
- if (existing !== undefined && canonicalStringify(existing) !== canonicalStringify(fragment)) {
- fail(source, "TEXT_FRAGMENT_CONFLICT", `Graph Fragment ${fragment.id} has conflicting definitions.`, opening.start);
- }
- fragments.set(fragment.id, fragment);
- }
- sourceMaps.push(...(output.sourceMaps ?? []));
- }
- if (!closed) {
- fail(source, "TEXT_ROOT_UNCLOSED", "Document is missing </svml>.", source.text.length);
- }
- for (const component of components) {
- if (!fragments.has(component.fragment)) {
- fail(
- source,
- "TEXT_COMPONENT_FRAGMENT_MISSING",
- `${component.id} references Fragment ${component.fragment} that no Surface contributed.`,
- componentRanges.get(component.id)?.start,
- );
- }
- }
- const resolveImportedRef = (ref: AuthorValueRef): AuthorValueRef => {
- const path = ref.kind === "record" ? ref.id : `${ref.component}.${ref.output}`;
- return importedBindings.get(path)?.ref ?? ref;
- };
- const resolvedComponents = components.map((component) => ({
- ...component,
- inputs: Object.fromEntries(Object.entries(component.inputs).map(([name, ref]) => [
- name,
- resolveImportedRef(ref),
- ])),
- }));
- const exports: AuthorSourceExport[] = records.map((record) => ({
- name: record.id,
- ref: { kind: "record", id: record.id },
- type: record.type,
- }));
- const exportNames = new Set(exports.map((item) => item.name));
- for (const component of resolvedComponents) {
- const fragment = fragments.get(component.fragment) as GraphFragment;
- for (const [output, name] of Object.entries(component.outputs)) {
- if (exportNames.has(name)) fail(source, "TEXT_EXPORT_DUPLICATE", `Duplicate public export ${name}.`);
- const declaration = fragment.exports.find((item) => item.name === output);
- if (declaration === undefined) {
- fail(source, "TEXT_COMPONENT_EXPORT", `${component.id} binds unknown Fragment export ${output}.`);
- }
- exportNames.add(name);
- exports.push({
- name,
- ref: { kind: "component-output", component: component.id, output },
- type: declaration.type,
- });
- }
- }
- return {
- module: sealTypedModule({
- id: `source:${source.name}`,
- closureDigest: context.closure.digest,
- records,
- }),
- author: sealAuthorModule({
- name: `source:${source.name}`,
- components: resolvedComponents,
- }),
- fragments: [...fragments.values()].sort((left, right) => left.id.localeCompare(right.id)),
- exports: exports.sort((left, right) => left.name.localeCompare(right.name)),
- imports: discovery.imports,
- frontendClosureDigest,
- sourceMaps,
- };
-}
-
-export const textFrontend = {
- id: textFrontendRef,
- discover: discoverText,
- decode: decodeText,
-} as const;
-
-/** Adapt the official Text decoder to the domain-neutral recursive Source Closure ABI. */
-export function createTextAuthorFrontend(options: TextAuthorFrontendOptions): TextAuthorFrontend {
- return {
- id: textAuthorFrontendId,
- implementationDigest: textFrontendImplementationDigest,
- discover(source) {
- const discovery = discoverText(source);
- return {
- modules: discovery.imports.filter((item) => item.kind === "module").map((item) => item.from),
- sources: discovery.imports
- .filter((item): item is TextImportRequest & { alias: string; kind: "source" } =>
- item.kind === "source" && item.alias !== undefined)
- .map((item) => ({
- from: item.from,
- alias: item.alias,
- range: item.range,
- })),
- };
- },
- async decode(source, context) {
- const result = await decodeText(
- { name: source.name, text: source.text, sourceDigest: source.sourceDigest },
- {
- closure: context.closure,
- registry: options.registry,
- resolveModule: options.resolveModule,
- sourceImports: context.imports,
- resolveAsset: context.resolveAsset,
- },
- );
- return {
- module: result.module,
- author: result.author,
- fragments: result.fragments,
- exports: result.exports,
- };
- },
- };
-}
+ },
+ });
+ verifyRecordStructure(context.closure, record);
+ const exports: AuthorSourceExport[] = [{ name: id, ref: { kind: "record", id }, type: textTypes.template }];
+ return {
+ module: sealTypedModule({ id: `source:${source.name}`, closureDigest: context.closure.digest, records: [record] }),
+ author: sealAuthorModule({ name: `source:${source.name}`, components: [] }),
+ fragments: [],
+ exports,
+ };
+ },
+};
diff --git a/packages/text/src/index.ts b/packages/text/src/index.ts
index 466b0a5e..eb38ec45 100644
--- a/packages/text/src/index.ts
+++ b/packages/text/src/index.ts
@@ -1,24 +1,29 @@
-export { TextFrontendError } from "./error.js";
+export { textComponent } from "./component.js";
+export { textSvsFrontend, textSvsFrontendId } from "./frontend.js";
+export { createTextRenderFragment } from "./fragment.js";
+export type { TextFragmentBinding } from "./fragment.js";
export {
- decodeText,
- createTextAuthorFrontend,
- textAuthorFrontendId,
- textFrontend,
- textFrontendImplementationDigest,
- textFrontendRef,
-} from "./frontend.js";
-export { TextSurfaceRegistry } from "./registry.js";
+ textDependency,
+ textImplementationDigests,
+ textManifest,
+ textManifestDigest,
+ textModuleRef,
+ textProducers,
+ textTypes,
+} from "./manifest.js";
export {
- createTextSurfaceHostFacet,
- installTextSurfaceHostFacets,
- textSurfaceHostFacetAbi,
-} from "./host-facet.js";
-export type { TextSurfaceHostFacetOptions } from "./host-facet.js";
-export {
- closeDocument,
- discoverText,
- parseOpeningTag,
- parseStructuredElement,
- skipTextTrivia,
-} from "./syntax.js";
+ bindText,
+ renderText,
+ sealText,
+ sealTextBinding,
+ sealTextBindings,
+ sealTextTemplate,
+ textTemplateBindingNames,
+ verifyText,
+ verifyTextBinding,
+ verifyTextBindings,
+ verifyTextTemplate,
+} from "./program.js";
+export { textTemplateFromSvsRecipes } from "./svs.js";
+export { decodeTextRenderSurface, decodeTextValueSurface } from "./surface.js";
export type * from "./types.js";
diff --git a/packages/text/src/manifest.ts b/packages/text/src/manifest.ts
new file mode 100644
index 00000000..5d8d2399
--- /dev/null
+++ b/packages/text/src/manifest.ts
@@ -0,0 +1,121 @@
+import { digestOf } from "@narratage/protocol";
+import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
+
+export const textModuleRef = { name: "@narratage/text", version: "1" } as const;
+
+export const textTypes = {
+ text: { module: textModuleRef, name: "Text" },
+ template: { module: textModuleRef, name: "TextTemplate" },
+ bindings: { module: textModuleRef, name: "TextBindings" },
+ binding: { module: textModuleRef, name: "TextBinding" },
+} satisfies Record<string, TypeRef>;
+
+export const textProducers = {
+ emptyBindings: { module: textModuleRef, name: "empty-bindings" },
+ bindText: { module: textModuleRef, name: "bind-text" },
+ render: { module: textModuleRef, name: "render" },
+} satisfies Record<string, ProducerRef>;
+
+export const textImplementationDigests = {
+ svsFrontend: digestOf("@narratage/text/svs-frontend@1"),
+ valueSurface: digestOf("@narratage/text/value-surface@1"),
+ renderSurface: digestOf("@narratage/text/render-surface@1"),
+ validateText: digestOf("@narratage/text/validate-text@1"),
+ validateTemplate: digestOf("@narratage/text/validate-template@1"),
+ validateBindings: digestOf("@narratage/text/validate-bindings@1"),
+ validateBinding: digestOf("@narratage/text/validate-binding@1"),
+ emptyBindings: digestOf("@narratage/text/empty-bindings@1"),
+ bindText: digestOf("@narratage/text/bind-text@1"),
+ render: digestOf("@narratage/text/render@1"),
+} as const;
+
+const openObject: ValueSchema = { kind: "object", fields: {}, allowUnknown: true };
+const type = (name: string, schema: ValueSchema, locator: string, digest: (typeof textImplementationDigests)[keyof typeof textImplementationDigests]) => ({
+ name,
+ schema,
+ validator: {
+ abi: "svml.type-validator@1" as const,
+ implementation: { kind: "registered" as const, locator, digest },
+ },
+});
+
+export const textManifest: ModuleManifest = {
+ format: "svml.module@1",
+ name: textModuleRef.name,
+ version: textModuleRef.version,
+ dependencies: [],
+ types: [
+ type(textTypes.text.name, {
+ kind: "object",
+ fields: {
+ contract: { schema: { kind: "literal", value: "svml.text@1" } },
+ value: { schema: { kind: "string" } },
+ },
+ }, "@narratage/text/validate-text", textImplementationDigests.validateText),
+ type(textTypes.template.name, openObject, "@narratage/text/validate-template", textImplementationDigests.validateTemplate),
+ type(textTypes.bindings.name, openObject, "@narratage/text/validate-bindings", textImplementationDigests.validateBindings),
+ type(textTypes.binding.name, {
+ kind: "object",
+ fields: {
+ contract: { schema: { kind: "literal", value: "svml.text-binding@1" } },
+ name: { schema: { kind: "string", minLength: 1 } },
+ mode: { schema: { kind: "string", enum: ["set", "append"] } },
+ },
+ }, "@narratage/text/validate-binding", textImplementationDigests.validateBinding),
+ ],
+ capabilities: [],
+ surfaces: [{
+ name: "value",
+ tag: "Value",
+ mode: "structured",
+ outputs: [textTypes.text],
+ implementation: {
+ kind: "trusted-frontend-surface",
+ locator: "@narratage/text/value-surface",
+ digest: textImplementationDigests.valueSurface,
+ },
+ }, {
+ name: "render",
+ tag: "Render",
+ mode: "structured",
+ outputs: [textTypes.text, textTypes.bindings, textTypes.binding],
+ implementation: {
+ kind: "trusted-frontend-surface",
+ locator: "@narratage/text/render-surface",
+ digest: textImplementationDigests.renderSurface,
+ },
+ }],
+ producers: [
+ {
+ name: textProducers.emptyBindings.name,
+ inputs: [],
+ outputs: [{ name: "bindings", type: textTypes.bindings }],
+ needs: [],
+ implementation: { kind: "registered", locator: "@narratage/text/empty-bindings", digest: textImplementationDigests.emptyBindings },
+ },
+ {
+ name: textProducers.bindText.name,
+ inputs: [
+ { name: "bindings", type: textTypes.bindings },
+ { name: "binding", type: textTypes.binding },
+ { name: "text", type: textTypes.text },
+ ],
+ outputs: [{ name: "bindings", type: textTypes.bindings }],
+ needs: [],
+ implementation: { kind: "registered", locator: "@narratage/text/bind-text", digest: textImplementationDigests.bindText },
+ },
+ {
+ name: textProducers.render.name,
+ inputs: [
+ { name: "template", type: textTypes.template },
+ { name: "bindings", type: textTypes.bindings },
+ ],
+ outputs: [{ name: "text", type: textTypes.text }],
+ needs: [],
+ implementation: { kind: "registered", locator: "@narratage/text/render", digest: textImplementationDigests.render },
+ },
+ ],
+};
+
+export const textManifestDigest = digestOf(textManifest);
+export const textDependency = { module: textModuleRef, digest: textManifestDigest } as const;
diff --git a/packages/text/src/program.ts b/packages/text/src/program.ts
new file mode 100644
index 00000000..b47ea3d9
--- /dev/null
+++ b/packages/text/src/program.ts
@@ -0,0 +1,421 @@
+import { canonicalize } from "@narratage/protocol";
+
+import type {
+ Text,
+ TextBinding,
+ TextBindings,
+ TextBindingValue,
+ TextCondition,
+ TextExpression,
+ TextScalar,
+ TextTemplate,
+ TextTransform,
+} from "./types.js";
+
+const NAME = /^[a-z][a-z0-9-]{0,95}$/u;
+
+function assert(condition: unknown, message: string): asserts condition {
+ if (!condition) throw new Error(message);
+}
+
+function object(value: unknown, subject: string): Record<string, unknown> {
+ assert(value !== null && typeof value === "object" && !Array.isArray(value), `${subject} must be an object`);
+ return value as Record<string, unknown>;
+}
+
+function name(value: unknown, subject: string): asserts value is string {
+ assert(typeof value === "string" && NAME.test(value), `${subject} must be a lower-kebab name`);
+}
+
+function scalar(value: unknown, subject: string): asserts value is TextScalar {
+ assert(
+ typeof value === "string"
+ || typeof value === "boolean"
+ || (typeof value === "number" && Number.isFinite(value)),
+ `${subject} must be text, boolean or a finite number`,
+ );
+}
+
+function bindingValue(value: unknown, subject: string): asserts value is TextBindingValue {
+ if (!Array.isArray(value)) {
+ scalar(value, subject);
+ return;
+ }
+ value.forEach((item, index) => scalar(item, `${subject}[${index}]`));
+}
+
+function condition(value: unknown, subject: string): asserts value is TextCondition {
+ const item = object(value, subject);
+ if (item.kind === "present") {
+ name(item.binding, `${subject}.binding`);
+ return;
+ }
+ if (item.kind === "equals") {
+ name(item.binding, `${subject}.binding`);
+ scalar(item.value, `${subject}.value`);
+ return;
+ }
+ if (item.kind === "all" || item.kind === "any") {
+ assert(Array.isArray(item.conditions) && item.conditions.length > 0, `${subject}.conditions must be non-empty`);
+ item.conditions.forEach((entry, index) => condition(entry, `${subject}.conditions[${index}]`));
+ return;
+ }
+ if (item.kind === "not") {
+ condition(item.condition, `${subject}.condition`);
+ return;
+ }
+ throw new Error(`${subject}.kind is invalid`);
+}
+
+function transform(value: unknown, subject: string): asserts value is TextTransform {
+ const item = object(value, subject);
+ assert(
+ item.kind === "trim"
+ || item.kind === "trim-start"
+ || item.kind === "trim-end"
+ || item.kind === "uppercase"
+ || item.kind === "lowercase"
+ || item.kind === "collapse-whitespace"
+ || item.kind === "normalize-newlines"
+ || item.kind === "json-string",
+ `${subject}.kind is invalid`,
+ );
+}
+
+function expression(
+ value: unknown,
+ subject: string,
+ calls: Set<string>,
+): asserts value is TextExpression {
+ const item = object(value, subject);
+ if (item.kind === "literal") {
+ assert(typeof item.value === "string", `${subject}.value must be text`);
+ return;
+ }
+ if (item.kind === "slot") {
+ name(item.binding, `${subject}.binding`);
+ return;
+ }
+ if (item.kind === "sequence" || item.kind === "join") {
+ assert(Array.isArray(item.items), `${subject}.items must be an array`);
+ if (item.kind === "join") {
+ assert(typeof item.separator === "string", `${subject}.separator must be text`);
+ assert(item.omitEmpty === undefined || typeof item.omitEmpty === "boolean", `${subject}.omitEmpty must be boolean`);
+ }
+ item.items.forEach((entry, index) => expression(entry, `${subject}.items[${index}]`, calls));
+ return;
+ }
+ if (item.kind === "choice") {
+ assert(Array.isArray(item.cases) && item.cases.length > 0, `${subject}.cases must be non-empty`);
+ item.cases.forEach((entry, index) => {
+ const candidate = object(entry, `${subject}.cases[${index}]`);
+ condition(candidate.when, `${subject}.cases[${index}].when`);
+ expression(candidate.value, `${subject}.cases[${index}].value`, calls);
+ });
+ if (item.otherwise !== undefined) expression(item.otherwise, `${subject}.otherwise`, calls);
+ return;
+ }
+ if (item.kind === "optional") {
+ condition(item.when, `${subject}.when`);
+ expression(item.value, `${subject}.value`, calls);
+ return;
+ }
+ if (item.kind === "each") {
+ name(item.binding, `${subject}.binding`);
+ name(item.as, `${subject}.as`);
+ assert(typeof item.separator === "string", `${subject}.separator must be text`);
+ expression(item.value, `${subject}.value`, calls);
+ return;
+ }
+ if (item.kind === "replace") {
+ expression(item.input, `${subject}.input`, calls);
+ assert(Array.isArray(item.replacements), `${subject}.replacements must be an array`);
+ item.replacements.forEach((entry, index) => {
+ const replacement = object(entry, `${subject}.replacements[${index}]`);
+ assert(typeof replacement.from === "string" && replacement.from.length > 0,
+ `${subject}.replacements[${index}].from must be non-empty text`);
+ assert(typeof replacement.to === "string", `${subject}.replacements[${index}].to must be text`);
+ assert(replacement.mode === "first" || replacement.mode === "all",
+ `${subject}.replacements[${index}].mode is invalid`);
+ });
+ return;
+ }
+ if (item.kind === "transform") {
+ expression(item.input, `${subject}.input`, calls);
+ assert(Array.isArray(item.transforms) && item.transforms.length > 0, `${subject}.transforms must be non-empty`);
+ item.transforms.forEach((entry, index) => transform(entry, `${subject}.transforms[${index}]`));
+ return;
+ }
+ if (item.kind === "call") {
+ name(item.template, `${subject}.template`);
+ calls.add(item.template);
+ return;
+ }
+ throw new Error(`${subject}.kind is invalid`);
+}
+
+function callGraph(template: TextTemplate): Map<string, Set<string>> {
+ const graph = new Map<string, Set<string>>();
+ const rootCalls = new Set<string>();
+ expression(template.root, "TextTemplate.root", rootCalls);
+ graph.set("$root", rootCalls);
+ for (const [id, value] of Object.entries(template.definitions ?? {})) {
+ name(id, `TextTemplate.definitions key ${id}`);
+ const calls = new Set<string>();
+ expression(value, `TextTemplate.definitions.${id}`, calls);
+ graph.set(id, calls);
+ }
+ return graph;
+}
+
+function verifyFiniteCalls(template: TextTemplate): void {
+ const graph = callGraph(template);
+ for (const [from, calls] of graph) {
+ for (const target of calls) {
+ assert(graph.has(target), `TextTemplate ${from} calls unknown definition ${target}`);
+ }
+ }
+ const visiting = new Set<string>();
+ const visited = new Set<string>();
+ const visit = (id: string) => {
+ if (visited.has(id)) return;
+ assert(!visiting.has(id), `TextTemplate call cycle reaches ${id}`);
+ visiting.add(id);
+ for (const target of graph.get(id) ?? []) visit(target);
+ visiting.delete(id);
+ visited.add(id);
+ };
+ visit("$root");
+ for (const id of graph.keys()) visit(id);
+}
+
+export function verifyText(value: unknown): asserts value is Text {
+ const item = object(value, "Text");
+ assert(item.contract === "svml.text@1" && typeof item.value === "string", "Text is invalid");
+}
+
+export function sealText(value: string): Text {
+ const result = canonicalize({ contract: "svml.text@1", value }) as unknown as Text;
+ verifyText(result);
+ return result;
+}
+
+export function verifyTextBindings(value: unknown): asserts value is TextBindings {
+ const item = object(value, "TextBindings");
+ assert(item.contract === "svml.text-bindings@1", "TextBindings contract is invalid");
+ const values = object(item.values, "TextBindings.values");
+ for (const [id, entry] of Object.entries(values)) {
+ name(id, `TextBindings.values key ${id}`);
+ bindingValue(entry, `TextBindings.values.${id}`);
+ }
+}
+
+export function sealTextBindings(values: Readonly<Record<string, TextBindingValue>> = {}): TextBindings {
+ const result = canonicalize({ contract: "svml.text-bindings@1", values }) as unknown as TextBindings;
+ verifyTextBindings(result);
+ return result;
+}
+
+export function verifyTextBinding(value: unknown): asserts value is TextBinding {
+ const item = object(value, "TextBinding");
+ assert(item.contract === "svml.text-binding@1", "TextBinding contract is invalid");
+ name(item.name, "TextBinding.name");
+ assert(item.mode === "set" || item.mode === "append", "TextBinding.mode is invalid");
+}
+
+export function sealTextBinding(value: Omit<TextBinding, "contract">): TextBinding {
+ const result = canonicalize({ contract: "svml.text-binding@1", ...value }) as unknown as TextBinding;
+ verifyTextBinding(result);
+ return result;
+}
+
+export function bindText(
+ bindings: TextBindings,
+ binding: TextBinding,
+ text: Text,
+): TextBindings {
+ verifyTextBindings(bindings);
+ verifyTextBinding(binding);
+ verifyText(text);
+ const existing = bindings.values[binding.name];
+ if (binding.mode === "set") {
+ assert(existing === undefined, `Text binding ${binding.name} is already set`);
+ return sealTextBindings({ ...bindings.values, [binding.name]: text.value });
+ }
+ if (existing === undefined) return sealTextBindings({ ...bindings.values, [binding.name]: [text.value] });
+ const values = Array.isArray(existing) ? [...existing] : [existing];
+ return sealTextBindings({ ...bindings.values, [binding.name]: [...values, text.value] });
+}
+
+export function verifyTextTemplate(value: unknown): asserts value is TextTemplate {
+ const template = object(value, "TextTemplate") as unknown as TextTemplate;
+ assert(template.contract === "svml.text-template@1", "TextTemplate contract is invalid");
+ if (template.defaults !== undefined) {
+ const defaults = object(template.defaults, "TextTemplate.defaults");
+ for (const [id, entry] of Object.entries(defaults)) {
+ name(id, `TextTemplate.defaults key ${id}`);
+ bindingValue(entry, `TextTemplate.defaults.${id}`);
+ }
+ }
+ if (template.definitions !== undefined) object(template.definitions, "TextTemplate.definitions");
+ verifyFiniteCalls(template);
+}
+
+export function sealTextTemplate(value: TextTemplate): TextTemplate {
+ const result = canonicalize(value) as unknown as TextTemplate;
+ verifyTextTemplate(result);
+ return result;
+}
+
+function collectBindings(
+ value: TextExpression,
+ template: TextTemplate,
+ result: Set<string>,
+ locals: ReadonlySet<string>,
+): void {
+ const add = (id: string) => { if (!locals.has(id)) result.add(id); };
+ const collectCondition = (item: TextCondition): void => {
+ if (item.kind === "present" || item.kind === "equals") {
+ add(item.binding);
+ return;
+ }
+ if (item.kind === "all" || item.kind === "any") {
+ item.conditions.forEach(collectCondition);
+ return;
+ }
+ collectCondition(item.condition);
+ };
+ if (value.kind === "literal") return;
+ if (value.kind === "slot") {
+ add(value.binding);
+ return;
+ }
+ if (value.kind === "sequence" || value.kind === "join") {
+ value.items.forEach((item) => collectBindings(item, template, result, locals));
+ return;
+ }
+ if (value.kind === "choice") {
+ value.cases.forEach((item) => {
+ collectCondition(item.when);
+ collectBindings(item.value, template, result, locals);
+ });
+ if (value.otherwise !== undefined) collectBindings(value.otherwise, template, result, locals);
+ return;
+ }
+ if (value.kind === "optional") {
+ collectCondition(value.when);
+ collectBindings(value.value, template, result, locals);
+ return;
+ }
+ if (value.kind === "each") {
+ add(value.binding);
+ collectBindings(value.value, template, result, new Set([...locals, value.as]));
+ return;
+ }
+ if (value.kind === "replace" || value.kind === "transform") {
+ collectBindings(value.input, template, result, locals);
+ return;
+ }
+ const definition = template.definitions?.[value.template];
+ if (definition !== undefined) collectBindings(definition, template, result, locals);
+}
+
+export function textTemplateBindingNames(template: TextTemplate): ReadonlySet<string> {
+ verifyTextTemplate(template);
+ const result = new Set<string>();
+ collectBindings(template.root, template, result, new Set());
+ return result;
+}
+
+function hasBinding(bindings: Readonly<Record<string, TextBindingValue>>, id: string): boolean {
+ const value = bindings[id];
+ return value !== undefined && (!Array.isArray(value) || value.length > 0);
+}
+
+function matches(value: TextCondition, bindings: Readonly<Record<string, TextBindingValue>>): boolean {
+ if (value.kind === "present") return hasBinding(bindings, value.binding);
+ if (value.kind === "equals") {
+ const actual = bindings[value.binding];
+ return !Array.isArray(actual) && actual === value.value;
+ }
+ if (value.kind === "all") return value.conditions.every((item) => matches(item, bindings));
+ if (value.kind === "any") return value.conditions.some((item) => matches(item, bindings));
+ return !matches(value.condition, bindings);
+}
+
+function scalarText(value: TextBindingValue | undefined, subject: string): string {
+ assert(value !== undefined, `${subject} is missing`);
+ assert(!Array.isArray(value), `${subject} is a list and must be consumed by each`);
+ return String(value);
+}
+
+function applyTransform(value: string, operation: TextTransform): string {
+ if (operation.kind === "trim") return value.trim();
+ if (operation.kind === "trim-start") return value.trimStart();
+ if (operation.kind === "trim-end") return value.trimEnd();
+ if (operation.kind === "uppercase") return value.toUpperCase();
+ if (operation.kind === "lowercase") return value.toLowerCase();
+ if (operation.kind === "collapse-whitespace") return value.replace(/\s+/gu, " ").trim();
+ if (operation.kind === "normalize-newlines") return value.replaceAll("\r\n", "\n").replaceAll("\r", "\n");
+ return JSON.stringify(value);
+}
+
+function renderExpression(
+ value: TextExpression,
+ template: TextTemplate,
+ bindings: Readonly<Record<string, TextBindingValue>>,
+): string {
+ if (value.kind === "literal") return value.value;
+ if (value.kind === "slot") return scalarText(bindings[value.binding], `Text binding ${value.binding}`);
+ if (value.kind === "sequence") return value.items.map((item) => renderExpression(item, template, bindings)).join("");
+ if (value.kind === "join") {
+ const items = value.items.map((item) => renderExpression(item, template, bindings));
+ return (value.omitEmpty === true ? items.filter((item) => item.length > 0) : items).join(value.separator);
+ }
+ if (value.kind === "choice") {
+ const selected = value.cases.filter((item) => matches(item.when, bindings));
+ assert(selected.length <= 1, `Text choice matched ${selected.length} cases`);
+ if (selected.length === 1) return renderExpression(selected[0]!.value, template, bindings);
+ assert(value.otherwise !== undefined, "Text choice matched no case and has no otherwise branch");
+ return renderExpression(value.otherwise, template, bindings);
+ }
+ if (value.kind === "optional") {
+ return matches(value.when, bindings) ? renderExpression(value.value, template, bindings) : "";
+ }
+ if (value.kind === "each") {
+ const source = bindings[value.binding];
+ assert(Array.isArray(source), `Text binding ${value.binding} must be a list`);
+ return source.map((item) => renderExpression(value.value, template, { ...bindings, [value.as]: item })).join(value.separator);
+ }
+ if (value.kind === "replace") {
+ let result = renderExpression(value.input, template, bindings);
+ for (const replacement of value.replacements) {
+ result = replacement.mode === "all"
+ ? result.replaceAll(replacement.from, replacement.to)
+ : result.replace(replacement.from, replacement.to);
+ }
+ return result;
+ }
+ if (value.kind === "transform") {
+ return value.transforms.reduce(
+ (result, operation) => applyTransform(result, operation),
+ renderExpression(value.input, template, bindings),
+ );
+ }
+ const definition = template.definitions?.[value.template];
+ assert(definition !== undefined, `TextTemplate definition ${value.template} is missing`);
+ return renderExpression(definition, template, bindings);
+}
+
+export function renderText(template: TextTemplate, bindings: TextBindings): Text {
+ verifyTextTemplate(template);
+ verifyTextBindings(bindings);
+ const known = textTemplateBindingNames(template);
+ for (const id of Object.keys(template.defaults ?? {})) {
+ assert(known.has(id), `TextTemplate default ${id} is not consumed`);
+ }
+ for (const id of Object.keys(bindings.values)) {
+ assert(known.has(id), `Text binding ${id} is not declared by the template`);
+ }
+ return sealText(renderExpression(template.root, template, { ...template.defaults, ...bindings.values }));
+}
diff --git a/packages/text/src/surface.ts b/packages/text/src/surface.ts
new file mode 100644
index 00000000..4c551adf
--- /dev/null
+++ b/packages/text/src/surface.ts
@@ -0,0 +1,183 @@
+import type { CanonicalValue } from "@narratage/protocol";
+import type {
+ MarkupAttributeValue,
+ StructuredElement,
+ StructuredSurfaceHandler,
+ SurfaceResolvedReference,
+} from "@narratage/markup";
+
+import { createTextRenderFragment } from "./fragment.js";
+import { sealText, sealTextBinding, sealTextBindings } from "./program.js";
+import { textTypes } from "./manifest.js";
+import type { TextBindingValue, TextScalar } from "./types.js";
+
+function localName(value: string): string {
+ return value.includes(":") ? value.slice(value.lastIndexOf(":") + 1) : value;
+}
+
+function exact(element: StructuredElement, allowed: readonly string[], required: readonly string[] = []): void {
+ const unknown = Object.keys(element.attributes).filter((name) => !allowed.includes(name));
+ if (unknown.length > 0) throw new Error(`${element.name} does not accept ${unknown[0]}`);
+ const missing = required.filter((name) => element.attributes[name] === undefined);
+ if (missing.length > 0) throw new Error(`${element.name} requires ${missing.join(", ")}`);
+}
+
+function stringAttribute(element: StructuredElement, name: string): string {
+ const value = element.attributes[name];
+ if (typeof value !== "string" || value.trim().length === 0) {
+ throw new Error(`${element.name}.${name} must be non-empty text`);
+ }
+ return value.trim();
+}
+
+function referencePath(element: StructuredElement, name: string): string {
+ const value: MarkupAttributeValue | undefined = element.attributes[name];
+ if (typeof value !== "object" || value.kind !== "reference" || value.path.length === 0) {
+ throw new Error(`${element.name}.${name} must be a whole-value reference`);
+ }
+ return value.path;
+}
+
+function sameType(left: SurfaceResolvedReference["type"], right: SurfaceResolvedReference["type"]): boolean {
+ return left.module.name === right.module.name
+ && left.module.version === right.module.version
+ && left.name === right.name;
+}
+
+function reference(
+ element: StructuredElement,
+ name: string,
+ expected: SurfaceResolvedReference["type"],
+ resolve: (path: string) => SurfaceResolvedReference | undefined,
+): SurfaceResolvedReference {
+ const path = referencePath(element, name);
+ const result = resolve(path);
+ if (result === undefined) throw new Error(`${element.name}.${name} cannot resolve ${path}`);
+ if (!sameType(result.type, expected)) throw new Error(`${element.name}.${name} has the wrong type`);
+ return result;
+}
+
+function bodyText(element: StructuredElement): string {
+ if (element.children.some((child) => child.kind === "element")) {
+ throw new Error(`${element.name} accepts text only`);
+ }
+ const raw = element.children.map((child) => child.kind === "text" ? child.value : "").join("");
+ const lines = raw.replaceAll("\r\n", "\n").split("\n");
+ while (lines[0]?.trim() === "") lines.shift();
+ while (lines.at(-1)?.trim() === "") lines.pop();
+ const indents = lines.filter((line) => line.trim()).map((line) => /^\s*/u.exec(line)?.[0].length ?? 0);
+ const indent = indents.length === 0 ? 0 : Math.min(...indents);
+ return lines.map((line) => line.slice(indent).trimEnd()).join("\n");
+}
+
+function parameterValue(element: StructuredElement): TextScalar {
+ const value = stringAttribute(element, "value");
+ const kind = element.attributes.type ?? "text";
+ if (kind === "text") return value;
+ if (kind === "boolean") {
+ if (value === "true") return true;
+ if (value === "false") return false;
+ throw new Error(`${element.name}.value must be true or false for type boolean`);
+ }
+ if (kind === "number") {
+ const parsed = Number(value);
+ if (!Number.isFinite(parsed)) throw new Error(`${element.name}.value must be a finite number`);
+ return parsed;
+ }
+ throw new Error(`${element.name}.type must be text, number or boolean`);
+}
+
+/** Author one literal graph Text value. */
+export const decodeTextValueSurface: StructuredSurfaceHandler = ({ element }) => {
+ exact(element, ["id"], ["id"]);
+ const id = stringAttribute(element, "id");
+ return {
+ records: [{
+ id,
+ type: textTypes.text,
+ value: { kind: "inline", value: sealText(bodyText(element)) as unknown as CanonicalValue },
+ range: element.range,
+ }],
+ components: [],
+ fragments: [],
+ };
+};
+
+/**
+ * Render one TextTemplate. Param children author scalar bindings; Set/Append
+ * children attach ordinary Text graph edges in source order.
+ */
+export const decodeTextRenderSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
+ exact(element, ["id", "template"], ["id", "template"]);
+ const id = stringAttribute(element, "id");
+ const template = reference(element, "template", textTypes.template, resolveReference);
+ const initial: Record<string, TextBindingValue> = {};
+ const dynamic: Array<{
+ readonly input: string;
+ readonly name: string;
+ readonly mode: "set" | "append";
+ readonly source: SurfaceResolvedReference;
+ }> = [];
+
+ for (const child of element.children) {
+ if (child.kind === "text") {
+ if (child.value.trim().length > 0) throw new Error(`${element.name} accepts only Param, Set or Append children`);
+ continue;
+ }
+ const kind = localName(child.name);
+ if (kind === "Param") {
+ exact(child, ["name", "value", "type"], ["name", "value"]);
+ const name = stringAttribute(child, "name");
+ if (initial[name] !== undefined) throw new Error(`${element.name} repeats Param ${name}`);
+ initial[name] = parameterValue(child);
+ continue;
+ }
+ if (kind !== "Set" && kind !== "Append") {
+ throw new Error(`${element.name} accepts only Param, Set or Append children`);
+ }
+ exact(child, ["name", "text"], ["name", "text"]);
+ const input = `binding-${String(dynamic.length + 1).padStart(4, "0")}`;
+ dynamic.push({
+ input,
+ name: stringAttribute(child, "name"),
+ mode: kind === "Set" ? "set" : "append",
+ source: reference(child, "text", textTypes.text, resolveReference),
+ });
+ }
+
+ const bindingsId = `${id}.bindings`;
+ const fragment = createTextRenderFragment(dynamic.map((item) => ({ name: item.input })));
+ const records = [{
+ id: bindingsId,
+ type: textTypes.bindings,
+ value: { kind: "inline" as const, value: sealTextBindings(initial) as unknown as CanonicalValue },
+ range: element.range,
+ }, ...dynamic.map((item) => ({
+ id: `${id}.${item.input}`,
+ type: textTypes.binding,
+ value: {
+ kind: "inline" as const,
+ value: sealTextBinding({ name: item.name, mode: item.mode }) as unknown as CanonicalValue,
+ },
+ range: element.range,
+ }))];
+ return {
+ records,
+ components: [{
+ id,
+ fragment: fragment.id,
+ inputs: {
+ template: template.ref,
+ bindings: { kind: "record", id: bindingsId },
+ ...Object.fromEntries(dynamic.flatMap((item) => [[
+ `binding:${item.input}:spec`, { kind: "record" as const, id: `${id}.${item.input}` },
+ ], [
+ `binding:${item.input}:text`, item.source.ref,
+ ]])),
+ },
+ outputs: { text: id },
+ range: element.range,
+ }],
+ fragments: [fragment],
+ };
+};
diff --git a/packages/text/src/svs.ts b/packages/text/src/svs.ts
new file mode 100644
index 00000000..7c036946
--- /dev/null
+++ b/packages/text/src/svs.ts
@@ -0,0 +1,189 @@
+import type { SvsRecipe } from "@narratage/svs";
+
+import { sealTextTemplate } from "./program.js";
+import type {
+ TextCondition,
+ TextExpression,
+ TextScalar,
+ TextTemplate,
+} from "./types.js";
+
+type Choice = {
+ readonly id: string;
+ readonly text: string;
+ readonly conditions: Readonly<Record<string, TextScalar>>;
+};
+
+type Block =
+ | { readonly kind: "fixed"; readonly id: string; readonly order: number; readonly text: string }
+ | { readonly kind: "axis"; readonly id: string; readonly order: number; readonly parameter: string; readonly choices: readonly Choice[] }
+ | { readonly kind: "variant"; readonly id: string; readonly order: number; readonly choices: readonly Choice[] }
+ | { readonly kind: "slot"; readonly id: string; readonly order: number; readonly slot: string; readonly optional: boolean; readonly label?: string };
+
+function text(recipe: SvsRecipe, name: string, fallback?: string): string {
+ const value = recipe.properties[name] ?? fallback;
+ if (typeof value !== "string" || value.length === 0) throw new Error(`${recipe.path}.${name} must be non-empty text`);
+ return value;
+}
+
+function integer(recipe: SvsRecipe, name: string): number {
+ const value = recipe.properties[name];
+ if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
+ throw new Error(`${recipe.path}.${name} must be a non-negative integer`);
+ }
+ return value;
+}
+
+function boolean(recipe: SvsRecipe, name: string, fallback: boolean): boolean {
+ const value = recipe.properties[name] ?? fallback;
+ if (typeof value !== "boolean") throw new Error(`${recipe.path}.${name} must be boolean`);
+ return value;
+}
+
+function exactProperties(recipe: SvsRecipe, allowed: ReadonlySet<string>, prefixes: readonly string[] = []): void {
+ const unknown = Object.keys(recipe.properties).filter(
+ (name) => !allowed.has(name) && !prefixes.some((prefix) => name.startsWith(prefix)),
+ );
+ if (unknown.length > 0) throw new Error(`${recipe.path} contains unknown property ${unknown[0]}`);
+}
+
+function choice(recipe: SvsRecipe, id: string): Choice {
+ exactProperties(recipe, new Set(["text"]), ["when-param-", "when-select-"]);
+ const conditions: Record<string, TextScalar> = {};
+ for (const [name, value] of Object.entries(recipe.properties)) {
+ const prefix = name.startsWith("when-param-")
+ ? "when-param-"
+ : name.startsWith("when-select-") ? "when-select-" : undefined;
+ if (prefix === undefined) continue;
+ if (typeof value !== "string" && typeof value !== "boolean" && !(typeof value === "number" && Number.isFinite(value))) {
+ throw new Error(`${recipe.path}.${name} must be a finite scalar`);
+ }
+ conditions[name.slice(prefix.length)] = value;
+ }
+ return { id, text: text(recipe, "text"), conditions };
+}
+
+function equalsConditions(values: Readonly<Record<string, TextScalar>>, subject: string): TextCondition {
+ const conditions = Object.entries(values).map(([binding, value]) => ({
+ kind: "equals" as const,
+ binding,
+ value,
+ }));
+ if (conditions.length === 0) throw new Error(`${subject} must declare at least one condition`);
+ return conditions.length === 1 ? conditions[0]! : { kind: "all", conditions };
+}
+
+function expression(block: Block): TextExpression {
+ if (block.kind === "fixed") return { kind: "literal", value: block.text };
+ if (block.kind === "axis") {
+ return {
+ kind: "choice",
+ cases: block.choices.map((item) => ({
+ when: { kind: "equals", binding: block.parameter, value: item.id },
+ value: { kind: "literal", value: item.text },
+ })),
+ };
+ }
+ if (block.kind === "variant") {
+ return {
+ kind: "choice",
+ cases: block.choices.map((item) => ({
+ when: equalsConditions(item.conditions, `Text Template variant ${block.id}.${item.id}`),
+ value: { kind: "literal", value: item.text },
+ })),
+ };
+ }
+ const value: TextExpression = block.label === undefined
+ ? { kind: "slot", binding: block.slot }
+ : {
+ kind: "sequence",
+ items: [
+ { kind: "literal", value: `${block.label}\n` },
+ { kind: "slot", binding: block.slot },
+ ],
+ };
+ return block.optional
+ ? { kind: "optional", when: { kind: "present", binding: block.slot }, value }
+ : value;
+}
+
+/**
+ * One optional textual convention for authoring a TextTemplate in flat SVS.
+ * SVS remains inert data; this Frontend only lowers fixed/axis/variant/slot
+ * recipes into the ordinary domain-neutral Text expression language.
+ */
+export function textTemplateFromSvsRecipes(
+ recipes: readonly SvsRecipe[],
+ templateId: string,
+): TextTemplate {
+ const prefix = `text-template.${templateId}`;
+ const meta = recipes.find((recipe) => recipe.path === prefix);
+ if (meta === undefined) throw new Error(`Missing ${prefix} metadata Recipe`);
+ exactProperties(meta, new Set(["separator"]), ["default-"]);
+ if (text(meta, "separator", "paragraph") !== "paragraph") throw new Error(`${prefix}.separator must be paragraph`);
+ const defaults: Record<string, TextScalar> = {};
+ for (const [name, value] of Object.entries(meta.properties)) {
+ if (!name.startsWith("default-")) continue;
+ if (typeof value !== "string" && typeof value !== "boolean" && !(typeof value === "number" && Number.isFinite(value))) {
+ throw new Error(`${prefix}.${name} must be a finite scalar`);
+ }
+ defaults[name.slice("default-".length)] = value;
+ }
+ const blockPrefix = `${prefix}.block.`;
+ const choicePrefix = `${prefix}.choice.`;
+ const blocks: Block[] = recipes
+ .filter((recipe) => recipe.path.startsWith(blockPrefix))
+ .map((recipe): Block => {
+ const id = recipe.path.slice(blockPrefix.length);
+ if (id.includes(".")) throw new Error(`${recipe.path} block id cannot contain '.'`);
+ const kind = text(recipe, "kind");
+ const order = integer(recipe, "order");
+ if (kind === "fixed") {
+ exactProperties(recipe, new Set(["kind", "order", "text"]));
+ return { kind, id, order, text: text(recipe, "text") };
+ }
+ if (kind === "axis" || kind === "variant") {
+ exactProperties(recipe, new Set(["kind", "order", ...(kind === "axis" ? ["parameter"] : [])]));
+ const choices = recipes
+ .filter((item) => item.path.startsWith(`${choicePrefix}${id}.`))
+ .map((item) => choice(item, item.path.slice(`${choicePrefix}${id}.`.length)));
+ if (choices.length === 0) throw new Error(`${recipe.path} has no choices`);
+ return kind === "axis"
+ ? { kind, id, order, parameter: text(recipe, "parameter"), choices }
+ : { kind, id, order, choices };
+ }
+ if (kind === "slot") {
+ exactProperties(recipe, new Set(["kind", "order", "slot", "optional", "label"]));
+ const label = recipe.properties.label;
+ return {
+ kind,
+ id,
+ order,
+ slot: text(recipe, "slot"),
+ optional: boolean(recipe, "optional", false),
+ ...(label === undefined ? {} : { label: text(recipe, "label") }),
+ };
+ }
+ throw new Error(`${recipe.path}.kind ${kind} is unsupported`);
+ })
+ .sort((left, right) => left.order - right.order);
+ if (new Set(blocks.map((item) => item.id)).size !== blocks.length) throw new Error(`${prefix} repeats a block id`);
+ if (new Set(blocks.map((item) => item.order)).size !== blocks.length) throw new Error(`${prefix} repeats a block order`);
+ const consumed = new Set([
+ meta.path,
+ ...blocks.map((item) => `${blockPrefix}${item.id}`),
+ ...recipes.filter((recipe) => recipe.path.startsWith(choicePrefix)).map((recipe) => recipe.path),
+ ]);
+ const stray = recipes.find((recipe) => recipe.path.startsWith(`${prefix}.`) && !consumed.has(recipe.path));
+ if (stray !== undefined) throw new Error(`Unrecognized Text Template Recipe ${stray.path}`);
+ return sealTextTemplate({
+ contract: "svml.text-template@1",
+ defaults,
+ root: {
+ kind: "join",
+ separator: "\n\n",
+ omitEmpty: true,
+ items: blocks.map(expression),
+ },
+ });
+}
diff --git a/packages/text/src/types.ts b/packages/text/src/types.ts
index c801a273..2f2a207e 100644
--- a/packages/text/src/types.ts
+++ b/packages/text/src/types.ts
@@ -1,157 +1,86 @@
-import type {
- CanonicalValue,
- Digest,
- ModuleRef,
- ResolvedModuleClosure,
- SourceRange,
- StoredValue,
- SurfaceDeclaration,
- TypeRef,
- TypedModule,
- TypedRecord,
-} from "@narratage/protocol";
-import type {
- AuthorComponent,
- AuthorFrontend,
- AuthorModule,
- AuthorSourceAssetRequest,
- AuthorSourceExport,
- AuthorValueRef,
- Awaitable,
- GraphFragment,
- ResolvedAuthorSourceImport,
-} from "@narratage/elaborator";
-
-export type SourceUnit = {
- readonly name: string;
- readonly text: string;
- /** Whole unmasked source digest supplied by Source Closure compilation. */
- readonly sourceDigest?: Digest;
-};
-
-export type TextImportRequest = {
- readonly kind: "module" | "source";
- readonly from: string;
- readonly alias?: string;
- readonly range: SourceRange;
-};
-
-export type TextDiscovery = {
- readonly imports: readonly TextImportRequest[];
- readonly bodyStart: number;
-};
-
-export type TextReference = {
- readonly kind: "reference";
- readonly path: string;
-};
-
-export type TextAttributeValue = string | TextReference;
-
-export type StructuredText = {
- readonly kind: "text";
+export type Text = {
+ readonly contract: "svml.text@1";
readonly value: string;
- readonly range: SourceRange;
-};
-
-export type StructuredElement = {
- readonly kind: "element";
- readonly name: string;
- readonly attributes: Readonly<Record<string, TextAttributeValue>>;
- readonly children: readonly StructuredNode[];
- readonly range: SourceRange;
-};
-
-export type StructuredNode = StructuredText | StructuredElement;
-
-export type SurfaceRecordDraft = {
- readonly id: string;
- readonly type: TypeRef;
- readonly value: StoredValue;
- readonly range: SourceRange;
-};
-
-/** Source-local diagnostics are removed before the component enters the semantic AuthorModule. */
-export type SurfaceComponentDraft = AuthorComponent & {
- readonly range: SourceRange;
-};
-
-export type SurfaceDecodeOutput = {
- readonly records: readonly SurfaceRecordDraft[];
- readonly components: readonly SurfaceComponentDraft[];
- readonly fragments: readonly GraphFragment[];
- readonly sourceMaps?: readonly CanonicalValue[];
-};
-
-export type RawSurfaceInput = {
- readonly sourceName: string;
- readonly source: string;
- readonly tag: string;
- readonly openingStart: number;
- readonly contentStart: number;
- readonly attributes: Readonly<Record<string, TextAttributeValue>>;
- readonly resolveAsset: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
-};
-
-export type RawSurfaceOutput = SurfaceDecodeOutput & {
- readonly nextOffset: number;
-};
-
-export type StructuredSurfaceInput = {
- readonly sourceName: string;
- readonly element: StructuredElement;
- /**
- * Resolve an explicitly written author reference. Imported record values are
- * available because their SourceUnit has already been compiled and admitted.
- * A component output has a ref and Type but no compile-time Record value.
- */
- readonly resolveReference: (path: string) => SurfaceResolvedReference | undefined;
- readonly resolveAsset: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
};
-export type SurfaceResolvedReference = {
- readonly path: string;
- readonly ref: AuthorValueRef;
- readonly type: TypeRef;
- readonly record?: TypedRecord;
-};
-
-export type RawSurfaceHandler = (input: RawSurfaceInput) => Awaitable<RawSurfaceOutput>;
-export type StructuredSurfaceHandler = (input: StructuredSurfaceInput) => Awaitable<SurfaceDecodeOutput>;
+export type TextScalar = string | number | boolean;
+export type TextBindingValue = TextScalar | readonly TextScalar[];
-export type RegisteredSurface = {
- readonly module: ModuleRef;
- readonly surface: string;
- readonly implementationDigest: Digest;
- readonly mode: SurfaceDeclaration["mode"];
- readonly handler: RawSurfaceHandler | StructuredSurfaceHandler;
+export type TextBindings = {
+ readonly contract: "svml.text-bindings@1";
+ readonly values: Readonly<Record<string, TextBindingValue>>;
};
-export type TextDecodeContext = {
- readonly closure: ResolvedModuleClosure;
- readonly registry: TextSurfaceRegistryLike;
- readonly resolveModule: (request: TextImportRequest) => ModuleRef;
- readonly sourceImports?: readonly ResolvedAuthorSourceImport[];
- readonly resolveAsset?: (request: AuthorSourceAssetRequest) => Awaitable<import("@narratage/elaborator").ResolvedAuthorSourceAsset>;
-};
-
-export type TextDecodeResult = {
- readonly module: TypedModule;
- readonly author: AuthorModule;
- readonly fragments: readonly GraphFragment[];
- readonly exports: readonly AuthorSourceExport[];
- readonly imports: readonly TextImportRequest[];
- readonly frontendClosureDigest: Digest;
- readonly sourceMaps: readonly CanonicalValue[];
-};
-
-export type TextAuthorFrontendOptions = {
- readonly registry: TextSurfaceRegistryLike;
- readonly resolveModule: (request: TextImportRequest) => ModuleRef;
+/** Instructions for attaching one graph Text edge to a named template input. */
+export type TextBinding = {
+ readonly contract: "svml.text-binding@1";
+ readonly name: string;
+ readonly mode: "set" | "append";
+};
+
+export type TextCondition =
+ | { readonly kind: "present"; readonly binding: string }
+ | { readonly kind: "equals"; readonly binding: string; readonly value: TextScalar }
+ | { readonly kind: "all"; readonly conditions: readonly TextCondition[] }
+ | { readonly kind: "any"; readonly conditions: readonly TextCondition[] }
+ | { readonly kind: "not"; readonly condition: TextCondition };
+
+export type TextTransform =
+ | { readonly kind: "trim" }
+ | { readonly kind: "trim-start" }
+ | { readonly kind: "trim-end" }
+ | { readonly kind: "uppercase" }
+ | { readonly kind: "lowercase" }
+ | { readonly kind: "collapse-whitespace" }
+ | { readonly kind: "normalize-newlines" }
+ | { readonly kind: "json-string" };
+
+export type TextExpression =
+ | { readonly kind: "literal"; readonly value: string }
+ | { readonly kind: "slot"; readonly binding: string }
+ | { readonly kind: "sequence"; readonly items: readonly TextExpression[] }
+ | {
+ readonly kind: "join";
+ readonly separator: string;
+ readonly omitEmpty?: boolean;
+ readonly items: readonly TextExpression[];
+ }
+ | {
+ readonly kind: "choice";
+ readonly cases: readonly { readonly when: TextCondition; readonly value: TextExpression }[];
+ readonly otherwise?: TextExpression;
+ }
+ | { readonly kind: "optional"; readonly when: TextCondition; readonly value: TextExpression }
+ | {
+ readonly kind: "each";
+ readonly binding: string;
+ readonly as: string;
+ readonly separator: string;
+ readonly value: TextExpression;
+ }
+ | {
+ readonly kind: "replace";
+ readonly input: TextExpression;
+ readonly replacements: readonly {
+ readonly from: string;
+ readonly to: string;
+ readonly mode: "first" | "all";
+ }[];
+ }
+ | {
+ readonly kind: "transform";
+ readonly input: TextExpression;
+ readonly transforms: readonly TextTransform[];
+ }
+ | { readonly kind: "call"; readonly template: string };
+
+/**
+ * A finite, data-only text program. Definitions share the caller's explicit
+ * bindings; `call` cannot pass hidden state or execute arbitrary code.
+ */
+export type TextTemplate = {
+ readonly contract: "svml.text-template@1";
+ readonly root: TextExpression;
+ readonly defaults?: Readonly<Record<string, TextBindingValue>>;
+ readonly definitions?: Readonly<Record<string, TextExpression>>;
};
-
-export type TextAuthorFrontend = AuthorFrontend;
-
-export interface TextSurfaceRegistryLike {
- resolve(module: ModuleRef, surface: string): RegisteredSurface | undefined;
-}
diff --git a/packages/text/test/text.test.ts b/packages/text/test/text.test.ts
index c595b5f9..733344a4 100644
--- a/packages/text/test/text.test.ts
+++ b/packages/text/test/text.test.ts
@@ -1,258 +1,169 @@
-import { narrativeManifest } from "@narratage/narrative";
-import type { Narrative, NarrativeDialogueExcerpt, NarrativeExcerpt, NarrativeSpeechExcerpt } from "@narratage/narrative";
import assert from "node:assert/strict";
import test from "node:test";
+import { parseStructuredElement } from "@narratage/markup";
+import type { SurfaceResolvedReference } from "@narratage/markup";
-import { createResolvedClosure, digestOf, isDigest, link } from "@narratage/core";
-import type { ModuleManifest } from "@narratage/protocol";
import {
- decodeScriptSurface,
- scriptManifest,
- scriptModuleRef,
- scriptSurfaceImplementationDigest,
-} from "@narratage/script";
-import {
- TextFrontendError,
- TextSurfaceRegistry,
- decodeText,
- parseStructuredElement,
+ bindText,
+ createTextRenderFragment,
+ decodeTextRenderSurface,
+ decodeTextValueSurface,
+ renderText,
+ sealText,
+ sealTextBinding,
+ sealTextBindings,
+ sealTextTemplate,
+ textTypes,
+ verifyTextTemplate,
} from "@narratage/text";
-function scriptContext() {
- const closure = createResolvedClosure([narrativeManifest, scriptManifest]);
- const registry = new TextSurfaceRegistry();
- registry.registerRaw(
- scriptModuleRef,
- "script",
- scriptSurfaceImplementationDigest,
- decodeScriptSurface,
- );
- return {
- closure,
- registry,
- resolveModule: () => scriptModuleRef,
- } as const;
-}
-
-test("Text learns <script> only from an imported Script Manifest", async () => {
- const result = await decodeText(
- {
- name: "talk.svml",
- text: `<svml>
- <import from="@narratage/script@1"/>
-
- <script id="story">
- <opening>
- <ALICE>Hello.
- <BOB>Hi.
- </opening>
- </script>
- </svml>`,
- },
- scriptContext(),
- );
-
- assert.equal(result.module.records.length, 6);
- assert.equal(result.module.records[0]?.id, "story");
- assert.equal(result.module.records[0]?.type.name, "Narrative");
- assert.equal(result.module.records.some((record) =>
- record.id === "story.segment.opening" && record.type.name === "NarrativeExcerpt"), true);
- assert.equal(result.module.records.some((record) =>
- record.id === "story.segment.opening.dialogue" && record.type.name === "NarrativeDialogueExcerpt"), true);
- assert.equal(result.module.records.some((record) =>
- record.id === "story.segment.opening.speech" && record.type.name === "NarrativeSpeechExcerpt"), true);
- assert.equal(result.module.records.some((record) =>
- record.id === "story.caption" && record.type.name === "CaptionDisplaySequence"), true);
- assert.equal(result.module.records.some((record) =>
- record.id === "story.caption.correspondence" && record.type.name === "CaptionCorrespondence"), true);
- assert.equal(result.sourceMaps.length, 1);
- assert.doesNotThrow(() => link(scriptContext().closure, [result.module]));
-});
-
-test("the same Script meaning has the same authored Record digest across reflow", async () => {
- const compact = await decodeText(
- {
- name: "compact.svml",
- text: `<svml><import from="@narratage/script"/><script id="story"><opening><ALICE>Hello.<BOB>Hi.</opening></script></svml>`,
+test("text programs compose nested templates, choices, lists and transforms", () => {
+ const template = sealTextTemplate({
+ contract: "svml.text-template@1",
+ definitions: {
+ dialogue: {
+ kind: "sequence",
+ items: [
+ { kind: "literal", value: "Spoken dialogue — say exactly:\n" },
+ { kind: "transform", input: { kind: "slot", binding: "dialogue" }, transforms: [{ kind: "trim" }] },
+ ],
+ },
},
- scriptContext(),
- );
- const multiline = await decodeText(
- {
- name: "multiline.svml",
- text: `<svml>
- <import from="@narratage/script"/>
- <script id="story">
- <opening>
- <ALICE>Hello.
- <BOB>Hi.
- </opening>
- </script>
- </svml>`,
+ root: {
+ kind: "join",
+ separator: "\n\n",
+ items: [
+ { kind: "slot", binding: "base" },
+ {
+ kind: "choice",
+ cases: [{
+ when: { kind: "equals", binding: "camera", value: "handheld" },
+ value: { kind: "literal", value: "Natural handheld camera movement." },
+ }],
+ otherwise: { kind: "literal", value: "Locked camera." },
+ },
+ {
+ kind: "optional",
+ when: { kind: "present", binding: "references" },
+ value: {
+ kind: "each",
+ binding: "references",
+ as: "reference",
+ separator: "\n",
+ value: { kind: "slot", binding: "reference" },
+ },
+ },
+ { kind: "call", template: "dialogue" },
+ ],
},
- scriptContext(),
- );
-
- assert.equal(compact.module.records[0]?.digest, multiline.module.records[0]?.digest);
- assert.equal(compact.module.records[1]?.digest, multiline.module.records[1]?.digest);
- assert.notEqual(
- compact.module.records[0]?.origin.kind === "authored" ? compact.module.records[0].origin.sourceDigest : undefined,
- multiline.module.records[0]?.origin.kind === "authored" ? multiline.module.records[0].origin.sourceDigest : undefined,
- );
-});
-
-test("without the import, Text has no hard-coded knowledge of Script", async () => {
- await assert.rejects(
- decodeText(
- { name: "unknown.svml", text: "<svml><script><opening>Hello.</opening></script></svml>" },
- scriptContext(),
- ),
- (error: unknown) => error instanceof TextFrontendError && error.code === "TEXT_UNKNOWN_SURFACE",
- );
-});
-
-test("a raw Surface cannot consume the Text document close", async () => {
- const closure = createResolvedClosure([narrativeManifest, scriptManifest]);
- const registry = new TextSurfaceRegistry();
- registry.registerRaw(
- scriptModuleRef,
- "script",
- scriptSurfaceImplementationDigest,
- (input) => ({
- nextOffset: input.source.length,
- records: [],
- components: [],
- fragments: [],
- }),
- );
- await assert.rejects(
- decodeText(
- {
- name: "swallowed.svml",
- text: `<svml><import from="@narratage/script"/><script><opening>Hello.</opening></script></svml>`,
- },
- { closure, registry, resolveModule: () => scriptModuleRef },
- ),
- (error: unknown) => error instanceof TextFrontendError && error.code === "TEXT_ROOT_UNCLOSED",
- );
-});
-
-test("imports are frozen before body decoding", async () => {
- await assert.rejects(
- decodeText(
- {
- name: "late.svml",
- text: `<svml>
- <import from="@narratage/script"/>
- <script><opening>Hello.</opening></script>
- <import from="@narratage/script"/>
- </svml>`,
- },
- scriptContext(),
- ),
- (error: unknown) => error instanceof TextFrontendError && error.code === "TEXT_IMPORT_AFTER_BODY",
- );
+ });
+ const result = renderText(template, sealTextBindings({
+ base: "A concise UGC video.",
+ camera: "handheld",
+ references: ["Image 1 is the person.", "Image 2 is the product."],
+ dialogue: " Hello world. ",
+ }));
+ assert.equal(result.value, [
+ "A concise UGC video.",
+ "Natural handheld camera movement.",
+ "Image 1 is the person.\nImage 2 is the product.",
+ "Spoken dialogue — say exactly:\nHello world.",
+ ].join("\n\n"));
});
-test("a body tag whose name merely starts with import is not treated as an import", async () => {
- await assert.rejects(
- decodeText(
- { name: "important.svml", text: "<svml><important/></svml>" },
- scriptContext(),
- ),
- (error: unknown) => error instanceof TextFrontendError && error.code === "TEXT_UNKNOWN_SURFACE",
- );
+test("graph Text bindings are explicit and cannot overwrite by accident", () => {
+ const initial = sealTextBindings({ base: "first" });
+ assert.throws(() => bindText(initial, sealTextBinding({ name: "base", mode: "set" }), sealText("second")), /already set/u);
+ const appended = bindText(initial, sealTextBinding({ name: "references", mode: "append" }), sealText("one"));
+ const twice = bindText(appended, sealTextBinding({ name: "references", mode: "append" }), sealText("two"));
+ assert.deepEqual(twice.values.references, ["one", "two"]);
+ const fragment = createTextRenderFragment([{ name: "dialogue" }]);
+ assert.equal(fragment.inputs.length, 4);
+ assert.equal(fragment.exports[0]?.type.name, "Text");
});
-test("Text also exposes a generic structured Surface tree", () => {
- const source = {
- name: "structured.svml",
- text: `<card title="Hello" target={story}><line>World</line></card>`,
- };
- const parsed = parseStructuredElement(source, 0);
- assert.equal(parsed.nextOffset, source.text.length);
- assert.equal(parsed.element.name, "card");
- assert.deepEqual(parsed.element.attributes.target, { kind: "reference", path: "story" });
- assert.equal(parsed.element.children[0]?.kind, "element");
+test("text templates reject recursion and ambiguous choices", () => {
+ assert.throws(() => verifyTextTemplate({
+ contract: "svml.text-template@1",
+ root: { kind: "call", template: "loop" },
+ definitions: { loop: { kind: "call", template: "loop" } },
+ }), /cycle/u);
+ assert.throws(() => renderText(sealTextTemplate({
+ contract: "svml.text-template@1",
+ root: {
+ kind: "choice",
+ cases: [
+ { when: { kind: "present", binding: "x" }, value: { kind: "literal", value: "a" } },
+ { when: { kind: "equals", binding: "x", value: true }, value: { kind: "literal", value: "b" } },
+ ],
+ },
+ }), sealTextBindings({ x: true })), /matched 2/u);
});
-test("a module can use Text's generic structured parser without adding another parser", async () => {
- const module = { name: "example.card", version: "1" } as const;
- const type = { module, name: "Card" } as const;
- const implementationDigest = digestOf("example.card/surface@1");
- const manifest: ModuleManifest = {
- format: "svml.module@1",
- name: module.name,
- version: module.version,
- dependencies: [],
- types: [
- {
- name: type.name,
- schema: {
- kind: "object",
- fields: { tag: { schema: { kind: "literal", value: "card" } } },
- },
- },
- ],
- capabilities: [],
- surfaces: [
- {
- name: "card",
- tag: "card",
- mode: "structured",
- outputs: [type],
- implementation: {
- kind: "trusted-frontend-surface",
- locator: "example.card/surface",
- digest: implementationDigest,
- },
- },
- ],
- producers: [],
- };
- const closure = createResolvedClosure([manifest]);
- const registry = new TextSurfaceRegistry();
- registry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
- records: [
- {
- id: "card",
- type,
- value: { kind: "inline", value: { tag: element.name } },
- range: element.range,
- },
- ],
- components: [],
- fragments: [],
- }));
- const result = await decodeText(
- {
- name: "card.svml",
- text: `<svml><import from="example.card@1"/><card title="Hello"><line>World</line></card></svml>`,
+test("one definition keeps lexical each bindings without hiding its global uses", () => {
+ const template = sealTextTemplate({
+ contract: "svml.text-template@1",
+ definitions: { item: { kind: "slot", binding: "item" } },
+ root: {
+ kind: "join",
+ separator: " / ",
+ items: [{
+ kind: "each",
+ binding: "items",
+ as: "item",
+ separator: ", ",
+ value: { kind: "call", template: "item" },
+ }, { kind: "call", template: "item" }],
},
- { closure, registry, resolveModule: () => module },
- );
+ });
+ assert.equal(renderText(template, sealTextBindings({ items: ["one", "two"], item: "global" })).value,
+ "one, two / global");
+});
- assert.equal(result.module.records[0]?.id, "card");
- assert.equal(isDigest(result.module.records[0]?.digest ?? ""), true);
+test("Markup Text Surfaces expose literal and assembled Text as ordinary graph values", async () => {
+ const literal = parseStructuredElement({
+ name: "text.svml",
+ text: `<text:Value id="base">
+ Make a vertical product video.
+ </text:Value>`,
+ }, 0).element;
+ const authored = await decodeTextValueSurface({
+ sourceName: "text.svml",
+ element: literal,
+ resolveReference: () => undefined,
+ resolveAsset: () => { throw new Error("no asset"); },
+ });
+ assert.equal((authored.records[0]?.value as { value?: { value?: string } }).value?.value, "Make a vertical product video.");
- const overreachingRegistry = new TextSurfaceRegistry();
- overreachingRegistry.registerStructured(module, "card", implementationDigest, ({ element }) => ({
- records: [
- {
- id: "other",
- type: { module, name: "Other" },
- value: { kind: "inline", value: { tag: element.name } },
- range: element.range,
- },
- ],
- components: [],
- fragments: [],
- }));
- await assert.rejects(
- decodeText(
- { name: "overreach.svml", text: `<svml><import from="example.card@1"/><card/></svml>` },
- { closure, registry: overreachingRegistry, resolveModule: () => module },
- ),
- (error: unknown) => error instanceof TextFrontendError && error.code === "TEXT_SURFACE_OUTPUT",
- );
+ const assembled = parseStructuredElement({
+ name: "text.svml",
+ text: `<text:Render id="prompt" template={kit}>
+ <text:Param name="camera" value="handheld"/>
+ <text:Param name="strict" value="true" type="boolean"/>
+ <text:Set name="dialogue" text={dialogue}/>
+ <text:Append name="references" text={first}/>
+ <text:Append name="references" text={second}/>
+ </text:Render>`,
+ }, 0).element;
+ const refs = new Map<string, SurfaceResolvedReference>([
+ ["kit", { path: "kit", ref: { kind: "record", id: "kit" }, type: textTypes.template }],
+ ["dialogue", { path: "dialogue", ref: { kind: "component-output", component: "script", output: "text" }, type: textTypes.text }],
+ ["first", { path: "first", ref: { kind: "record", id: "first" }, type: textTypes.text }],
+ ["second", { path: "second", ref: { kind: "record", id: "second" }, type: textTypes.text }],
+ ]);
+ const result = await decodeTextRenderSurface({
+ sourceName: "text.svml",
+ element: assembled,
+ resolveReference: (path) => refs.get(path),
+ resolveAsset: () => { throw new Error("no asset"); },
+ });
+ assert.equal(result.components.length, 1);
+ assert.deepEqual(result.components[0]?.outputs, { text: "prompt" });
+ assert.deepEqual(result.components[0]?.inputs["binding:binding-0001:text"], {
+ kind: "component-output", component: "script", output: "text",
+ });
+ const initial = result.records.find((record) => record.id === "prompt.bindings");
+ assert.deepEqual((initial?.value as { value?: { values?: unknown } }).value?.values,
+ { camera: "handheld", strict: true });
+ assert.equal(result.records.filter((record) => record.type.name === "TextBinding").length, 3);
});
diff --git a/packages/typography-track/README.md b/packages/typography-track/README.md
new file mode 100644
index 00000000..c21999c1
--- /dev/null
+++ b/packages/typography-track/README.md
@@ -0,0 +1,45 @@
+# `@narratage/typography-track`
+
+Official provider-free Text overlay package. It owns a typed `TypographyTrackProgram` and lowers every
+item into an independently timed and stacked Present in the public VisualTrack contract.
+
+The current `TypographyTrackProgram@1` implements the complete pre-release Point/Area/Path author model:
+bounded rich documents, exact font stacks, ordered Paint, frame/content/paragraph/line/run/word/
+grapheme boxes, deterministic overflow and Unicode-aware local motion. Its author Surface remains
+pre-release even though the repository-internal Track and Visual IR waist is now frozen.
+
+An item spanning the complete ProgramSpace is a persistent overlay; a shorter item is timed. They
+are not different Track kinds. Timing is projected through `@narratage/temporal`, and placement is
+an explicit `SpatialFrame` input from `@narratage/spatial`; neither is hidden in the appearance
+Recipe. The package exposes semantic typography rather than a rendering callback, arbitrary CSS or
+cross-Track access.
+
+The provider-free `<text:Track>` Surface validates `.svs` Recipes, accepts Program, Selection,
+Moment or explicit point-expression timing plus explicit Point/Frame/Path edges, and produces the
+same TypographyTrackProgram without changing Core or Film. `<text:Mask>` is a separate component that
+consumes one authored Text Program and one owned still Surface; advanced/multiline/Path masks fail
+closed and materialize through an independent package.
+
+Content has two explicit author forms:
+
+```svml
+<import as="copy" from="@narratage/text@1"/>
+<import as="typo" from="@narratage/typography-track@1"/>
+
+<copy:Value id="headline">Intent, not timelines.</copy:Value>
+
+<typo:Track id="titles" space={speech.space}>
+ <typo:Area id="headline" content={headline}
+ placement={layout.headline} style={title-style} during="program"/>
+
+ <typo:Area id="editorial" placement={layout.editorial}
+ style={body-style} during="program">
+ <typo:P>Rich <typo:Span style={accent}>authored</typo:Span> typography.</typo:P>
+ </typo:Area>
+</typo:Track>
+```
+
+`content={...}` consumes an ordinary graph `Text` and is exclusive with body content. It becomes
+one plain document run; the Track still owns placement, timing, appearance and motion. Inline body
+content owns a bounded rich `VisualTextDocument`. Dynamic rich text is intentionally not smuggled
+through generic `Text`; it would require a separate explicit rich-document contract.
diff --git a/packages/text-track/package.json b/packages/typography-track/package.json
similarity index 86%
rename from packages/text-track/package.json
rename to packages/typography-track/package.json
index 12c065b5..685d7695 100644
--- a/packages/text-track/package.json
+++ b/packages/typography-track/package.json
@@ -1,5 +1,5 @@
{
- "name": "@narratage/text-track",
+ "name": "@narratage/typography-track",
"version": "0.0.0-dev",
"private": true,
"type": "module",
@@ -21,7 +21,8 @@
"@narratage/spatial": "workspace:*",
"@narratage/svs": "workspace:*",
"@narratage/temporal": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/text": "workspace:*",
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/hyperframes": "workspace:*"
diff --git a/packages/typography-track/src/activation.ts b/packages/typography-track/src/activation.ts
new file mode 100644
index 00000000..7f4be3a1
--- /dev/null
+++ b/packages/typography-track/src/activation.ts
@@ -0,0 +1,37 @@
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
+import {
+ decodeTypographyMotionSurface,
+ decodeTypographyMaskSurface,
+ decodeTypographyStyleSurface,
+ decodeTypographyTrackSurface,
+ typographyTrackComponent,
+ typographyTrackManifest,
+ typographyTrackModuleRef,
+ typographyTrackSurfaceImplementationDigests,
+} from "./index.js";
+
+export const svmlPackage = {
+ format: "svml.node-package@1" as const,
+ name: "@narratage/typography-track",
+ modules: [{ manifest: typographyTrackManifest, specifiers: ["@narratage/typography-track", "@narratage/typography-track@1"] }],
+ components: [typographyTrackComponent],
+ hostFacets: [
+ createMarkupSurfaceHostFacet({
+ module: typographyTrackModuleRef, surface: "style", mode: "structured",
+ implementationDigest: typographyTrackSurfaceImplementationDigests.style, handler: decodeTypographyStyleSurface,
+ }),
+ createMarkupSurfaceHostFacet({
+ module: typographyTrackModuleRef, surface: "motion", mode: "structured",
+ implementationDigest: typographyTrackSurfaceImplementationDigests.motion, handler: decodeTypographyMotionSurface,
+ }),
+ createMarkupSurfaceHostFacet({
+ module: typographyTrackModuleRef, surface: "track", mode: "structured",
+ implementationDigest: typographyTrackSurfaceImplementationDigests.track, handler: decodeTypographyTrackSurface,
+ }),
+ createMarkupSurfaceHostFacet({
+ module: typographyTrackModuleRef, surface: "mask", mode: "structured",
+ implementationDigest: typographyTrackSurfaceImplementationDigests.mask, handler: decodeTypographyMaskSurface,
+ }),
+ ],
+};
+export default svmlPackage;
diff --git a/packages/text-track/src/component.ts b/packages/typography-track/src/component.ts
similarity index 64%
rename from packages/text-track/src/component.ts
rename to packages/typography-track/src/component.ts
index fbf18cc3..6151a6e9 100644
--- a/packages/text-track/src/component.ts
+++ b/packages/typography-track/src/component.ts
@@ -5,9 +5,10 @@ import type { CompleteSemanticMap } from "@narratage/semantic-map";
import type { CompositableSurfaceRef } from "@narratage/media";
import type { SpatialFrame, SpatialPath, SpatialPoint } from "@narratage/spatial";
import type { StoredValue } from "@narratage/protocol";
+import type { Text } from "@narratage/text";
import { canonicalize } from "@narratage/protocol";
-import { textTrackProducers } from "./manifest.js";
+import { typographyTrackProducers } from "./manifest.js";
import {
appendMomentTextItem,
appendProgramTextItem,
@@ -18,27 +19,30 @@ import {
bindPathTextPlacementImplementationDigest,
bindPointTextPlacement,
bindPointTextPlacementImplementationDigest,
- createTextTrackSet,
- createTextTrackSetImplementationDigest,
- finalizeTextTrack,
- finalizeTextTrackImplementationDigest,
- renderTextTrack,
- renderTextTrackImplementationDigest,
+ createTypographyTrackSet,
+ createTypographyTrackSetImplementationDigest,
+ finalizeTypographyTrack,
+ finalizeTypographyTrackImplementationDigest,
+ renderTypographyTrack,
+ renderTypographyTrackImplementationDigest,
renderTextMaskTrack,
renderTextMaskTrackImplementationDigest,
appendMomentTextItemImplementationDigest,
appendProgramTextItemImplementationDigest,
appendSelectionTextItemImplementationDigest,
+ materializePlainTextItem,
+ materializePlainTextItemImplementationDigest,
} from "./program.js";
import type {
TextItemSpec,
+ PlainTextItemSpec,
TextPlacement,
TextMotion,
TextMaskSpec,
TextStyle,
- TextTrackHeader,
- TextTrackProgram,
- TextTrackSet,
+ TypographyTrackHeader,
+ TypographyTrackProgram,
+ TypographyTrackSet,
} from "./types.js";
function inline<T>(value: StoredValue | undefined, subject: string): T {
@@ -48,35 +52,43 @@ function inline<T>(value: StoredValue | undefined, subject: string): T {
const output = (value: unknown) => ({ kind: "inline" as const, value: canonicalize(value) });
-export const textTrackComponent = {
- name: "@narratage/text-track",
+export const typographyTrackComponent = {
+ name: "@narratage/typography-track",
producers: [
{
- producer: textTrackProducers.bindPoint,
+ producer: typographyTrackProducers.materializePlainItem,
+ implementationDigest: materializePlainTextItemImplementationDigest,
+ handler: ({ inputs }) => ({ outputs: { spec: output(materializePlainTextItem(
+ inline<PlainTextItemSpec>(inputs.spec?.value, "PlainTextItemSpec"),
+ inline<Text>(inputs.content?.value, "Text"),
+ )) }, needs: {} }),
+ },
+ {
+ producer: typographyTrackProducers.bindPoint,
implementationDigest: bindPointTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindPointTextPlacement(inline<SpatialPoint>(inputs.point?.value, "SpatialPoint"))) }, needs: {} }),
},
{
- producer: textTrackProducers.bindArea,
+ producer: typographyTrackProducers.bindArea,
implementationDigest: bindAreaTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindAreaTextPlacement(inline<SpatialFrame>(inputs.frame?.value, "SpatialFrame"))) }, needs: {} }),
},
{
- producer: textTrackProducers.bindPath,
+ producer: typographyTrackProducers.bindPath,
implementationDigest: bindPathTextPlacementImplementationDigest,
handler: ({ inputs }) => ({ outputs: { placement: output(bindPathTextPlacement(inline<SpatialPath>(inputs.path?.value, "SpatialPath"))) }, needs: {} }),
},
{
- producer: textTrackProducers.createSet,
- implementationDigest: createTextTrackSetImplementationDigest,
- handler: () => ({ outputs: { set: output(createTextTrackSet()) }, needs: {} }),
+ producer: typographyTrackProducers.createSet,
+ implementationDigest: createTypographyTrackSetImplementationDigest,
+ handler: () => ({ outputs: { set: output(createTypographyTrackSet()) }, needs: {} }),
},
{
- producer: textTrackProducers.appendProgram,
+ producer: typographyTrackProducers.appendProgram,
implementationDigest: appendProgramTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendProgramTextItem(
- inline<TextTrackSet>(inputs.set?.value, "TextTrackSet"),
- inline<TextTrackHeader>(inputs.header?.value, "TextTrackHeader"),
+ inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
+ inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
inline<TextPlacement>(inputs.placement?.value, "TextPlacement"),
inline<TextItemSpec>(inputs.spec?.value, "TextItemSpec"),
@@ -85,11 +97,11 @@ export const textTrackComponent = {
)) }, needs: {} }),
},
{
- producer: textTrackProducers.appendSelection,
+ producer: typographyTrackProducers.appendSelection,
implementationDigest: appendSelectionTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendSelectionTextItem(
- inline<TextTrackSet>(inputs.set?.value, "TextTrackSet"),
- inline<TextTrackHeader>(inputs.header?.value, "TextTrackHeader"),
+ inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
+ inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
inline<NarrativeSelectionRef>(inputs.selection?.value, "NarrativeSelection"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
@@ -100,11 +112,11 @@ export const textTrackComponent = {
)) }, needs: {} }),
},
{
- producer: textTrackProducers.appendMoment,
+ producer: typographyTrackProducers.appendMoment,
implementationDigest: appendMomentTextItemImplementationDigest,
handler: ({ inputs }) => ({ outputs: { set: output(appendMomentTextItem(
- inline<TextTrackSet>(inputs.set?.value, "TextTrackSet"),
- inline<TextTrackHeader>(inputs.header?.value, "TextTrackHeader"),
+ inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
+ inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
inline<CompleteSemanticMap>(inputs.map?.value, "CompleteSemanticMap"),
inline<NarrativeMomentRef>(inputs.moment?.value, "NarrativeMoment"),
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
@@ -115,27 +127,27 @@ export const textTrackComponent = {
)) }, needs: {} }),
},
{
- producer: textTrackProducers.finalize,
- implementationDigest: finalizeTextTrackImplementationDigest,
- handler: ({ inputs }) => ({ outputs: { program: output(finalizeTextTrack(
- inline<TextTrackHeader>(inputs.header?.value, "TextTrackHeader"),
- inline<TextTrackSet>(inputs.set?.value, "TextTrackSet"),
+ producer: typographyTrackProducers.finalize,
+ implementationDigest: finalizeTypographyTrackImplementationDigest,
+ handler: ({ inputs }) => ({ outputs: { program: output(finalizeTypographyTrack(
+ inline<TypographyTrackHeader>(inputs.header?.value, "TypographyTrackHeader"),
+ inline<TypographyTrackSet>(inputs.set?.value, "TypographyTrackSet"),
)) }, needs: {} }),
},
{
- producer: textTrackProducers.render,
- implementationDigest: renderTextTrackImplementationDigest,
- handler: ({ inputs }) => ({ outputs: { track: output(renderTextTrack(
+ producer: typographyTrackProducers.render,
+ implementationDigest: renderTypographyTrackImplementationDigest,
+ handler: ({ inputs }) => ({ outputs: { track: output(renderTypographyTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
- inline<TextTrackProgram>(inputs.program?.value, "TextTrackProgram"),
+ inline<TypographyTrackProgram>(inputs.program?.value, "TypographyTrackProgram"),
)) }, needs: {} }),
},
{
- producer: textTrackProducers.renderMask,
+ producer: typographyTrackProducers.renderMask,
implementationDigest: renderTextMaskTrackImplementationDigest,
handler: ({ inputs }) => ({ outputs: { track: output(renderTextMaskTrack(
inline<ProgramSpace>(inputs.space?.value, "ProgramSpace"),
- inline<TextTrackProgram>(inputs.program?.value, "TextTrackProgram"),
+ inline<TypographyTrackProgram>(inputs.program?.value, "TypographyTrackProgram"),
inline<CompositableSurfaceRef>(inputs.material?.value, "CompositableSurfaceRef"),
inline<TextMaskSpec>(inputs.spec?.value, "TextMaskSpec"),
)) }, needs: {} }),
diff --git a/packages/text-track/src/fragment.ts b/packages/typography-track/src/fragment.ts
similarity index 67%
rename from packages/text-track/src/fragment.ts
rename to packages/typography-track/src/fragment.ts
index 4640d795..82c0929d 100644
--- a/packages/text-track/src/fragment.ts
+++ b/packages/typography-track/src/fragment.ts
@@ -3,21 +3,21 @@ import { compositionTypes } from "@narratage/composition";
import type { VisualTrack } from "@narratage/composition";
import { sealGraphFragment } from "@narratage/elaborator";
-import { textTrackProducers, textTrackTypes } from "./manifest.js";
+import { typographyTrackProducers, typographyTrackTypes } from "./manifest.js";
const input = (name: string) => ({ kind: "fragment-input" as const, name });
const operation = (id: string) => ({ kind: "fragment-operation" as const, operation: id });
-/** Provider-free official lowering from TextTrackProgram to one peer VisualTrack. */
-export const textTrackFragment = sealGraphFragment({
- name: "@narratage/text-track/render@1",
+/** Provider-free official lowering from TypographyTrackProgram to one peer VisualTrack. */
+export const typographyTrackFragment = sealGraphFragment({
+ name: "@narratage/typography-track/render@1",
inputs: [
{ name: "space", type: programSpaceTypes.programSpace },
- { name: "program", type: textTrackTypes.program },
+ { name: "program", type: typographyTrackTypes.program },
],
operations: [{
id: "render",
- producer: textTrackProducers.render,
+ producer: typographyTrackProducers.render,
inputs: { space: input("space"), program: input("program") },
result: { kind: "output", name: "track" },
}],
diff --git a/packages/typography-track/src/index.ts b/packages/typography-track/src/index.ts
new file mode 100644
index 00000000..6e065316
--- /dev/null
+++ b/packages/typography-track/src/index.ts
@@ -0,0 +1,60 @@
+export { typographyTrackFragment } from "./fragment.js";
+export { typographyTrackComponent } from "./component.js";
+export {
+ typographyTrackManifest,
+ typographyTrackManifestDigest,
+ typographyTrackModuleRef,
+ typographyTrackProducers,
+ typographyTrackProgramSchema,
+ typographyTrackSurfaceImplementationDigests,
+ typographyTrackTypes,
+} from "./manifest.js";
+export {
+ appendMomentTextItem,
+ appendMomentTextItemImplementationDigest,
+ appendProgramTextItem,
+ appendProgramTextItemImplementationDigest,
+ appendSelectionTextItem,
+ appendSelectionTextItemImplementationDigest,
+ assertPlainTextItemSpec,
+ bindAreaTextPlacement,
+ bindAreaTextPlacementImplementationDigest,
+ bindPathTextPlacement,
+ bindPathTextPlacementImplementationDigest,
+ bindPointTextPlacement,
+ bindPointTextPlacementImplementationDigest,
+ assertTextItemSpec,
+ assertTextMaskSpec,
+ assertTextMotion,
+ assertTextPlacement,
+ assertTextStyle,
+ assertTypographyTrackHeader,
+ assertTypographyTrackProgramIdentity,
+ assertTypographyTrackSet,
+ createTypographyTrackSet,
+ createTypographyTrackSetImplementationDigest,
+ finalizeTypographyTrack,
+ finalizeTypographyTrackImplementationDigest,
+ renderTypographyTrack,
+ renderTypographyTrackImplementationDigest,
+ renderTextMaskTrack,
+ renderTextMaskTrackImplementationDigest,
+ sealTypographyTrackProgram,
+ sealTypographyTrackHeader,
+ sealTextItemSpec,
+ sealPlainTextItemSpec,
+ materializePlainTextItem,
+ materializePlainTextItemImplementationDigest,
+ sealTextMotion,
+ sealTextMaskSpec,
+ sealTextPlacement,
+ sealTextStyle,
+ stillTextMotion,
+} from "./program.js";
+export {
+ decodeTypographyMotionSurface,
+ decodeTypographyStyleSurface,
+ decodeTypographyTrackSurface,
+ decodeTypographyMaskSurface,
+} from "./surface.js";
+export type * from "./types.js";
diff --git a/packages/typography-track/src/manifest.ts b/packages/typography-track/src/manifest.ts
new file mode 100644
index 00000000..6c632c21
--- /dev/null
+++ b/packages/typography-track/src/manifest.ts
@@ -0,0 +1,218 @@
+import { narrativeDependency, narrativeTypes } from "@narratage/narrative";
+import { programSpaceDependency, programSpaceTypes } from "@narratage/program-space";
+import { semanticMapDependency, semanticMapTypes } from "@narratage/semantic-map";
+import {
+ compositionDependency,
+ compositionTypes,
+ visualTextDocumentSchema,
+ visualTextFlowSchema,
+ visualTextPaintSchema,
+ visualTextSequenceSchema,
+ visualTextTypographySchema,
+} from "@narratage/composition";
+import {
+ spatialDependency,
+ spatialFrameSchema,
+ spatialPathSchema,
+ spatialPointSchema,
+ spatialTypes,
+} from "@narratage/spatial";
+import { VISUAL_STYLE_ENUM_VALUES_V1, VISUAL_STYLE_NAMES_V1 } from "@narratage/visual-ir";
+import { mediaDependency, mediaTypes } from "@narratage/media";
+import { textDependency, textTypes } from "@narratage/text";
+import { digestOf } from "@narratage/protocol";
+import type { ModuleManifest, ProducerRef, TypeRef, ValueSchema } from "@narratage/protocol";
+
+import {
+ appendMomentTextItemImplementationDigest,
+ appendProgramTextItemImplementationDigest,
+ appendSelectionTextItemImplementationDigest,
+ bindAreaTextPlacementImplementationDigest,
+ bindPathTextPlacementImplementationDigest,
+ bindPointTextPlacementImplementationDigest,
+ createTypographyTrackSetImplementationDigest,
+ finalizeTypographyTrackImplementationDigest,
+ renderTypographyTrackImplementationDigest,
+ renderTextMaskTrackImplementationDigest,
+ materializePlainTextItemImplementationDigest,
+} from "./program.js";
+
+export const typographyTrackModuleRef = { name: "@narratage/typography-track", version: "1" } as const;
+export const typographyTrackTypes = {
+ style: { module: typographyTrackModuleRef, name: "TextStyle" },
+ motion: { module: typographyTrackModuleRef, name: "TextMotion" },
+ placement: { module: typographyTrackModuleRef, name: "TextPlacement" },
+ program: { module: typographyTrackModuleRef, name: "TypographyTrackProgram" },
+ header: { module: typographyTrackModuleRef, name: "TypographyTrackHeader" },
+ itemSpec: { module: typographyTrackModuleRef, name: "TextItemSpec" },
+ plainItemSpec: { module: typographyTrackModuleRef, name: "PlainTextItemSpec" },
+ set: { module: typographyTrackModuleRef, name: "TypographyTrackSet" },
+ maskSpec: { module: typographyTrackModuleRef, name: "TextMaskSpec" },
+} satisfies Record<string, TypeRef>;
+
+export const typographyTrackProducers = {
+ bindPoint: { module: typographyTrackModuleRef, name: "bind-point-placement" },
+ bindArea: { module: typographyTrackModuleRef, name: "bind-area-placement" },
+ bindPath: { module: typographyTrackModuleRef, name: "bind-path-placement" },
+ createSet: { module: typographyTrackModuleRef, name: "create-typography-track-set" },
+ appendProgram: { module: typographyTrackModuleRef, name: "append-program-text-item" },
+ appendSelection: { module: typographyTrackModuleRef, name: "append-selection-text-item" },
+ appendMoment: { module: typographyTrackModuleRef, name: "append-moment-text-item" },
+ finalize: { module: typographyTrackModuleRef, name: "finalize-typography-track" },
+ render: { module: typographyTrackModuleRef, name: "render-typography-track" },
+ renderMask: { module: typographyTrackModuleRef, name: "render-text-mask-track" },
+ materializePlainItem: { module: typographyTrackModuleRef, name: "materialize-plain-text-item" },
+} satisfies Record<string, ProducerRef>;
+
+const string = { kind: "string", minLength: 1 } as const;
+const number = { kind: "number" } as const;
+const positive = { kind: "number", minimum: 0.000001 } as const;
+const integer = { kind: "number", integer: true, minimum: 0 } as const;
+const positiveInteger = { kind: "number", integer: true, minimum: 1 } as const;
+const signedInteger = { kind: "number", integer: true } as const;
+const object = (fields: Readonly<Record<string, { readonly schema: ValueSchema; readonly optional?: boolean }>>): ValueSchema => ({ kind: "object", fields });
+const enumString = (values: readonly string[]): ValueSchema => ({ kind: "string", enum: values });
+
+const duration: ValueSchema = { kind: "oneOf", variants: [
+ object({ unit: { schema: { kind: "literal", value: "frames" } }, value: { schema: integer } }),
+ object({ unit: { schema: { kind: "literal", value: "milliseconds" } }, value: { schema: number } }),
+ object({ unit: { schema: { kind: "literal", value: "seconds" } }, numerator: { schema: signedInteger }, denominator: { schema: positiveInteger } }),
+] };
+const point: ValueSchema = { kind: "oneOf", variants: [
+ ...["program.start", "program.end", "selection.start", "selection.end", "moment.cue"].map((ref) => object({ ref: { schema: { kind: "literal", value: ref } }, offset: { schema: duration, optional: true } })),
+ object({ ref: { schema: { kind: "literal", value: "absolute" } }, at: { schema: duration } }),
+] };
+const projection = object({ start: { schema: point }, end: { schema: point } });
+const expansion: ValueSchema = { kind: "oneOf", variants: [
+ object({ kind: { schema: { kind: "literal", value: "one" } } }),
+ object({ kind: { schema: { kind: "literal", value: "each" } } }),
+] };
+
+const styleDeclaration: ValueSchema = { kind: "oneOf", variants: VISUAL_STYLE_NAMES_V1.map((name) => object({
+ name: { schema: { kind: "literal", value: name } },
+ value: { schema: Object.hasOwn(VISUAL_STYLE_ENUM_VALUES_V1, name)
+ ? { kind: "string", enum: VISUAL_STYLE_ENUM_VALUES_V1[name as keyof typeof VISUAL_STYLE_ENUM_VALUES_V1] }
+ : { kind: "oneOf", variants: [{ kind: "string" }, { kind: "number" }] } },
+})) };
+const visualKeyframe = object({
+ atFrame: { schema: integer },
+ easing: { schema: enumString(["linear", "ease-in", "ease-out", "ease-in-out"]), optional: true },
+ style: { schema: { kind: "array", minItems: 1, items: styleDeclaration } },
+});
+const visualAnimation = object({ keyframes: { schema: { kind: "array", minItems: 2, items: visualKeyframe } } });
+
+const areaFlow = (() => {
+ const schema = visualTextFlowSchema;
+ if (schema.kind !== "object") throw new Error("Visual Text flow schema must be an object.");
+ const { form: _form, ...fields } = schema.fields;
+ return object(fields);
+})();
+
+export const textStyleSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.text-style@1" } },
+ id: { schema: string }, stackingOrder: { schema: signedInteger },
+ typography: { schema: visualTextTypographySchema },
+ paints: { schema: { kind: "array", items: visualTextPaintSchema } },
+ area: { schema: areaFlow },
+ point: { schema: object({ anchorInline: { schema: enumString(["start", "center", "end"]) }, anchorBlock: { schema: enumString(["start", "center", "end"]) } }) },
+ path: { schema: object({
+ side: { schema: enumString(["left", "right"]) }, orientation: { schema: enumString(["follow", "upright"]) },
+ startMarginPx: { schema: { kind: "number", minimum: 0 } }, endMarginPx: { schema: { kind: "number", minimum: 0 } },
+ align: { schema: enumString(["start", "center", "end"]) }, reverse: { schema: { kind: "boolean" } },
+ overflow: { schema: enumString(["visible", "clip"]) },
+ }) },
+});
+
+export const textMotionSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.text-motion@1" } }, id: { schema: string },
+ item: { schema: visualAnimation, optional: true },
+ sequences: { schema: { kind: "array", items: visualTextSequenceSchema } },
+ pathMargin: { schema: object({ keyframes: { schema: { kind: "array", minItems: 2, items: object({
+ atFrame: { schema: integer }, startMarginPx: { schema: { kind: "number", minimum: 0 } },
+ easing: { schema: enumString(["linear", "ease-in", "ease-out", "ease-in-out"]), optional: true },
+ }) } } }), optional: true },
+});
+
+const geometry: ValueSchema = { kind: "oneOf", variants: [
+ object({ kind: { schema: { kind: "literal", value: "point" } }, point: { schema: spatialPointSchema } }),
+ object({ kind: { schema: { kind: "literal", value: "area" } }, frame: { schema: spatialFrameSchema } }),
+ object({ kind: { schema: { kind: "literal", value: "path" } }, path: { schema: spatialPathSchema } }),
+] };
+export const textPlacementSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.text-placement@1" } }, geometry: { schema: geometry },
+});
+export const textItemSpecSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.text-item-spec@1" } }, id: { schema: string },
+ document: { schema: visualTextDocumentSchema },
+ projection: { schema: projection }, expansion: { schema: expansion },
+});
+export const plainTextItemSpecSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.plain-text-item-spec@1" } }, id: { schema: string },
+ projection: { schema: projection }, expansion: { schema: expansion },
+});
+const span = object({ startFrame: { schema: integer }, endFrameExclusive: { schema: positiveInteger } });
+const item = object({
+ id: { schema: string }, sourceOccurrenceId: { schema: string }, span: { schema: span }, geometry: { schema: geometry },
+ document: { schema: visualTextDocumentSchema }, style: { schema: textStyleSchema }, motion: { schema: textMotionSchema },
+ tieBreak: { schema: string },
+});
+export const typographyTrackProgramSchema: ValueSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.typography-track-program@1" } }, id: { schema: string },
+ items: { schema: { kind: "array", minItems: 1, items: item } },
+});
+const typographyTrackHeaderSchema = object({ contract: { schema: { kind: "literal", value: "svml.typography-track-header@1" } }, id: { schema: string } });
+const typographyTrackSetSchema = object({ contract: { schema: { kind: "literal", value: "svml.typography-track-set@1" } }, items: { schema: { kind: "array", items: item } } });
+const textMaskSpecSchema = object({
+ contract: { schema: { kind: "literal", value: "svml.text-mask-spec@1" } },
+ id: { schema: string }, mode: { schema: enumString(["alpha", "luminance"]) },
+ materialFit: { schema: enumString(["contain", "cover", "fill"]) },
+});
+
+export const typographyTrackSurfaceImplementationDigests = {
+ style: digestOf("@narratage/typography-track/style-surface@1"),
+ motion: digestOf("@narratage/typography-track/motion-surface@1"),
+ track: digestOf("@narratage/typography-track/complete-track-surface@1"),
+ mask: digestOf("@narratage/typography-track/owned-mask-surface@1"),
+} as const;
+
+const registered = (locator: string, digest: ReturnType<typeof digestOf>) => ({ kind: "registered" as const, locator, digest });
+
+export const typographyTrackManifest: ModuleManifest = {
+ format: "svml.module@1",
+ name: typographyTrackModuleRef.name,
+ version: typographyTrackModuleRef.version,
+ dependencies: [programSpaceDependency, narrativeDependency, semanticMapDependency, spatialDependency, mediaDependency, compositionDependency, textDependency],
+ types: [
+ { name: typographyTrackTypes.style.name, schema: textStyleSchema },
+ { name: typographyTrackTypes.motion.name, schema: textMotionSchema },
+ { name: typographyTrackTypes.placement.name, schema: textPlacementSchema },
+ { name: typographyTrackTypes.program.name, schema: typographyTrackProgramSchema },
+ { name: typographyTrackTypes.header.name, schema: typographyTrackHeaderSchema },
+ { name: typographyTrackTypes.itemSpec.name, schema: textItemSpecSchema },
+ { name: typographyTrackTypes.plainItemSpec.name, schema: plainTextItemSpecSchema },
+ { name: typographyTrackTypes.set.name, schema: typographyTrackSetSchema },
+ { name: typographyTrackTypes.maskSpec.name, schema: textMaskSpecSchema },
+ ],
+ capabilities: [],
+ surfaces: [
+ { name: "style", tag: "Style", mode: "structured", outputs: [typographyTrackTypes.style], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/style-surface", digest: typographyTrackSurfaceImplementationDigests.style } },
+ { name: "motion", tag: "Motion", mode: "structured", outputs: [typographyTrackTypes.motion], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/motion-surface", digest: typographyTrackSurfaceImplementationDigests.motion } },
+ { name: "track", tag: "Track", mode: "structured", outputs: [typographyTrackTypes.header, typographyTrackTypes.itemSpec, typographyTrackTypes.plainItemSpec, typographyTrackTypes.motion, typographyTrackTypes.set, typographyTrackTypes.placement, typographyTrackTypes.program, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/complete-track-surface", digest: typographyTrackSurfaceImplementationDigests.track } },
+ { name: "mask", tag: "Mask", mode: "structured", outputs: [typographyTrackTypes.maskSpec, compositionTypes.visualTrack], implementation: { kind: "trusted-frontend-surface", locator: "@narratage/typography-track/owned-mask-surface", digest: typographyTrackSurfaceImplementationDigests.mask } },
+ ],
+ producers: [
+ { name: typographyTrackProducers.materializePlainItem.name, inputs: [{ name: "spec", type: typographyTrackTypes.plainItemSpec }, { name: "content", type: textTypes.text }], outputs: [{ name: "spec", type: typographyTrackTypes.itemSpec }], needs: [], implementation: registered("@narratage/typography-track/materialize-plain-text-item", materializePlainTextItemImplementationDigest) },
+ { name: typographyTrackProducers.bindPoint.name, inputs: [{ name: "point", type: spatialTypes.point }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-point-placement", bindPointTextPlacementImplementationDigest) },
+ { name: typographyTrackProducers.bindArea.name, inputs: [{ name: "frame", type: spatialTypes.frame }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-area-placement", bindAreaTextPlacementImplementationDigest) },
+ { name: typographyTrackProducers.bindPath.name, inputs: [{ name: "path", type: spatialTypes.path }], outputs: [{ name: "placement", type: typographyTrackTypes.placement }], needs: [], implementation: registered("@narratage/typography-track/bind-path-placement", bindPathTextPlacementImplementationDigest) },
+ { name: typographyTrackProducers.createSet.name, inputs: [], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered("@narratage/typography-track/create-set", createTypographyTrackSetImplementationDigest) },
+ { name: typographyTrackProducers.appendProgram.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered("@narratage/typography-track/append-program", appendProgramTextItemImplementationDigest) },
+ { name: typographyTrackProducers.appendSelection.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "selection", type: narrativeTypes.selection }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered("@narratage/typography-track/append-selection", appendSelectionTextItemImplementationDigest) },
+ { name: typographyTrackProducers.appendMoment.name, inputs: [{ name: "set", type: typographyTrackTypes.set }, { name: "header", type: typographyTrackTypes.header }, { name: "map", type: semanticMapTypes.complete }, { name: "moment", type: narrativeTypes.moment }, { name: "space", type: programSpaceTypes.programSpace }, { name: "placement", type: typographyTrackTypes.placement }, { name: "spec", type: typographyTrackTypes.itemSpec }, { name: "style", type: typographyTrackTypes.style }, { name: "motion", type: typographyTrackTypes.motion }], outputs: [{ name: "set", type: typographyTrackTypes.set }], needs: [], implementation: registered("@narratage/typography-track/append-moment", appendMomentTextItemImplementationDigest) },
+ { name: typographyTrackProducers.finalize.name, inputs: [{ name: "header", type: typographyTrackTypes.header }, { name: "set", type: typographyTrackTypes.set }], outputs: [{ name: "program", type: typographyTrackTypes.program }], needs: [], implementation: registered("@narratage/typography-track/finalize", finalizeTypographyTrackImplementationDigest) },
+ { name: typographyTrackProducers.render.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered("@narratage/typography-track/render", renderTypographyTrackImplementationDigest) },
+ { name: typographyTrackProducers.renderMask.name, inputs: [{ name: "space", type: programSpaceTypes.programSpace }, { name: "program", type: typographyTrackTypes.program }, { name: "material", type: mediaTypes.compositableSurface }, { name: "spec", type: typographyTrackTypes.maskSpec }], outputs: [{ name: "track", type: compositionTypes.visualTrack }], needs: [], implementation: registered("@narratage/typography-track/render-mask", renderTextMaskTrackImplementationDigest) },
+ ],
+};
+
+export const typographyTrackManifestDigest = digestOf(typographyTrackManifest);
diff --git a/packages/text-track/src/program.ts b/packages/typography-track/src/program.ts
similarity index 83%
rename from packages/text-track/src/program.ts
rename to packages/typography-track/src/program.ts
index 33bd15ef..20444e97 100644
--- a/packages/text-track/src/program.ts
+++ b/packages/typography-track/src/program.ts
@@ -35,30 +35,34 @@ import type {
import { assertCompositableSurfaceRef } from "@narratage/media";
import type { CompositableSurfaceRef } from "@narratage/media";
import { canonicalize, digestOf } from "@narratage/protocol";
+import { verifyText } from "@narratage/text";
+import type { Text } from "@narratage/text";
import type {
TextGeometry,
TextItem,
TextItemSpec,
+ PlainTextItemSpec,
TextMotion,
TextMaskSpec,
TextPlacement,
TextStyle,
- TextTrackHeader,
- TextTrackProgram,
- TextTrackSet,
+ TypographyTrackHeader,
+ TypographyTrackProgram,
+ TypographyTrackSet,
} from "./types.js";
-export const renderTextTrackImplementationDigest = digestOf("@narratage/text-track/render-complete@1");
-export const renderTextMaskTrackImplementationDigest = digestOf("@narratage/text-track/render-owned-mask@1");
-export const createTextTrackSetImplementationDigest = digestOf("@narratage/text-track/create-set-complete@1");
-export const appendProgramTextItemImplementationDigest = digestOf("@narratage/text-track/append-program-item@1");
-export const appendSelectionTextItemImplementationDigest = digestOf("@narratage/text-track/append-selection-item@1");
-export const appendMomentTextItemImplementationDigest = digestOf("@narratage/text-track/append-moment-item@1");
-export const finalizeTextTrackImplementationDigest = digestOf("@narratage/text-track/finalize-complete@1");
-export const bindPointTextPlacementImplementationDigest = digestOf("@narratage/text-track/bind-point-placement@1");
-export const bindAreaTextPlacementImplementationDigest = digestOf("@narratage/text-track/bind-area-placement@1");
-export const bindPathTextPlacementImplementationDigest = digestOf("@narratage/text-track/bind-path-placement@1");
+export const renderTypographyTrackImplementationDigest = digestOf("@narratage/typography-track/render-complete@1");
+export const renderTextMaskTrackImplementationDigest = digestOf("@narratage/typography-track/render-owned-mask@1");
+export const createTypographyTrackSetImplementationDigest = digestOf("@narratage/typography-track/create-set-complete@1");
+export const appendProgramTextItemImplementationDigest = digestOf("@narratage/typography-track/append-program-item@1");
+export const appendSelectionTextItemImplementationDigest = digestOf("@narratage/typography-track/append-selection-item@1");
+export const appendMomentTextItemImplementationDigest = digestOf("@narratage/typography-track/append-moment-item@1");
+export const finalizeTypographyTrackImplementationDigest = digestOf("@narratage/typography-track/finalize-complete@1");
+export const bindPointTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-point-placement@1");
+export const bindAreaTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-area-placement@1");
+export const bindPathTextPlacementImplementationDigest = digestOf("@narratage/typography-track/bind-path-placement@1");
+export const materializePlainTextItemImplementationDigest = digestOf("@narratage/typography-track/materialize-plain-text-item@1");
function nonEmpty(value: string, label: string): void {
if (!value.trim()) throw new Error(`${label} must not be empty.`);
@@ -198,14 +202,43 @@ export function sealTextItemSpec(value: TextItemSpec): TextItemSpec {
return result;
}
-export function assertTextTrackHeader(value: TextTrackHeader): void {
- if (value.contract !== "svml.text-track-header@1") throw new Error("Unsupported TextTrackHeader contract.");
- nonEmpty(value.id, "TextTrackHeader id");
+export function assertPlainTextItemSpec(value: PlainTextItemSpec): void {
+ if (value.contract !== "svml.plain-text-item-spec@1") throw new Error("Unsupported PlainTextItemSpec contract.");
+ nonEmpty(value.id, "PlainTextItemSpec id");
}
-export function sealTextTrackHeader(value: TextTrackHeader): TextTrackHeader {
- const result = canonicalize(value) as unknown as TextTrackHeader;
- assertTextTrackHeader(result);
+export function sealPlainTextItemSpec(value: PlainTextItemSpec): PlainTextItemSpec {
+ const result = canonicalize(value) as unknown as PlainTextItemSpec;
+ assertPlainTextItemSpec(result);
+ return result;
+}
+
+export function materializePlainTextItem(spec: PlainTextItemSpec, content: Text): TextItemSpec {
+ assertPlainTextItemSpec(spec);
+ verifyText(content);
+ if (!content.value.trim()) throw new Error("Typography plain Text content must not be empty.");
+ return sealTextItemSpec({
+ contract: "svml.text-item-spec@1",
+ id: spec.id,
+ document: {
+ paragraphs: [{
+ id: `${spec.id}:paragraph`,
+ inlines: [{ kind: "text", id: `${spec.id}:text`, text: content.value }],
+ }],
+ },
+ projection: spec.projection,
+ expansion: spec.expansion,
+ });
+}
+
+export function assertTypographyTrackHeader(value: TypographyTrackHeader): void {
+ if (value.contract !== "svml.typography-track-header@1") throw new Error("Unsupported TypographyTrackHeader contract.");
+ nonEmpty(value.id, "TypographyTrackHeader id");
+}
+
+export function sealTypographyTrackHeader(value: TypographyTrackHeader): TypographyTrackHeader {
+ const result = canonicalize(value) as unknown as TypographyTrackHeader;
+ assertTypographyTrackHeader(result);
return result;
}
@@ -242,11 +275,11 @@ export function bindPathTextPlacement(path: SpatialPath): TextPlacement {
return sealTextPlacement({ contract: "svml.text-placement@1", geometry: { kind: "path", path } });
}
-export function assertTextTrackSet(value: TextTrackSet): void {
- if (value.contract !== "svml.text-track-set@1") throw new Error("Unsupported TextTrackSet contract.");
+export function assertTypographyTrackSet(value: TypographyTrackSet): void {
+ if (value.contract !== "svml.typography-track-set@1") throw new Error("Unsupported TypographyTrackSet contract.");
const ids = new Set<string>();
for (const item of value.items) {
- if (ids.has(item.id)) throw new Error(`TextTrackSet repeats ${item.id}.`);
+ if (ids.has(item.id)) throw new Error(`TypographyTrackSet repeats ${item.id}.`);
ids.add(item.id);
assertGeometry(item.geometry);
assertDocument(item.document, `${item.id} document`);
@@ -255,12 +288,12 @@ export function assertTextTrackSet(value: TextTrackSet): void {
}
}
-export function createTextTrackSet(): TextTrackSet {
- return { contract: "svml.text-track-set@1", items: [] };
+export function createTypographyTrackSet(): TypographyTrackSet {
+ return { contract: "svml.typography-track-set@1", items: [] };
}
function occurrenceItem(
- header: TextTrackHeader,
+ header: TypographyTrackHeader,
spec: TextItemSpec,
style: TextStyle,
motion: TextMotion,
@@ -282,35 +315,35 @@ function occurrenceItem(
}
function append(
- set: TextTrackSet,
- header: TextTrackHeader,
+ set: TypographyTrackSet,
+ header: TypographyTrackHeader,
spec: TextItemSpec,
style: TextStyle,
motion: TextMotion,
geometry: TextGeometry,
occurrences: readonly ProjectedOccurrence[],
-): TextTrackSet {
- assertTextTrackSet(set);
- assertTextTrackHeader(header);
+): TypographyTrackSet {
+ assertTypographyTrackSet(set);
+ assertTypographyTrackHeader(header);
assertTextItemSpec(spec);
assertTextStyle(style);
assertTextMotion(motion);
assertGeometry(geometry);
const existing = new Set(set.items.map((item) => item.id));
const additions = occurrences.map((occurrence, index) => occurrenceItem(header, spec, style, motion, geometry, occurrence, index, occurrences.length));
- if (additions.some((item) => existing.has(item.id))) throw new Error(`TextTrackSet already contains ${spec.id}.`);
- return { contract: "svml.text-track-set@1", items: [...set.items, ...additions] };
+ if (additions.some((item) => existing.has(item.id))) throw new Error(`TypographyTrackSet already contains ${spec.id}.`);
+ return { contract: "svml.typography-track-set@1", items: [...set.items, ...additions] };
}
export function appendProgramTextItem(
- set: TextTrackSet,
- header: TextTrackHeader,
+ set: TypographyTrackSet,
+ header: TypographyTrackHeader,
space: ProgramSpace,
placement: TextPlacement,
spec: TextItemSpec,
style: TextStyle,
motion: TextMotion,
-): TextTrackSet {
+): TypographyTrackSet {
assertProgramSpaceIdentity(space);
assertTextPlacement(placement);
if (spec.expansion.kind !== "one") throw new Error("Program Text uses one occurrence.");
@@ -318,8 +351,8 @@ export function appendProgramTextItem(
}
export function appendSelectionTextItem(
- set: TextTrackSet,
- header: TextTrackHeader,
+ set: TypographyTrackSet,
+ header: TypographyTrackHeader,
map: CompleteSemanticMap,
selection: NarrativeSelectionRef,
space: ProgramSpace,
@@ -327,7 +360,7 @@ export function appendSelectionTextItem(
spec: TextItemSpec,
style: TextStyle,
motion: TextMotion,
-): TextTrackSet {
+): TypographyTrackSet {
assertCompleteSemanticMapIdentity(map);
assertNarrativeSelectionIdentity(selection);
assertProgramSpaceIdentity(space);
@@ -338,8 +371,8 @@ export function appendSelectionTextItem(
}
export function appendMomentTextItem(
- set: TextTrackSet,
- header: TextTrackHeader,
+ set: TypographyTrackSet,
+ header: TypographyTrackHeader,
map: CompleteSemanticMap,
moment: NarrativeMomentRef,
space: ProgramSpace,
@@ -347,7 +380,7 @@ export function appendMomentTextItem(
spec: TextItemSpec,
style: TextStyle,
motion: TextMotion,
-): TextTrackSet {
+): TypographyTrackSet {
assertCompleteSemanticMapIdentity(map);
assertNarrativeMomentIdentity(moment);
assertProgramSpaceIdentity(space);
@@ -357,9 +390,9 @@ export function appendMomentTextItem(
}), "disjoint"));
}
-function programContent(value: TextTrackProgram): TextTrackProgram {
+function programContent(value: TypographyTrackProgram): TypographyTrackProgram {
return {
- contract: "svml.text-track-program@1",
+ contract: "svml.typography-track-program@1",
id: value.id,
items: [...value.items].map((item) => structuredClone(item)).sort((left, right) =>
left.span.startFrame - right.span.startFrame
@@ -369,20 +402,20 @@ function programContent(value: TextTrackProgram): TextTrackProgram {
};
}
-export function sealTextTrackProgram(value: TextTrackProgram): TextTrackProgram {
+export function sealTypographyTrackProgram(value: TypographyTrackProgram): TypographyTrackProgram {
return programContent(value);
}
-export function assertTextTrackProgramIdentity(program: TextTrackProgram, space: ProgramSpace): void {
+export function assertTypographyTrackProgramIdentity(program: TypographyTrackProgram, space: ProgramSpace): void {
assertProgramSpaceIdentity(space);
- if (program.contract !== "svml.text-track-program@1") throw new Error("Unsupported TextTrackProgram contract.");
- nonEmpty(program.id, "TextTrackProgram id");
- if (program.items.length === 0) throw new Error("TextTrackProgram has no Items.");
+ if (program.contract !== "svml.typography-track-program@1") throw new Error("Unsupported TypographyTrackProgram contract.");
+ nonEmpty(program.id, "TypographyTrackProgram id");
+ if (program.items.length === 0) throw new Error("TypographyTrackProgram has no Items.");
const total = programSpaceFrameCount(space);
const ids = new Set<string>();
for (const item of program.items) {
nonEmpty(item.id, "Text Item id");
- if (ids.has(item.id)) throw new Error(`TextTrackProgram repeats ${item.id}.`);
+ if (ids.has(item.id)) throw new Error(`TypographyTrackProgram repeats ${item.id}.`);
ids.add(item.id);
if (item.span.startFrame < 0 || item.span.endFrameExclusive <= item.span.startFrame || item.span.endFrameExclusive > total) {
throw new Error(`${item.id} is outside ProgramSpace.`);
@@ -407,11 +440,11 @@ export function sealTextMaskSpec(value: TextMaskSpec): TextMaskSpec {
return result;
}
-export function finalizeTextTrack(header: TextTrackHeader, set: TextTrackSet): TextTrackProgram {
- assertTextTrackHeader(header);
- assertTextTrackSet(set);
- if (set.items.length === 0) throw new Error("TextTrack requires at least one Item.");
- return sealTextTrackProgram({ contract: "svml.text-track-program@1", id: header.id, items: set.items });
+export function finalizeTypographyTrack(header: TypographyTrackHeader, set: TypographyTrackSet): TypographyTrackProgram {
+ assertTypographyTrackHeader(header);
+ assertTypographyTrackSet(set);
+ if (set.items.length === 0) throw new Error("TypographyTrack requires at least one Item.");
+ return sealTypographyTrackProgram({ contract: "svml.typography-track-program@1", id: header.id, items: set.items });
}
function baseBoxStyle(geometry: TextGeometry): VisualStyleDeclaration[] {
@@ -610,8 +643,8 @@ function elements(item: TextItem): VisualElement[] {
return [root, motion, terminalTextElement(item, "motion", 2)];
}
-export function renderTextTrack(space: ProgramSpace, program: TextTrackProgram): VisualTrack {
- assertTextTrackProgramIdentity(program, space);
+export function renderTypographyTrack(space: ProgramSpace, program: TypographyTrackProgram): VisualTrack {
+ assertTypographyTrackProgramIdentity(program, space);
const track = sealVisualTrack({
contract: "svml.visual-track@1",
visualIr: "svml.visual-ir@1",
@@ -629,11 +662,11 @@ export function renderTextTrack(space: ProgramSpace, program: TextTrackProgram):
export function renderTextMaskTrack(
space: ProgramSpace,
- program: TextTrackProgram,
+ program: TypographyTrackProgram,
material: CompositableSurfaceRef,
spec: TextMaskSpec,
): VisualTrack {
- assertTextTrackProgramIdentity(program, space);
+ assertTypographyTrackProgramIdentity(program, space);
assertCompositableSurfaceRef(material);
assertTextMaskSpec(spec);
if (material.timing.kind !== "still") {
diff --git a/packages/text-track/src/surface.ts b/packages/typography-track/src/surface.ts
similarity index 88%
rename from packages/text-track/src/surface.ts
rename to packages/typography-track/src/surface.ts
index 39630f35..546796b6 100644
--- a/packages/text-track/src/surface.ts
+++ b/packages/typography-track/src/surface.ts
@@ -22,13 +22,14 @@ import { sealGraphFragment } from "@narratage/elaborator";
import type { AuthorValueRef, FragmentOperation, GraphFragment } from "@narratage/elaborator";
import { svsRecipeType } from "@narratage/svs";
import type { SvsRecipe } from "@narratage/svs";
+import { textTypes } from "@narratage/text";
import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceRecordDraft,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import type {
OccurrenceExpansion,
TemporalDuration,
@@ -36,13 +37,14 @@ import type {
TemporalWindowProjection,
} from "@narratage/temporal";
-import { textTrackProducers, textTrackTypes } from "./manifest.js";
+import { typographyTrackProducers, typographyTrackTypes } from "./manifest.js";
import {
sealTextItemSpec,
+ sealPlainTextItemSpec,
sealTextMaskSpec,
sealTextMotion,
sealTextStyle,
- sealTextTrackHeader,
+ sealTypographyTrackHeader,
stillTextMotion,
} from "./program.js";
import type { TextItemSpec, TextMotion, TextStyle } from "./types.js";
@@ -118,7 +120,7 @@ function booleanValue(value: unknown, label: string, fallback: boolean): boolean
}
function reference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: SurfaceResolvedReference["type"],
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -130,7 +132,7 @@ function reference(
}
function oneOfReference(
- raw: TextAttributeValue | undefined,
+ raw: MarkupAttributeValue | undefined,
label: string,
expected: readonly SurfaceResolvedReference["type"][],
resolve: (path: string) => SurfaceResolvedReference | undefined,
@@ -353,7 +355,7 @@ const STYLE_PROPERTIES = new Set([
"path-end-margin", "path-align", "path-reverse", "path-overflow",
]);
-export const decodeTextStyleSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
+export const decodeTypographyStyleSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
allowed(element, ["id", "recipe", "font"], ["id", "recipe", "font"]);
const id = text(element, "id");
const value = recipe(reference(element.attributes.recipe, `${element.name}.recipe`, svsRecipeType, resolveReference), `${element.name}.recipe`);
@@ -457,7 +459,7 @@ export const decodeTextStyleSurface: StructuredSurfaceHandler = ({ element, reso
reverse: propBoolean(value, "path-reverse", false), overflow: propString(value, "path-overflow", "visible") as "visible" | "clip",
},
});
- return { records: [{ id, type: textTrackTypes.style, value: { kind: "inline", value: style }, range: element.range }], components: [], fragments: [] };
+ return { records: [{ id, type: typographyTrackTypes.style, value: { kind: "inline", value: style }, range: element.range }], components: [], fragments: [] };
};
function keyframeStyle(element: StructuredElement): VisualStyleDeclaration[] {
@@ -483,7 +485,7 @@ function keyframeStyle(element: StructuredElement): VisualStyleDeclaration[] {
const KEYFRAME_ATTRIBUTES = ["at", "easing", "x", "y", "scale", "rotate", "skew-x", "skew-y", "opacity", "blur", "color", "clip-top", "clip-right", "clip-bottom", "clip-left"] as const;
-export const decodeTextMotionSurface: StructuredSurfaceHandler = ({ element }) => {
+export const decodeTypographyMotionSurface: StructuredSurfaceHandler = ({ element }) => {
allowed(element, ["id"], ["id"]);
const id = text(element, "id");
const itemKeyframes: NonNullable<TextMotion["item"]>["keyframes"][number][] = [];
@@ -532,7 +534,7 @@ export const decodeTextMotionSurface: StructuredSurfaceHandler = ({ element }) =
sequences,
...(pathKeyframes.length === 0 ? {} : { pathMargin: { keyframes: pathKeyframes } }),
});
- return { records: [{ id, type: textTrackTypes.motion, value: { kind: "inline", value: motion }, range: element.range }], components: [], fragments: [] };
+ return { records: [{ id, type: typographyTrackTypes.motion, value: { kind: "inline", value: motion }, range: element.range }], components: [], fragments: [] };
};
function divisor(left: number, right: number): number {
@@ -638,7 +640,7 @@ function paragraph(element: StructuredElement, index: number, resolve: (path: st
if (child.children.some((nested) => nested.kind === "element")) throw new Error(`${child.name} cannot contain nested elements.`);
const spanText = child.children.map((nested) => nested.kind === "text" ? nested.value : "").join("");
if (spanText.length === 0) throw new Error(`${child.name} cannot be empty.`);
- const styleRef = child.attributes.style === undefined ? undefined : reference(child.attributes.style, `${child.name}.style`, textTrackTypes.style, resolve);
+ const styleRef = child.attributes.style === undefined ? undefined : reference(child.attributes.style, `${child.name}.style`, typographyTrackTypes.style, resolve);
inlines.push({
kind: "text", id: optionalText(child, "id") ?? `run-${inlineIndex}`, text: spanText,
...(styleRef === undefined ? {} : { style: runStyle(styleRef) }),
@@ -647,7 +649,7 @@ function paragraph(element: StructuredElement, index: number, resolve: (path: st
});
}
if (inlines.length === 0) throw new Error(`${element.name} cannot be empty.`);
- const styleRef = element.attributes.style === undefined ? undefined : reference(element.attributes.style, `${element.name}.style`, textTrackTypes.style, resolve);
+ const styleRef = element.attributes.style === undefined ? undefined : reference(element.attributes.style, `${element.name}.style`, typographyTrackTypes.style, resolve);
return { id: optionalText(element, "id") ?? `paragraph-${index}`, inlines, ...(styleRef === undefined ? {} : { style: runStyle(styleRef) }) };
}
@@ -671,58 +673,70 @@ type FragmentItem = {
readonly placementKind: "point" | "area" | "path";
readonly geometryName: string;
readonly specName: string;
+ readonly contentName?: string;
readonly styleName: string;
readonly motionName: string;
};
function createTrackFragment(id: string, items: readonly FragmentItem[]): GraphFragment {
const usesMap = items.some((item) => item.binding !== "program");
- const operations: FragmentOperation[] = [{ id: "text:set:empty", producer: textTrackProducers.createSet, inputs: {}, result: { kind: "output", name: "set" } }];
+ const operations: FragmentOperation[] = [{ id: "text:set:empty", producer: typographyTrackProducers.createSet, inputs: {}, result: { kind: "output", name: "set" } }];
let current = "text:set:empty";
for (const [index, item] of items.entries()) {
const bind = `text:placement:${String(index + 1).padStart(4, "0")}`;
operations.push({
id: bind,
- producer: item.placementKind === "point" ? textTrackProducers.bindPoint : item.placementKind === "area" ? textTrackProducers.bindArea : textTrackProducers.bindPath,
+ producer: item.placementKind === "point" ? typographyTrackProducers.bindPoint : item.placementKind === "area" ? typographyTrackProducers.bindArea : typographyTrackProducers.bindPath,
inputs: { [item.placementKind === "point" ? "point" : item.placementKind === "area" ? "frame" : "path"]: input(item.geometryName) },
result: { kind: "output", name: "placement" },
});
+ const materialized = `text:content:${String(index + 1).padStart(4, "0")}`;
+ if (item.contentName !== undefined) {
+ operations.push({
+ id: materialized,
+ producer: typographyTrackProducers.materializePlainItem,
+ inputs: { spec: input(item.specName), content: input(item.contentName) },
+ result: { kind: "output", name: "spec" },
+ });
+ }
const append = `text:set:append:${String(index + 1).padStart(4, "0")}`;
const common = {
set: operation(current), header: input("header"), space: input("space"), placement: operation(bind),
- spec: input(item.specName), style: input(item.styleName), motion: input(item.motionName),
+ spec: item.contentName === undefined ? input(item.specName) : operation(materialized),
+ style: input(item.styleName), motion: input(item.motionName),
};
operations.push(item.binding === "program" ? {
- id: append, producer: textTrackProducers.appendProgram, inputs: common, result: { kind: "output", name: "set" },
+ id: append, producer: typographyTrackProducers.appendProgram, inputs: common, result: { kind: "output", name: "set" },
} : item.binding === "selection" ? {
- id: append, producer: textTrackProducers.appendSelection, inputs: { ...common, map: input("map"), selection: input(item.sourceName!) }, result: { kind: "output", name: "set" },
+ id: append, producer: typographyTrackProducers.appendSelection, inputs: { ...common, map: input("map"), selection: input(item.sourceName!) }, result: { kind: "output", name: "set" },
} : {
- id: append, producer: textTrackProducers.appendMoment, inputs: { ...common, map: input("map"), moment: input(item.sourceName!) }, result: { kind: "output", name: "set" },
+ id: append, producer: typographyTrackProducers.appendMoment, inputs: { ...common, map: input("map"), moment: input(item.sourceName!) }, result: { kind: "output", name: "set" },
});
current = append;
}
operations.push(
- { id: "text:finalize", producer: textTrackProducers.finalize, inputs: { header: input("header"), set: operation(current) }, result: { kind: "output", name: "program" } },
- { id: "text:render", producer: textTrackProducers.render, inputs: { space: input("space"), program: operation("text:finalize") }, result: { kind: "output", name: "track" } },
+ { id: "text:finalize", producer: typographyTrackProducers.finalize, inputs: { header: input("header"), set: operation(current) }, result: { kind: "output", name: "program" } },
+ { id: "text:render", producer: typographyTrackProducers.render, inputs: { space: input("space"), program: operation("text:finalize") }, result: { kind: "output", name: "track" } },
);
const inputEntries = [
{ name: "space", type: programSpaceTypes.programSpace },
- { name: "header", type: textTrackTypes.header },
+ { name: "header", type: typographyTrackTypes.header },
...(usesMap ? [{ name: "map", type: semanticMapTypes.complete }] : []),
...items.flatMap((item) => [
{ name: item.geometryName, type: item.placementKind === "point" ? spatialTypes.point : item.placementKind === "area" ? spatialTypes.frame : spatialTypes.path },
- { name: item.specName, type: textTrackTypes.itemSpec },
- { name: item.styleName, type: textTrackTypes.style },
- { name: item.motionName, type: textTrackTypes.motion },
+ { name: item.specName, type: item.contentName === undefined ? typographyTrackTypes.itemSpec : typographyTrackTypes.plainItemSpec },
+ ...(item.contentName === undefined ? [] : [{ name: item.contentName, type: textTypes.text }]),
+ { name: item.styleName, type: typographyTrackTypes.style },
+ { name: item.motionName, type: typographyTrackTypes.motion },
...(item.sourceName === undefined ? [] : [{ name: item.sourceName, type: item.binding === "selection" ? narrativeTypes.selection : narrativeTypes.moment }]),
]),
];
const inputs = [...new Map(inputEntries.map((value) => [value.name, value])).values()];
return sealGraphFragment({
- name: `@narratage/text-track/surface/${id}@1`, inputs, operations,
+ name: `@narratage/typography-track/surface/${id}@1`, inputs, operations,
exports: [
{
- name: "program", type: textTrackTypes.program, root: operation("text:finalize"),
+ name: "program", type: typographyTrackTypes.program, root: operation("text:finalize"),
semanticInputs: inputs.map((value) => value.name), fidelity: "exact",
},
{
@@ -733,22 +747,23 @@ function createTrackFragment(id: string, items: readonly FragmentItem[]): GraphF
});
}
-export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
+export const decodeTypographyTrackSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
allowed(element, ["id", "space", "map"], ["id", "space"]);
const id = text(element, "id");
const space = reference(element.attributes.space, `${element.name}.space`, programSpaceTypes.programSpace, resolveReference);
const headerId = `${id}.__header`;
const records: SurfaceRecordDraft[] = [{
- id: headerId, type: textTrackTypes.header,
- value: { kind: "inline", value: sealTextTrackHeader({ contract: "svml.text-track-header@1", id }) }, range: element.range,
+ id: headerId, type: typographyTrackTypes.header,
+ value: { kind: "inline", value: sealTypographyTrackHeader({ contract: "svml.typography-track-header@1", id }) }, range: element.range,
}];
const defaultMotionId = `${id}.__still-motion`;
- records.push({ id: defaultMotionId, type: textTrackTypes.motion, value: { kind: "inline", value: stillTextMotion(defaultMotionId) }, range: element.range });
+ records.push({ id: defaultMotionId, type: typographyTrackTypes.motion, value: { kind: "inline", value: stillTextMotion(defaultMotionId) }, range: element.range });
const items: Array<FragmentItem & {
readonly geometry: SurfaceResolvedReference;
readonly style: SurfaceResolvedReference;
readonly motion: AuthorValueRef;
readonly source?: SurfaceResolvedReference;
+ readonly content?: SurfaceResolvedReference;
readonly specId: string;
}> = [];
const sharedInputNames = new Map<string, string>();
@@ -770,7 +785,7 @@ export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, reso
const index = items.length + 1;
const suffix = String(index).padStart(4, "0");
allowed(child, [
- "id", "placement", "style", "motion", "during", "at", "for", "start", "end", "selection", "moment", "occurrences",
+ "id", "content", "placement", "style", "motion", "during", "at", "for", "start", "end", "selection", "moment", "occurrences",
], ["id", "placement", "style"]);
const itemId = text(child, "id");
const binding = temporalBinding(child, resolveReference);
@@ -779,20 +794,34 @@ export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, reso
const expansion: OccurrenceExpansion = { kind: occurrences };
const placementKind = form.toLowerCase() as "point" | "area" | "path";
const geometry = reference(child.attributes.placement, `${child.name}.placement`, placementKind === "point" ? spatialTypes.point : placementKind === "area" ? spatialTypes.frame : spatialTypes.path, resolveReference);
- const style = reference(child.attributes.style, `${child.name}.style`, textTrackTypes.style, resolveReference);
+ const style = reference(child.attributes.style, `${child.name}.style`, typographyTrackTypes.style, resolveReference);
const motionRef = child.attributes.motion === undefined
? ({ kind: "record", id: defaultMotionId } as const)
- : reference(child.attributes.motion, `${child.name}.motion`, textTrackTypes.motion, resolveReference).ref;
+ : reference(child.attributes.motion, `${child.name}.motion`, typographyTrackTypes.motion, resolveReference).ref;
const specId = `${id}.item.${suffix}.spec`;
- const spec = sealTextItemSpec({
- contract: "svml.text-item-spec@1", id: itemId,
- document: document(child, resolveReference), projection: binding.projection, expansion,
+ const content = child.attributes.content === undefined
+ ? undefined
+ : reference(child.attributes.content, `${child.name}.content`, textTypes.text, resolveReference);
+ if (content !== undefined) empty(child);
+ const spec = content === undefined
+ ? sealTextItemSpec({
+ contract: "svml.text-item-spec@1", id: itemId,
+ document: document(child, resolveReference), projection: binding.projection, expansion,
+ })
+ : sealPlainTextItemSpec({
+ contract: "svml.plain-text-item-spec@1", id: itemId,
+ projection: binding.projection, expansion,
+ });
+ records.push({
+ id: specId,
+ type: content === undefined ? typographyTrackTypes.itemSpec : typographyTrackTypes.plainItemSpec,
+ value: { kind: "inline", value: spec }, range: child.range,
});
- records.push({ id: specId, type: textTrackTypes.itemSpec, value: { kind: "inline", value: spec }, range: child.range });
items.push({
suffix, binding: binding.kind, placementKind,
geometryName: sharedInputName("geometry", geometry.ref, suffix), specName: `item-${suffix}-spec`,
styleName: sharedInputName("style", style.ref, suffix), motionName: sharedInputName("motion", motionRef, suffix),
+ ...(content === undefined ? {} : { contentName: sharedInputName("content", content.ref, suffix), content }),
...(binding.source === undefined ? {} : { sourceName: sharedInputName("source", binding.source.ref, suffix), source: binding.source }),
geometry, style, motion: motionRef, specId,
});
@@ -801,8 +830,9 @@ export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, reso
const usesMap = items.some((item) => item.binding !== "program");
const map = usesMap ? reference(element.attributes.map, `${element.name}.map`, semanticMapTypes.complete, resolveReference) : undefined;
if (!usesMap && element.attributes.map !== undefined) throw new Error(`${element.name}.map is unused.`);
- const fragmentItems: FragmentItem[] = items.map(({ suffix, binding, sourceName, placementKind, geometryName, specName, styleName, motionName }) => ({
- suffix, binding, placementKind, geometryName, specName, styleName, motionName, ...(sourceName === undefined ? {} : { sourceName }),
+ const fragmentItems: FragmentItem[] = items.map(({ suffix, binding, sourceName, placementKind, geometryName, specName, styleName, motionName, contentName }) => ({
+ suffix, binding, placementKind, geometryName, specName, styleName, motionName,
+ ...(contentName === undefined ? {} : { contentName }), ...(sourceName === undefined ? {} : { sourceName }),
}));
const fragment = createTrackFragment(id, fragmentItems);
return {
@@ -814,6 +844,7 @@ export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, reso
...Object.fromEntries(items.flatMap((item) => [
[item.geometryName, item.geometry.ref], [item.specName, { kind: "record" as const, id: item.specId }],
[item.styleName, item.style.ref], [item.motionName, item.motion],
+ ...(item.content === undefined ? [] : [[item.contentName!, item.content.ref] as const]),
...(item.source === undefined ? [] : [[item.sourceName!, item.source.ref] as const]),
])),
},
@@ -826,15 +857,15 @@ export const decodeTextTrackSurface: StructuredSurfaceHandler = ({ element, reso
function createMaskFragment(id: string): GraphFragment {
const inputs = [
{ name: "space", type: programSpaceTypes.programSpace },
- { name: "program", type: textTrackTypes.program },
+ { name: "program", type: typographyTrackTypes.program },
{ name: "material", type: mediaTypes.compositableSurface },
- { name: "spec", type: textTrackTypes.maskSpec },
+ { name: "spec", type: typographyTrackTypes.maskSpec },
];
return sealGraphFragment({
- name: `@narratage/text-track/mask-surface/${id}@1`,
+ name: `@narratage/typography-track/mask-surface/${id}@1`,
inputs,
operations: [{
- id: "text-mask:render", producer: textTrackProducers.renderMask,
+ id: "text-mask:render", producer: typographyTrackProducers.renderMask,
inputs: { space: input("space"), program: input("program"), material: input("material"), spec: input("spec") },
result: { kind: "output", name: "track" },
}],
@@ -845,12 +876,12 @@ function createMaskFragment(id: string): GraphFragment {
});
}
-export const decodeTextMaskSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
+export const decodeTypographyMaskSurface: StructuredSurfaceHandler = ({ element, resolveReference }) => {
allowed(element, ["id", "space", "text", "material", "mode", "fit"], ["id", "space", "text", "material"]);
empty(element);
const id = text(element, "id");
const space = reference(element.attributes.space, `${element.name}.space`, programSpaceTypes.programSpace, resolveReference);
- const program = reference(element.attributes.text, `${element.name}.text`, textTrackTypes.program, resolveReference);
+ const program = reference(element.attributes.text, `${element.name}.text`, typographyTrackTypes.program, resolveReference);
const material = reference(element.attributes.material, `${element.name}.material`, mediaTypes.compositableSurface, resolveReference);
const specId = `${id}.__spec`;
const spec = sealTextMaskSpec({
@@ -860,7 +891,7 @@ export const decodeTextMaskSurface: StructuredSurfaceHandler = ({ element, resol
});
const fragment = createMaskFragment(id);
return {
- records: [{ id: specId, type: textTrackTypes.maskSpec, value: { kind: "inline", value: spec }, range: element.range }],
+ records: [{ id: specId, type: typographyTrackTypes.maskSpec, value: { kind: "inline", value: spec }, range: element.range }],
components: [{
id, fragment: fragment.id,
inputs: { space: space.ref, program: program.ref, material: material.ref, spec: { kind: "record", id: specId } },
diff --git a/packages/text-track/src/types.ts b/packages/typography-track/src/types.ts
similarity index 81%
rename from packages/text-track/src/types.ts
rename to packages/typography-track/src/types.ts
index c6af66cc..1df873c9 100644
--- a/packages/text-track/src/types.ts
+++ b/packages/typography-track/src/types.ts
@@ -72,6 +72,18 @@ export type TextItemSpec = {
readonly expansion: OccurrenceExpansion;
};
+/**
+ * Author/runtime-independent part of one plain-text item. The actual copy is
+ * supplied by an ordinary @narratage/text Text edge and materialized into a
+ * TextItemSpec before temporal projection.
+ */
+export type PlainTextItemSpec = {
+ readonly contract: "svml.plain-text-item-spec@1";
+ readonly id: string;
+ readonly projection: TemporalWindowProjection;
+ readonly expansion: OccurrenceExpansion;
+};
+
export type TextItem = {
readonly id: string;
readonly sourceOccurrenceId: string;
@@ -83,8 +95,8 @@ export type TextItem = {
readonly tieBreak: string;
};
-export type TextTrackProgram = {
- readonly contract: "svml.text-track-program@1";
+export type TypographyTrackProgram = {
+ readonly contract: "svml.typography-track-program@1";
readonly id: string;
readonly items: readonly TextItem[];
};
@@ -101,12 +113,12 @@ export type TextMaskSpec = {
readonly materialFit: "contain" | "cover" | "fill";
};
-export type TextTrackHeader = {
- readonly contract: "svml.text-track-header@1";
+export type TypographyTrackHeader = {
+ readonly contract: "svml.typography-track-header@1";
readonly id: string;
};
-export type TextTrackSet = {
- readonly contract: "svml.text-track-set@1";
+export type TypographyTrackSet = {
+ readonly contract: "svml.typography-track-set@1";
readonly items: readonly TextItem[];
};
diff --git a/packages/text-track/test/text-track.test.ts b/packages/typography-track/test/typography-track.test.ts
similarity index 85%
rename from packages/text-track/test/text-track.test.ts
rename to packages/typography-track/test/typography-track.test.ts
index da1d5998..7ff993ac 100644
--- a/packages/text-track/test/text-track.test.ts
+++ b/packages/typography-track/test/typography-track.test.ts
@@ -18,32 +18,33 @@ import type { CompleteSemanticMap } from "@narratage/semantic-map";
import {
appendSelectionTextItem,
bindAreaTextPlacement,
- createTextTrackSet,
- finalizeTextTrack,
- assertTextTrackProgramIdentity,
- renderTextTrack,
+ createTypographyTrackSet,
+ finalizeTypographyTrack,
+ assertTypographyTrackProgramIdentity,
+ renderTypographyTrack,
renderTextMaskTrack,
sealTextItemSpec,
sealTextStyle,
- sealTextTrackHeader,
- sealTextTrackProgram,
+ sealTypographyTrackHeader,
+ sealTypographyTrackProgram,
stillTextMotion,
sealTextMotion,
sealTextMaskSpec,
- decodeTextMotionSurface,
- decodeTextMaskSurface,
- decodeTextStyleSurface,
- decodeTextTrackSurface,
- textTrackManifest,
- textTrackModuleRef,
- textTrackProducers,
- textTrackSurfaceImplementationDigests,
- textTrackTypes,
-} from "@narratage/text-track";
-import type { TextStyle } from "@narratage/text-track";
+ decodeTypographyMotionSurface,
+ decodeTypographyMaskSurface,
+ decodeTypographyStyleSurface,
+ decodeTypographyTrackSurface,
+ typographyTrackManifest,
+ typographyTrackModuleRef,
+ typographyTrackProducers,
+ typographyTrackSurfaceImplementationDigests,
+ typographyTrackTypes,
+} from "@narratage/typography-track";
+import type { TextStyle } from "@narratage/typography-track";
import { spatialDependency, spatialTypes } from "@narratage/spatial";
import { svsManifest, svsRecipeType } from "@narratage/svs";
-import { TextSurfaceRegistry, createTextAuthorFrontend } from "@narratage/text";
+import { sealText, textComponent, textDependency, textManifest, textTypes } from "@narratage/text";
+import { MarkupSurfaceRegistry, createMarkupAuthorFrontend } from "@narratage/markup";
import { createRecordAdmitter, TypeValidatorRegistry } from "@narratage/validation";
const space = sealProgramSpace({
@@ -56,7 +57,7 @@ const exactTestFont: FontArtifactRef = {
contract: "svml.font-artifact@1",
sources: [{ artifact: {
kind: "blob",
- digest: digestOf("text-track-test-font"),
+ digest: digestOf("typography-track-test-font"),
size: 1,
mediaType: "font/woff2",
} }],
@@ -68,7 +69,7 @@ const exactTestSurface: CompositableSurfaceRef = {
contract: "svml.compositable-surface@1",
artifact: {
kind: "blob",
- digest: digestOf("text-track-test-surface"),
+ digest: digestOf("typography-track-test-surface"),
size: 1,
mediaType: "image/png",
},
@@ -155,8 +156,8 @@ function document(text: string) {
test("persistent and timed Text Items lower to ordinary VisualTrack Presents", () => {
const style = textStyle("editorial", 55);
- const program = sealTextTrackProgram({
- contract: "svml.text-track-program@1",
+ const program = sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1",
id: "editorial-text",
items: [
{
@@ -182,8 +183,8 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
],
});
- assert.doesNotThrow(() => assertTextTrackProgramIdentity(program, space));
- const track = renderTextTrack(space, program);
+ assert.doesNotThrow(() => assertTypographyTrackProgramIdentity(program, space));
+ const track = renderTypographyTrack(space, program);
assert.deepEqual(track.presents.map((present) => present.id), ["watermark", "callout"]);
assert.equal(track.presents[0]?.elements[2]?.kind, "text-flow");
@@ -210,8 +211,8 @@ test("persistent and timed Text Items lower to ordinary VisualTrack Presents", (
});
test("Text Mask explicitly consumes one authored Text Program and one owned still Surface", () => {
- const program = sealTextTrackProgram({
- contract: "svml.text-track-program@1", id: "mask-shape",
+ const program = sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1", id: "mask-shape",
items: [{
id: "mask-title", sourceOccurrenceId: "program",
span: { startFrame: 0, endFrameExclusive: 150 }, tieBreak: "mask-title",
@@ -248,7 +249,7 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
}, sealTextMaskSpec({
contract: "svml.text-mask-spec@1", id: "timed-mask", mode: "alpha", materialFit: "cover",
})), /requires one explicit still material Surface/u);
- assert.throws(() => renderTextMaskTrack(space, sealTextTrackProgram({
+ assert.throws(() => renderTextMaskTrack(space, sealTypographyTrackProgram({
...program,
id: "advanced-mask-shape",
items: program.items.map((item) => ({
@@ -260,9 +261,9 @@ test("Text Mask explicitly consumes one authored Text Program and one owned stil
})), /must be materialized by an independent package/u);
});
-test("TextTrackProgram rejects a frame span outside ProgramSpace", () => {
- const program = sealTextTrackProgram({
- contract: "svml.text-track-program@1",
+test("TypographyTrackProgram rejects a frame span outside ProgramSpace", () => {
+ const program = sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1",
id: "invalid-text",
items: [{
id: "late",
@@ -275,7 +276,7 @@ test("TextTrackProgram rejects a frame span outside ProgramSpace", () => {
motion: stillTextMotion(),
}],
});
- assert.throws(() => renderTextTrack(space, program), /outside ProgramSpace/u);
+ assert.throws(() => renderTypographyTrack(space, program), /outside ProgramSpace/u);
});
test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and Placement edges", () => {
@@ -292,7 +293,7 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
id: "callout",
occurrences: [{ occurrence: 1, startAnchorId: "selection:start", endAnchorId: "selection:end" }],
};
- const header = sealTextTrackHeader({ contract: "svml.text-track-header@1", id: "selected-text" });
+ const header = sealTypographyTrackHeader({ contract: "svml.typography-track-header@1", id: "selected-text" });
const spec = sealTextItemSpec({
contract: "svml.text-item-spec@1",
id: "meaning",
@@ -300,8 +301,8 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
projection: { start: { ref: "selection.start" }, end: { ref: "selection.end" } },
expansion: { kind: "one" },
});
- const program = finalizeTextTrack(header, appendSelectionTextItem(
- createTextTrackSet(),
+ const program = finalizeTypographyTrack(header, appendSelectionTextItem(
+ createTypographyTrackSet(),
header,
map,
selection,
@@ -314,7 +315,7 @@ test("Selection Text consumes explicit Selection, SemanticMap, Style, Motion and
assert.deepEqual(program.items.map((item) => item.span), [{ startFrame: 30, endFrameExclusive: 60 }]);
});
-test("the self-described Text Surfaces compile Style, Motion and all three spatial forms", async () => {
+test("the self-described Markup Surfaces compile Style, Motion and all three spatial forms", async () => {
const fixtureModule = { name: "example.text-inputs", version: "1" } as const;
const fixtureDigest = digestOf("example.text-inputs/surface@1");
const fixtureManifest: ModuleManifest = {
@@ -329,6 +330,7 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
module: { name: svsManifest.name, version: svsManifest.version },
digest: computeModuleDigest(svsManifest),
},
+ textDependency,
],
types: [],
capabilities: [],
@@ -344,6 +346,7 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
spatialTypes.path,
mediaTypes.fontArtifact,
mediaTypes.compositableSurface,
+ textTypes.text,
],
implementation: { kind: "trusted-frontend-surface", locator: "example.text-inputs/surface", digest: fixtureDigest },
}],
@@ -352,10 +355,11 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
const closure = createResolvedClosure([
...videoContractManifests,
svsManifest,
- textTrackManifest,
+ textManifest,
+ typographyTrackManifest,
fixtureManifest,
]);
- const surfaces = new TextSurfaceRegistry();
+ const surfaces = new MarkupSurfaceRegistry();
surfaces.registerStructured(fixtureModule, "inputs", fixtureDigest, ({ element }) => ({
records: [
{
@@ -404,29 +408,31 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
] } }, range: element.range },
{ id: "exact-font", type: mediaTypes.fontArtifact, value: { kind: "inline", value: exactTestFont }, range: element.range },
{ id: "material", type: mediaTypes.compositableSurface, value: { kind: "inline", value: exactTestSurface }, range: element.range },
+ { id: "copy", type: textTypes.text, value: { kind: "inline", value: sealText("Hello from a Text edge") }, range: element.range },
],
components: [],
fragments: [],
}));
- surfaces.registerStructured(textTrackModuleRef, "style", textTrackSurfaceImplementationDigests.style, decodeTextStyleSurface);
- surfaces.registerStructured(textTrackModuleRef, "motion", textTrackSurfaceImplementationDigests.motion, decodeTextMotionSurface);
- surfaces.registerStructured(textTrackModuleRef, "track", textTrackSurfaceImplementationDigests.track, decodeTextTrackSurface);
- surfaces.registerStructured(textTrackModuleRef, "mask", textTrackSurfaceImplementationDigests.mask, decodeTextMaskSurface);
+ surfaces.registerStructured(typographyTrackModuleRef, "style", typographyTrackSurfaceImplementationDigests.style, decodeTypographyStyleSurface);
+ surfaces.registerStructured(typographyTrackModuleRef, "motion", typographyTrackSurfaceImplementationDigests.motion, decodeTypographyMotionSurface);
+ surfaces.registerStructured(typographyTrackModuleRef, "track", typographyTrackSurfaceImplementationDigests.track, decodeTypographyTrackSurface);
+ surfaces.registerStructured(typographyTrackModuleRef, "mask", typographyTrackSurfaceImplementationDigests.mask, decodeTypographyMaskSurface);
const frontends = new AuthorFrontendRegistry();
- frontends.register(createTextAuthorFrontend({
+ frontends.register(createMarkupAuthorFrontend({
registry: surfaces,
- resolveModule: (request) => request.from === "example.text-inputs@1" ? fixtureModule : textTrackModuleRef,
+ resolveModule: (request) => request.from === "example.text-inputs@1" ? fixtureModule : typographyTrackModuleRef,
}));
const validators = new TypeValidatorRegistry();
registerTypeValidatorFacets(validators, spatialComponent.validators ?? []);
+ registerTypeValidatorFacets(validators, textComponent.validators ?? []);
const compiled = await compileSourceClosure({
entry: {
id: "/project/text.svml",
name: "text.svml",
- text: `<?svml using="@narratage/text@1"?>
+ text: `<?svml using="@narratage/markup@1"?>
<svml>
<import as="fixture" from="example.text-inputs@1"/>
- <import as="text" from="@narratage/text-track@1"/>
+ <import as="text" from="@narratage/typography-track@1"/>
<fixture:Inputs/>
<text:Style id="poster" recipe={editorial} font={exact-font}>
<text:Fill color="#f8fafc"/>
@@ -445,7 +451,7 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
</text:Sequence>
</text:Motion>
<text:Track id="titles" space={space}>
- <text:Point id="hook" placement={title-point} style={poster} during="program">Hello world</text:Point>
+ <text:Point id="hook" content={copy} placement={title-point} style={poster} during="program"/>
<text:Area id="body" placement={body-frame} style={poster} motion={arrive} during="program">
<text:P id="first">Rich <text:Span style={poster}>inline text</text:Span><text:Break/>wraps.</text:P>
</text:Area>
@@ -462,7 +468,7 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
admitRecord: createRecordAdmitter(validators),
resolveSource() { throw new Error("Text fixture has no source imports."); },
});
- const program = resolveCompiledSourceExport(compiled, "mask-shape.program", textTrackTypes.program);
+ const program = resolveCompiledSourceExport(compiled, "mask-shape.program", typographyTrackTypes.program);
const ordinaryTrack = resolveCompiledSourceExport(compiled, "titles.track", compositionTypes.visualTrack);
const track = resolveCompiledSourceExport(compiled, "masked-titles.track", compositionTypes.visualTrack);
assert.equal(program.ref.kind, "logical-output");
@@ -477,11 +483,11 @@ test("the self-described Text Surfaces compile Style, Motion and all three spati
satisfactions: [],
}));
const producers = build.plan.steps.map((step) => step.producer.name);
- assert.equal(producers.filter((name) => name === textTrackProducers.bindPoint.name).length, 1);
- assert.equal(producers.filter((name) => name === textTrackProducers.bindArea.name).length, 2);
- assert.equal(producers.filter((name) => name === textTrackProducers.bindPath.name).length, 1);
- assert.equal(producers.filter((name) => name === textTrackProducers.render.name).length, 1);
- assert.equal(producers.filter((name) => name === textTrackProducers.renderMask.name).length, 1);
+ assert.equal(producers.filter((name) => name === typographyTrackProducers.bindPoint.name).length, 1);
+ assert.equal(producers.filter((name) => name === typographyTrackProducers.bindArea.name).length, 2);
+ assert.equal(producers.filter((name) => name === typographyTrackProducers.bindPath.name).length, 1);
+ assert.equal(producers.filter((name) => name === typographyTrackProducers.render.name).length, 1);
+ assert.equal(producers.filter((name) => name === typographyTrackProducers.renderMask.name).length, 1);
});
test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and Path Text", () => {
@@ -568,8 +574,8 @@ test("rich Text lowers ordered glyph layers, boxes, bounded flow, sequences and
contract: "svml.text-motion@1", id: "path-motion", sequences: [],
pathMargin: { keyframes: [{ atFrame: 0, startMarginPx: 0 }, { atFrame: 150, startMarginPx: 120, easing: "ease-in-out" }] },
});
- const track = renderTextTrack(space, sealTextTrackProgram({
- contract: "svml.text-track-program@1",
+ const track = renderTypographyTrack(space, sealTypographyTrackProgram({
+ contract: "svml.typography-track-program@1",
id: "rich-text",
items: [
{
diff --git a/packages/video-cli/README.md b/packages/video-cli/README.md
index 587890d4..7ddc1d6f 100644
--- a/packages/video-cli/README.md
+++ b/packages/video-cli/README.md
@@ -1,6 +1,6 @@
# `@narratage/video-cli`
-Official video command application. It selects the Text compiler Host, but deliberately carries
+Official video command application. It selects the Markup compiler Host, but deliberately carries
no built-in author, Run, Provider or Store package.
Every Frontend, Surface, deterministic Producer and Validator is activated from an explicit
@@ -12,7 +12,7 @@ From the repository:
```bash
pnpm narratage lock-packages ./svml.packages.lock \
- --package @narratage/run-text --package @narratage/script --package @example/cards --root .
+ --package @narratage/run-markup --package @narratage/script --package @example/cards --root .
pnpm narratage lock-packages ./svml.runtime-packages.lock \
--package @narratage/provider-kie --package @narratage/provider-media-local --root .
pnpm narratage check path/to/main.svml --package-lock ./svml.packages.lock --root .
diff --git a/packages/video-cli/package.json b/packages/video-cli/package.json
index 1016b74c..3ba28779 100644
--- a/packages/video-cli/package.json
+++ b/packages/video-cli/package.json
@@ -8,7 +8,7 @@
},
"dependencies": {
"@narratage/cli": "workspace:*",
- "@narratage/compiler-text-node": "workspace:*",
+ "@narratage/compiler-markup-node": "workspace:*",
"@narratage/local": "workspace:*",
"@narratage/package-loader-node": "workspace:*"
},
diff --git a/packages/video-cli/src/compiler.ts b/packages/video-cli/src/compiler.ts
index 46130e41..0cf1e701 100644
--- a/packages/video-cli/src/compiler.ts
+++ b/packages/video-cli/src/compiler.ts
@@ -1,12 +1,12 @@
import type { CliCompilerOptions } from "@narratage/cli";
-import { createTextNodeCompiler } from "@narratage/compiler-text-node";
+import { createMarkupNodeCompiler } from "@narratage/compiler-markup-node";
/** Video authoring packages are selected by an explicit package lock; none are implicit here. */
export const videoBuiltInPackageContributions = [] as const;
-/** Assemble the Text compiler Host from only the packages selected for this invocation. */
+/** Assemble the Markup compiler Host from only the packages selected for this invocation. */
export function createVideoCompiler(options: CliCompilerOptions) {
- return createTextNodeCompiler(options.packageContributions, {
+ return createMarkupNodeCompiler(options.packageContributions, {
...(options.root === undefined ? {} : { root: options.root }),
});
}
diff --git a/packages/video-cli/test/cli.test.ts b/packages/video-cli/test/cli.test.ts
index 4edea6a2..291618e9 100644
--- a/packages/video-cli/test/cli.test.ts
+++ b/packages/video-cli/test/cli.test.ts
@@ -18,7 +18,7 @@ const runCli = (
test("production video CLI has no implicit author or Run packages", async () => {
const root = await mkdtemp(join(tmpdir(), "svml-cli-empty-distribution-"));
const file = join(root, "main.svml");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
<script id="story"><opening><HOST>No hidden package.</opening></script>
@@ -36,7 +36,7 @@ async function writeRun(
targets: readonly { readonly output: string; readonly accepts?: "exact" | "substitute" }[],
): Promise<string> {
const path = join(root, name);
- await writeFile(path, `<?svml using="@narratage/run-text@1"?>
+ await writeFile(path, `<?svml using="@narratage/run-markup@1"?>
<svrun version="1" targets="selected">
<author source="./main.svml"/>
<target-set id="selected">
@@ -56,7 +56,7 @@ test("official video CLI checks a real Script source through the Node compiler h
font-size: 72;
}
</sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
<import as="studio" source="./studio.svs"/>
@@ -80,6 +80,7 @@ test("official video CLI checks a real Script source through the Node compiler h
"@narratage/narrative@1",
"@narratage/script@1",
"@narratage/svs@1",
+ "@narratage/text@1",
]);
assert.deepEqual(result.exports, [
{ name: "story", type: {
@@ -99,12 +100,12 @@ test("official video CLI checks a real Script source through the Node compiler h
name: "NarrativeExcerpt",
}, kind: "record" },
{ name: "story.segment.opening.dialogue", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "NarrativeDialogueExcerpt",
+ module: { name: "@narratage/text", version: "1" },
+ name: "Text",
}, kind: "record" },
{ name: "story.segment.opening.speech", type: {
- module: { name: "@narratage/narrative", version: "1" },
- name: "NarrativeSpeechExcerpt",
+ module: { name: "@narratage/text", version: "1" },
+ name: "Text",
}, kind: "record" },
]);
});
@@ -124,7 +125,7 @@ test("author source binds an ordered exact Font stack to a Fine Caption Style",
fill: #ffffff; background: #00000000; padding: 0 0; radius: 0;
}
</sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="media" from="@narratage/media@1"/>
<import as="caption-fine" from="@narratage/caption-fine@1"/>
@@ -161,7 +162,7 @@ test("an installed open-font package supplies a multilingual exact stack without
fill: #ffffff; background: #00000000; padding: 0 0; radius: 0;
}
</sheet>`, "utf8");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="fonts" from="@narratage/fonts-open@1"/>
<import as="caption-fine" from="@narratage/caption-fine@1"/>
@@ -186,8 +187,8 @@ test("an installed open-font package supplies a multilingual exact stack without
);
});
-test("Prompt Kit source and Speaker Surface finish prompt assembly before the Run Graph", async () => {
- const root = await mkdtemp(join(tmpdir(), "svml-cli-prompt-kit-"));
+test("Text Template and Speaker keep prompt assembly visible in the Run Graph", async () => {
+ const root = await mkdtemp(join(tmpdir(), "svml-cli-text-template-"));
const file = join(root, "main.svml");
const kitSource = await readFile(
new URL("../../seedance-speaker/kits/official-ugc-v1.svs", import.meta.url),
@@ -200,7 +201,7 @@ test("Prompt Kit source and Speaker Surface finish prompt assembly before the Ru
speaker.default { kind: ugc-talking-head; model: mini; resolution: 720p; aspect-ratio: 9:16; }
</sheet>`, "utf8");
await writeFile(join(root, "host.png"), new Uint8Array([137, 80, 78, 71]));
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import from="@narratage/script@1"/>
<import as="media" from="@narratage/media@1"/>
@@ -236,16 +237,15 @@ test("Prompt Kit source and Speaker Surface finish prompt assembly before the Ru
};
assert.deepEqual(plan.steps.map((step) => step.producer.name).sort(), [
"bind-request-seedance-2-mini-referenceImage",
+ "bind-request-seedance-2-mini-prompt-text",
+ "bind-text",
"compile-seedance-2-mini-speech-request",
"estimate-speech-duration",
"finalize-request-seedance-2-mini",
"request-seedance-2-mini",
+ "render",
"select-primary-video",
].sort());
- assert.equal(
- plan.steps.some((step) => /prompt|speaker/u.test(step.producer.name)),
- false,
- );
});
test("CLI accepts a declarative Runtime Profile without an executable config module", async () => {
@@ -317,7 +317,7 @@ test("one checked-in fixture closes the complete provider-free video plan", asyn
"request-media-normalization",
"project-media-visual-track",
"render-fine-caption",
- "render-text-track",
+ "render-typography-track",
"compile-composition",
"request-visual-render",
"request-audio-render",
@@ -355,8 +355,8 @@ test("CLI package lock activates an installed package without changing the offic
implementation: { kind: "trusted-frontend-surface", locator: "example/empty", digest } }],
}, specifiers: ["example.empty@1"] }],
hostFacets: [{
- abi: "svml.text-surface-host@1",
- identity: { contract: "svml.text-surface-host-facet@1", module, surface: "empty",
+ abi: "svml.markup-surface-host@1",
+ identity: { contract: "svml.markup-surface-host-facet@1", module, surface: "empty",
mode: "structured", implementationDigest: digest },
implementation() { return { records: [], components: [], fragments: [] }; },
}],
@@ -364,7 +364,7 @@ test("CLI package lock activates an installed package without changing the offic
`, "utf8");
const file = join(root, "main.svml");
const lockPath = join(root, "svml.packages.lock");
- await writeFile(file, `<?svml using="@narratage/text@1"?>
+ await writeFile(file, `<?svml using="@narratage/markup@1"?>
<svml>
<import as="example" from="example.empty@1"/>
<example:Empty/>
diff --git a/packages/video-cli/test/packages.ts b/packages/video-cli/test/packages.ts
index 5ba2be29..a72c5465 100644
--- a/packages/video-cli/test/packages.ts
+++ b/packages/video-cli/test/packages.ts
@@ -14,8 +14,8 @@ import mediaTrack from "../../media-track/src/activation.js";
import media from "../../media/src/activation.js";
import narrative from "../../narrative/src/activation.js";
import programSpace from "../../program-space/src/activation.js";
-import promptKit from "../../prompt-kit/src/activation.js";
-import runText from "../../run-text/src/activation.js";
+import text from "../../text/src/activation.js";
+import runMarkup from "../../run-markup/src/activation.js";
import script from "../../script/src/activation.js";
import seedanceSpeaker from "../../seedance-speaker/src/activation.js";
import seedance from "../../seedance/src/activation.js";
@@ -29,7 +29,7 @@ import spatial from "../../spatial/src/activation.js";
import temporal from "../../temporal/src/activation.js";
import visualIr from "../../visual-ir/src/activation.js";
import svs from "../../svs/src/activation.js";
-import textTrack from "../../text-track/src/activation.js";
+import typographyTrack from "../../typography-track/src/activation.js";
import whisperX from "../../whisperx/src/activation.js";
/** Test-only explicit environment; production video CLI starts with no author packages. */
@@ -47,7 +47,7 @@ export const videoTestPackages = [
script,
estimate,
fontsOpen,
- promptKit,
+ text,
generation,
seedance,
seedanceSpeaker,
@@ -61,10 +61,10 @@ export const videoTestPackages = [
spatial,
temporal,
mediaTrack,
- textTrack,
+ typographyTrack,
film,
hyperframes,
mediaPipeline,
renderHyperframes,
- runText,
+ runMarkup,
] as const;
diff --git a/packages/whisperx/package.json b/packages/whisperx/package.json
index 98c75f72..1f0cfaf5 100644
--- a/packages/whisperx/package.json
+++ b/packages/whisperx/package.json
@@ -19,7 +19,7 @@
"@narratage/speech": "workspace:*",
"@narratage/speech-alignment": "workspace:*",
"@narratage/speech-evidence": "workspace:*",
- "@narratage/text": "workspace:*"
+ "@narratage/markup": "workspace:*"
},
"devDependencies": {
"@narratage/program-space": "workspace:*"
diff --git a/packages/whisperx/src/activation.ts b/packages/whisperx/src/activation.ts
index d176a53f..ccf8ecb3 100644
--- a/packages/whisperx/src/activation.ts
+++ b/packages/whisperx/src/activation.ts
@@ -1,4 +1,4 @@
-import { createTextSurfaceHostFacet } from "@narratage/text";
+import { createMarkupSurfaceHostFacet } from "@narratage/markup";
import {
decodeWhisperXAlignmentSurface, whisperXComponent, whisperXImplementationDigests,
whisperXManifest, whisperXModuleRef,
@@ -9,7 +9,7 @@ export const svmlPackage = {
name: "@narratage/whisperx",
modules: [{ manifest: whisperXManifest, specifiers: ["@narratage/whisperx", "@narratage/whisperx@1"] }],
components: [whisperXComponent],
- hostFacets: [createTextSurfaceHostFacet({
+ hostFacets: [createMarkupSurfaceHostFacet({
module: whisperXModuleRef, surface: "alignment", mode: "structured",
implementationDigest: whisperXImplementationDigests.surface,
handler: decodeWhisperXAlignmentSurface,
diff --git a/packages/whisperx/src/surface.ts b/packages/whisperx/src/surface.ts
index d4ac5300..343abbbd 100644
--- a/packages/whisperx/src/surface.ts
+++ b/packages/whisperx/src/surface.ts
@@ -4,8 +4,8 @@ import type {
StructuredElement,
StructuredSurfaceHandler,
SurfaceResolvedReference,
- TextAttributeValue,
-} from "@narratage/text";
+ MarkupAttributeValue,
+} from "@narratage/markup";
import { whisperXSpeechAlignmentFragment } from "./fragment.js";
@@ -31,7 +31,7 @@ function reference(
expected: SurfaceResolvedReference["type"],
resolveReference: (path: string) => SurfaceResolvedReference | undefined,
): SurfaceResolvedReference {
- const raw: TextAttributeValue | undefined = element.attributes[name];
+ const raw: MarkupAttributeValue | undefined = element.attributes[name];
if (typeof raw !== "object" || raw.kind !== "reference") throw new Error(`${element.name}.${name} must be a whole-value reference`);
const value = resolveReference(raw.path);
if (value === undefined) throw new Error(`${element.name}.${name} cannot resolve ${raw.path}`);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7142e75f..ac2f4439 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,9 +77,6 @@ importers:
'@narratage/program-space':
specifier: workspace:*
version: link:packages/program-space
- '@narratage/prompt-kit':
- specifier: workspace:*
- version: link:packages/prompt-kit
'@narratage/provider-google-vertex':
specifier: workspace:*
version: link:packages/provider-google-vertex
@@ -110,9 +107,9 @@ importers:
'@narratage/render-hyperframes':
specifier: workspace:*
version: link:packages/render-hyperframes
- '@narratage/run-text':
+ '@narratage/run-markup':
specifier: workspace:*
- version: link:packages/run-text
+ version: link:packages/run-markup
'@narratage/runtime-adapter':
specifier: workspace:*
version: link:packages/runtime-adapter
@@ -158,9 +155,12 @@ importers:
'@narratage/temporal':
specifier: workspace:*
version: link:packages/temporal
- '@narratage/text-track':
+ '@narratage/text':
specifier: workspace:*
- version: link:packages/text-track
+ version: link:packages/text
+ '@narratage/typography-track':
+ specifier: workspace:*
+ version: link:packages/typography-track
'@narratage/visual-ir':
specifier: workspace:*
version: link:packages/visual-ir
@@ -221,6 +221,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -239,9 +242,6 @@ importers:
'@narratage/temporal':
specifier: workspace:*
version: link:../temporal
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/background-removal:
dependencies:
@@ -254,12 +254,12 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/caption:
dependencies:
@@ -269,6 +269,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/narrative':
specifier: workspace:*
version: link:../narrative
@@ -278,9 +281,6 @@ importers:
'@narratage/semantic-map':
specifier: workspace:*
version: link:../semantic-map
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/script':
specifier: workspace:*
@@ -309,6 +309,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -327,9 +330,6 @@ importers:
'@narratage/svs':
specifier: workspace:*
version: link:../svs
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/script':
specifier: workspace:*
@@ -346,15 +346,15 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/narrative':
specifier: workspace:*
version: link:../narrative
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/script':
specifier: workspace:*
@@ -401,6 +401,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -429,67 +432,67 @@ importers:
specifier: workspace:*
version: link:../text
- packages/compiler-node:
+ packages/compiler-markup-node:
dependencies:
- '@narratage/core':
+ '@narratage/compiler-node':
specifier: workspace:*
- version: link:../core
+ version: link:../compiler-node
+ '@narratage/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
'@narratage/host':
specifier: workspace:*
version: link:../host
- '@narratage/protocol':
- specifier: workspace:*
- version: link:../protocol
- '@narratage/run':
+ '@narratage/markup':
specifier: workspace:*
- version: link:../run
- '@narratage/source':
+ version: link:../markup
+ '@narratage/package-loader-node':
specifier: workspace:*
- version: link:../source
+ version: link:../package-loader-node
'@narratage/validation':
specifier: workspace:*
version: link:../validation
- '@narratage/workspace-fs-node':
- specifier: workspace:*
- version: link:../workspace-fs-node
devDependencies:
- '@narratage/run-text':
- specifier: workspace:*
- version: link:../run-text
- '@narratage/text':
+ '@narratage/protocol':
specifier: workspace:*
- version: link:../text
+ version: link:../protocol
- packages/compiler-text-node:
+ packages/compiler-node:
dependencies:
- '@narratage/compiler-node':
- specifier: workspace:*
- version: link:../compiler-node
- '@narratage/component-kit':
+ '@narratage/core':
specifier: workspace:*
- version: link:../component-kit
+ version: link:../core
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
'@narratage/host':
specifier: workspace:*
version: link:../host
- '@narratage/package-loader-node':
+ '@narratage/protocol':
specifier: workspace:*
- version: link:../package-loader-node
- '@narratage/text':
+ version: link:../protocol
+ '@narratage/run':
specifier: workspace:*
- version: link:../text
+ version: link:../run
+ '@narratage/source':
+ specifier: workspace:*
+ version: link:../source
'@narratage/validation':
specifier: workspace:*
version: link:../validation
+ '@narratage/workspace-fs-node':
+ specifier: workspace:*
+ version: link:../workspace-fs-node
devDependencies:
- '@narratage/protocol':
+ '@narratage/markup':
specifier: workspace:*
- version: link:../protocol
+ version: link:../markup
+ '@narratage/run-markup':
+ specifier: workspace:*
+ version: link:../run-markup
packages/component-kit:
dependencies:
@@ -582,6 +585,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -683,9 +689,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
- '@narratage/narrative':
+ '@narratage/markup':
specifier: workspace:*
- version: link:../narrative
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -710,6 +716,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/program-space':
specifier: workspace:*
version: link:../program-space
@@ -722,9 +731,6 @@ importers:
'@narratage/svs':
specifier: workspace:*
version: link:../svs
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/core':
specifier: workspace:*
@@ -735,9 +741,9 @@ importers:
'@narratage/hyperframes':
specifier: workspace:*
version: link:../hyperframes
- '@narratage/text-track':
+ '@narratage/typography-track':
specifier: workspace:*
- version: link:../text-track
+ version: link:../typography-track
'@narratage/validation':
specifier: workspace:*
version: link:../validation
@@ -1071,15 +1077,15 @@ importers:
'@infolektuell/noto-color-emoji':
specifier: 0.2.0
version: 0.2.0
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/gemini-omni:
dependencies:
@@ -1104,6 +1110,9 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
+ '@narratage/text':
+ specifier: workspace:*
+ version: link:../text
devDependencies:
'@narratage/driver-node':
specifier: workspace:*
@@ -1132,6 +1141,9 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
+ '@narratage/text':
+ specifier: workspace:*
+ version: link:../text
packages/grok-imagine:
dependencies:
@@ -1189,6 +1201,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -1198,9 +1213,6 @@ importers:
'@narratage/spatial':
specifier: workspace:*
version: link:../spatial
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/image-transform:
dependencies:
@@ -1213,15 +1225,15 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
'@narratage/raster':
specifier: workspace:*
version: link:../raster
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/local:
dependencies:
@@ -1266,6 +1278,28 @@ importers:
specifier: workspace:*
version: link:../core
+ packages/markup:
+ dependencies:
+ '@narratage/core':
+ specifier: workspace:*
+ version: link:../core
+ '@narratage/elaborator':
+ specifier: workspace:*
+ version: link:../elaborator
+ '@narratage/host':
+ specifier: workspace:*
+ version: link:../host
+ '@narratage/protocol':
+ specifier: workspace:*
+ version: link:../protocol
+ devDependencies:
+ '@narratage/narrative':
+ specifier: workspace:*
+ version: link:../narrative
+ '@narratage/script':
+ specifier: workspace:*
+ version: link:../script
+
packages/media:
dependencies:
'@narratage/artifact':
@@ -1274,12 +1308,12 @@ importers:
'@narratage/component-kit':
specifier: workspace:*
version: link:../component-kit
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/media-execution:
dependencies:
@@ -1310,6 +1344,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -1325,9 +1362,6 @@ importers:
'@narratage/speech':
specifier: workspace:*
version: link:../speech
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/core':
specifier: workspace:*
@@ -1350,6 +1384,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -1374,9 +1411,6 @@ importers:
'@narratage/temporal':
specifier: workspace:*
version: link:../temporal
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/mimo-tts:
dependencies:
@@ -1389,12 +1423,12 @@ importers:
'@narratage/generation':
specifier: workspace:*
version: link:../generation
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/model-kit':
specifier: workspace:*
version: link:../model-kit
- '@narratage/narrative':
- specifier: workspace:*
- version: link:../narrative
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -1428,6 +1462,9 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
+ '@narratage/text':
+ specifier: workspace:*
+ version: link:../text
packages/nano-banana:
dependencies:
@@ -1503,24 +1540,6 @@ importers:
specifier: workspace:*
version: link:../protocol
- packages/prompt-kit:
- dependencies:
- '@narratage/component-kit':
- specifier: workspace:*
- version: link:../component-kit
- '@narratage/core':
- specifier: workspace:*
- version: link:../core
- '@narratage/elaborator':
- specifier: workspace:*
- version: link:../elaborator
- '@narratage/protocol':
- specifier: workspace:*
- version: link:../protocol
- '@narratage/svs':
- specifier: workspace:*
- version: link:../svs
-
packages/protocol: {}
packages/provider-google-vertex:
@@ -1890,6 +1909,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -1944,6 +1966,9 @@ importers:
'@narratage/hyperframes':
specifier: workspace:*
version: link:../hyperframes
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -1956,9 +1981,6 @@ importers:
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/core':
specifier: workspace:*
@@ -1988,24 +2010,24 @@ importers:
specifier: workspace:*
version: link:../source
devDependencies:
- '@narratage/run-text':
+ '@narratage/run-markup':
specifier: workspace:*
- version: link:../run-text
+ version: link:../run-markup
'@narratage/validation':
specifier: workspace:*
version: link:../validation
- packages/run-text:
+ packages/run-markup:
dependencies:
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
'@narratage/run':
specifier: workspace:*
version: link:../run
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/runtime:
dependencies:
@@ -2048,6 +2070,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/narrative':
specifier: workspace:*
version: link:../narrative
@@ -2066,15 +2091,15 @@ importers:
'@narratage/temporal':
specifier: workspace:*
version: link:../temporal
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/script:
dependencies:
'@narratage/core':
specifier: workspace:*
version: link:../core
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/narrative':
specifier: workspace:*
version: link:../narrative
@@ -2096,6 +2121,9 @@ importers:
'@narratage/generation':
specifier: workspace:*
version: link:../generation
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/model-kit':
specifier: workspace:*
version: link:../model-kit
@@ -2123,15 +2151,12 @@ importers:
'@narratage/generation':
specifier: workspace:*
version: link:../generation
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/model-kit':
specifier: workspace:*
version: link:../model-kit
- '@narratage/narrative':
- specifier: workspace:*
- version: link:../narrative
- '@narratage/prompt-kit':
- specifier: workspace:*
- version: link:../prompt-kit
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
@@ -2185,12 +2210,12 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
'@narratage/validation':
specifier: workspace:*
version: link:../validation
@@ -2301,6 +2326,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -2325,9 +2353,6 @@ importers:
'@narratage/speech-basis':
specifier: workspace:*
version: link:../speech-basis
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/caption':
specifier: workspace:*
@@ -2381,12 +2406,12 @@ importers:
specifier: workspace:*
version: link:../protocol
devDependencies:
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/source':
specifier: workspace:*
version: link:../source
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
packages/temporal:
dependencies:
@@ -2405,27 +2430,44 @@ importers:
packages/text:
dependencies:
+ '@narratage/component-kit':
+ specifier: workspace:*
+ version: link:../component-kit
'@narratage/core':
specifier: workspace:*
version: link:../core
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
- '@narratage/host':
+ '@narratage/markup':
specifier: workspace:*
- version: link:../host
+ version: link:../markup
'@narratage/protocol':
specifier: workspace:*
version: link:../protocol
- devDependencies:
- '@narratage/narrative':
+ '@narratage/svs':
specifier: workspace:*
- version: link:../narrative
- '@narratage/script':
+ version: link:../svs
+
+ packages/transport:
+ dependencies:
+ '@narratage/protocol':
specifier: workspace:*
- version: link:../script
+ version: link:../protocol
+
+ packages/transport-aws-lambda:
+ dependencies:
+ '@aws-sdk/client-lambda':
+ specifier: ^3.1103.0
+ version: 3.1103.0
+ '@narratage/protocol':
+ specifier: workspace:*
+ version: link:../protocol
+ '@narratage/transport':
+ specifier: workspace:*
+ version: link:../transport
- packages/text-track:
+ packages/typography-track:
dependencies:
'@narratage/component-kit':
specifier: workspace:*
@@ -2436,6 +2478,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media':
specifier: workspace:*
version: link:../media
@@ -2468,24 +2513,6 @@ importers:
specifier: workspace:*
version: link:../hyperframes
- packages/transport:
- dependencies:
- '@narratage/protocol':
- specifier: workspace:*
- version: link:../protocol
-
- packages/transport-aws-lambda:
- dependencies:
- '@aws-sdk/client-lambda':
- specifier: ^3.1103.0
- version: 3.1103.0
- '@narratage/protocol':
- specifier: workspace:*
- version: link:../protocol
- '@narratage/transport':
- specifier: workspace:*
- version: link:../transport
-
packages/validation:
dependencies:
'@narratage/core':
@@ -2500,9 +2527,9 @@ importers:
'@narratage/cli':
specifier: workspace:*
version: link:../cli
- '@narratage/compiler-text-node':
+ '@narratage/compiler-markup-node':
specifier: workspace:*
- version: link:../compiler-text-node
+ version: link:../compiler-markup-node
'@narratage/local':
specifier: workspace:*
version: link:../local
@@ -2524,6 +2551,9 @@ importers:
'@narratage/elaborator':
specifier: workspace:*
version: link:../elaborator
+ '@narratage/markup':
+ specifier: workspace:*
+ version: link:../markup
'@narratage/media-pipeline':
specifier: workspace:*
version: link:../media-pipeline
@@ -2545,9 +2575,6 @@ importers:
'@narratage/speech-evidence':
specifier: workspace:*
version: link:../speech-evidence
- '@narratage/text':
- specifier: workspace:*
- version: link:../text
devDependencies:
'@narratage/program-space':
specifier: workspace:*
diff --git a/spec/script-surface.md b/spec/script-surface.md
index e3fd033e..261b0316 100644
--- a/spec/script-surface.md
+++ b/spec/script-surface.md
@@ -86,7 +86,7 @@ Segment 的两个独立结构端点;真正的静音或素材行为由外部 Pr
## 1. 文档与 Segment
-在官方 Text Frontend 中,一个 `<script>` Surface 实例产生一份 Narrative;
+在官方 Markup Frontend 中,一个 `<script>` Surface 实例产生一份 Narrative;
`<script>` 外壳由 Text 根据导入后的 Surface Registry 分派,Script Parser 接收的
只是它的 raw body。Script body 的 Segment 形式只有具名块和具名空块:
diff --git a/spec/track-authoring.md b/spec/track-authoring.md
index 8b3f9dbc..48d02c8b 100644
--- a/spec/track-authoring.md
+++ b/spec/track-authoring.md
@@ -4,7 +4,7 @@ Status: executable temporal authority for the next official Track-package migrat
`@narratage/temporal` package implements strict occurrence expansion, exact rational window
projection and triggered sibling schedules. Shared Spatial, Text, Ranking, Media,
Audio and Screen Overlay are now specified in [`spatial-layout.md`](./spatial-layout.md),
-[`text-track.md`](./text-track.md), [`ranking-track.md`](./ranking-track.md),
+[`typography-track.md`](./typography-track.md), [`ranking-track.md`](./ranking-track.md),
[`media-track.md`](./media-track.md), [`deck-track.md`](./deck-track.md),
[`audio-track.md`](./audio-track.md) and
[`screen-overlay.md`](./screen-overlay.md). Comment Sticker remains independent future work and
@@ -416,7 +416,7 @@ structural cuts are Narrative Selection consumption.
## 8. Migration consequences
-The current simple `text-track` Surface still supports only `during="full"` or an identity
+The current simple `typography-track` Surface still supports only `during="full"` or an identity
Selection mapping. It must not independently grow another timing enum. Its rewrite must consume the
shared temporal package. Media Track already consumes that package for Item and Sequence timing.
diff --git a/spec/track-expressiveness.md b/spec/track-expressiveness.md
index c739e8c9..608c7c6b 100644
--- a/spec/track-expressiveness.md
+++ b/spec/track-expressiveness.md
@@ -173,7 +173,7 @@ remote renderer-deployment digest in receipt-covered metadata. Shared ffprobe-ba
verification proves declared dimensions, timing, SDR/sRGB and alpha facts before local staging;
Endpoints without this ability decline Surface-bearing documents.
-E1–E5, E7 and E8 now have their official package witnesses. `@narratage/text-track` proves the
+E1–E5, E7 and E8 now have their official package witnesses. `@narratage/typography-track` proves the
complete three-box/Text terminal model without public Text fields; Caption and Media prove their
independent package models. `@narratage/audio-track` proves the exact
48 kHz source/target mapping, overlap law, bounded stretch and one shared local/remote
diff --git a/spec/text-track.md b/spec/typography-track.md
similarity index 94%
rename from spec/text-track.md
rename to spec/typography-track.md
index 3cf861e3..5db27277 100644
--- a/spec/text-track.md
+++ b/spec/typography-track.md
@@ -1,4 +1,4 @@
-# Text Track Authoring and Expressiveness
+# Typography Track Authoring and Expressiveness
Status: implemented pre-release authority for the official two-dimensional Text package. The
complete declared model and browser evidence execute through the frozen repository-internal
@@ -39,7 +39,7 @@ that language, not the definition of Text.
### 2.1 Current Narratage slice
-The current `packages/text-track` implementation has one fixed rectangular box, one plain string
+The current `packages/typography-track` implementation has one fixed rectangular box, one plain string
and one `TextAppearance` containing color, size, family, weight, line height, horizontal/vertical
alignment, one background, radius, padding and tracking. Its Surface accepts exactly `text`,
`during` and `appearance`; its Recipe requires exactly eleven scalar properties.
@@ -124,7 +124,7 @@ This is an expressiveness attack set, not a request to reproduce every product's
The ordinary two-dimensional package remains one package:
```text
-@narratage/text-track
+@narratage/typography-track
Point Text
Area Text
Path Text
@@ -363,32 +363,48 @@ The intended author shape is:
</text:Style>
<text:Track id="titles" space={film.space}>
- <text:Point id="hook" style={poster} timing={hook-time} placement={hook-point}>
+ <text:Point id="hook" style={poster} during={story.selection.hook} placement={hook-point}>
Nothing hidden in the Runtime.
</text:Point>
- <text:Area id="explanation" style={word-pills} timing={body-time} placement={body-frame}>
+ <text:Area id="explanation" style={word-pills} during={story.selection.body} placement={body-frame}>
<text:P>Every <text:Span style={plain}>visible word</text:Span> stays authored.</text:P>
</text:Area>
</text:Track>
```
-This spelling is illustrative until shared temporal/spatial Surface syntax is fixed. Its important
-properties are already final:
+An item may alternatively consume one ordinary graph `Text` value:
-- the author imports and selects the Text package;
+```svml
+<copy:Value id="headline">Nothing hidden in the Runtime.</copy:Value>
+
+<text:Track id="titles" space={film.space}>
+ <text:Point id="hook" content={headline}
+ style={poster} during="program" placement={hook-point}/>
+</text:Track>
+```
+
+`content={Text}` and inline body content are mutually exclusive. The former materializes one plain
+document run from the exact graph value; the latter owns the bounded rich document and may use
+`P`, `Span` and `Break`. This prevents a Frontend from copying runtime Text into hidden authored
+state while keeping rich typography explicitly owned by this package.
+
+This spelling executes through the current shared temporal/spatial Surface syntax. Its important
+properties are:
+
+- the author imports and selects the Typography package;
- Styles are declared before use and are ordinary authored Records;
- simple Style values remain compact;
- repeated layers are repeated declarations, not numbered fields or encoded strings;
-- the Text Surface, not SVS, interprets the Recipe vocabulary;
+- the Markup Surface, not SVS, interprets the Recipe vocabulary;
- exact fonts and timing/placement facts travel on explicit graph edges;
- the resulting Text Program contains no unresolved Recipe and no Runtime/provider choice.
## 10. Compiled pipeline and data gates
```text
-Text Surface
- authored document + named Style + temporal binding + spatial binding
+Markup Surface
+ (authored rich document | graph Text input) + named Style + temporal binding + spatial binding
│
▼
Text Program package-owned author truth
diff --git a/tools/graph-first-value-boundary.test.mjs b/tools/graph-first-value-boundary.test.mjs
index 0406c0d7..eb540cde 100644
--- a/tools/graph-first-value-boundary.test.mjs
+++ b/tools/graph-first-value-boundary.test.mjs
@@ -39,14 +39,14 @@ const domainValuePackages = [
"render-hyperframes",
"image-transform",
"media-pipeline",
- "prompt-kit",
+ "text",
"script",
"seedance",
"seedance-speaker",
"speech-alignment",
"speech-spine",
"speech-basis",
- "text-track",
+ "typography-track",
"whisperx",
];
@@ -103,7 +103,7 @@ test("fold values retain members, not hidden identity or policy context", async
["media-track", "types.ts", "MediaTrackSet"],
["film", "types.ts", "FilmTrackSet"],
["speech-spine", "types.ts", "SpeechSpineSet"],
- ["text-track", "types.ts", "TextTrackSet"],
+ ["typography-track", "types.ts", "TypographyTrackSet"],
];
for (const [packageName, fileName, typeName] of declarations) {
const path = new URL(`./${packageName}/src/${fileName}`, packageRoot);
diff --git a/tools/package-boundaries.test.mjs b/tools/package-boundaries.test.mjs
index 2e7d1a4d..e683b8b5 100644
--- a/tools/package-boundaries.test.mjs
+++ b/tools/package-boundaries.test.mjs
@@ -90,6 +90,23 @@ test("official production packages have no dependency cycle", async () => {
for (const name of graph.keys()) visit(name, []);
});
+test("Markup syntax, graph Text and video Typography keep distinct package identities", async () => {
+ const packages = await workspacePackages();
+ for (const name of [
+ "@narratage/markup",
+ "@narratage/run-markup",
+ "@narratage/compiler-markup-node",
+ "@narratage/text",
+ "@narratage/typography-track",
+ ]) assert.ok(packages.has(name), `${name} is absent`);
+ for (const retired of [
+ "@narratage/run-text",
+ "@narratage/compiler-text-node",
+ "@narratage/text-track",
+ "@narratage/prompt-kit",
+ ]) assert.ok(!packages.has(retired), `${retired} must stay retired`);
+});
+
test("the declared domain-neutral distribution closes without syntax, AIGC or video packages", async () => {
const packages = await workspacePackages();
const graph = productionGraph(packages);
@@ -152,11 +169,11 @@ test("the speech time map is an opaque handle: no consumer reads its fields", as
}
});
-test("Text compilation is one explicit leaf assembly, not a Package Loader or Local Runtime dependency", async () => {
+test("Markup compilation is one explicit leaf assembly, not a Package Loader or Local Runtime dependency", async () => {
const graph = productionGraph(await workspacePackages());
- assert.ok(transitive(graph, "@narratage/compiler-text-node").has("@narratage/text"));
- assert.ok(!transitive(graph, "@narratage/package-loader-node").has("@narratage/text"));
- assert.ok(!transitive(graph, "@narratage/local").has("@narratage/text"));
+ assert.ok(transitive(graph, "@narratage/compiler-markup-node").has("@narratage/markup"));
+ assert.ok(!transitive(graph, "@narratage/package-loader-node").has("@narratage/markup"));
+ assert.ok(!transitive(graph, "@narratage/local").has("@narratage/markup"));
});
test("generic and video CLIs reach no Provider package and video CLI activates no author aggregate", async () => {
@@ -170,12 +187,12 @@ test("generic and video CLIs reach no Provider package and video CLI activates n
assert.ok(!videoDependencies.has("@narratage/script"));
assert.ok(!videoDependencies.has("@narratage/seedance-speaker"));
assert.ok(!videoDependencies.has("@narratage/media-track"));
- assert.ok(!videoDependencies.has("@narratage/text-track"));
+ assert.ok(!videoDependencies.has("@narratage/typography-track"));
assert.ok(!videoDependencies.has("@narratage/film"));
assert.ok(videoDependencies.has("@narratage/cli"));
});
-test("domain packages confine their Text dependency to Surface and activation entries", async () => {
+test("domain packages confine their Markup dependency to Surface and activation entries", async () => {
const { readdir, readFile } = await import("node:fs/promises");
const surfaceOnly = [
"caption", "caption-gemini", "estimate", "film", "render-hyperframes",
@@ -187,8 +204,8 @@ test("domain packages confine their Text dependency to Surface and activation en
for (const file of await readdir(root)) {
if (!file.endsWith(".ts") || allowed.has(file)) continue;
const content = await readFile(new URL(file, root), "utf8");
- assert.ok(!content.includes("\"@narratage/text\""),
- `${name}/src/${file} imports @narratage/text outside its Surface boundary`);
+ assert.ok(!content.includes("\"@narratage/markup\""),
+ `${name}/src/${file} imports @narratage/markup outside its Surface boundary`);
}
}
});
diff --git a/tools/visual-ir-boundary.test.mjs b/tools/visual-ir-boundary.test.mjs
index 1a685b23..9e11ba78 100644
--- a/tools/visual-ir-boundary.test.mjs
+++ b/tools/visual-ir-boundary.test.mjs
@@ -68,7 +68,7 @@ test("Composition and render adapters reach no author-package family", async ()
"@narratage/media-track",
"@narratage/ranking",
"@narratage/screen-overlay",
- "@narratage/text-track",
+ "@narratage/typography-track",
]);
for (const name of ["composition", "hyperframes", "render-hyperframes", "provider-hyperframes-local"]) {
const manifest = await packageManifest(name);
diff --git a/tsconfig.json b/tsconfig.json
index 38ccfac1..69d84464 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -96,6 +96,9 @@
"@narratage/script": [
"packages/script/src/index.ts"
],
+ "@narratage/markup": [
+ "packages/markup/src/index.ts"
+ ],
"@narratage/text": [
"packages/text/src/index.ts"
],
@@ -120,8 +123,8 @@
"@narratage/run": [
"packages/run/src/index.ts"
],
- "@narratage/run-text": [
- "packages/run-text/src/index.ts"
+ "@narratage/run-markup": [
+ "packages/run-markup/src/index.ts"
],
"@narratage/runtime": [
"packages/runtime/src/index.ts"
@@ -154,9 +157,6 @@
"@narratage/model-kit": [
"packages/model-kit/src/index.ts"
],
- "@narratage/prompt-kit": [
- "packages/prompt-kit/src/index.ts"
- ],
"@narratage/seedance": [
"packages/seedance/src/index.ts"
],
@@ -231,8 +231,8 @@
"@narratage/film": [
"packages/film/src/index.ts"
],
- "@narratage/text-track": [
- "packages/text-track/src/index.ts"
+ "@narratage/typography-track": [
+ "packages/typography-track/src/index.ts"
],
"@narratage/svs": [
"packages/svs/src/index.ts"
@@ -240,6 +240,9 @@
"@narratage/compiler-node": [
"packages/compiler-node/src/index.ts"
],
+ "@narratage/compiler-markup-node": [
+ "packages/compiler-markup-node/src/index.ts"
+ ],
"@narratage/package-loader-node": [
"packages/package-loader-node/src/index.ts"
],