acrylblends 1.0.9 → 1.0.10

package/docs/framework/guides/bring-your-own-tool.md

@@ -119,6 +119,8 @@ export async function apply(ctx: Context, config: { path?: string } = {}): Promi
 
 The suite is the contract: it runs the same cases against every provider. A test gives it a fresh store for each case and a way to reopen the same storage.
 
+The suite imports `vitest` from your project, where `--suite` put it as a dev dependency. The same suite is in the package as `acrylblends/kv/conformance` (and `acrylblends/db/conformance`), and there it runs on the vitest your test hands it: `import * as vitest from 'vitest'` and `describeKvConformance('my-provider', open, vitest)`. The package does not declare `vitest` as a peer, so a production install of an app that uses `acrylblends` carries no vitest, vite or native build tools (1.0.10 and later; before that, `pnpm deploy --prod` pulled them in).
+
 ```ts no-check
 // test/kv-lowdb.spec.ts
 import { mkdir, mkdtemp } from 'node:fs/promises'

package/lib/cordis/door.js

@@ -4,7 +4,7 @@ import { r as loopbackAuthority } from "../loopback-only-BbasoF7R.js";
 import "../helpers-BEjcdbgw.js";
 import { n as clientModules } from "../client-modules-drj4mjhj.js";
 import { a as MAX_WAIT_MS, d as parseChannelToHost, l as UiControlError, p as parseUiRequest, r as MAX_SNAPSHOT_NODES, u as WINDOW_ID } from "../protocol-CQ_if7Dg.js";
-import { a as INVALID_JSON, c as operatorOnly, d as AuditLog, f as auditPath, i as DOOR_PREFIX, l as privateApi, o as error, p as UiChannel, r as pageChannelRoutes, s as jsonBody, t as renderSnapshot, u as readJson } from "../snapshot-text-CBi3EMnj.js";
+import { a as INVALID_JSON, c as operatorOnly, d as AuditLog, f as auditPath, i as DOOR_PREFIX, l as privateApi, o as error, p as UiChannel, r as pageChannelRoutes, s as jsonBody, t as renderSnapshot, u as readJson } from "../snapshot-text-BfEbEOjA.js";
 import "../src-BTBm4OPD.js";
 import "../middleware-BfG_fp8P.js";
 import { isAbsolute, join, relative, resolve } from "node:path";

package/lib/db/conformance.d.ts

@@ -1,4 +1,5 @@
 import { t as Db } from "../database-DBHdwefi.js";
+import { t as VitestApi } from "../vitest-binding-CctNu3jT.js";
 
 //#region ../../plugins/acryl-db/src/conformance.d.ts
 /** A fresh, empty database from the provider under test, and how to close it. */
@@ -6,6 +7,9 @@ interface DbUnderTest {
   readonly db: Db;
   close(): Promise<void>;
 }
-declare function describeDbConformance(provider: string, open: () => Promise<DbUnderTest>): void;
+declare function describeDbConformance$1(provider: string, open: () => Promise<DbUnderTest>): void;
 //#endregion
-export { DbUnderTest, describeDbConformance };
+//#region src/db-conformance.d.ts
+declare function describeDbConformance(provider: string, open: Parameters<typeof describeDbConformance$1>[1], vitest: VitestApi): void;
+//#endregion
+export { type DbUnderTest, type VitestApi, describeDbConformance };

package/lib/db/conformance.js

@@ -1,8 +1,8 @@
 import { i as applyMigrations, n as MIGRATIONS_TABLE, r as readMigrationFiles } from "../src-MWcsMS8i.js";
+import { a as it, i as expect, n as bind, r as describe, t as afterEach } from "../vitest-binding-CrH7rKg2.js";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { afterEach, describe, expect, it } from "vitest";
 //#region ../../plugins/acryl-db/src/conformance.ts
 /**
 * The `db` conformance suite: what every provider of the port must do, as Vitest tests. A provider passes it to be accepted
@@ -24,7 +24,7 @@ function gate() {
 		open
 	};
 }
-function describeDbConformance(provider, open) {
+function describeDbConformance$1(provider, open) {
 	describe(`db conformance: ${provider}`, () => {
 		const opened = [];
 		const fresh = async () => {
@@ -264,4 +264,16 @@ function describeDbConformance(provider, open) {
 	});
 }
 //#endregion
+//#region src/db-conformance.ts
+/**
+* `acrylblends/db/conformance`: the `db` conformance suite a provider of the port passes. It runs on the vitest your test hands it, so the package declares no vitest:
+*
+*   import * as vitest from 'vitest'
+*   describeDbConformance('my-provider', open, vitest)
+*/
+function describeDbConformance(provider, open, vitest) {
+	bind(vitest);
+	describeDbConformance$1(provider, open);
+}
+//#endregion
 export { describeDbConformance };

package/lib/door/host.js

@@ -1,2 +1,2 @@
-import { d as AuditLog, f as auditPath, n as HEARTBEAT_MS, p as UiChannel, r as pageChannelRoutes, t as renderSnapshot } from "../snapshot-text-CBi3EMnj.js";
+import { d as AuditLog, f as auditPath, n as HEARTBEAT_MS, p as UiChannel, r as pageChannelRoutes, t as renderSnapshot } from "../snapshot-text-BfEbEOjA.js";
 export { AuditLog, HEARTBEAT_MS, UiChannel, auditPath, pageChannelRoutes, renderSnapshot };

package/lib/kv/conformance.d.ts

@@ -1,3 +1,4 @@
+import { t as VitestApi } from "../vitest-binding-CctNu3jT.js";
 import { n as Kv } from "../kv-9f-AlRKN.js";
 
 //#region ../../plugins/acryl-kv/src/conformance.d.ts
@@ -8,6 +9,9 @@ interface KvUnderTest {
   /** Close this store (if it is still open) and open the same storage again, to prove what was written is durable. */
   reopen(): Promise<KvUnderTest>;
 }
-declare function describeKvConformance(provider: string, open: () => Promise<KvUnderTest>): void;
+declare function describeKvConformance$1(provider: string, open: () => Promise<KvUnderTest>): void;
 //#endregion
-export { KvUnderTest, describeKvConformance };
+//#region src/kv-conformance.d.ts
+declare function describeKvConformance(provider: string, open: Parameters<typeof describeKvConformance$1>[1], vitest: VitestApi): void;
+//#endregion
+export { type KvUnderTest, type VitestApi, describeKvConformance };

package/lib/kv/conformance.js

@@ -1,10 +1,10 @@
-import { afterEach, describe, expect, it } from "vitest";
+import { a as it, i as expect, n as bind, r as describe, t as afterEach } from "../vitest-binding-CrH7rKg2.js";
 //#region ../../plugins/acryl-kv/src/conformance.ts
 /**
 * The `kv` conformance suite: what every provider of the port must do, as Vitest tests. A provider passes it to be accepted
 * (`describeKvConformance('acryl-kv-json', open)` in its own tests), so the same cases run on a file and on SQL.
 */
-function describeKvConformance(provider, open) {
+function describeKvConformance$1(provider, open) {
 	describe(`kv conformance: ${provider}`, () => {
 		const opened = [];
 		const track = (subject) => {
@@ -298,4 +298,16 @@ function describeKvConformance(provider, open) {
 	});
 }
 //#endregion
+//#region src/kv-conformance.ts
+/**
+* `acrylblends/kv/conformance`: the `kv` conformance suite a provider of the port passes. It runs on the vitest your test hands it, so the package declares no vitest:
+*
+*   import * as vitest from 'vitest'
+*   describeKvConformance('my-provider', open, vitest)
+*/
+function describeKvConformance(provider, open, vitest) {
+	bind(vitest);
+	describeKvConformance$1(provider, open);
+}
+//#endregion
 export { describeKvConformance };

package/lib/{snapshot-text-CBi3EMnj.js → snapshot-text-BfEbEOjA.js}

@@ -142,7 +142,7 @@ var UiChannel = class {
 			const fresh = await this.expectNewPage(this.attachWaitMs);
 			if (fresh !== void 0 && !tried.has(fresh)) return await this.call(request, options, true);
 		}
-		throw new UiControlError("timeout", `no page of the app answered within ${String(Math.round(this.ackMs / 1e3))} s: the app's pages are open but none responded. Likely causes: a tab in the background, a page that is still loading after a navigation (look again), or a page that holds the browser's six connections with event streams of its own (a page should keep to two). Bring the app's tab to the front, or navigate it, then look again`);
+		throw new UiControlError("timeout", `no page of the app answered within ${String(Math.round(this.ackMs / 1e3))} s: the app's pages are open but none responded. Likely causes: a tab in the background, a page that is still loading after a navigation (look again), a page busy running a long script, or a page that holds the browser's six connections with event streams of its own (a page should keep to two). Bring the app's tab to the front, or navigate it, then look again`);
 	}
 	callOne(target, request, options, failOver) {
 		const signal = options.signal;

package/lib/vitest-binding-CctNu3jT.d.ts

@@ -0,0 +1,15 @@
+//#region src/vitest-binding.d.ts
+/**
+ * The conformance suites (`acrylblends/db/conformance`, `acrylblends/kv/conformance`) run on the test runner's own vitest, which the test hands them. In the package build their
+ * `import ... from 'vitest'` is pointed here (`tsdown.config.ts`), so the package imports no vitest and does not declare one: it cannot put vitest, vite, rolldown or lightningcss into
+ * a production install, and the suite can never see a second copy of vitest that is not the one running the test.
+ */
+/** The four functions of vitest the suites use; a test passes `import * as vitest from 'vitest'`. */
+interface VitestApi {
+  readonly afterEach: (...args: never[]) => unknown;
+  readonly describe: (...args: never[]) => unknown;
+  readonly expect: (...args: never[]) => unknown;
+  readonly it: (...args: never[]) => unknown;
+}
+//#endregion
+export { VitestApi as t };

package/lib/vitest-binding-CrH7rKg2.js

@@ -0,0 +1,17 @@
+//#region src/vitest-binding.ts
+let bound;
+/** Use `api` for the suites that run next. They register their cases synchronously, so one call per suite is enough. */
+function bind(api) {
+	if (api === void 0 || typeof api.describe !== "function" || typeof api.it !== "function" || typeof api.expect !== "function" || typeof api.afterEach !== "function") throw new Error("the conformance suite needs the vitest your tests run on: pass it as the third argument, `import * as vitest from 'vitest'` then `describeKvConformance(name, open, vitest)`");
+	bound = api;
+}
+const use = () => {
+	if (bound === void 0) throw new Error("the conformance suite ran before it was given vitest");
+	return bound;
+};
+const afterEach = (...args) => Reflect.apply(use().afterEach, void 0, args);
+const describe = (...args) => Reflect.apply(use().describe, void 0, args);
+const expect = (...args) => Reflect.apply(use().expect, void 0, args);
+const it = (...args) => Reflect.apply(use().it, void 0, args);
+//#endregion
+export { it as a, expect as i, bind as n, describe as r, afterEach as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acrylblends",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "The Acryl web framework (import { Acryl } from \"acrylblends\") and the acrylblends command that scaffolds Cordis apps.",
   "license": "MIT",
   "type": "module",
@@ -436,7 +436,6 @@
     "@deepseek-ai/cordis": "^4.0.2",
     "@deepseek-ai/schemastery": "~3.18.4",
     "react": ">=18",
-    "vitest": ">=3",
     "ws": ">=8"
   },
   "peerDependenciesMeta": {
@@ -449,9 +448,6 @@
     "react": {
       "optional": true
     },
-    "vitest": {
-      "optional": true
-    },
     "ws": {
       "optional": true
     }

package/plugins/acryl-door/src/host/channel.ts

@@ -179,7 +179,7 @@ export class UiChannel {
       const fresh = await this.expectNewPage(this.attachWaitMs)
       if (fresh !== undefined && !tried.has(fresh)) return await this.call(request, options, true)
     }
-    throw new UiControlError('timeout', `no page of the app answered within ${String(Math.round(this.ackMs / 1000))} s: the app's pages are open but none responded. Likely causes: a tab in the background, a page that is still loading after a navigation (look again), or a page that holds the browser's six connections with event streams of its own (a page should keep to two). Bring the app's tab to the front, or navigate it, then look again`)
+    throw new UiControlError('timeout', `no page of the app answered within ${String(Math.round(this.ackMs / 1000))} s: the app's pages are open but none responded. Likely causes: a tab in the background, a page that is still loading after a navigation (look again), a page busy running a long script, or a page that holds the browser's six connections with event streams of its own (a page should keep to two). Bring the app's tab to the front, or navigate it, then look again`)
   }
 
   private callOne(target: Connection, request: UiRequest, options: { signal?: AbortSignal; timeoutMs?: number }, failOver: boolean): Promise<UiResult> {

package/plugins/desktop/main.ts

@@ -91,6 +91,8 @@ if (!app.requestSingleInstanceLock()) {
     }
     const origin = new URL(url).origin
     /** One window on a path of the app. Navigation stays on the app's own server; any other address opens in the system browser. The user agent names the window to the door (`AcrylWindow/<id>`), so an agent can drive it with `--window <id>`. */
+    // Where each window was opened: `window list` shows it until the page reports its own address (Electron gives none while the first load has not started).
+    const openedOn = new Map<number, string>()
     const createWindow = (path: string): BrowserWindow => {
       // A window opened while another is open sits a step down and to the right of it, not exactly on top.
       const beside =
@@ -112,6 +114,7 @@ if (!app.requestSingleInstanceLock()) {
         )
       })()
       const created = new BrowserWindow(windowOptions({ title: chosen.name, ...where }))
+      openedOn.set(created.id, path)
       created.webContents.setUserAgent(
         `${created.webContents.getUserAgent()} AcrylWindow/${String(created.id)}`,
       )
@@ -139,7 +142,8 @@ if (!app.requestSingleInstanceLock()) {
     const port = (candidate: BrowserWindow): WindowPort => ({
       id: candidate.id,
       getTitle: () => candidate.getTitle(),
-      getURL: () => candidate.webContents.getURL(),
+      getURL: () =>
+        candidate.webContents.getURL() || new URL(openedOn.get(candidate.id) ?? '/', url).href,
       isFocused: () => candidate.isFocused(),
       isMinimized: () => candidate.isMinimized(),
       getSize: () => candidate.getSize(),