@marver-design/marver 0.33.0 → 0.35.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +57 -0
- package/README.md +1 -1
- package/dist/{anchor-check-KCe6WeRA.mjs → anchor-check-DREwCQiE.mjs} +1 -1
- package/dist/{build-4-k2XhhX.mjs → build-3AH123fe.mjs} +3 -3
- package/dist/cli.mjs +5 -8
- package/dist/{comments-C2SN1QdM.mjs → comments-C7NjFGgl.mjs} +14 -7
- package/dist/{daemon-CCDgagw2.mjs → daemon-BE-t9iU-.mjs} +2 -4
- package/dist/{dev-CJf5upVK.mjs → dev-Dw6mcoP8.mjs} +7 -7
- package/dist/{notes-CRAX4wgk.mjs → notes-CmfQ9604.mjs} +13 -4
- package/dist/{pdf-GGya_nI6.mjs → pdf-CkE4Ir2P.mjs} +3 -3
- package/dist/{plugin-Cm74UDfp.mjs → plugin-C6jEpbCx.mjs} +43 -34
- package/dist/{poster-BnuT9UyW.mjs → poster-d10h73z0.mjs} +1 -1
- package/dist/{publish-bakes-zHmPEOB5.mjs → publish-bakes-weNQnNqE.mjs} +2 -2
- package/dist/{recover-BpRQxBA7.mjs → recover-Dekpav7b.mjs} +1 -1
- package/dist/{shot-HZtclbOT.mjs → shot-Ct2FiEbu.mjs} +2 -2
- package/docs/boards-and-folders.md +1 -1
- package/docs/performance.md +4 -0
- package/docs/slides.md +8 -0
- package/package.json +1 -1
- package/src/client/const.ts +5 -0
- package/src/client/content/img-lod.ts +3 -1
- package/src/client/frame-host/inplace.ts +43 -0
- package/src/client/frame-host/main.tsx +10 -1
- package/src/client/shell/App.tsx +26 -18
- package/src/client/shell/LockedApp.tsx +6 -5
- package/src/client/shell/canvas/Canvas.tsx +50 -16
- package/src/client/shell/canvas/FrameNode.tsx +40 -7
- package/src/client/shell/canvas/admission.ts +138 -5
- package/src/client/shell/canvas/sleep.ts +258 -26
- package/src/client/shell/hash.ts +24 -0
- package/src/client/shell/jam-capture.ts +3 -2
- package/src/client/shell/notes.ts +11 -4
- package/src/client/shell/recorder.ts +1 -1
- package/src/client/shell/store.ts +63 -11
- package/templates/AGENTS-embedded.md +3 -3
- package/templates/AGENTS-studio.md +3 -3
- package/templates/instructions/iterate.md +1 -1
- package/templates/instructions/reference/deck-replicate.md +44 -0
- package/templates/instructions/slides.md +8 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,63 @@
|
|
|
2
2
|
|
|
3
3
|
Notable changes to `@marver-design/marver`. Format follows [Keep a Changelog](https://keepachangelog.com); versions follow semver.
|
|
4
4
|
|
|
5
|
+
## 0.35.0 - 2026-11-19
|
|
6
|
+
|
|
7
|
+
### Highlights
|
|
8
|
+
|
|
9
|
+
- **Heavy boards are about 2x faster to open and up to 10x faster to work on.** The canvas engine now does far less
|
|
10
|
+
work to start a frame, switch a tool on and save an edit. On a board of 112 rich frames in the Mac app:
|
|
11
|
+
|
|
12
|
+
| | 0.34 | 0.35 | |
|
|
13
|
+
|---|---|---|---|
|
|
14
|
+
| Every frame ready | 32 s | 18 s | 1.8x faster |
|
|
15
|
+
| Frames on screen ready | 24 s | 12 s | 2x |
|
|
16
|
+
| Comment mode on | 8.4 s | 0.8 s | 10x |
|
|
17
|
+
| Laser on | 8 s | 0.9 s | 9x |
|
|
18
|
+
| Theme switch | 4.4 s | 1.3 s | 3.4x |
|
|
19
|
+
| Panning, slowest frames | about 75 ms | about 25 ms | 3x smoother |
|
|
20
|
+
| Memory | 1,080 MB | 950 MB | 12% less |
|
|
21
|
+
| Requests per saved edit | 650 | 530 | 17-40% fewer |
|
|
22
|
+
|
|
23
|
+
A board of 103 phone screens reloads in 15 s instead of 56 s (3.8x, in a fresh Chrome profile), a 270-frame board
|
|
24
|
+
that never finished loading is ready in under a minute, and boards that were already fast stay fast.
|
|
25
|
+
[Performance](docs/performance.md)
|
|
26
|
+
- **A board too big for one browser tab no longer crashes it.** Past a few hundred heavy frames the tab ran out of
|
|
27
|
+
memory and died. The canvas now stops starting frames before that point and starts the ones you look at when you
|
|
28
|
+
get to them, so the board stays open and usable. [Performance](docs/performance.md#making-a-board-faster)
|
|
29
|
+
- **A board at rest really rests.** A frame with a moving SVG - a spinner, an animated mark - kept the whole board
|
|
30
|
+
drawing sixty times a second with nothing happening. A resting frame's SVG animation now stands still, like its CSS
|
|
31
|
+
animation already did, and moves again the moment the frame wakes: about 50x less work at rest on such a board.
|
|
32
|
+
|
|
33
|
+
### Fixed
|
|
34
|
+
|
|
35
|
+
- **Adding or deleting a file no longer restarts every frame** on a canvas whose theme is a module
|
|
36
|
+
(`design/theme.ts`). Each frame started itself again, lost what it was showing and kept its old copy in memory. A
|
|
37
|
+
theme that is a stylesheet was never affected.
|
|
38
|
+
- **A link, Back or Forward used while a board is still loading is no longer lost.** The canvas could write the
|
|
39
|
+
board's own address back over the one you had just asked for.
|
|
40
|
+
|
|
41
|
+
### Changed
|
|
42
|
+
|
|
43
|
+
- While a frame starts in `marver dev`, React no longer records where each element was created, which was most of a
|
|
44
|
+
heavy frame's start. An element created at the top of a module shows React's generic stack in DevTools; elements
|
|
45
|
+
created in a render are unchanged.
|
|
46
|
+
|
|
47
|
+
## 0.34.0 - 2026-11-14
|
|
48
|
+
|
|
49
|
+
### Highlights
|
|
50
|
+
|
|
51
|
+
- **Your agent can replicate a deck in another presentation tool, ready for others to edit.** Google Slides,
|
|
52
|
+
PowerPoint, Keynote, Canva or any tool it can drive through an MCP or API: every text, shape, line and image becomes
|
|
53
|
+
a native element, never a picture of the slide. [Slides](docs/slides.md)
|
|
54
|
+
- **Your agent can resolve one frame's comments.** `npx marver comments resolve --all --frame <scene/frame>` does what
|
|
55
|
+
a frame's **Resolve comments** does in the sidebar (0.33), with `--dry-run` and `--undo` like the other scopes. Your
|
|
56
|
+
agent still asks you first. [Boards and folders](docs/boards-and-folders.md)
|
|
57
|
+
|
|
58
|
+
### Upgrading
|
|
59
|
+
|
|
60
|
+
- `npx marver init` - your agent's guide names the new `--frame` scope and teaches replicating a deck in another presentation tool.
|
|
61
|
+
|
|
5
62
|
## 0.33.0 - 2026-11-13
|
|
6
63
|
|
|
7
64
|
### Highlights
|
package/README.md
CHANGED
|
@@ -47,7 +47,7 @@ Frames appear on the canvas the moment the files land. That's the loop.
|
|
|
47
47
|
- **Content frames.** Specs, Mermaid diagrams, mood boards, and slides live on the same canvas as the screens - import `Doc`, `Md`, `Diagram`, `Img`, `Slide`, `Chart`, `Video` from `@marver-design/marver/content` and think a feature through before any pixels exist. Works in a repo with no app at all: idea first, design second.
|
|
48
48
|
- **Boards that hold still.** A content frame is as tall as its content, which only a render can tell - so the height each one settles at is kept in `design/boards/_sizes.json` (written by `marver dev`, committed with the rest of `design/`), and a board opens with every frame at its real size: the content fills in and nothing moves. When an agent does make a doc taller, the frame you are looking at stays put on screen while the rows re-flow around it.
|
|
49
49
|
- **Sticky notes.** A markdown file beside a frame (`cart.note.md`) or a scene (`_note.md`) becomes a yellow note left of the frame on the canvas - what it is for, how two variations differ, an open question. Markdown, `goto:` links to frames, hand-drawn Mermaid; readers comment on a note's text like on a frame's, fold it to its corner, hide them all with `n`. The layout makes room for it, beside the frame and below; published canvases carry them.
|
|
50
|
-
- **Hi-fi at rest.** A frame at rest is its own live document, asleep: animations paused and every `backdrop-filter` element painted with a certified texture of its filtered backdrop (compiled by the dev server's headless Chrome), so a board of 30 glass screens pans like 30 statics and wakes pixel-identical on interact. Glass inside glass, blend modes and frames whose paint depends on random data or the clock stay live; `?awake=1` keeps every frame live for comparison.
|
|
50
|
+
- **Hi-fi at rest.** A frame at rest is its own live document, asleep: animations paused (CSS and SVG) and every `backdrop-filter` element painted with a certified texture of its filtered backdrop (compiled by the dev server's headless Chrome), so a board of 30 glass screens pans like 30 statics and wakes pixel-identical on interact. Glass inside glass, blend modes and frames whose paint depends on random data or the clock stay live; `?awake=1` keeps every frame live for comparison.
|
|
51
51
|
- **Charts and video in any frame.** `Chart` (Apache ECharts, SVG, still at rest) inherits the ink, typeface and accent of whatever frame it sits in - a Tailwind dashboard, a dark spec, a slide - sizes its type to the context and follows the layout on resize. `Video` is poster-first everywhere: click to play wherever the frame is live, `autoplay` for an ambient loop, `ratio` for vertical clips; omit the poster and marver renders one from the clip. A screen with a chart or a clip is still a screen.
|
|
52
52
|
- **Deck PDFs.** **Export PDF** on a board (or `npx marver pdf <board>`) prints it one page per slide (any other board, one page per frame): real text you can search, vector shapes, links that click, a bookmark per slide - and the glass, blur and shadows Chrome usually prints wrong, fixed and checked against the screen. `--notes` makes a handout with the speaker notes ([Deck PDFs](docs/pdf.md)).
|
|
53
53
|
- **Copy as image.** Select a frame, press `i` - a 2x PNG of it lands on the clipboard, rendered by the same headless Chrome that serves `marver shot`; `⇧i` for 4x (a 1280×720 slide is 5120×2880, whatever size its node has). Paste into Slack, a doc, or a chat with your agent.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { a as frameUrl, d as withBrowser, n as MOUNTED, o as manifestFrame, s as planShot } from "./shot-
|
|
1
|
+
import { a as frameUrl, d as withBrowser, n as MOUNTED, o as manifestFrame, s as planShot } from "./shot-Ct2FiEbu.mjs";
|
|
2
2
|
//#region src/server/anchor-check.ts
|
|
3
3
|
/**
|
|
4
4
|
* The anchor check (spec 26, Part 6): `comments new --on|--at`, `comments move` and a Live Jam re-pin
|
|
@@ -6,7 +6,7 @@ import { a as readLog, o as shareable, r as legacyExposure, t as appendEvents }
|
|
|
6
6
|
import { t as detectHost } from "./detect-C0wpaePX.mjs";
|
|
7
7
|
import { a as publishLogo, r as logoIcons } from "./logo-C9s7-Cy9.mjs";
|
|
8
8
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
9
|
-
import { d as canvasIdentity, n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-
|
|
9
|
+
import { d as canvasIdentity, n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-C6jEpbCx.mjs";
|
|
10
10
|
import { i as measuringFrames, n as autoWidthOf, o as readSizes, r as keptSizes } from "./sizes-BckcL4Zz.mjs";
|
|
11
11
|
import { cpSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
12
12
|
import { dirname, join, sep } from "node:path";
|
|
@@ -790,7 +790,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
|
|
|
790
790
|
const realAssets = existsSync(assetsDir) ? realpathSync(assetsDir) : null;
|
|
791
791
|
for (const r of refs) {
|
|
792
792
|
if (!isLocalAssetRef(r) || !r.endsWith(".poster.png") || existsSync(join(assetsDir, r))) continue;
|
|
793
|
-
const { ensurePoster } = await import("./poster-
|
|
793
|
+
const { ensurePoster } = await import("./poster-d10h73z0.mjs");
|
|
794
794
|
const g = await ensurePoster(assetsDir, r.slice(0, -11));
|
|
795
795
|
if (!g.ok) throw new Error(`design/assets/${r}: ${g.error}`);
|
|
796
796
|
console.log(` poster: rendered design/assets/${r} (${g.width}×${g.height})`);
|
|
@@ -849,7 +849,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
|
|
|
849
849
|
}));
|
|
850
850
|
let textureLine = " textures: skipped (--no-textures)";
|
|
851
851
|
if (textures && bakeGen) {
|
|
852
|
-
const { bakePublished } = await import("./publish-bakes-
|
|
852
|
+
const { bakePublished } = await import("./publish-bakes-weNQnNqE.mjs");
|
|
853
853
|
const pubFrameFile = new Map(pubFrames.map((f) => [f.id, f]));
|
|
854
854
|
const r = await bakePublished({
|
|
855
855
|
root,
|
package/dist/cli.mjs
CHANGED
|
@@ -10,9 +10,6 @@ import { fileURLToPath } from "node:url";
|
|
|
10
10
|
const NAME = "marver";
|
|
11
11
|
const PKG = "@marver-design/marver";
|
|
12
12
|
const ROUTE = "/__mv";
|
|
13
|
-
/** Content-frame natural widths: Doc layout -> own-size width.
|
|
14
|
-
* Shared by the Doc primitive (measurement messages) and the server-side
|
|
15
|
-
* manifest scan (defaultSize for content frames) - one source, no drift. */
|
|
16
13
|
const CONTENT_WIDTH = {
|
|
17
14
|
document: 760,
|
|
18
15
|
wide: 1280
|
|
@@ -90,7 +87,7 @@ cli.command("init", "Scaffold design/ in this repo").option("--mode <mode>", "st
|
|
|
90
87
|
});
|
|
91
88
|
});
|
|
92
89
|
for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot reload, comments, Live Jam)"], ["canvas", "Start the local canvas - same as dev"]]) cli.command(name, desc).option("--root <dir>", "Host repo root", { default: "." }).option("--port <port>", "A port of its own (default: a free slot, localhost:4805-4824 - usually the same one next time; a port in that range takes exactly that slot)").option("--recover [n]", "Run on an address this canvas had before, where an unsent Jam capture waits: alone it lists them; with a number it starts on that one; --recover --port <p>: the port 0.26 used").action(async (opts) => {
|
|
93
|
-
const { dev, DevStartError, DevLockError } = await import("./dev-
|
|
90
|
+
const { dev, DevStartError, DevLockError } = await import("./dev-Dw6mcoP8.mjs");
|
|
94
91
|
let port;
|
|
95
92
|
if (opts.port !== void 0) {
|
|
96
93
|
const n = Number(opts.port);
|
|
@@ -102,7 +99,7 @@ for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot
|
|
|
102
99
|
process.exit(1);
|
|
103
100
|
};
|
|
104
101
|
try {
|
|
105
|
-
if (opts.recover !== void 0 && opts.recover !== false) await (await import("./recover-
|
|
102
|
+
if (opts.recover !== void 0 && opts.recover !== false) await (await import("./recover-Dekpav7b.mjs")).recoverCommand(resolve$1(opts.root), opts.recover, port, { onFail });
|
|
106
103
|
else await dev(resolve$1(opts.root), {
|
|
107
104
|
port,
|
|
108
105
|
onFail
|
|
@@ -118,7 +115,7 @@ cli.command("ls", "The canvases running on this Mac: slot, link, name, version,
|
|
|
118
115
|
(await import("./ls-DGVIW-Io.mjs")).lsCommand({ json: opts.json === true });
|
|
119
116
|
});
|
|
120
117
|
cli.command("build", "Static export → design/.dist (what ships comes from design/publish.json - publishing is default-closed)").option("--boards <names>", "Publish only these boards (comma-separated); overrides the publish policy").option("--all-boards", "Publish every board - the loud override for the default-closed policy").option("--embed-seeds", "Copy comment history INTO the web root (identifying - every event carries its author's email)").option("--no-textures", "Skip compiling the glass textures the published frames rest under (needs Chrome; a CI without one skips on its own)").option("--root <dir>", "Host repo root", { default: "." }).action(async (opts) => {
|
|
121
|
-
const { buildSite } = await import("./build-
|
|
118
|
+
const { buildSite } = await import("./build-3AH123fe.mjs");
|
|
122
119
|
try {
|
|
123
120
|
const boards = opts.boards === void 0 ? void 0 : typeof opts.boards === "string" ? opts.boards : "";
|
|
124
121
|
await buildSite(resolve$1(opts.root), boards, opts.allBoards === true, opts.embedSeeds === true, opts.textures !== false && !process.env.MARVER_NO_TEXTURES);
|
|
@@ -136,8 +133,8 @@ cli.command("serve", "Serve design/.dist (set MARVER_PASSWORD to gate it)").opti
|
|
|
136
133
|
}
|
|
137
134
|
serve(resolve$1(opts.root), port);
|
|
138
135
|
});
|
|
139
|
-
cli.command("comments <action> [value]", "Comment collaboration: connect <url> · sync · list · new <scene/frame> · reply <thread> · move <thread> · resolve <thread> | --all · invite <email> · revoke <email>. Nothing here edits or deletes a message: people do their own on the canvas, and Marver's have no Edit or Delete - correct a wrong note in its thread").option("--root <dir>", "Host repo root", { default: "." }).option("--token <token>", "connect: the canvas's MARVER_CLI_TOKEN (default $MARVER_CLI_TOKEN) - the identity-mode path").option("--invite <token>", "connect: claim this invite instead of signing in").option("--canvas-password <password>", "connect: the canvas gate password (default $MARVER_PASSWORD or prompt)").option("--email <email>", "connect: account email (skips the prompt)").option("--password <password>", "connect: account password (skips the prompt - mind your shell history)").option("--name <name>", "connect --invite: display name for the new account").option("--open", "list: only unresolved threads").option("--json", "list: machine-readable output").option("--board <board>", "list: scope to one board · new: the board to pin on (default: the one its link opens) · resolve --all: the threads on frames this board shows").option("--body <text>", "new / reply: the text").option("--on <text>", "new / move: pin on the element showing these words").option("--at <selector>", "new / move: pin on the element this data-testid or CSS selector names (an element without words, like an icon)").option("--nth <n>", "new / move: which of several matching elements (1 = the first)").option("--viewport <name>", "new / move: check the frame at this viewport (default: its own)").option("--theme <name>", "new / move: check the frame in this theme (default: light)").option("--thread <id>", "new: add the note to this open thread instead of pinning a new one").option("--fyi", "new: the note asks nothing (default: it asks - it comes first for the human)").option("--ask", "reply: the reply asks the human something").option("--addressed-in <frame>", "resolve: the variant frame that answered the feedback").option("--all", "resolve: every open thread in a scope - with --board, --folder, --scene or --canvas (ask the human first)").option("--folder <folder>", "resolve --all: the threads on every board in this folder, sub-folders included").option("--scene <scene>", "resolve --all: the threads on this scene's frames").option("--canvas", "resolve --all: every open thread on the canvas").option("--dry-run", "resolve --all: count what it would resolve, write nothing").option("--undo <op>", "resolve: undo a resolve --all by the op id it printed").action(async (action, value, opts) => {
|
|
140
|
-
const { commentsCommand } = await import("./comments-
|
|
136
|
+
cli.command("comments <action> [value]", "Comment collaboration: connect <url> · sync · list · new <scene/frame> · reply <thread> · move <thread> · resolve <thread> | --all · invite <email> · revoke <email>. Nothing here edits or deletes a message: people do their own on the canvas, and Marver's have no Edit or Delete - correct a wrong note in its thread").option("--root <dir>", "Host repo root", { default: "." }).option("--token <token>", "connect: the canvas's MARVER_CLI_TOKEN (default $MARVER_CLI_TOKEN) - the identity-mode path").option("--invite <token>", "connect: claim this invite instead of signing in").option("--canvas-password <password>", "connect: the canvas gate password (default $MARVER_PASSWORD or prompt)").option("--email <email>", "connect: account email (skips the prompt)").option("--password <password>", "connect: account password (skips the prompt - mind your shell history)").option("--name <name>", "connect --invite: display name for the new account").option("--open", "list: only unresolved threads").option("--json", "list: machine-readable output").option("--board <board>", "list: scope to one board · new: the board to pin on (default: the one its link opens) · resolve --all: the threads on frames this board shows").option("--body <text>", "new / reply: the text").option("--on <text>", "new / move: pin on the element showing these words").option("--at <selector>", "new / move: pin on the element this data-testid or CSS selector names (an element without words, like an icon)").option("--nth <n>", "new / move: which of several matching elements (1 = the first)").option("--viewport <name>", "new / move: check the frame at this viewport (default: its own)").option("--theme <name>", "new / move: check the frame in this theme (default: light)").option("--thread <id>", "new: add the note to this open thread instead of pinning a new one").option("--fyi", "new: the note asks nothing (default: it asks - it comes first for the human)").option("--ask", "reply: the reply asks the human something").option("--addressed-in <frame>", "resolve: the variant frame that answered the feedback").option("--all", "resolve: every open thread in a scope - with --board, --folder, --scene, --frame or --canvas (ask the human first)").option("--folder <folder>", "resolve --all: the threads on every board in this folder, sub-folders included").option("--scene <scene>", "resolve --all: the threads on this scene's frames").option("--frame <frame>", "resolve --all: the threads on this one frame (scene/frame)").option("--canvas", "resolve --all: every open thread on the canvas").option("--dry-run", "resolve --all: count what it would resolve, write nothing").option("--undo <op>", "resolve: undo a resolve --all by the op id it printed").action(async (action, value, opts) => {
|
|
137
|
+
const { commentsCommand } = await import("./comments-C7NjFGgl.mjs");
|
|
141
138
|
try {
|
|
142
139
|
await commentsCommand(resolve$1(opts.root), action, value, opts);
|
|
143
140
|
} catch (err) {
|
|
@@ -29,7 +29,7 @@ import { createInterface } from "node:readline";
|
|
|
29
29
|
* --ask when the reply asks the human something
|
|
30
30
|
* move <thread> re-pin a thread on another element (--on / --at) - its author's only
|
|
31
31
|
* resolve <thread> mark addressed (--addressed-in <frame> records WHICH variant)
|
|
32
|
-
* resolve --all every open thread in one scope (--board | --folder | --scene | --canvas; --dry-run counts) -
|
|
32
|
+
* resolve --all every open thread in one scope (--board | --folder | --scene | --frame | --canvas; --dry-run counts) -
|
|
33
33
|
* never what Jam is at work on; --undo <op> reopens what it resolved. Only on the human's yes.
|
|
34
34
|
* invite <email> mint a single-use invite link (owner only, needs connect first)
|
|
35
35
|
* revoke <email> revoke an account and its sessions (owner only)
|
|
@@ -194,7 +194,7 @@ async function commentsCommand(root, action, value, opts) {
|
|
|
194
194
|
case "resolve": {
|
|
195
195
|
if (opts.undo !== void 0) return resolveUndo(root, String(opts.undo));
|
|
196
196
|
if (opts.all) return resolveAllCli(root, value, opts);
|
|
197
|
-
if (!value) throw new Error("usage: comments resolve <thread-id> [--addressed-in <frame>] | --all (--board b | --folder f | --scene s | --canvas) [--dry-run]");
|
|
197
|
+
if (!value) throw new Error("usage: comments resolve <thread-id> [--addressed-in <frame>] | --all (--board b | --folder f | --scene s | --frame scene/frame | --canvas) [--dry-run]");
|
|
198
198
|
const t = allThreads(root).find((t) => t.id === value);
|
|
199
199
|
if (!t) throw new Error(`no thread ${value} in design/comments/`);
|
|
200
200
|
appendEvents(join(root, "design", "comments"), t.board, [{
|
|
@@ -236,15 +236,22 @@ async function commentsCommand(root, action, value, opts) {
|
|
|
236
236
|
* memory is the one checked, in the same step as the writes), else here, against the journal on disk. Never decided by
|
|
237
237
|
* an agent alone: the guide says to ask, with the counts \`--dry-run\` prints. */
|
|
238
238
|
const resolveAllCli = async (root, value, opts) => {
|
|
239
|
-
if (value) throw new Error(`resolve --all takes no thread id - name a scope: --board, --folder, --scene or --canvas`);
|
|
239
|
+
if (value) throw new Error(`resolve --all takes no thread id - name a scope: --board, --folder, --scene, --frame or --canvas`);
|
|
240
240
|
const ca = await import("./comment-actions-BCBcd-Wq.mjs");
|
|
241
|
+
const typed = (flag) => {
|
|
242
|
+
if (Array.isArray(opts[flag])) throw new Error(`resolve --all names one --${flag}, not ${opts[flag].length}`);
|
|
243
|
+
const argv = process.argv, i = argv.indexOf(`--${flag}`);
|
|
244
|
+
const raw = i >= 0 ? argv[i + 1] : argv.find((t) => t.startsWith(`--${flag}=`))?.slice(flag.length + 3);
|
|
245
|
+
return raw !== void 0 && !raw.startsWith("--") ? raw : String(opts[flag]);
|
|
246
|
+
};
|
|
241
247
|
const named = [
|
|
242
|
-
opts.board !== void 0 && { board:
|
|
243
|
-
opts.folder !== void 0 && { folder:
|
|
244
|
-
opts.scene !== void 0 && { scene:
|
|
248
|
+
opts.board !== void 0 && { board: typed("board") },
|
|
249
|
+
opts.folder !== void 0 && { folder: typed("folder") },
|
|
250
|
+
opts.scene !== void 0 && { scene: typed("scene") },
|
|
251
|
+
opts.frame !== void 0 && { frame: typed("frame") },
|
|
245
252
|
opts.canvas && { canvas: true }
|
|
246
253
|
].filter(Boolean);
|
|
247
|
-
if (named.length !== 1) throw new Error("resolve --all needs exactly one scope: --board <b> | --folder <f> | --scene <s> | --canvas");
|
|
254
|
+
if (named.length !== 1) throw new Error("resolve --all needs exactly one scope: --board <b> | --folder <f> | --scene <s> | --frame <scene/frame> | --canvas");
|
|
248
255
|
const scope = ca.parseScope(named[0]);
|
|
249
256
|
if (typeof scope === "string") throw new Error(scope);
|
|
250
257
|
const op = randomUUID();
|
|
@@ -13,7 +13,7 @@ import { C as refusedAsk, S as parseMembers, T as sharedWhy, _ as wordsUntil, a
|
|
|
13
13
|
import { a as recordFile, c as storeWrapup, i as readWrapup, l as wrapupWithoutDeleted, n as buildWrapup, o as recordPathProblem, r as moreOf, t as SESSION_ID } from "./session-DBF-nQvq.mjs";
|
|
14
14
|
import { act, addCapture, addWrapup, answeredSince, beginStep, captureComment, captureIntact, conflictStep, createQueue, ctxFor, deletedEvents, dropDeleted, endSession, endStep, fail, failCard, form, joinAlone, liveThreads, looksGood, moreWrapup, ownerOnly, payloadKey, pending, prune, r as releaseLock, redelivering, requeue, runsAlone, sameComment, settle, startSession, stillOwned, t as acquireLock, textOf, tombstonesOf, undelivered, withdrawnCaptures, wrapupIntact, wrapupOf } from "./queue-BLLfdlDw.mjs";
|
|
15
15
|
import { d as logJam } from "./perf-BA_NDarr.mjs";
|
|
16
|
-
import { i as jamLive } from "./plugin-
|
|
16
|
+
import { i as jamLive } from "./plugin-C6jEpbCx.mjs";
|
|
17
17
|
import { t as PROTECTED_GLOBS } from "./permit-DDa6wqOs.mjs";
|
|
18
18
|
import { jamReservations, restoreHolds } from "./reserve-BURNQ2Y3.mjs";
|
|
19
19
|
import { recordOwn } from "./own-C8Mq0Hnf.mjs";
|
|
@@ -1102,9 +1102,7 @@ const STALL_MS = 9e5;
|
|
|
1102
1102
|
* MARVER_SLOT_BASE set (test-build.ts; as perf-run.ts's MV_PERF_RUN_T): a real stall in seconds, so a browser case
|
|
1103
1103
|
* drives one through this daemon and the page's own actions. */
|
|
1104
1104
|
const stallMs = () => {
|
|
1105
|
-
|
|
1106
|
-
const v = Number(process.env.MV_JAM_STALL_MS);
|
|
1107
|
-
return Number.isFinite(v) && v > 0 ? v : STALL_MS;
|
|
1105
|
+
return STALL_MS;
|
|
1108
1106
|
};
|
|
1109
1107
|
/** How long a request's answer is kept for the same request sent again. */
|
|
1110
1108
|
const RECEIPT_MS = 6e5;
|
|
@@ -2,7 +2,7 @@ import { i as PKG, r as NAME } from "./cli.mjs";
|
|
|
2
2
|
import { _ as runIdentity, a as notePrefer, c as ranDevBefore, f as startedWhere, i as marverHome, o as originOf, p as stopPrefer, s as place, t as forgetDevTraces } from "./slots-BOcfIqxy.mjs";
|
|
3
3
|
import { t as detectHost } from "./detect-C0wpaePX.mjs";
|
|
4
4
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
5
|
-
import { c as installedVersion, d as canvasIdentity, f as identityNudge, n as tailwind3Css, o as liveChanged, r as tailwind4Plugin, t as marverPlugin } from "./plugin-
|
|
5
|
+
import { c as installedVersion, d as canvasIdentity, f as identityNudge, n as tailwind3Css, o as liveChanged, r as tailwind4Plugin, t as marverPlugin } from "./plugin-C6jEpbCx.mjs";
|
|
6
6
|
import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, watch, writeSync } from "node:fs";
|
|
7
7
|
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
8
8
|
import { fileURLToPath } from "node:url";
|
|
@@ -1021,7 +1021,7 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1021
1021
|
if (fromConfig !== void 0 && !placed.fellBackFrom) console.log(` this canvas keeps its own port (${fromConfig} in design/config.ts); remove it to use the slots\n`);
|
|
1022
1022
|
setTimeout(async () => {
|
|
1023
1023
|
try {
|
|
1024
|
-
await (await import("./shot-
|
|
1024
|
+
await (await import("./shot-Ct2FiEbu.mjs").then((n) => n.u)).sweepGhosts((m) => console.log(` ${m}`));
|
|
1025
1025
|
} catch {}
|
|
1026
1026
|
}, 0);
|
|
1027
1027
|
try {
|
|
@@ -1108,8 +1108,8 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1108
1108
|
console.log(` comments: could not record who wrote what here - ${err.message}`);
|
|
1109
1109
|
}
|
|
1110
1110
|
if (config.jam) {
|
|
1111
|
-
const { startJam } = await import("./daemon-
|
|
1112
|
-
const { checkAnchor } = await import("./anchor-check-
|
|
1111
|
+
const { startJam } = await import("./daemon-BE-t9iU-.mjs");
|
|
1112
|
+
const { checkAnchor } = await import("./anchor-check-DREwCQiE.mjs");
|
|
1113
1113
|
const jam = startJam(root, config.jam, (m) => console.log(m), (board) => {
|
|
1114
1114
|
server.ws.send("sh:jam-comment", { board });
|
|
1115
1115
|
liveChanged();
|
|
@@ -1126,13 +1126,13 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1126
1126
|
return () => {
|
|
1127
1127
|
due ??= setTimeout(async () => {
|
|
1128
1128
|
due = null;
|
|
1129
|
-
const { jamLive } = await import("./plugin-
|
|
1129
|
+
const { jamLive } = await import("./plugin-C6jEpbCx.mjs").then((n) => n.a);
|
|
1130
1130
|
server.ws.send("sh:jam-queue", jamLive.view?.() ?? { cards: [] });
|
|
1131
1131
|
liveChanged();
|
|
1132
1132
|
}, 60);
|
|
1133
1133
|
};
|
|
1134
1134
|
})(), async (frameId, theme, entry, size) => {
|
|
1135
|
-
const { shootFrame } = await import("./shot-
|
|
1135
|
+
const { shootFrame } = await import("./shot-Ct2FiEbu.mjs").then((n) => n.u);
|
|
1136
1136
|
const r = await shootFrame({
|
|
1137
1137
|
root,
|
|
1138
1138
|
viewports: config.viewports,
|
|
@@ -1153,7 +1153,7 @@ async function boot(root, opts, instance, t, ctx) {
|
|
|
1153
1153
|
t.defer(() => jam.stop());
|
|
1154
1154
|
if (config.jam.session !== false) try {
|
|
1155
1155
|
const { ensureConnectors, connectorLine } = await import("./connectors-DekQvKt9.mjs");
|
|
1156
|
-
const { jamLive } = await import("./plugin-
|
|
1156
|
+
const { jamLive } = await import("./plugin-C6jEpbCx.mjs").then((n) => n.a);
|
|
1157
1157
|
const results = ensureConnectors(root);
|
|
1158
1158
|
jamLive.connectors = results;
|
|
1159
1159
|
const line = connectorLine(results);
|
|
@@ -34,10 +34,13 @@ const noteHeight = (key) => noteHeights.get(key) ?? 0;
|
|
|
34
34
|
* the frames make way. An obstacle is another node's card, or its own note column (two columns
|
|
35
35
|
* running into each other cramp too) - the two rectangles, never their bounding box: the empty
|
|
36
36
|
* canvas under a card beside a long column is free. Missing nodes (a deleted frame's card, still
|
|
37
|
-
* drawn full size) block room but never host a note. `noteH` is the measured column extent
|
|
37
|
+
* drawn full size) block room but never host a note. `noteH` is the measured column extent - a pure lookup: it is
|
|
38
|
+
* asked once per node, when its room is first needed. */
|
|
38
39
|
function notesCramped(nodes, manifest, noteH = noteHeight) {
|
|
39
40
|
if (!manifest) return false;
|
|
40
|
-
const
|
|
41
|
+
const byId = /* @__PURE__ */ new Map();
|
|
42
|
+
for (const f of manifest.frames) if (!byId.has(f.id)) byId.set(f.id, f);
|
|
43
|
+
const entry = (id) => byId.get(id);
|
|
41
44
|
const live = nodes.filter((n) => !n.missing);
|
|
42
45
|
const hosts = /* @__PURE__ */ new Set();
|
|
43
46
|
for (const s of manifest.scenes) {
|
|
@@ -61,12 +64,18 @@ function notesCramped(nodes, manifest, noteH = noteHeight) {
|
|
|
61
64
|
y1: n.y + Math.max(n.h + 28, noteH(n.key))
|
|
62
65
|
} : null;
|
|
63
66
|
};
|
|
67
|
+
const rooms = /* @__PURE__ */ new Map();
|
|
68
|
+
const roomOf = (n) => {
|
|
69
|
+
let r = rooms.get(n);
|
|
70
|
+
if (r === void 0) rooms.set(n, r = room(n));
|
|
71
|
+
return r;
|
|
72
|
+
};
|
|
64
73
|
return live.some((n) => {
|
|
65
|
-
const mine =
|
|
74
|
+
const mine = roomOf(n);
|
|
66
75
|
if (!mine) return false;
|
|
67
76
|
return nodes.some((o) => {
|
|
68
77
|
if (o === n) return false;
|
|
69
|
-
const theirs =
|
|
78
|
+
const theirs = roomOf(o);
|
|
70
79
|
return hit(mine, card(o)) || !!theirs && hit(mine, theirs);
|
|
71
80
|
});
|
|
72
81
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { a as ROUTE, o as slideSize } from "./cli.mjs";
|
|
2
2
|
import { s as checkRealDirs } from "./boards-Cim1GTKc.mjs";
|
|
3
3
|
import { n as BOARD_NAME } from "./board-tree-DGj0HhEE.mjs";
|
|
4
|
-
import { s as onPdfReset } from "./plugin-
|
|
5
|
-
import { c as pool, f as staleSurface, p as Browser } from "./shot-
|
|
4
|
+
import { s as onPdfReset } from "./plugin-C6jEpbCx.mjs";
|
|
5
|
+
import { c as pool, f as staleSurface, p as Browser } from "./shot-Ct2FiEbu.mjs";
|
|
6
6
|
import { existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
7
7
|
import { join, sep } from "node:path";
|
|
8
8
|
import { randomBytes } from "node:crypto";
|
|
@@ -1216,7 +1216,7 @@ async function boardNodes(root, board, frames, viewports, themes, scenes = []) {
|
|
|
1216
1216
|
});
|
|
1217
1217
|
}
|
|
1218
1218
|
const { boardLayoutOf } = await import("./boards-Cim1GTKc.mjs").then((n) => n.a);
|
|
1219
|
-
const { notesCramped, tidyNodes } = await import("./notes-
|
|
1219
|
+
const { notesCramped, tidyNodes } = await import("./notes-CmfQ9604.mjs");
|
|
1220
1220
|
const { composed, flow } = boardLayoutOf(b);
|
|
1221
1221
|
const manifest = {
|
|
1222
1222
|
frames: frames.map((f) => ({
|
|
@@ -14,7 +14,7 @@ import { C as WRITE_MATCH_MS, S as WRITER_HEADERS, _ as ID12, b as RELOAD_BOUNDS
|
|
|
14
14
|
import { c as proofHeaders, i as logoRoute, s as appProofOk, t as findLogo } from "./logo-C9s7-Cy9.mjs";
|
|
15
15
|
import { n as loadConfig } from "./config-B0YcFtqS.mjs";
|
|
16
16
|
import { a as mergeSizes, c as serializeSizes, i as measuringFrames, l as sizesPath, n as autoWidthOf, o as readSizes, r as keptSizes, s as readSizesFile } from "./sizes-BckcL4Zz.mjs";
|
|
17
|
-
import { c as pool, d as withBrowser, h as launchFlags, l as shotConcurrency, p as Browser, r as SURFACE, t as AREA } from "./shot-
|
|
17
|
+
import { c as pool, d as withBrowser, h as launchFlags, l as shotConcurrency, p as Browser, r as SURFACE, t as AREA } from "./shot-Ct2FiEbu.mjs";
|
|
18
18
|
import { closeSync, copyFileSync, existsSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, utimesSync, watch, writeFileSync } from "node:fs";
|
|
19
19
|
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
20
20
|
import { fileURLToPath } from "node:url";
|
|
@@ -184,8 +184,13 @@ function updatesPlugin(root, manifest, hooks, landed, changes) {
|
|
|
184
184
|
}
|
|
185
185
|
/** Wraps the client's hot channel: the reload guard and refused refreshes. `onStyles`: this server's, for a scanned file no
|
|
186
186
|
* document imports - it names the stylesheets that scan it, any of which may have new classes; no frame needs a reload. */
|
|
187
|
-
function guardUpdates(server, root, manifest, hooks, changes, onStyles) {
|
|
187
|
+
function guardUpdates(server, root, manifest, hooks, changes, onStyles, registryFile) {
|
|
188
188
|
const env = server.environments.client;
|
|
189
|
+
const registry = registryFile ? safeReal(registryFile) : null;
|
|
190
|
+
const viaRegistry = (u) => {
|
|
191
|
+
const f = u.path ? env.moduleGraph.urlToModuleMap.get(u.path)?.file : void 0;
|
|
192
|
+
return !!f && safeReal(f) === registry;
|
|
193
|
+
};
|
|
189
194
|
const notImported = (file) => [...env.moduleGraph.getModulesByFile(file) ?? []].every((m) => m.id == null || m.type === "asset");
|
|
190
195
|
const sheetsOf = (files) => {
|
|
191
196
|
const push = /* @__PURE__ */ new Set(), refused = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set();
|
|
@@ -216,6 +221,14 @@ function guardUpdates(server, root, manifest, hooks, changes, onStyles) {
|
|
|
216
221
|
const send = ch.send.bind(ch);
|
|
217
222
|
ch.send = (...a) => {
|
|
218
223
|
const p = a[0];
|
|
224
|
+
if (registry && typeof p === "object" && p?.type === "update" && p.updates.some(viaRegistry)) {
|
|
225
|
+
const updates = p.updates.filter((u) => !viaRegistry(u));
|
|
226
|
+
if (!updates.length) return;
|
|
227
|
+
a = [{
|
|
228
|
+
...p,
|
|
229
|
+
updates
|
|
230
|
+
}, ...a.slice(1)];
|
|
231
|
+
}
|
|
219
232
|
if (typeof p === "object" && p?.type === "full-reload") {
|
|
220
233
|
const passed = p.path === "*" && !p.triggeredBy;
|
|
221
234
|
const by = passed ? void 0 : p.triggeredBy ?? (p.path && p.path !== "*" ? join(root, p.path.replace(/^\//, "")) : void 0);
|
|
@@ -856,7 +869,7 @@ async function bakeIn(b, opts) {
|
|
|
856
869
|
const deadline = setTimeout(() => {
|
|
857
870
|
timedOut = true;
|
|
858
871
|
b.abort(me, TIMED_OUT);
|
|
859
|
-
},
|
|
872
|
+
}, DEADLINE_MS);
|
|
860
873
|
const closeTarget = async (id) => {
|
|
861
874
|
let t;
|
|
862
875
|
await Promise.race([b.send("Target.closeTarget", { targetId: id }).catch(() => {}), new Promise((r) => {
|
|
@@ -1341,13 +1354,11 @@ function endRunBakes(owner) {
|
|
|
1341
1354
|
* looks at a COMPILING outlast any held compile (A3.8 r1 #4's case, added by the review of a3-runs). */
|
|
1342
1355
|
const bakeSeams = {};
|
|
1343
1356
|
const holdMs = () => {
|
|
1344
|
-
|
|
1345
|
-
const v = process.env.MARVER_SLOT_BASE ? Number(process.env.MV_BAKE_HOLD_MS) : NaN;
|
|
1346
|
-
return Number.isFinite(v) && v > 0 ? Math.min(v, 6e4) : 0;
|
|
1357
|
+
return 0;
|
|
1347
1358
|
};
|
|
1348
1359
|
/** The suite's answer for a compile still running, under MV_BAKE_STOP_ASKING (above). */
|
|
1349
1360
|
const STOP_ASKING = "still compiling - the suite asks the page to stop asking";
|
|
1350
|
-
const stillCompiling = () =>
|
|
1361
|
+
const stillCompiling = () => COMPILING;
|
|
1351
1362
|
/** Compiles in flight, by generation and key: identical asks - inside one request or across
|
|
1352
1363
|
* concurrent ones - share one compile. */
|
|
1353
1364
|
const inflight = /* @__PURE__ */ new Map();
|
|
@@ -1385,7 +1396,8 @@ async function bakeBatch(opts) {
|
|
|
1385
1396
|
if (error !== void 0) return {
|
|
1386
1397
|
...ask,
|
|
1387
1398
|
ok: false,
|
|
1388
|
-
error
|
|
1399
|
+
error,
|
|
1400
|
+
kept: true
|
|
1389
1401
|
};
|
|
1390
1402
|
return readCached(root, gen, ask, urlBase) ?? theirs?.get(key(ask)) ?? (bakesEnded(owner) ? {
|
|
1391
1403
|
...ask,
|
|
@@ -1512,6 +1524,10 @@ async function bakeBatch(opts) {
|
|
|
1512
1524
|
if (!a.ok && keptFor(owner, a.error) && !bakesEnded(owner)) {
|
|
1513
1525
|
if (failed.size >= FAILED_MAX) failed.clear();
|
|
1514
1526
|
failed.set(key(job.ask), a.error);
|
|
1527
|
+
a = {
|
|
1528
|
+
...a,
|
|
1529
|
+
kept: true
|
|
1530
|
+
};
|
|
1515
1531
|
}
|
|
1516
1532
|
log?.(a);
|
|
1517
1533
|
settle(job, a);
|
|
@@ -2157,17 +2173,7 @@ const runSeams = {};
|
|
|
2157
2173
|
/** RUN_T, with the suite's overrides: `runSeams.t` in-process, `MV_PERF_RUN_T` (JSON) for a dev server a test starts -
|
|
2158
2174
|
* both read only with MARVER_SLOT_BASE set (the suite's marker). */
|
|
2159
2175
|
function runT() {
|
|
2160
|
-
|
|
2161
|
-
if (!process.env.MARVER_SLOT_BASE) return t;
|
|
2162
|
-
let env = {};
|
|
2163
|
-
try {
|
|
2164
|
-
env = JSON.parse(process.env.MV_PERF_RUN_T ?? "{}");
|
|
2165
|
-
} catch {}
|
|
2166
|
-
for (const src of [env, runSeams.t ?? {}]) for (const k of Object.keys(t)) {
|
|
2167
|
-
const v = src[k];
|
|
2168
|
-
if (typeof v === "number" && v >= 0) t[k] = v;
|
|
2169
|
-
}
|
|
2170
|
-
return t;
|
|
2176
|
+
return { ...RUN_T };
|
|
2171
2177
|
}
|
|
2172
2178
|
/** The shell's address for a run's load: its run id, the warm-up's mark, the recorder's level when not `full` (spec 30
|
|
2173
2179
|
* #58: the shell reads it, `withWs()` carries it to the frames), the board. */
|
|
@@ -2235,7 +2241,6 @@ async function openPage(b, o) {
|
|
|
2235
2241
|
}
|
|
2236
2242
|
};
|
|
2237
2243
|
function call(m, p = {}, sid, ms = T.callMs) {
|
|
2238
|
-
runSeams.cdp?.(m, p);
|
|
2239
2244
|
const sent = b.send(m, p, sid, own);
|
|
2240
2245
|
let t;
|
|
2241
2246
|
const late = new Promise((_, reject) => {
|
|
@@ -2299,7 +2304,6 @@ async function openPage(b, o) {
|
|
|
2299
2304
|
async function closePage(b, page) {
|
|
2300
2305
|
page.stop();
|
|
2301
2306
|
const bounded = async (m, p, sid) => {
|
|
2302
|
-
runSeams.cdp?.(m, p);
|
|
2303
2307
|
let t;
|
|
2304
2308
|
await Promise.race([b.send(m, p, sid).catch(() => {}), new Promise((r) => {
|
|
2305
2309
|
t = setTimeout(r, 2e3);
|
|
@@ -2824,7 +2828,7 @@ async function serveRun(req, res, o) {
|
|
|
2824
2828
|
};
|
|
2825
2829
|
const beat = setInterval(() => write({ heartbeat: Date.now() }), T.heartbeatMs);
|
|
2826
2830
|
try {
|
|
2827
|
-
const drive =
|
|
2831
|
+
const drive = runOnce;
|
|
2828
2832
|
for (let i = 0; i < asked.req.repeat && !ac.signal.aborted; i++) write({ line: await drive({
|
|
2829
2833
|
root: o.root,
|
|
2830
2834
|
origin: o.origin,
|
|
@@ -3810,7 +3814,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3810
3814
|
};
|
|
3811
3815
|
const asPng = url.searchParams.get("format") === "png";
|
|
3812
3816
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
3813
|
-
const { shootFrame } = await import("./shot-
|
|
3817
|
+
const { shootFrame } = await import("./shot-Ct2FiEbu.mjs").then((n) => n.u);
|
|
3814
3818
|
const r = await shootFrame({
|
|
3815
3819
|
root,
|
|
3816
3820
|
viewports: opts.viewports ?? {},
|
|
@@ -3848,7 +3852,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3848
3852
|
const { readDevInfo } = await import("./work-B4tydWnf.mjs").then((n) => n.c);
|
|
3849
3853
|
const token = readDevInfo(root)?.token;
|
|
3850
3854
|
if (!ownerGated(req) && !(token && req.headers["x-mv-work"] === token)) return json(res, 403, { error: "forbidden" });
|
|
3851
|
-
const pdf = await import("./pdf-
|
|
3855
|
+
const pdf = await import("./pdf-CkE4Ir2P.mjs");
|
|
3852
3856
|
if (pdfRoute[1] === void 0) {
|
|
3853
3857
|
if (req.method !== "POST") return json(res, 405, { error: "POST to start a PDF" });
|
|
3854
3858
|
const raw = await readBody(req);
|
|
@@ -3954,7 +3958,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3954
3958
|
if (typeof theme !== "string" || !/^[a-z0-9-]+$/i.test(theme)) return json(res, 400, { error: "invalid theme" });
|
|
3955
3959
|
const scale = body.scale === void 0 ? void 0 : body.scale;
|
|
3956
3960
|
if (scale !== void 0 && !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) return json(res, 400, { error: "invalid scale" });
|
|
3957
|
-
const { resolveFrames, shootBatch } = await import("./shot-
|
|
3961
|
+
const { resolveFrames, shootBatch } = await import("./shot-Ct2FiEbu.mjs").then((n) => n.u);
|
|
3958
3962
|
const sel = resolveFrames(root, body);
|
|
3959
3963
|
if (!sel.ok) return json(res, sel.status, { error: sel.error });
|
|
3960
3964
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
@@ -3988,7 +3992,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
3988
3992
|
if (typeof target === "string") return json(res, 400, { error: target });
|
|
3989
3993
|
const others = Array.isArray(b.others) ? b.others.filter((o) => typeof o?.key === "string").slice(0, 200) : [];
|
|
3990
3994
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
3991
|
-
const { checkAnchor, CheckInputError } = await import("./anchor-check-
|
|
3995
|
+
const { checkAnchor, CheckInputError } = await import("./anchor-check-DREwCQiE.mjs");
|
|
3992
3996
|
try {
|
|
3993
3997
|
return json(res, 200, await checkAnchor({
|
|
3994
3998
|
root,
|
|
@@ -4096,8 +4100,8 @@ function apiMiddleware(root, opts = {}) {
|
|
|
4096
4100
|
return json(res, 400, { error: "malformed JSON" });
|
|
4097
4101
|
}
|
|
4098
4102
|
const src = typeof b?.src === "string" ? b.src : "";
|
|
4099
|
-
const { ensurePoster, isLocalClip } = await import("./poster-
|
|
4100
|
-
const { isLocalAssetRef } = await import("./build-
|
|
4103
|
+
const { ensurePoster, isLocalClip } = await import("./poster-d10h73z0.mjs");
|
|
4104
|
+
const { isLocalAssetRef } = await import("./build-3AH123fe.mjs");
|
|
4101
4105
|
if (!isLocalAssetRef(src) || !isLocalClip(src)) return json(res, 400, { error: "src must be a clip under design/assets/" });
|
|
4102
4106
|
const r = await ensurePoster(join(root, "design", "assets"), src);
|
|
4103
4107
|
if (!r.ok) return json(res, r.error.includes("does not exist") ? 404 : 503, { error: r.error });
|
|
@@ -4553,7 +4557,7 @@ function apiMiddleware(root, opts = {}) {
|
|
|
4553
4557
|
if (!b || typeof b.capture !== "string" || !CAPTURE_ID.test(b.capture) || typeof b.frame !== "string") return json(res, 400, { error: "expected { capture, frame, theme?, viewport? }" });
|
|
4554
4558
|
if (readCapture(root, b.capture)) return json(res, 409, { error: "that capture is sealed" });
|
|
4555
4559
|
const theme = typeof b.theme === "string" && /^[a-z0-9-]+$/i.test(b.theme) ? b.theme : "light";
|
|
4556
|
-
const { shootFrame } = await import("./shot-
|
|
4560
|
+
const { shootFrame } = await import("./shot-Ct2FiEbu.mjs").then((n) => n.u);
|
|
4557
4561
|
const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
|
|
4558
4562
|
const vp = typeof b.viewport === "string" ? opts.viewports?.[b.viewport] : void 0;
|
|
4559
4563
|
const dim = (v) => typeof v === "number" && Number.isFinite(v) ? Math.round(v) : void 0;
|
|
@@ -5682,7 +5686,7 @@ function marverPlugin(ctx) {
|
|
|
5682
5686
|
server.httpServer?.once("close", () => resetPdf(root));
|
|
5683
5687
|
server.middlewares.use((req, res, next) => {
|
|
5684
5688
|
if (!(req.url ?? "").startsWith(`/__mv/handout/`)) return next();
|
|
5685
|
-
import("./pdf-
|
|
5689
|
+
import("./pdf-CkE4Ir2P.mjs").then((m) => m.handoutMiddleware()(req, res, next), next);
|
|
5686
5690
|
});
|
|
5687
5691
|
server.middlewares.use(apiMiddleware(root, {
|
|
5688
5692
|
viewports: config.viewports,
|
|
@@ -5710,7 +5714,7 @@ function marverPlugin(ctx) {
|
|
|
5710
5714
|
onClose(() => {
|
|
5711
5715
|
if (devServer === server) devServer = before;
|
|
5712
5716
|
});
|
|
5713
|
-
guardUpdates(server, root, () => manifest, hooks, changes, (sheets) => rescanTheme(sheets));
|
|
5717
|
+
guardUpdates(server, root, () => manifest, hooks, changes, (sheets) => rescanTheme(sheets), join(clientDir, "frame-host", "registry.ts"));
|
|
5714
5718
|
let framesKey = JSON.stringify(manifest.frames);
|
|
5715
5719
|
let scenesKey = JSON.stringify(manifest.scenes);
|
|
5716
5720
|
let unplacedKey = "";
|
|
@@ -5742,11 +5746,12 @@ function marverPlugin(ctx) {
|
|
|
5742
5746
|
if (!f) return [];
|
|
5743
5747
|
const out = [];
|
|
5744
5748
|
const seen = /* @__PURE__ */ new Set();
|
|
5749
|
+
const css = (mod) => String(mod.id ?? "").split("?")[0].endsWith(".css");
|
|
5745
5750
|
const walk = (mod) => {
|
|
5746
5751
|
if (!mod || seen.has(mod)) return;
|
|
5747
5752
|
seen.add(mod);
|
|
5748
|
-
out.push(mod);
|
|
5749
|
-
for (const im of mod.clientImportedModules ?? mod.importedModules ?? []) if (
|
|
5753
|
+
if (css(mod)) out.push(mod);
|
|
5754
|
+
for (const im of mod.clientImportedModules ?? mod.importedModules ?? []) if (css(im)) walk(im);
|
|
5750
5755
|
};
|
|
5751
5756
|
for (const mod of server.moduleGraph.getModulesByFile(f) ?? []) walk(mod);
|
|
5752
5757
|
return out;
|
|
@@ -5764,10 +5769,14 @@ function marverPlugin(ctx) {
|
|
|
5764
5769
|
pushTheme();
|
|
5765
5770
|
};
|
|
5766
5771
|
const localDir = join(root, "design", ".local"), boardsDirGen = join(root, "design", "boards"), manifestPath = join(root, "design", "manifest.json");
|
|
5772
|
+
let genPush;
|
|
5773
|
+
onClose(() => clearTimeout(genPush));
|
|
5767
5774
|
const bumpGen = (f) => {
|
|
5768
5775
|
if (f.startsWith(localDir) || f.startsWith(boardsDirGen) || f === manifestPath || f.includes("/node_modules/")) return;
|
|
5769
5776
|
bakeGen++;
|
|
5770
5777
|
prune();
|
|
5778
|
+
clearTimeout(genPush);
|
|
5779
|
+
genPush = setTimeout(() => server.ws.send("sh:bake-gen", { gen: bakeGen }), 300);
|
|
5771
5780
|
};
|
|
5772
5781
|
const pruning = /* @__PURE__ */ new Set();
|
|
5773
5782
|
const prune = () => {
|
|
@@ -5968,7 +5977,7 @@ function marverPlugin(ctx) {
|
|
|
5968
5977
|
});
|
|
5969
5978
|
return;
|
|
5970
5979
|
}
|
|
5971
|
-
const { shootFrame, shootBatch, resolveFrames } = await import("./shot-
|
|
5980
|
+
const { shootFrame, shootBatch, resolveFrames } = await import("./shot-Ct2FiEbu.mjs").then((n) => n.u);
|
|
5972
5981
|
if (ways[0] === "frame") {
|
|
5973
5982
|
if (typeof spec.frame !== "string") {
|
|
5974
5983
|
write({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { i as capture, m as findChrome } from "./shot-
|
|
1
|
+
import { i as capture, m as findChrome } from "./shot-Ct2FiEbu.mjs";
|
|
2
2
|
import { constants, copyFileSync, existsSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
3
3
|
import { basename, dirname, join, sep } from "node:path";
|
|
4
4
|
import { pathToFileURL } from "node:url";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { o as slideSize } from "./cli.mjs";
|
|
2
|
-
import { l as ASK_MAX, u as bakeBatch } from "./plugin-
|
|
3
|
-
import { m as findChrome, s as planShot } from "./shot-
|
|
2
|
+
import { l as ASK_MAX, u as bakeBatch } from "./plugin-C6jEpbCx.mjs";
|
|
3
|
+
import { m as findChrome, s as planShot } from "./shot-Ct2FiEbu.mjs";
|
|
4
4
|
import { MIME } from "./serve-kcF6-H8V.mjs";
|
|
5
5
|
import { copyFileSync, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
6
6
|
import { extname, isAbsolute, join, relative, resolve } from "node:path";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { r as NAME } from "./cli.mjs";
|
|
2
2
|
import { d as recoverTarget, r as legacyEntry, u as recoverEntries, v as workspaceId } from "./slots-BOcfIqxy.mjs";
|
|
3
|
-
import { DevStartError, dev } from "./dev-
|
|
3
|
+
import { DevStartError, dev } from "./dev-Dw6mcoP8.mjs";
|
|
4
4
|
//#region src/cli/recover.ts
|
|
5
5
|
/**
|
|
6
6
|
* `marver dev --recover` (spec 28 A1.6). A Jam capture the page could not send waits in that browser's
|
|
@@ -524,8 +524,8 @@ async function shootFrame(opts) {
|
|
|
524
524
|
};
|
|
525
525
|
const plan = planShot(frame, viewports, size);
|
|
526
526
|
if (frame.kind !== "html") try {
|
|
527
|
-
const { scanAssetRefs } = await import("./build-
|
|
528
|
-
const { ensurePoster } = await import("./poster-
|
|
527
|
+
const { scanAssetRefs } = await import("./build-3AH123fe.mjs");
|
|
528
|
+
const { ensurePoster } = await import("./poster-d10h73z0.mjs");
|
|
529
529
|
const refs = scanAssetRefs(readFileSync(join(root, frame.file), "utf8"), frame.file);
|
|
530
530
|
for (const r of refs) if (r.endsWith(".poster.png")) await ensurePoster(join(root, "design", "assets"), r.slice(0, -11));
|
|
531
531
|
} catch {}
|