diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aafaaea..1993644 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,21 +46,23 @@ jobs: /usr/local/cargo/registry /usr/local/cargo/git wasm/target - key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('wasm/Cargo.toml', 'fixtures/generators/Cargo.toml', 'app/yarn.lock') }} + key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('wasm/Cargo.toml', 'fixtures/generators/Cargo.toml', 'yarn.lock') }} restore-keys: ${{ runner.os }}-${{ runner.arch }}-cargo- # Yarn Berry's global cache holds the *built* `comline-simulator` archive # (post-`prepack`). A hit here means `yarn install` skips the Rust build - # entirely: it only re-runs when `app/yarn.lock` changes (a sim bump). + # entirely: it only re-runs when `yarn.lock` changes (a sim bump). - name: Cache yarn uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: ~/.yarn/berry/cache - key: ${{ runner.os }}-${{ runner.arch }}-yarn-${{ hashFiles('app/yarn.lock') }} + key: ${{ runner.os }}-${{ runner.arch }}-yarn-${{ hashFiles('yarn.lock') }} restore-keys: ${{ runner.os }}-${{ runner.arch }}-yarn- + # Into the kit (kit/pkg-editor), which the app and the kit's tests + # import it from. - name: Build editor WASM - run: wasm-pack build wasm --release --target web --out-dir ../app/src/wasm --out-name comline_playground_wasm + run: wasm-pack build wasm --release --target web --out-dir ../kit/pkg-editor --out-name comline_playground_wasm - name: Test editor crate run: cargo test --manifest-path wasm/Cargo.toml @@ -91,25 +93,25 @@ jobs: with: node-version: 22.23.5 - # `app/.yarnrc.yml` points `yarnPath` at the committed Yarn release; + # `.yarnrc.yml` points `yarnPath` at the committed Yarn release; # corepack provides the `yarn` command that hands over to it. - name: Yarn run: corepack enable - # `yarn install` pulls `comline-simulator` as a git dependency and builds - # its WASM in `prepack` (lean `pkg/` + scripted `pkg-script/`), unless the - # yarn cache above already has it. The image has cargo, wasm-bindgen and - # wasm-opt. Yarn's `npmMinimalAgeGate` (its default, one day) stays on. + # One install for the workspace (app/ and kit/). It pulls + # `comline-simulator`, the kit's git dependency, and builds its WASM in + # `prepack` (lean `pkg/` + scripted `pkg-script/`), unless the yarn cache + # above already has it. The image has cargo, wasm-bindgen and wasm-opt. + # Yarn's `npmMinimalAgeGate` (its default, one day) stays on. - name: Install - working-directory: app run: yarn install - - name: Test (simulate view) - working-directory: app + # The kit's tests (the simulate view, the shape), then the app's + # (examples, the WASI generator runner). + - name: Test run: yarn test - name: Build site - working-directory: app run: yarn build - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master' diff --git a/.gitignore b/.gitignore index 3029f7a..44a50ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,16 +7,16 @@ node_modules /app/dist # wasm-pack output for the editor wasm (regenerated by `yarn wasm` / CI) -/app/src/wasm +/kit/pkg-editor -# Yarn Berry (app/) — keep the pinned release, drop the rest -/app/.yarn/* -!/app/.yarn/patches -!/app/.yarn/plugins -!/app/.yarn/releases -!/app/.yarn/sdks -!/app/.yarn/versions -/app/.pnp.* +# Yarn Berry (the workspace root) — keep the pinned release, drop the rest +/.yarn/* +!/.yarn/patches +!/.yarn/plugins +!/.yarn/releases +!/.yarn/sdks +!/.yarn/versions +/.pnp.* .DS_Store .idea/ diff --git a/app/.yarn/releases/yarn-4.18.0.cjs b/.yarn/releases/yarn-4.18.0.cjs similarity index 100% rename from app/.yarn/releases/yarn-4.18.0.cjs rename to .yarn/releases/yarn-4.18.0.cjs diff --git a/app/.yarnrc.yml b/.yarnrc.yml similarity index 63% rename from app/.yarnrc.yml rename to .yarnrc.yml index 4e08a33..9159c87 100644 --- a/app/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,9 +1,10 @@ yarnPath: .yarn/releases/yarn-4.18.0.cjs nodeLinker: node-modules -# `comline-simulator` is the sim engine — fetched from git and built to WASM in -# its `prepack`/`prepare` on install. Yarn 4 gates git deps behind this -# allow-list and disables lifecycle scripts by default; the build needs both on. +# `comline-simulator` is the sim engine (the kit's dependency) — fetched from +# git and built to WASM in its `prepack`/`prepare` on install. Yarn 4 gates git +# deps behind this allow-list and disables lifecycle scripts by default; the +# build needs both on. approvedGitRepositories: - "https://github.com/ComlineProject/simulator.git" - "https://github.com/ComlineProject/examples.git" diff --git a/README.md b/README.md index 321a3be..2ee25de 100644 --- a/README.md +++ b/README.md @@ -28,39 +28,64 @@ wasm/ comline-playground-wasm — the editor's Rust crate, wasm-bindgen surf semantic_tokens / hover / completions — the LSP handlers verbatim deps: comline-core, comline-codegen, comline-codegen-rust, comline-codegen-typescript, comline-language-server (git rev) -app/ a Vite site: a CodeMirror 6 editor (highlighting / diagnostics / - hover / autocomplete all from the editor WASM's LSP, in a Web - Worker), plus the **simulate** view — a thin canvas / inspector / - frame-log over the sim WASM. `app/src/sim/` is that view; the engine - is the `comline-simulator` git dependency (ComlineProject/simulator), - which builds itself to WASM on `npm install` — `pkg/` (lean) plus - `pkg-script/` (Rhai, code-split and fetched only when a `script` - behaviour is picked). +kit/ comline-web-kit — what the playground shares with the tutorial and + other Comline pages, as TypeScript that Vite compiles: + comline-web-kit/editor a CodeMirror 6 editor (highlighting / + diagnostics / hover / autocomplete all + from the editor WASM's LSP) and the Web + Worker that runs that WASM + comline-web-kit/sim the **simulate** view: a canvas / + inspector / frame log over the sim WASM + comline-web-kit/sim/scripted the Rhai engine's loader, passed to + `createSim` to offer the `script` + behaviour + comline-web-kit/sim.css its styles, scoped under `.cl-sim` and + themed with `--cl-*` properties + The sim engine is the `comline-simulator` git dependency + (ComlineProject/simulator), which builds itself to WASM on install + — `pkg/` (lean) plus `pkg-script/` (Rhai, code-split and fetched + only when a `script` behaviour is picked). `kit/pkg-editor/` is the + editor WASM, built by `yarn wasm` (or the kit's `prepack`). +app/ the playground site (Vite): files, tabs, problems, generated + output and examples around the kit's editor and simulate view fixtures/generators/ a hostile WASI generator (one misbehaviour per name) for app/src/wasi-generator.test.ts -.github/workflows/deploy.yml build editor WASM → npm install (builds the sim - WASM) → build site → deploy to Pages +.github/workflows/deploy.yml build editor WASM → yarn install (builds the sim + WASM) → test → build site → deploy to Pages ``` ## Develop ```sh -cd app -npm install # also clones + builds comline-simulator to WASM (needs cargo) -npm run dev # editor WASM, then Vite +yarn install # app/ and kit/; also clones + builds comline-simulator to WASM (needs cargo) +yarn dev # editor WASM, then Vite +yarn test # the kit's tests, then the app's ``` Needs a Rust toolchain with the `wasm32-unknown-unknown` target (for the editor WASM via [`wasm-pack`](https://rustwasm.github.io/wasm-pack/), and for -`comline-simulator`'s install-time build — `npm install` compiles +`comline-simulator`'s install-time build — `yarn install` compiles `wasm-bindgen-cli` once, then caches it in `~/.cargo`). `wasm-opt` trims the -output when present. `COMLINE_SIMULATOR_SCRIPT=0 npm install` skips the ~2 MB +output when present. `COMLINE_SIMULATOR_SCRIPT=0 yarn install` skips the ~2 MB scripted build. +## Using the kit elsewhere + +Another site depends on the kit by git, at a commit of this repo: + +```json +"comline-web-kit": "git+https://github.com/ComlineProject/playground.git#workspace=comline-web-kit&commit=" +``` + +Yarn clones the repo, and the kit's `prepack` builds the editor WASM. A site +that only uses `comline-web-kit/sim` sets `COMLINE_KIT_EDITOR=0` to skip that +build. Its Vite config needs `optimizeDeps.exclude: ["comline-web-kit"]`, so +the kit's `?url` WASM imports and its worker aren't pre-bundled. + ## Deploy Push to `master`. The workflow builds the editor WASM (`wasm-pack`), runs -`npm install` (which builds `comline-simulator` to WASM), builds the site with +`yarn install` (which builds `comline-simulator` to WASM), the tests, builds the site with Vite (`base: "./"`, so it works under `//`), and publishes `app/dist` to Pages. Enable Pages → "GitHub Actions" in the repo settings once. diff --git a/app/package.json b/app/package.json index 144d032..2067454 100644 --- a/app/package.json +++ b/app/package.json @@ -4,8 +4,7 @@ "private": true, "type": "module", "scripts": { - "wasm": "wasm-pack build ../wasm --release --target web --out-dir ../app/src/wasm --out-name comline_playground_wasm", - "dev": "yarn wasm && vite", + "dev": "vite", "build": "tsc --noEmit && vite build", "preview": "vite preview", "test": "tsc -p tsconfig.test.json && node --import tsx --test \"src/**/*.test.ts\"" @@ -24,7 +23,7 @@ "@codemirror/view": "^6.34.0", "@lezer/highlight": "^1.2.3", "comline-examples": "git+https://github.com/ComlineProject/examples.git#f63894988ea2cc5db98ff97cc0fbdfceb5af6bb7", - "comline-simulator": "git+https://github.com/ComlineProject/simulator.git#564851a8fa00709cd94db8ce8ab1c4325a691fc4" + "comline-web-kit": "workspace:*" }, "devDependencies": { "@types/node": "^20.19.43", diff --git a/app/src/examples.test.ts b/app/src/examples.test.ts index 0e1fb6b..911c42d 100644 --- a/app/src/examples.test.ts +++ b/app/src/examples.test.ts @@ -9,10 +9,10 @@ import { test } from "node:test"; import examples from "comline-examples"; -const initWasm = (await import("./wasm/comline_playground_wasm.js")).default; -const { compile_project } = await import("./wasm/comline_playground_wasm.js"); +const initWasm = (await import("comline-web-kit/editor-wasm")).default; +const { compile_project } = await import("comline-web-kit/editor-wasm"); await initWasm( - readFileSync(fileURLToPath(new URL("./wasm/comline_playground_wasm_bg.wasm", import.meta.url))), + readFileSync(fileURLToPath(import.meta.resolve("comline-web-kit/editor-wasm/bg.wasm"))), ); interface Example { diff --git a/app/src/main.ts b/app/src/main.ts index b5c599a..6f25046 100644 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -4,25 +4,19 @@ import { Compartment, EditorState, type Extension } from "@codemirror/state"; import { EditorView } from "@codemirror/view"; import { + createCompiler, makeState, mountEditor, readOnlyExtensions, - type EditorBridge, + type CompileProjectResult, type EditorContext, -} from "./editor.ts"; -import type { - CompileProjectResult, - CompletionItem, - FileInput, - GeneratedFile, - GenerateResult, - Hover, - LspPosition, - SemanticTokens, -} from "./worker.ts"; -import { createSim, type ProjectShape, type SimView } from "./sim/index.ts"; -import initSimWasm from "comline-simulator"; -import simWasmUrl from "comline-simulator/pkg/comline_simulator_bg.wasm?url"; + type FileInput, + type GeneratedFile, + type LspPosition, +} from "comline-web-kit/editor"; +import { createSim, loadSim, type SimView } from "comline-web-kit/sim"; +import { loadScripted } from "comline-web-kit/sim/scripted"; +import "comline-web-kit/sim.css"; import examplesData from "comline-examples"; // ── examples ──────────────────────────────────────────────────────────── @@ -106,50 +100,17 @@ const langCompartment = new Compartment(); const langCache = new Map(); const langLoading = new Set(); -// ── worker plumbing ───────────────────────────────────────────────────── -const worker = new Worker(new URL("./worker.ts", import.meta.url), { type: "module" }); -let seq = 0; -const pending = new Map void>(); - -worker.onmessage = (e: MessageEvent<{ id: number; result?: unknown; error?: string }>) => { - const resolve = pending.get(e.data.id); - if (!resolve) return; - pending.delete(e.data.id); - resolve(e.data.error ? { __error: e.data.error } : e.data.result); -}; - -function call(msg: Record): Promise { - const id = ++seq; - return new Promise((resolve) => { - pending.set(id, resolve as (v: unknown) => void); - worker.postMessage({ id, ...msg }); - }); -} - -async function unwrap(msg: Record, fallback: T): Promise { - const r = await call(msg); - if (r && typeof r === "object" && "__error" in r) { +// ── the compile worker ────────────────────────────────────────────────── +const compiler = createCompiler({ + onError: () => { statusEl.textContent = "wasm error"; statusEl.className = "status err"; - return fallback; - } - return r as T; -} - -const bridge: EditorBridge = { - compileProject: (f) => - unwrap({ cmd: "compileProject", files: f }, { files: [] }), - semanticTokens: (source) => - unwrap({ cmd: "semanticTokens", source }, { data: [] }), - hover: (files, activePath, line, character) => - unwrap({ cmd: "hover", files, activePath, line, character }, null), - completions: (source, line, character) => - unwrap({ cmd: "completions", source, line, character }, []), -}; + }, +}); // ── editor ────────────────────────────────────────────────────────────── const ctx: EditorContext = { - bridge, + bridge: compiler, project, activeName: () => activeFile()?.name ?? "", onDocChanged: (d) => { @@ -505,10 +466,7 @@ async function renderOutput() { destroyGenCode(); viewEl.innerHTML = `

generating…

`; } - const res = await unwrap( - { cmd: "generateProject", files: project(), target: targetSel.value, mode }, - { files: [], error: "wasm error" }, - ); + const res = await compiler.generateProject(project(), targetSel.value, mode); if (currentView !== "output") return; if (res.error) { genFiles = null; @@ -681,7 +639,7 @@ function scheduleRefresh() { } async function refresh() { - lastProject = await bridge.compileProject(project()); + lastProject = await compiler.compileProject(project()); let problems = 0; let parseFail = false; for (const f of lastProject.files) { @@ -732,13 +690,10 @@ let sim: SimView | null = null; let simLoaded = false; async function enterSimulate() { - await initSimWasm({ module_or_path: simWasmUrl }); // idempotent - const shape = await unwrap( - { cmd: "describeProject", files: project() }, - { schemas: [] }, - ); + await loadSim(); // idempotent + const shape = await compiler.describeProject(project()); if (!sim) { - sim = createSim(); + sim = createSim({ loadScripted }); simEl.append(sim.el); } // A `#s=…` fragment restores a shared topology, but only on the first entry. diff --git a/app/src/sim/index.ts b/app/src/sim/index.ts deleted file mode 100644 index 087c151..0000000 --- a/app/src/sim/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -/// The simulation: place two protocol instances, wire them together, send a -/// call, watch the frames. Public entry — everything else under `sim/` is -/// internal. - -export { createSim, type SimView } from "./ui/view.ts"; -export type { ProjectShape } from "./shape.ts"; diff --git a/app/src/style.css b/app/src/style.css index 2a6673d..2c459fd 100644 --- a/app/src/style.css +++ b/app/src/style.css @@ -434,6 +434,7 @@ main { } /* ── simulate view ─────────────────────────────────────────────────────── */ +/* Only where it sits in the page: the view's own styles are comline-web-kit/sim.css. */ #sim { display: none; flex: 1; @@ -448,869 +449,6 @@ body.mode-simulate #sim { body.mode-simulate #gen-controls { display: none; } - -.sim { - height: 100%; - display: grid; - grid-template-columns: 190px 1fr 320px; - grid-template-rows: 1fr 230px; - grid-template-areas: - "palette canvas inspector" - "frames frames inspector"; -} -.sim-col { - min-width: 0; - min-height: 0; - overflow: auto; -} -.sim-palette { - grid-area: palette; - border-right: 1px solid var(--border); - background: var(--bg-2); - padding: 0.4rem; -} -.sim-canvas { - grid-area: canvas; - position: relative; - padding: 1.2rem; - overflow: auto; - touch-action: none; -} -.canvas-hint { - position: absolute; - inset: 0; - display: flex; - align-items: center; - justify-content: center; - text-align: center; - pointer-events: none; -} -/* `display: flex` above outranks the UA `[hidden]` rule — restore it */ -.canvas-hint[hidden] { - display: none; -} -/* the inspector column: a left-edge drag grip + the scrolling pane */ -.sim-inspector-wrap { - grid-area: inspector; - display: flex; - min-width: 0; - min-height: 0; - background: var(--bg-2); -} -.sim-inspector-grip { - flex: 0 0 6px; - cursor: ew-resize; - background: var(--border); - touch-action: none; -} -.sim-inspector-grip:hover { - background: var(--muted); -} -.sim-inspector { - flex: 1; - min-width: 0; - padding: 0.6rem 0.7rem; - font-size: 0.78rem; -} -.sim-frames { - grid-area: frames; - background: var(--bg-2); - display: flex; - flex-direction: column; - min-height: 0; -} -.sim-frames-grip { - flex: 0 0 6px; - cursor: ns-resize; - background: var(--border); - touch-action: none; -} -.sim-frames-grip:hover { - background: var(--muted); -} - -/* palette */ -.palette-group { - margin-bottom: 0.8rem; -} -.palette-proto { - font-size: 0.7rem; - text-transform: uppercase; - letter-spacing: 0.08em; - color: var(--muted); - margin-bottom: 0.3rem; -} -.palette-chip { - font-size: 0.75rem; - padding: 0.25rem 0.5rem; - margin-bottom: 0.25rem; - border: 1px solid var(--border); - border-radius: 5px; - background: var(--bg); - cursor: grab; - user-select: none; -} -.palette-chip.role-server { - border-left: 3px solid var(--accent); -} -.palette-chip.role-client { - border-left: 3px solid var(--ok); -} - -/* canvas */ -.sim-wire { - position: absolute; - inset: 0; - width: 100%; - height: 100%; - pointer-events: none; - overflow: visible; -} -.sim-wire line { - stroke-width: 2; -} -.sim-wire .wire-live { - stroke: var(--ok); -} -.sim-wire .wire-pending { - stroke: var(--muted); - stroke-dasharray: 5 4; -} -.sim-wire .wire-faulty { - stroke: var(--warn); - stroke-dasharray: 6 4; -} -.sim-wire .wire-drag { - stroke: var(--accent); - stroke-dasharray: 4 3; -} -.sim-wire .wire-hit { - stroke: transparent; - stroke-width: 12; - pointer-events: stroke; - cursor: pointer; -} -.sim-wire .wire-selected { - stroke-width: 3.5; - filter: drop-shadow(0 0 3px currentColor); -} -/* the box on the canvas — one or more instance rows */ -.sim-node-group { - position: absolute; - width: 156px; - border: 1px solid var(--border); - border-radius: 8px; - background: var(--bg-2); - cursor: grab; - user-select: none; - touch-action: none; -} -.sim-node-group:active { - cursor: grabbing; -} -.sim-node-group.drop-target { - outline: 2px dashed var(--accent); - outline-offset: 2px; -} -.sim-node-group.selected { - outline: 1px solid var(--accent); - outline-offset: 2px; -} -.sim-node-group.selected > .group-cap { - color: var(--accent); -} -.group-cap { - padding: 0.28rem 0.6rem 0.24rem; - font-size: 0.62rem; - text-transform: uppercase; - letter-spacing: 0.07em; - color: var(--muted); - border-bottom: 1px solid var(--border); -} -.group-rename { - width: 100%; - font: inherit; - font-size: 0.62rem; - text-transform: uppercase; - letter-spacing: 0.07em; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--accent); - border-radius: 3px; - padding: 0 0.2rem; -} - -/* one instance inside the box */ -.sim-node { - position: relative; - padding: 0.45rem 0.7rem; - cursor: pointer; - border-left: 3px solid transparent; -} -.sim-node + .sim-node { - border-top: 1px solid var(--border); -} -.sim-node.role-server { - border-left-color: var(--accent); -} -.sim-node.role-client { - border-left-color: var(--ok); -} -.sim-node.selected { - background: #ffffff0d; - outline: 1px solid var(--accent); - outline-offset: -1px; -} -.sim-node.wired .node-name::after { - content: " ●"; - color: var(--ok); - font-size: 0.6rem; - vertical-align: middle; -} -.node-name { - font-weight: 600; - font-size: 0.82rem; -} -.node-sub { - font-size: 0.68rem; - color: var(--muted); -} -.node-port { - position: absolute; - right: -6px; - top: 50%; - transform: translateY(-50%); - width: 12px; - height: 12px; - border-radius: 50%; - background: var(--accent); - border: 2px solid var(--bg-2); - cursor: crosshair; -} -.node-port:hover { - transform: translateY(-50%) scale(1.25); -} - -/* inspector */ -.insp-section { - font-size: 0.68rem; - text-transform: uppercase; - letter-spacing: 0.09em; - color: var(--muted); - margin: 0.9rem 0 0.4rem; - border-top: 1px solid var(--border); - padding-top: 0.6rem; -} -/* the first section heads the panel — no divider above nothing */ -.sim-inspector > .insp-section:first-child, -.insp-tabpanel > .insp-section:first-child { - margin-top: 0.1rem; - border-top: none; - padding-top: 0; -} -/* instance-inspector tabs — Instance · Connections · Behaviours · Call */ -.insp-tabs { - display: flex; - gap: 0.15rem; - border-bottom: 1px solid var(--border); - margin-bottom: 0.7rem; -} -.insp-tab { - background: transparent; - border: none; - border-bottom: 2px solid transparent; - margin-bottom: -1px; - padding: 0.32rem 0.5rem; - font: inherit; - font-size: 0.66rem; - text-transform: uppercase; - letter-spacing: 0.06em; - color: var(--muted); - cursor: pointer; -} -.insp-tab:hover { - color: var(--fg); -} -.insp-tab.active { - color: var(--fg); - border-bottom-color: var(--accent); -} -.insp-facts { - display: grid; - gap: 0.25rem; - margin-bottom: 0.5rem; -} -.fact { - display: flex; - justify-content: space-between; - gap: 0.6rem; -} -.insp-label { - color: var(--muted); -} -.fact-v { - color: var(--fg); -} -.insp-row { - display: flex; - align-items: center; - gap: 0.5rem; - margin: 0.35rem 0; -} -.conn-row { - display: flex; - align-items: center; - gap: 0.4rem; - margin: 0.2rem 0; -} -.conn-dot { - color: var(--muted); - font-size: 0.7rem; - vertical-align: middle; -} -.conn-dot.ok { - color: var(--ok); -} -.conn-dot.err { - color: var(--err); -} -.conn-name { - flex: 1; - min-width: 0; - text-align: left; - background: transparent; - border: none; - color: var(--fg); - font: inherit; - font-size: 0.75rem; - cursor: pointer; - padding: 0.1rem 0; -} -.conn-name:hover { - color: var(--accent); -} -.conn-x { - background: transparent; - border: none; - color: var(--muted); - cursor: pointer; - font-size: 0.72rem; -} -.conn-x:hover { - color: var(--err); -} -.insp-row select, -.insp-row .hash-copy { - flex: 1; - min-width: 0; -} -.hash-copy { - font-size: 0.72rem; - text-align: left; - background: var(--bg); - color: var(--fg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.15rem 0.4rem; - cursor: pointer; - overflow: hidden; - text-overflow: ellipsis; -} -.sim-inspector select, -.sim-inspector textarea { - font: inherit; - font-size: 0.75rem; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.15rem 0.4rem; -} -.sim-inspector textarea { - width: 100%; - resize: vertical; -} -.sim-btn { - font: inherit; - font-size: 0.75rem; - border: 1px solid var(--border); - border-radius: 5px; - padding: 0.25rem 0.6rem; - margin-top: 0.4rem; - cursor: pointer; - background: var(--bg); - color: var(--fg); -} -.sim-btn.primary { - border-color: var(--accent); - color: var(--accent); -} -.sim-btn.danger { - border-color: var(--err); - color: var(--err); -} -.behavior-row { - margin: 0.4rem 0; -} -.behavior-head { - display: flex; - align-items: center; - gap: 0.5rem; -} -.behavior-fn { - flex: 0 0 4.5rem; - color: var(--accent); - font-size: 0.75rem; -} -.behavior-kind { - flex: 1; -} -.behavior-config { - margin-top: 0.25rem; - font-size: 0.72rem !important; -} -.behavior-config.bad { - border-color: var(--err); -} -.forward-cfg { - margin-top: 0.3rem; - display: grid; - gap: 0.25rem; -} -.forward-cfg select { - width: 100%; -} -.call-args { - margin: 0.4rem 0; -} -.call-out { - white-space: pre-wrap; - font-size: 0.72rem; - margin-top: 0.4rem; - max-height: 8rem; - overflow: auto; -} -.call-fn-name { - font-size: 0.8rem; - color: var(--accent); -} -.call-btns { - display: flex; - gap: 0.4rem; - margin-top: 0.3rem; -} -/* 2g — the compare-across-framings result: a verdict line + a small table */ -.compare-out:empty { - display: none; -} -.compare-note { - margin: 0.6rem 0 0.3rem; - font-size: 0.72rem; -} -.compare-table { - width: 100%; - border-collapse: collapse; - font-size: 0.7rem; - margin-bottom: 0.3rem; -} -.compare-table th, -.compare-table td { - padding: 0.2rem 0.4rem; - text-align: left; - border-bottom: 1px solid var(--border); -} -.compare-table th { - color: var(--muted); - font-weight: 400; - text-transform: uppercase; - font-size: 0.6rem; - letter-spacing: 0.05em; -} -.compare-table td:nth-child(2) { - text-align: right; - color: var(--muted); -} -.compare-table tr.mismatch td { - color: var(--err); -} -/* a short, centred rule between repeated blocks (call fns, behaviour rows) */ -.insp-sep { - width: 45%; - height: 0; - margin: 0.9rem auto; - border: 0; - border-top: 1px solid var(--border); -} - -/* args form */ -.arg-row { - margin: 0.3rem 0; -} -.arg-label { - display: flex; - justify-content: space-between; - gap: 0.5rem; - font-size: 0.72rem; - color: var(--muted); - margin-bottom: 0.15rem; -} -.arg-type { - color: var(--accent); -} -.arg-input { - width: 100%; - font: inherit; - font-size: 0.75rem; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.15rem 0.4rem; -} -.arg-struct { - border: 1px solid var(--border); - border-radius: 5px; - padding: 0.3rem 0.5rem; - margin: 0; -} -.args-raw-toggle { - font-size: 0.7rem; - color: var(--muted); - display: flex; - align-items: center; - gap: 0.3rem; - margin-bottom: 0.3rem; -} -.args-json { - width: 100%; -} - .mono { font-family: ui-monospace, "JetBrains Mono", Menlo, monospace; } - -/* ── frame inspector (1e) ─────────────────────────────────────────────── */ -.sim-frames-list { - flex: 1; - overflow: auto; - padding-bottom: 0.4rem; - font-size: 0.72rem; -} -.sim-frames-head { - display: flex; - align-items: center; - gap: 0.6rem; - padding: 0.3rem 0.7rem; - font-size: 0.68rem; - text-transform: uppercase; - letter-spacing: 0.09em; - color: var(--muted); -} -.sim-frames-head .icon-btn { - font-size: 0.68rem; - margin-left: auto; -} -.frame-filters { - display: flex; - gap: 0.3rem; -} -.frame-filter { - font: inherit; - font-size: 0.62rem; - text-transform: lowercase; - letter-spacing: 0; - color: var(--muted); - background: transparent; - border: 1px solid var(--border); - border-radius: 4px; - padding: 0 0.35rem; - cursor: pointer; - opacity: 0.45; -} -.frame-filter.on { - opacity: 1; - color: var(--fg); - border-color: var(--accent); -} - -/* clock / seed strip in the frames header */ -.clock-bar { - display: flex; - align-items: center; - gap: 0.3rem; - padding-left: 0.4rem; - border-left: 1px solid var(--border); -} -.clock-bar select, -.clock-bar input { - font: inherit; - font-size: 0.62rem; - text-transform: none; - letter-spacing: 0; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0 0.2rem; -} -.clock-seed { - width: 3rem; -} -.clock-btn { - font: inherit; - font-size: 0.72rem; - line-height: 1; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.05rem 0.3rem; - cursor: pointer; -} -.clock-btn:disabled { - opacity: 0.4; - cursor: default; -} -.clock-btn.recording { - color: var(--err); - border-color: var(--err); -} -label.clock-btn { - cursor: pointer; -} -.clock-queued { - font-size: 0.6rem; - color: var(--warn); - white-space: nowrap; -} -.sim-wire .wire-refused { - stroke: var(--err); - stroke-dasharray: 3 3; -} -/* the frame log is a real : fixed layout keeps the columns aligned, - the sticks while the rows scroll. */ -.sim-frames-table { - width: 100%; - border-collapse: collapse; - table-layout: fixed; - font-size: 0.72rem; -} -.sim-frames-table th, -.sim-frames-table td { - padding: 0.22rem 0.5rem; - text-align: left; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - border-right: 1px solid var(--border); -} -.sim-frames-table th:last-child, -.sim-frames-table td:last-child { - border-right: none; -} -.sim-frames-table thead th { - position: sticky; - top: 0; - z-index: 1; - font-weight: 400; - font-size: 0.6rem; - text-transform: uppercase; - letter-spacing: 0.05em; - color: var(--muted); - background: var(--bg-2); - /* a real border-bottom doesn't stick with border-collapse — paint it */ - box-shadow: inset 0 -1px 0 var(--border); -} - -tbody.frame-row { - border-bottom: 1px solid var(--border); -} -tbody.frame-row > tr.frame-summary { - cursor: pointer; -} -tbody.frame-row > tr.frame-summary:hover { - background: #ffffff08; -} -tbody.frame-row > tr.frame-detail > td { - padding: 0; -} - -.frame-conn { - color: var(--accent); - opacity: 0.85; -} -.conn-filters { - border-left: 1px solid var(--border); - padding-left: 0.4rem; -} -.frame-row .frame-seq { - color: var(--muted); -} -.frame-row .frame-kind { - color: var(--accent); -} -.frame-row .frame-fn { - color: var(--fg); -} -.frame-row .frame-delta, -.frame-row .frame-len { - color: var(--muted); -} -.frame-delta, -.frame-len { - text-align: right; -} -.frame-handshake .frame-kind, -.frame-unknown .frame-kind { - color: var(--muted); -} -.frame-refused td { - padding: 0.3rem 0.4rem; - color: var(--err); -} -.frame-faulted .frame-kind { - color: var(--warn); -} -.frame-dropped { - opacity: 0.45; -} -.frame-fault-reply .frame-fn { - color: var(--err); -} -.frame-dropped .frame-kind { - color: var(--err); - text-decoration: line-through; -} - -/* per-connection fault controls */ -.fault-ctls { - display: grid; - gap: 0.25rem; - margin-bottom: 0.4rem; -} -.fault-ctls input[type="range"] { - flex: 1; - min-width: 0; - accent-color: var(--warn); -} -.fault-ctls input[type="number"] { - width: 4.5rem; -} -.fault-val { - flex: 0 0 2.6rem; - text-align: right; - color: var(--muted); - font-size: 0.72rem; -} -tbody.frame-idle > tr > td { - padding: 0; -} -.frame-idle-line { - display: flex; - align-items: center; - gap: 0.6rem; - padding: 0.2rem 0.5rem; - font-size: 0.62rem; - color: var(--muted); - opacity: 0.75; -} -.frame-idle-line::before, -.frame-idle-line::after { - content: ""; - flex: 1; - border-top: 1px dashed var(--border); -} -.frame-body { - padding: 0.3rem 0.6rem 0.5rem; - background: var(--bg); - border-top: 1px solid var(--border); -} -.frame-kv { - display: flex; - gap: 0.6rem; - margin: 0.15rem 0; -} -.frame-k { - flex: 0 0 6rem; - color: var(--muted); -} -.frame-json { - margin: 0; - white-space: pre-wrap; - color: var(--fg); - max-height: 8rem; - overflow: auto; -} -.frame-raw-btns { - display: flex; - gap: 0.3rem; - margin-top: 0.3rem; -} -.bytes-toggle { - font: inherit; - font-size: 0.68rem; - color: var(--muted); - background: transparent; - border: 1px solid var(--border); - border-radius: 4px; - padding: 0 0.35rem; - cursor: pointer; -} -.bytes-toggle.on { - color: var(--fg); - border-color: var(--muted); -} -.frame-bytes { - margin: 0.3rem 0 0; - white-space: pre-wrap; - word-break: break-all; - color: var(--muted); - font-size: 0.68rem; -} -.sim-inspector input[type="number"] { - font: inherit; - font-size: 0.75rem; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.15rem 0.4rem; - width: 5rem; -} -.box-name { - flex: 1; - min-width: 0; - font: inherit; - font-size: 0.75rem; - color: var(--fg); - background: var(--bg); - border: 1px solid var(--border); - border-radius: 4px; - padding: 0.15rem 0.4rem; -} -/* the box inspector's instance list — role-tinted like the canvas chips */ -.box-inst { - border-left: 3px solid transparent; - padding-left: 0.4rem; -} -.box-inst.role-server { - border-left-color: var(--accent); -} -.box-inst.role-client { - border-left-color: var(--ok); -} -/* "▸ in box MACHINE 2" — jumps the inspector up to the box */ -.insp-crumb { - display: block; - margin: 0 0 0.5rem; - padding: 0; - background: transparent; - border: none; - color: var(--muted); - font: inherit; - font-size: 0.7rem; - cursor: pointer; -} -.insp-crumb:hover { - color: var(--accent); -} diff --git a/app/src/wasi-generator.test.ts b/app/src/wasi-generator.test.ts index af0727e..9b6775f 100644 --- a/app/src/wasi-generator.test.ts +++ b/app/src/wasi-generator.test.ts @@ -24,7 +24,7 @@ import { Worker } from "node:worker_threads"; import examples from "comline-examples"; -import initEditor, { decode_response, encode_describe, generate_project } from "./wasm/comline_playground_wasm.js"; +import initEditor, { decode_response, encode_describe, generate_project } from "comline-web-kit/editor-wasm"; import { generateWithWasiGenerator, limitMemory, @@ -37,7 +37,7 @@ import { import type { GuestResult } from "./wasi-generator-guest.ts"; await initEditor( - readFileSync(fileURLToPath(new URL("./wasm/comline_playground_wasm_bg.wasm", import.meta.url))), + readFileSync(fileURLToPath(import.meta.resolve("comline-web-kit/editor-wasm/bg.wasm"))), ); const tsxApi = import.meta.resolve("tsx/esm/api"); diff --git a/app/src/wasi-generator.ts b/app/src/wasi-generator.ts index 6d960f1..7760fb6 100644 --- a/app/src/wasi-generator.ts +++ b/app/src/wasi-generator.ts @@ -41,7 +41,7 @@ import { decode_response, encode_describe, encode_request, -} from "./wasm/comline_playground_wasm.js"; +} from "comline-web-kit/editor-wasm"; import { STDERR_CAP, type GuestCall, type GuestResult } from "./wasi-generator-guest.ts"; export { STDERR_CAP, STDOUT_CAP } from "./wasi-generator-guest.ts"; diff --git a/app/tsconfig.test.json b/app/tsconfig.test.json index ec16152..2ba83c4 100644 --- a/app/tsconfig.test.json +++ b/app/tsconfig.test.json @@ -7,7 +7,6 @@ "noEmit": true }, "include": [ - "src/sim", "src/examples.test.ts", "src/wasi-generator.ts", "src/wasi-generator.test.ts", diff --git a/kit/package.json b/kit/package.json new file mode 100644 index 0000000..a89f5ab --- /dev/null +++ b/kit/package.json @@ -0,0 +1,49 @@ +{ + "name": "comline-web-kit", + "version": "0.1.0", + "description": "The playground's editor and simulate view, for the playground, the tutorial and other Comline web pages.", + "private": true, + "license": "GPL-3.0-only", + "repository": { + "type": "git", + "url": "git+https://github.com/ComlineProject/playground.git", + "directory": "kit" + }, + "type": "module", + "exports": { + "./sim": "./src/sim/index.ts", + "./sim/scripted": "./src/sim/scripted.ts", + "./sim.css": "./src/sim/sim.css", + "./editor": "./src/editor/index.ts", + "./editor-wasm": "./pkg-editor/comline_playground_wasm.js", + "./editor-wasm/bg.wasm": "./pkg-editor/comline_playground_wasm_bg.wasm" + }, + "files": [ + "src", + "!src/**/*.test.ts", + "pkg-editor", + "scripts" + ], + "scripts": { + "wasm": "wasm-pack build ../wasm --release --target web --out-dir ../kit/pkg-editor --out-name comline_playground_wasm", + "prepack": "bash scripts/prepare.sh", + "test": "tsc -p tsconfig.test.json && node --import tsx --test \"src/**/*.test.ts\"" + }, + "dependencies": { + "@codemirror/autocomplete": "^6.18.0", + "@codemirror/commands": "^6.7.0", + "@codemirror/language": "^6.10.0", + "@codemirror/lint": "^6.8.0", + "@codemirror/state": "^6.4.0", + "@codemirror/view": "^6.34.0", + "@lezer/highlight": "^1.2.3", + "comline-simulator": "git+https://github.com/ComlineProject/simulator.git#564851a8fa00709cd94db8ce8ab1c4325a691fc4" + }, + "devDependencies": { + "@types/node": "^20.19.43", + "linkedom": "^0.18.13", + "tsx": "^4.23.13", + "typescript": "^5.6.0", + "vite": "^5.4.0" + } +} diff --git a/kit/scripts/prepare.sh b/kit/scripts/prepare.sh new file mode 100755 index 0000000..a745bcc --- /dev/null +++ b/kit/scripts/prepare.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# The build hook run when the kit is consumed as a git dependency +# (`"comline-web-kit": "git+https://github.com/ComlineProject/playground.git#workspace=comline-web-kit&commit="`): +# Yarn clones the repo, installs it, and runs this `prepack` before packing the +# workspace, so `../wasm` (the editor's Rust crate) is there to build. +# +# Builds the editor WASM (core, codegen and the language server's analysis, +# compiled together) into `pkg-editor/`. That takes a Rust toolchain, the +# wasm32 target and wasm-pack, and a few minutes. A consumer that only uses +# `comline-web-kit/sim` sets COMLINE_KIT_EDITOR=0 to skip it. +set -euo pipefail +cd "$(dirname "$0")/.." + +if [ "${COMLINE_KIT_EDITOR:-1}" = "0" ]; then + echo "comline-web-kit: COMLINE_KIT_EDITOR=0, skipping the editor WASM" >&2 + exit 0 +fi + +if [ -f pkg-editor/comline_playground_wasm.js ] && [ pkg-editor/comline_playground_wasm.js -nt ../wasm/Cargo.toml ]; then + echo "comline-web-kit: pkg-editor/ is already built, skipping" >&2 + exit 0 +fi + +for tool in cargo wasm-pack; do + if ! command -v "$tool" >/dev/null 2>&1; then + echo "comline-web-kit: building the editor WASM needs $tool." >&2 + echo " Install a Rust toolchain (https://rustup.rs) and wasm-pack, or set COMLINE_KIT_EDITOR=0" >&2 + echo " if you only use comline-web-kit/sim." >&2 + exit 1 + fi +done + +rustup target add wasm32-unknown-unknown >/dev/null 2>&1 || true +wasm-pack build ../wasm --release --target web --out-dir ../kit/pkg-editor --out-name comline_playground_wasm diff --git a/kit/src/editor/compiler.ts b/kit/src/editor/compiler.ts new file mode 100644 index 0000000..31384c3 --- /dev/null +++ b/kit/src/editor/compiler.ts @@ -0,0 +1,74 @@ +/// The page's side of the compile worker (`worker.ts`): starts it, and turns +/// each request into a promise. It satisfies `EditorBridge`, so it can feed +/// the editor directly, and adds what a page needs beyond the editor: +/// generating code and describing the project for the simulate view. + +import type { EditorBridge } from "./editor.ts"; +import type { + CompileProjectResult, + CompletionItem, + FileInput, + GenerateResult, + Hover, + ProjectShape, + SemanticTokens, +} from "./worker.ts"; + +export interface Compiler extends EditorBridge { + generateProject(files: FileInput[], target: string, mode: string): Promise; + describeProject(files: FileInput[]): Promise; + /** Stop the worker. The compiler can't be used afterwards. */ + terminate(): void; +} + +export interface CompilerOpts { + /** Called when the WASM throws. The request resolves to its fallback + * (no diagnostics, no files, an empty shape) either way. */ + onError?: (message: string) => void; +} + +export function createCompiler(opts: CompilerOpts = {}): Compiler { + const worker = new Worker(new URL("./worker.ts", import.meta.url), { type: "module" }); + let seq = 0; + const pending = new Map void>(); + + worker.onmessage = (e: MessageEvent<{ id: number; result?: unknown; error?: string }>) => { + const resolve = pending.get(e.data.id); + if (!resolve) return; + pending.delete(e.data.id); + resolve(e.data.error ? { __error: e.data.error } : e.data.result); + }; + + function call(msg: Record): Promise { + const id = ++seq; + return new Promise((resolve) => { + pending.set(id, resolve as (v: unknown) => void); + worker.postMessage({ id, ...msg }); + }); + } + + async function unwrap(msg: Record, fallback: T): Promise { + const r = await call(msg); + if (r && typeof r === "object" && "__error" in r) { + opts.onError?.(r.__error); + return fallback; + } + return r as T; + } + + return { + compileProject: (files) => + unwrap({ cmd: "compileProject", files }, { files: [] }), + semanticTokens: (source) => + unwrap({ cmd: "semanticTokens", source }, { data: [] }), + hover: (files, activePath, line, character) => + unwrap({ cmd: "hover", files, activePath, line, character }, null), + completions: (source, line, character) => + unwrap({ cmd: "completions", source, line, character }, []), + generateProject: (files, target, mode) => + unwrap({ cmd: "generateProject", files, target, mode }, { files: [], error: "wasm error" }), + describeProject: (files) => + unwrap({ cmd: "describeProject", files }, { schemas: [] }), + terminate: () => worker.terminate(), + }; +} diff --git a/app/src/editor.ts b/kit/src/editor/editor.ts similarity index 100% rename from app/src/editor.ts rename to kit/src/editor/editor.ts diff --git a/kit/src/editor/index.ts b/kit/src/editor/index.ts new file mode 100644 index 0000000..550b7ec --- /dev/null +++ b/kit/src/editor/index.ts @@ -0,0 +1,25 @@ +/// The editor: CodeMirror fed by the language server, compiled to WASM and run +/// in a worker. `createCompiler` starts that worker, and `mountEditor` / +/// `makeState` put an editor on the page that uses it. + +export { + makeState, + mountEditor, + readOnlyExtensions, + type EditorBridge, + type EditorContext, +} from "./editor.ts"; +export { createCompiler, type Compiler, type CompilerOpts } from "./compiler.ts"; +export type { + CompileProjectResult, + CompletionItem, + FileInput, + FileReport, + GeneratedFile, + GenerateResult, + Hover, + LspDiagnostic, + LspPosition, + LspRange, + SemanticTokens, +} from "./worker.ts"; diff --git a/app/src/worker.ts b/kit/src/editor/worker.ts similarity index 96% rename from app/src/worker.ts rename to kit/src/editor/worker.ts index 7a0ee66..ca10297 100644 --- a/app/src/worker.ts +++ b/kit/src/editor/worker.ts @@ -13,9 +13,9 @@ import init, { semantic_tokens, hover, completions, -} from "./wasm/comline_playground_wasm.js"; +} from "../../pkg-editor/comline_playground_wasm.js"; -export type { ProjectShape } from "./sim/shape.ts"; +export type { ProjectShape } from "../sim/shape.ts"; // ── result shapes (a thin slice of lsp-types) ───────────────────────────── export interface LspPosition { diff --git a/kit/src/sim/index.ts b/kit/src/sim/index.ts new file mode 100644 index 0000000..5456e31 --- /dev/null +++ b/kit/src/sim/index.ts @@ -0,0 +1,21 @@ +/// The simulation: place protocol instances, wire them together, send a call, +/// watch the frames. `loadSim` loads the engine, `createSim` builds the view, +/// and its styles are `comline-web-kit/sim.css`. Public entry — everything +/// else under `sim/` is internal. + +export { loadSim } from "./load.ts"; +export { createSim, type Recording, type SimOpts, type SimView } from "./ui/view.ts"; +export { + findProtocol, + type ArgShape, + type ConnectionShape, + type ErrorShape, + type FieldShape, + type FnShape, + type ProjectShape, + type ProtocolShape, + type SchemaShape, + type ThrowShape, + type TypeDef, + type TypeRef, +} from "./shape.ts"; diff --git a/kit/src/sim/load.ts b/kit/src/sim/load.ts new file mode 100644 index 0000000..478a09a --- /dev/null +++ b/kit/src/sim/load.ts @@ -0,0 +1,14 @@ +/// Loads the simulation engine's (lean) WASM. Call it once before +/// `createSim`; later calls return the same promise. The Rhai-scripted engine +/// is separate, and `createSim` fetches it only when a `script` behaviour is +/// picked. + +import initSimWasm from "comline-simulator"; +import simWasmUrl from "comline-simulator/pkg/comline_simulator_bg.wasm?url"; + +let loading: Promise | null = null; + +export function loadSim(): Promise { + loading ??= initSimWasm({ module_or_path: simWasmUrl }).then(() => undefined); + return loading; +} diff --git a/kit/src/sim/scripted.ts b/kit/src/sim/scripted.ts new file mode 100644 index 0000000..0c2c322 --- /dev/null +++ b/kit/src/sim/scripted.ts @@ -0,0 +1,26 @@ +/// The Rhai-scripted engine, for the `script` behaviour. Pass it to +/// `createSim({ loadScripted })` to offer scripting. The view calls it only +/// once a `script` behaviour is picked, and Vite code-splits these imports, so +/// the ~2 MB scripted WASM downloads only then. +/// +/// It's its own entry point (`comline-web-kit/sim/scripted`) because a build +/// resolves dynamic imports too: a page that never imports this module builds +/// without the scripted engine, as when installed with +/// `COMLINE_SIMULATOR_SCRIPT=0`. + +/// + +import type { Sim } from "comline-simulator"; + +export async function loadScripted(): Promise<{ Sim: typeof Sim }> { + // Same surface as the lean module, just Rhai-enabled — hence the cast (the + // `pkg-script/` ambient is deliberately opaque). + const m = (await import( + "comline-simulator/pkg-script/comline_simulator.js" + )) as typeof import("comline-simulator"); + const { default: wasmUrl } = await import( + "comline-simulator/pkg-script/comline_simulator_bg.wasm?url" + ); + await m.default({ module_or_path: wasmUrl }); + return { Sim: m.Sim }; +} diff --git a/app/src/sim/shape.test.ts b/kit/src/sim/shape.test.ts similarity index 84% rename from app/src/sim/shape.test.ts rename to kit/src/sim/shape.test.ts index dfe1bd5..6b74211 100644 --- a/app/src/sim/shape.test.ts +++ b/kit/src/sim/shape.test.ts @@ -6,10 +6,10 @@ import { fileURLToPath } from "node:url"; import { strict as assert } from "node:assert"; import { test } from "node:test"; -const initWasm = (await import("../wasm/comline_playground_wasm.js")).default; -const { describe_project } = await import("../wasm/comline_playground_wasm.js"); +const initWasm = (await import("../../pkg-editor/comline_playground_wasm.js")).default; +const { describe_project } = await import("../../pkg-editor/comline_playground_wasm.js"); await initWasm( - readFileSync(fileURLToPath(new URL("../wasm/comline_playground_wasm_bg.wasm", import.meta.url))), + readFileSync(fileURLToPath(new URL("../../pkg-editor/comline_playground_wasm_bg.wasm", import.meta.url))), ); import { typeLabel, zeroValue, type ProjectShape, type TypeDef } from "./shape.ts"; diff --git a/app/src/sim/shape.ts b/kit/src/sim/shape.ts similarity index 100% rename from app/src/sim/shape.ts rename to kit/src/sim/shape.ts diff --git a/app/src/sim/sim-wasm-script.d.ts b/kit/src/sim/sim-wasm-script.d.ts similarity index 100% rename from app/src/sim/sim-wasm-script.d.ts rename to kit/src/sim/sim-wasm-script.d.ts diff --git a/app/src/sim/sim-wasm.test.ts b/kit/src/sim/sim-wasm.test.ts similarity index 90% rename from app/src/sim/sim-wasm.test.ts rename to kit/src/sim/sim-wasm.test.ts index e647b22..2cd7bff 100644 --- a/app/src/sim/sim-wasm.test.ts +++ b/kit/src/sim/sim-wasm.test.ts @@ -7,15 +7,15 @@ import { fileURLToPath } from "node:url"; import { strict as assert } from "node:assert"; import { test } from "node:test"; -import initEditor, { describe_project } from "../wasm/comline_playground_wasm.js"; +import initEditor, { describe_project } from "../../pkg-editor/comline_playground_wasm.js"; import initSim, { Sim } from "comline-simulator"; const simWasm = fileURLToPath( - new URL("../../node_modules/comline-simulator/pkg/comline_simulator_bg.wasm", import.meta.url), + import.meta.resolve("comline-simulator/pkg/comline_simulator_bg.wasm"), ); await initEditor( - readFileSync(fileURLToPath(new URL("../wasm/comline_playground_wasm_bg.wasm", import.meta.url))), + readFileSync(fileURLToPath(new URL("../../pkg-editor/comline_playground_wasm_bg.wasm", import.meta.url))), ); await initSim(readFileSync(simWasm)); diff --git a/kit/src/sim/sim.css b/kit/src/sim/sim.css new file mode 100644 index 0000000..587fbec --- /dev/null +++ b/kit/src/sim/sim.css @@ -0,0 +1,923 @@ +/* The simulate view (comline-web-kit/sim), scoped under .cl-sim. */ + +/* Colours and font: set the --cl-* properties on .cl-sim or an ancestor to + theme it. The defaults are the playground's. */ +.cl-sim { + --bg: var(--cl-bg, #1e1e28); + --bg-2: var(--cl-bg-2, #262633); + --fg: var(--cl-fg, #e4e4ef); + --muted: var(--cl-muted, #9a9ab0); + --accent: var(--cl-accent, #7aa2f7); + --ok: var(--cl-ok, #9ece6a); + --err: var(--cl-err, #f7768e); + --warn: var(--cl-warn, #e0af68); + --border: var(--cl-border, #34344a); + font-family: var(--cl-font, ui-monospace, "SF Mono", "JetBrains Mono", Menlo, monospace); + color: var(--fg); + box-sizing: border-box; +} +.cl-sim *, +.cl-sim *::before, +.cl-sim *::after { + box-sizing: inherit; +} + +/* general utilities the view uses */ +.cl-sim .is-hidden { + display: none !important; +} +.cl-sim .empty { + flex: 1; + min-height: 0; + display: flex; + align-items: center; + justify-content: center; + padding: 1rem; + text-align: center; + color: var(--muted); + font-size: 0.8rem; +} +.cl-sim .icon-btn { + font: inherit; + font-size: 0.9rem; + line-height: 1; + color: var(--muted); + background: transparent; + border: 1px solid var(--border); + border-radius: 4px; + padding: 0 0.4rem; + cursor: pointer; +} +.cl-sim .icon-btn:hover { + color: var(--fg); + border-color: var(--muted); +} +.cl-sim .ok { + color: var(--ok); +} +.cl-sim .err { + color: var(--err); +} +.cl-sim .muted { + color: var(--muted); +} +.cl-sim .pad { + padding: 0.5rem 0.7rem; + margin: 0; + font-size: 0.78rem; +} + +.cl-sim { + height: 100%; + display: grid; + grid-template-columns: 190px 1fr 320px; + grid-template-rows: 1fr 230px; + grid-template-areas: + "palette canvas inspector" + "frames frames inspector"; +} +.cl-sim .sim-col { + min-width: 0; + min-height: 0; + overflow: auto; +} +.cl-sim .sim-palette { + grid-area: palette; + border-right: 1px solid var(--border); + background: var(--bg-2); + padding: 0.4rem; +} +.cl-sim .sim-canvas { + grid-area: canvas; + position: relative; + padding: 1.2rem; + overflow: auto; + touch-action: none; +} +.cl-sim .canvas-hint { + position: absolute; + inset: 0; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + pointer-events: none; +} +/* `display: flex` above outranks the UA `[hidden]` rule — restore it */ +.cl-sim .canvas-hint[hidden] { + display: none; +} +/* the inspector column: a left-edge drag grip + the scrolling pane */ +.cl-sim .sim-inspector-wrap { + grid-area: inspector; + display: flex; + min-width: 0; + min-height: 0; + background: var(--bg-2); +} +.cl-sim .sim-inspector-grip { + flex: 0 0 6px; + cursor: ew-resize; + background: var(--border); + touch-action: none; +} +.cl-sim .sim-inspector-grip:hover { + background: var(--muted); +} +.cl-sim .sim-inspector { + flex: 1; + min-width: 0; + padding: 0.6rem 0.7rem; + font-size: 0.78rem; +} +.cl-sim .sim-frames { + grid-area: frames; + background: var(--bg-2); + display: flex; + flex-direction: column; + min-height: 0; +} +.cl-sim .sim-frames-grip { + flex: 0 0 6px; + cursor: ns-resize; + background: var(--border); + touch-action: none; +} +.cl-sim .sim-frames-grip:hover { + background: var(--muted); +} +/* palette */ +.cl-sim .palette-group { + margin-bottom: 0.8rem; +} +.cl-sim .palette-proto { + font-size: 0.7rem; + text-transform: uppercase; + letter-spacing: 0.08em; + color: var(--muted); + margin-bottom: 0.3rem; +} +.cl-sim .palette-chip { + font-size: 0.75rem; + padding: 0.25rem 0.5rem; + margin-bottom: 0.25rem; + border: 1px solid var(--border); + border-radius: 5px; + background: var(--bg); + cursor: grab; + user-select: none; +} +.cl-sim .palette-chip.role-server { + border-left: 3px solid var(--accent); +} +.cl-sim .palette-chip.role-client { + border-left: 3px solid var(--ok); +} +/* canvas */ +.cl-sim .sim-wire { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + pointer-events: none; + overflow: visible; +} +.cl-sim .sim-wire line { + stroke-width: 2; +} +.cl-sim .sim-wire .wire-live { + stroke: var(--ok); +} +.cl-sim .sim-wire .wire-pending { + stroke: var(--muted); + stroke-dasharray: 5 4; +} +.cl-sim .sim-wire .wire-faulty { + stroke: var(--warn); + stroke-dasharray: 6 4; +} +.cl-sim .sim-wire .wire-drag { + stroke: var(--accent); + stroke-dasharray: 4 3; +} +.cl-sim .sim-wire .wire-hit { + stroke: transparent; + stroke-width: 12; + pointer-events: stroke; + cursor: pointer; +} +.cl-sim .sim-wire .wire-selected { + stroke-width: 3.5; + filter: drop-shadow(0 0 3px currentColor); +} +/* the box on the canvas — one or more instance rows */ +.cl-sim .sim-node-group { + position: absolute; + width: 156px; + border: 1px solid var(--border); + border-radius: 8px; + background: var(--bg-2); + cursor: grab; + user-select: none; + touch-action: none; +} +.cl-sim .sim-node-group:active { + cursor: grabbing; +} +.cl-sim .sim-node-group.drop-target { + outline: 2px dashed var(--accent); + outline-offset: 2px; +} +.cl-sim .sim-node-group.selected { + outline: 1px solid var(--accent); + outline-offset: 2px; +} +.cl-sim .sim-node-group.selected > .group-cap { + color: var(--accent); +} +.cl-sim .group-cap { + padding: 0.28rem 0.6rem 0.24rem; + font-size: 0.62rem; + text-transform: uppercase; + letter-spacing: 0.07em; + color: var(--muted); + border-bottom: 1px solid var(--border); +} +.cl-sim .group-rename { + width: 100%; + font: inherit; + font-size: 0.62rem; + text-transform: uppercase; + letter-spacing: 0.07em; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--accent); + border-radius: 3px; + padding: 0 0.2rem; +} +/* one instance inside the box */ +.cl-sim .sim-node { + position: relative; + padding: 0.45rem 0.7rem; + cursor: pointer; + border-left: 3px solid transparent; +} +.cl-sim .sim-node + .sim-node { + border-top: 1px solid var(--border); +} +.cl-sim .sim-node.role-server { + border-left-color: var(--accent); +} +.cl-sim .sim-node.role-client { + border-left-color: var(--ok); +} +.cl-sim .sim-node.selected { + background: #ffffff0d; + outline: 1px solid var(--accent); + outline-offset: -1px; +} +.cl-sim .sim-node.wired .node-name::after { + content: " ●"; + color: var(--ok); + font-size: 0.6rem; + vertical-align: middle; +} +.cl-sim .node-name { + font-weight: 600; + font-size: 0.82rem; +} +.cl-sim .node-sub { + font-size: 0.68rem; + color: var(--muted); +} +.cl-sim .node-port { + position: absolute; + right: -6px; + top: 50%; + transform: translateY(-50%); + width: 12px; + height: 12px; + border-radius: 50%; + background: var(--accent); + border: 2px solid var(--bg-2); + cursor: crosshair; +} +.cl-sim .node-port:hover { + transform: translateY(-50%) scale(1.25); +} +/* inspector */ +.cl-sim .insp-section { + font-size: 0.68rem; + text-transform: uppercase; + letter-spacing: 0.09em; + color: var(--muted); + margin: 0.9rem 0 0.4rem; + border-top: 1px solid var(--border); + padding-top: 0.6rem; +} +/* the first section heads the panel — no divider above nothing */ +.cl-sim .sim-inspector > .insp-section:first-child, +.cl-sim .insp-tabpanel > .insp-section:first-child { + margin-top: 0.1rem; + border-top: none; + padding-top: 0; +} +/* instance-inspector tabs — Instance · Connections · Behaviours · Call */ +.cl-sim .insp-tabs { + display: flex; + gap: 0.15rem; + border-bottom: 1px solid var(--border); + margin-bottom: 0.7rem; +} +.cl-sim .insp-tab { + background: transparent; + border: none; + border-bottom: 2px solid transparent; + margin-bottom: -1px; + padding: 0.32rem 0.5rem; + font: inherit; + font-size: 0.66rem; + text-transform: uppercase; + letter-spacing: 0.06em; + color: var(--muted); + cursor: pointer; +} +.cl-sim .insp-tab:hover { + color: var(--fg); +} +.cl-sim .insp-tab.active { + color: var(--fg); + border-bottom-color: var(--accent); +} +.cl-sim .insp-facts { + display: grid; + gap: 0.25rem; + margin-bottom: 0.5rem; +} +.cl-sim .fact { + display: flex; + justify-content: space-between; + gap: 0.6rem; +} +.cl-sim .insp-label { + color: var(--muted); +} +.cl-sim .fact-v { + color: var(--fg); +} +.cl-sim .insp-row { + display: flex; + align-items: center; + gap: 0.5rem; + margin: 0.35rem 0; +} +.cl-sim .conn-row { + display: flex; + align-items: center; + gap: 0.4rem; + margin: 0.2rem 0; +} +.cl-sim .conn-dot { + color: var(--muted); + font-size: 0.7rem; + vertical-align: middle; +} +.cl-sim .conn-dot.ok { + color: var(--ok); +} +.cl-sim .conn-dot.err { + color: var(--err); +} +.cl-sim .conn-name { + flex: 1; + min-width: 0; + text-align: left; + background: transparent; + border: none; + color: var(--fg); + font: inherit; + font-size: 0.75rem; + cursor: pointer; + padding: 0.1rem 0; +} +.cl-sim .conn-name:hover { + color: var(--accent); +} +.cl-sim .conn-x { + background: transparent; + border: none; + color: var(--muted); + cursor: pointer; + font-size: 0.72rem; +} +.cl-sim .conn-x:hover { + color: var(--err); +} +.cl-sim .insp-row select, +.cl-sim .insp-row .hash-copy { + flex: 1; + min-width: 0; +} +.cl-sim .hash-copy { + font-size: 0.72rem; + text-align: left; + background: var(--bg); + color: var(--fg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.15rem 0.4rem; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; +} +.cl-sim .sim-inspector select, +.cl-sim .sim-inspector textarea { + font: inherit; + font-size: 0.75rem; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.15rem 0.4rem; +} +.cl-sim .sim-inspector textarea { + width: 100%; + resize: vertical; +} +.cl-sim .sim-btn { + font: inherit; + font-size: 0.75rem; + border: 1px solid var(--border); + border-radius: 5px; + padding: 0.25rem 0.6rem; + margin-top: 0.4rem; + cursor: pointer; + background: var(--bg); + color: var(--fg); +} +.cl-sim .sim-btn.primary { + border-color: var(--accent); + color: var(--accent); +} +.cl-sim .sim-btn.danger { + border-color: var(--err); + color: var(--err); +} +.cl-sim .behavior-row { + margin: 0.4rem 0; +} +.cl-sim .behavior-head { + display: flex; + align-items: center; + gap: 0.5rem; +} +.cl-sim .behavior-fn { + flex: 0 0 4.5rem; + color: var(--accent); + font-size: 0.75rem; +} +.cl-sim .behavior-kind { + flex: 1; +} +.cl-sim .behavior-config { + margin-top: 0.25rem; + font-size: 0.72rem !important; +} +.cl-sim .behavior-config.bad { + border-color: var(--err); +} +.cl-sim .forward-cfg { + margin-top: 0.3rem; + display: grid; + gap: 0.25rem; +} +.cl-sim .forward-cfg select { + width: 100%; +} +.cl-sim .call-args { + margin: 0.4rem 0; +} +.cl-sim .call-out { + white-space: pre-wrap; + font-size: 0.72rem; + margin-top: 0.4rem; + max-height: 8rem; + overflow: auto; +} +.cl-sim .call-fn-name { + font-size: 0.8rem; + color: var(--accent); +} +.cl-sim .call-btns { + display: flex; + gap: 0.4rem; + margin-top: 0.3rem; +} +/* 2g — the compare-across-framings result: a verdict line + a small table */ +.cl-sim .compare-out:empty { + display: none; +} +.cl-sim .compare-note { + margin: 0.6rem 0 0.3rem; + font-size: 0.72rem; +} +.cl-sim .compare-table { + width: 100%; + border-collapse: collapse; + font-size: 0.7rem; + margin-bottom: 0.3rem; +} +.cl-sim .compare-table th, +.cl-sim .compare-table td { + padding: 0.2rem 0.4rem; + text-align: left; + border-bottom: 1px solid var(--border); +} +.cl-sim .compare-table th { + color: var(--muted); + font-weight: 400; + text-transform: uppercase; + font-size: 0.6rem; + letter-spacing: 0.05em; +} +.cl-sim .compare-table td:nth-child(2) { + text-align: right; + color: var(--muted); +} +.cl-sim .compare-table tr.mismatch td { + color: var(--err); +} +/* a short, centred rule between repeated blocks (call fns, behaviour rows) */ +.cl-sim .insp-sep { + width: 45%; + height: 0; + margin: 0.9rem auto; + border: 0; + border-top: 1px solid var(--border); +} +/* args form */ +.cl-sim .arg-row { + margin: 0.3rem 0; +} +.cl-sim .arg-label { + display: flex; + justify-content: space-between; + gap: 0.5rem; + font-size: 0.72rem; + color: var(--muted); + margin-bottom: 0.15rem; +} +.cl-sim .arg-type { + color: var(--accent); +} +.cl-sim .arg-input { + width: 100%; + font: inherit; + font-size: 0.75rem; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.15rem 0.4rem; +} +.cl-sim .arg-struct { + border: 1px solid var(--border); + border-radius: 5px; + padding: 0.3rem 0.5rem; + margin: 0; +} +.cl-sim .args-raw-toggle { + font-size: 0.7rem; + color: var(--muted); + display: flex; + align-items: center; + gap: 0.3rem; + margin-bottom: 0.3rem; +} +.cl-sim .args-json { + width: 100%; +} +.cl-sim .mono { + font-family: ui-monospace, "JetBrains Mono", Menlo, monospace; +} +/* ── frame inspector (1e) ─────────────────────────────────────────────── */ +.cl-sim .sim-frames-list { + flex: 1; + overflow: auto; + padding-bottom: 0.4rem; + font-size: 0.72rem; +} +.cl-sim .sim-frames-head { + display: flex; + align-items: center; + gap: 0.6rem; + padding: 0.3rem 0.7rem; + font-size: 0.68rem; + text-transform: uppercase; + letter-spacing: 0.09em; + color: var(--muted); +} +.cl-sim .sim-frames-head .icon-btn { + font-size: 0.68rem; + margin-left: auto; +} +.cl-sim .frame-filters { + display: flex; + gap: 0.3rem; +} +.cl-sim .frame-filter { + font: inherit; + font-size: 0.62rem; + text-transform: lowercase; + letter-spacing: 0; + color: var(--muted); + background: transparent; + border: 1px solid var(--border); + border-radius: 4px; + padding: 0 0.35rem; + cursor: pointer; + opacity: 0.45; +} +.cl-sim .frame-filter.on { + opacity: 1; + color: var(--fg); + border-color: var(--accent); +} +/* clock / seed strip in the frames header */ +.cl-sim .clock-bar { + display: flex; + align-items: center; + gap: 0.3rem; + padding-left: 0.4rem; + border-left: 1px solid var(--border); +} +.cl-sim .clock-bar select, +.cl-sim .clock-bar input { + font: inherit; + font-size: 0.62rem; + text-transform: none; + letter-spacing: 0; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0 0.2rem; +} +.cl-sim .clock-seed { + width: 3rem; +} +.cl-sim .clock-btn { + font: inherit; + font-size: 0.72rem; + line-height: 1; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.05rem 0.3rem; + cursor: pointer; +} +.cl-sim .clock-btn:disabled { + opacity: 0.4; + cursor: default; +} +.cl-sim .clock-btn.recording { + color: var(--err); + border-color: var(--err); +} +.cl-sim label.clock-btn { + cursor: pointer; +} +.cl-sim .clock-queued { + font-size: 0.6rem; + color: var(--warn); + white-space: nowrap; +} +.cl-sim .sim-wire .wire-refused { + stroke: var(--err); + stroke-dasharray: 3 3; +} +/* the frame log is a real
: fixed layout keeps the columns aligned, + the sticks while the rows scroll. */ +.cl-sim .sim-frames-table { + width: 100%; + border-collapse: collapse; + table-layout: fixed; + font-size: 0.72rem; +} +.cl-sim .sim-frames-table th, +.cl-sim .sim-frames-table td { + padding: 0.22rem 0.5rem; + text-align: left; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + border-right: 1px solid var(--border); +} +.cl-sim .sim-frames-table th:last-child, +.cl-sim .sim-frames-table td:last-child { + border-right: none; +} +.cl-sim .sim-frames-table thead th { + position: sticky; + top: 0; + z-index: 1; + font-weight: 400; + font-size: 0.6rem; + text-transform: uppercase; + letter-spacing: 0.05em; + color: var(--muted); + background: var(--bg-2); + /* a real border-bottom doesn't stick with border-collapse — paint it */ + box-shadow: inset 0 -1px 0 var(--border); +} +.cl-sim tbody.frame-row { + border-bottom: 1px solid var(--border); +} +.cl-sim tbody.frame-row > tr.frame-summary { + cursor: pointer; +} +.cl-sim tbody.frame-row > tr.frame-summary:hover { + background: #ffffff08; +} +.cl-sim tbody.frame-row > tr.frame-detail > td { + padding: 0; +} +.cl-sim .frame-conn { + color: var(--accent); + opacity: 0.85; +} +.cl-sim .conn-filters { + border-left: 1px solid var(--border); + padding-left: 0.4rem; +} +.cl-sim .frame-row .frame-seq { + color: var(--muted); +} +.cl-sim .frame-row .frame-kind { + color: var(--accent); +} +.cl-sim .frame-row .frame-fn { + color: var(--fg); +} +.cl-sim .frame-row .frame-delta, +.cl-sim .frame-row .frame-len { + color: var(--muted); +} +.cl-sim .frame-delta, +.cl-sim .frame-len { + text-align: right; +} +.cl-sim .frame-handshake .frame-kind, +.cl-sim .frame-unknown .frame-kind { + color: var(--muted); +} +.cl-sim .frame-refused td { + padding: 0.3rem 0.4rem; + color: var(--err); +} +.cl-sim .frame-faulted .frame-kind { + color: var(--warn); +} +.cl-sim .frame-dropped { + opacity: 0.45; +} +.cl-sim .frame-fault-reply .frame-fn { + color: var(--err); +} +.cl-sim .frame-dropped .frame-kind { + color: var(--err); + text-decoration: line-through; +} +/* per-connection fault controls */ +.cl-sim .fault-ctls { + display: grid; + gap: 0.25rem; + margin-bottom: 0.4rem; +} +.cl-sim .fault-ctls input[type="range"] { + flex: 1; + min-width: 0; + accent-color: var(--warn); +} +.cl-sim .fault-ctls input[type="number"] { + width: 4.5rem; +} +.cl-sim .fault-val { + flex: 0 0 2.6rem; + text-align: right; + color: var(--muted); + font-size: 0.72rem; +} +.cl-sim tbody.frame-idle > tr > td { + padding: 0; +} +.cl-sim .frame-idle-line { + display: flex; + align-items: center; + gap: 0.6rem; + padding: 0.2rem 0.5rem; + font-size: 0.62rem; + color: var(--muted); + opacity: 0.75; +} +.cl-sim .frame-idle-line::before, +.cl-sim .frame-idle-line::after { + content: ""; + flex: 1; + border-top: 1px dashed var(--border); +} +.cl-sim .frame-body { + padding: 0.3rem 0.6rem 0.5rem; + background: var(--bg); + border-top: 1px solid var(--border); +} +.cl-sim .frame-kv { + display: flex; + gap: 0.6rem; + margin: 0.15rem 0; +} +.cl-sim .frame-k { + flex: 0 0 6rem; + color: var(--muted); +} +.cl-sim .frame-json { + margin: 0; + white-space: pre-wrap; + color: var(--fg); + max-height: 8rem; + overflow: auto; +} +.cl-sim .frame-raw-btns { + display: flex; + gap: 0.3rem; + margin-top: 0.3rem; +} +.cl-sim .bytes-toggle { + font: inherit; + font-size: 0.68rem; + color: var(--muted); + background: transparent; + border: 1px solid var(--border); + border-radius: 4px; + padding: 0 0.35rem; + cursor: pointer; +} +.cl-sim .bytes-toggle.on { + color: var(--fg); + border-color: var(--muted); +} +.cl-sim .frame-bytes { + margin: 0.3rem 0 0; + white-space: pre-wrap; + word-break: break-all; + color: var(--muted); + font-size: 0.68rem; +} +.cl-sim .sim-inspector input[type="number"] { + font: inherit; + font-size: 0.75rem; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.15rem 0.4rem; + width: 5rem; +} +.cl-sim .box-name { + flex: 1; + min-width: 0; + font: inherit; + font-size: 0.75rem; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border); + border-radius: 4px; + padding: 0.15rem 0.4rem; +} +/* the box inspector's instance list — role-tinted like the canvas chips */ +.cl-sim .box-inst { + border-left: 3px solid transparent; + padding-left: 0.4rem; +} +.cl-sim .box-inst.role-server { + border-left-color: var(--accent); +} +.cl-sim .box-inst.role-client { + border-left-color: var(--ok); +} +/* "▸ in box MACHINE 2" — jumps the inspector up to the box */ +.cl-sim .insp-crumb { + display: block; + margin: 0 0 0.5rem; + padding: 0; + background: transparent; + border: none; + color: var(--muted); + font: inherit; + font-size: 0.7rem; + cursor: pointer; +} +.cl-sim .insp-crumb:hover { + color: var(--accent); +} diff --git a/app/src/sim/ui/argsform.ts b/kit/src/sim/ui/argsform.ts similarity index 100% rename from app/src/sim/ui/argsform.ts rename to kit/src/sim/ui/argsform.ts diff --git a/app/src/sim/ui/framelog.ts b/kit/src/sim/ui/framelog.ts similarity index 100% rename from app/src/sim/ui/framelog.ts rename to kit/src/sim/ui/framelog.ts diff --git a/app/src/sim/ui/view.ts b/kit/src/sim/ui/view.ts similarity index 98% rename from app/src/sim/ui/view.ts rename to kit/src/sim/ui/view.ts index 3c9ce60..9d59171 100644 --- a/app/src/sim/ui/view.ts +++ b/kit/src/sim/ui/view.ts @@ -119,8 +119,9 @@ function faultsActive(f: Faults): boolean { } export interface SimOpts { - /** Test seam: hand back the scripted sim module instead of `import()`ing it - * (which, in a build, is a code-split fetch of the heavier Rhai wasm). */ + /** Loads the Rhai-scripted engine: `loadScripted` from + * `comline-web-kit/sim/scripted`, or a test's own. Without it, the + * `script` behaviour isn't offered. */ loadScripted?: () => Promise<{ Sim: typeof Sim }>; } @@ -144,25 +145,16 @@ export function createSim(opts: SimOpts = {}): SimView { // loaded only once a `script` behaviour is actually picked. `SimClass` starts // lean; `ensureScripted` swaps in the scripted class and re-seats the live // session on it (via the `#s=` link), after which every rebuild uses it too. + // Without `opts.loadScripted`, the page has no scripted engine to load. let SimClass: typeof Sim = Sim; let scripted = false; - const loadScripted = - opts.loadScripted ?? - (async () => { - // Same surface as the lean module, just Rhai-enabled — hence the cast - // (the `pkg-script/` ambient is deliberately opaque). Vite code-splits - // this dynamic import, so the ~2 MB scripted wasm only downloads here. - const m = (await import( - "comline-simulator/pkg-script/comline_simulator.js" - )) as typeof import("comline-simulator"); - const { default: wasmUrl } = await import( - "comline-simulator/pkg-script/comline_simulator_bg.wasm?url" - ); - await m.default({ module_or_path: wasmUrl }); - return { Sim: m.Sim }; - }); + const loadScripted = opts.loadScripted ?? null; async function ensureScripted(): Promise { if (scripted) return true; + if (!loadScripted) { + flashInspectorError("scripting isn't available on this page"); + return false; + } try { SimClass = (await loadScripted()).Sim; if (sim) { @@ -181,7 +173,7 @@ export function createSim(opts: SimOpts = {}): SimView { const sessionHasScript = () => !!model?.instances.some((i) => Object.values(i.behaviors).some((b) => b.kind === "script")); - const el = div("sim"); + const el = div("cl-sim sim"); const paletteEl = div("sim-col sim-palette"); const canvasEl = div("sim-col sim-canvas"); const inspectorEl = div("sim-col sim-inspector"); @@ -1237,7 +1229,9 @@ export function createSim(opts: SimOpts = {}): SimView { label: string; applies: boolean; }[] - ).filter((e) => e.applies); // `script` lazy-loads its wasm on first pick + ) + // `script` lazy-loads its wasm on first pick, so it needs a loader + .filter((e) => e.applies && (e.kind !== "script" || loadScripted !== null)); const wrap = div("behavior-row"); const head = div("behavior-head"); diff --git a/app/src/sim/view.test.ts b/kit/src/sim/view.test.ts similarity index 98% rename from app/src/sim/view.test.ts rename to kit/src/sim/view.test.ts index 6facd1f..4397b3c 100644 --- a/app/src/sim/view.test.ts +++ b/kit/src/sim/view.test.ts @@ -16,16 +16,16 @@ const { document, window } = parseHTML(" { // ── 2f — scripted behaviour (Rhai), lazy-loaded ────────────────────── const scriptedWasm = fileURLToPath( new URL( - "../../node_modules/comline-simulator/pkg-script/comline_simulator_bg.wasm", - import.meta.url, + "pkg-script/comline_simulator_bg.wasm", + import.meta.resolve("comline-simulator/package.json"), ), ); const loadScripted = async () => { @@ -1177,6 +1177,21 @@ const loadScripted = async () => { return { Sim: m.Sim }; }; +test("2f — without a scripted engine to load, `script` isn't offered", () => { + const sim = createSim(); + document.body.append(sim.el); + sim.setShape(shape()); + const { server } = place(sim); + + fire(server, "click"); + const kinds = [ + ...(sim.el.querySelector(".behavior-row .behavior-kind") as HTMLSelectElement).options, + ].map((o) => o.value); + assert.ok(kinds.includes("reply") && kinds.includes("echo"), "the other behaviours are offered"); + assert.ok(!kinds.includes("script"), "`script` needs a loader"); + sim.destroy(); +}); + test( "2f — picking `script` pulls the scripted wasm and runs a Rhai reply", { skip: existsSync(scriptedWasm) ? false : "set COMLINE_SIMULATOR_SCRIPT=1 and reinstall" }, diff --git a/kit/tsconfig.json b/kit/tsconfig.json new file mode 100644 index 0000000..3d209eb --- /dev/null +++ b/kit/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "ESNext", + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "lib": ["ES2022", "DOM", "DOM.Iterable", "WebWorker"], + "strict": true, + "noUnusedLocals": true, + "skipLibCheck": true, + "noEmit": true, + "types": ["vite/client"] + }, + "include": ["src"], + "exclude": ["src/**/*.test.ts"] +} diff --git a/kit/tsconfig.test.json b/kit/tsconfig.test.json new file mode 100644 index 0000000..21bdacb --- /dev/null +++ b/kit/tsconfig.test.json @@ -0,0 +1,13 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "types": [ + "node", + "vite/client" + ] + }, + "include": [ + "src/sim" + ], + "exclude": [] +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..3fe76d7 --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "comline-playground-workspace", + "private": true, + "workspaces": [ + "app", + "kit" + ], + "scripts": { + "wasm": "yarn workspace comline-web-kit wasm", + "dev": "yarn wasm && yarn workspace comline-playground dev", + "build": "yarn workspace comline-playground build", + "test": "yarn workspace comline-web-kit test && yarn workspace comline-playground test" + }, + "packageManager": "yarn@4.18.0" +} diff --git a/app/yarn.lock b/yarn.lock similarity index 97% rename from app/yarn.lock rename to yarn.lock index a16a8a1..59dca12 100644 --- a/app/yarn.lock +++ b/yarn.lock @@ -769,9 +769,15 @@ __metadata: languageName: node linkType: hard -"comline-playground@workspace:.": +"comline-playground-workspace@workspace:.": version: 0.0.0-use.local - resolution: "comline-playground@workspace:." + resolution: "comline-playground-workspace@workspace:." + languageName: unknown + linkType: soft + +"comline-playground@workspace:app": + version: 0.0.0-use.local + resolution: "comline-playground@workspace:app" dependencies: "@bjorn3/browser_wasi_shim": "npm:0.4.2" "@codemirror/autocomplete": "npm:^6.18.0" @@ -787,7 +793,7 @@ __metadata: "@lezer/highlight": "npm:^1.2.3" "@types/node": "npm:^20.19.43" comline-examples: "git+https://github.com/ComlineProject/examples.git#f63894988ea2cc5db98ff97cc0fbdfceb5af6bb7" - comline-simulator: "git+https://github.com/ComlineProject/simulator.git#564851a8fa00709cd94db8ce8ab1c4325a691fc4" + comline-web-kit: "workspace:*" linkedom: "npm:^0.18.13" tsx: "npm:^4.23.13" typescript: "npm:^5.6.0" @@ -798,10 +804,30 @@ __metadata: "comline-simulator@git+https://github.com/ComlineProject/simulator.git#564851a8fa00709cd94db8ce8ab1c4325a691fc4": version: 0.0.0 resolution: "comline-simulator@https://github.com/ComlineProject/simulator.git#commit=564851a8fa00709cd94db8ce8ab1c4325a691fc4" - checksum: 10c0/0238c841ab44ef23e1224473c61631b0424ab9d470474921d43fdb7a5d9f4792c0902374964773298f28fcd91913c6447edb57a9643a5f2cee1052ffc0dbb396 + checksum: 10c0/1fe55d8965ac0390ea18b5734e8ccc62e9d474caad40529305a40a90d247b4da93ac99fe124b93aa46fe214f53755260ac2070c80da839a8aaa4c64a9206a8b2 languageName: node linkType: hard +"comline-web-kit@workspace:*, comline-web-kit@workspace:kit": + version: 0.0.0-use.local + resolution: "comline-web-kit@workspace:kit" + dependencies: + "@codemirror/autocomplete": "npm:^6.18.0" + "@codemirror/commands": "npm:^6.7.0" + "@codemirror/language": "npm:^6.10.0" + "@codemirror/lint": "npm:^6.8.0" + "@codemirror/state": "npm:^6.4.0" + "@codemirror/view": "npm:^6.34.0" + "@lezer/highlight": "npm:^1.2.3" + "@types/node": "npm:^20.19.43" + comline-simulator: "git+https://github.com/ComlineProject/simulator.git#564851a8fa00709cd94db8ce8ab1c4325a691fc4" + linkedom: "npm:^0.18.13" + tsx: "npm:^4.23.13" + typescript: "npm:^5.6.0" + vite: "npm:^5.4.0" + languageName: unknown + linkType: soft + "crelt@npm:^1.0.5, crelt@npm:^1.0.6": version: 1.0.7 resolution: "crelt@npm:1.0.7"