acrylblends 0.8.1 → 0.9.0

package/lib/timing-Cky7C1Jf.js

@@ -0,0 +1,183 @@
+//#region ../../plugins/acryl-router/src/core/middleware/timing/timing.ts
+const getTime = () => {
+	try {
+		return performance.now();
+	} catch {}
+	return Date.now();
+};
+/**
+* Server-Timing Middleware for Acryl.
+*
+*
+* @param {TimingOptions} [config] - The options for the timing middleware.
+* @param {boolean} [config.total=true] - Show the total response time.
+* @param {boolean | ((c: Context) => boolean)} [config.enabled=true] - Whether timings should be added to the headers or not.
+* @param {string} [config.totalDescription=Total Response Time] - Description for the total response time.
+* @param {boolean} [config.autoEnd=true] - If `startTime()` should end automatically at the end of the request.
+* @param {boolean | string | ((c: Context) => boolean | string)} [config.crossOrigin=false] - The origin this timings header should be readable.
+* @returns {MiddlewareHandler} The middleware handler function.
+*
+* @example
+* ```ts
+* const app = new Acryl()
+*
+* // add the middleware to your router
+* app.use(timing());
+*
+* app.get('/', async (c) => {
+*   // add custom metrics
+*   setMetric(c, 'region', 'europe-west3')
+*
+*   // add custom metrics with timing, must be in milliseconds
+*   setMetric(c, 'custom', 23.8, 'My custom Metric')
+*
+*   // start a new timer
+*   startTime(c, 'db');
+*
+*   const data = await db.findMany(...);
+*
+*   // end the timer
+*   endTime(c, 'db');
+*
+*   return c.json({ response: data });
+* });
+* ```
+*/
+const timing = (config) => {
+	const options = {
+		total: true,
+		enabled: true,
+		totalDescription: "Total Response Time",
+		autoEnd: true,
+		crossOrigin: false,
+		...config
+	};
+	return async function timing(c, next) {
+		const headers = [];
+		const timers = /* @__PURE__ */ new Map();
+		if (c.get("metric")) return await next();
+		c.set("metric", {
+			headers,
+			timers
+		});
+		if (options.total) startTime(c, "total", options.totalDescription);
+		await next();
+		if (options.total) endTime(c, "total");
+		if (options.autoEnd) timers.forEach((_, key) => {
+			endTime(c, key);
+		});
+		if (typeof options.enabled === "function" ? options.enabled(c) : options.enabled) {
+			c.res.headers.append("Server-Timing", headers.join(","));
+			const crossOrigin = typeof options.crossOrigin === "function" ? options.crossOrigin(c) : options.crossOrigin;
+			if (crossOrigin) c.res.headers.append("Timing-Allow-Origin", typeof crossOrigin === "string" ? crossOrigin : "*");
+		}
+	};
+};
+/**
+* Set a metric for the timing middleware.
+*
+* @param {Context} c - The context of the request.
+* @param {string} name - The name of the metric.
+* @param {number | string} [valueDescription] - The value or description of the metric.
+* @param {string} [description] - The description of the metric.
+* @param {number} [precision] - The precision of the metric value.
+*
+* @example
+* ```ts
+* setMetric(c, 'region', 'europe-west3')
+* setMetric(c, 'custom', 23.8, 'My custom Metric')
+* ```
+*/
+const setMetric = (c, name, valueDescription, description, precision) => {
+	const metrics = c.get("metric");
+	if (!metrics) {
+		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
+		return;
+	}
+	if (typeof valueDescription === "number") {
+		const dur = valueDescription.toFixed(precision || 1);
+		const metric = description ? `${name};dur=${dur};desc="${description}"` : `${name};dur=${dur}`;
+		metrics.headers.push(metric);
+	} else {
+		const metric = valueDescription ? `${name};desc="${valueDescription}"` : `${name}`;
+		metrics.headers.push(metric);
+	}
+};
+/**
+* Start a timer for the timing middleware.
+*
+* @param {Context} c - The context of the request.
+* @param {string} name - The name of the timer.
+* @param {string} [description] - The description of the timer.
+*
+* @example
+* ```ts
+* startTime(c, 'db')
+* ```
+*/
+const startTime = (c, name, description) => {
+	const metrics = c.get("metric");
+	if (!metrics) {
+		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
+		return;
+	}
+	metrics.timers.set(name, {
+		description,
+		start: getTime()
+	});
+};
+/**
+* End a timer for the timing middleware.
+*
+* @param {Context} c - The context of the request.
+* @param {string} name - The name of the timer.
+* @param {number} [precision] - The precision of the timer value.
+*
+* @example
+* ```ts
+* endTime(c, 'db')
+* ```
+*/
+const endTime = (c, name, precision) => {
+	const metrics = c.get("metric");
+	if (!metrics) {
+		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
+		return;
+	}
+	const timer = metrics.timers.get(name);
+	if (!timer) {
+		console.warn(`Timer "${name}" does not exist!`);
+		return;
+	}
+	const { description, start } = timer;
+	const duration = getTime() - start;
+	setMetric(c, name, duration, description, precision);
+	metrics.timers.delete(name);
+};
+/**
+* Wrap a Promise to capture its duration.
+* @param {Context} c - The context of the request.
+* @param {string} name - The name of the timer.
+* @param {Promise<T>} callable - The Promise to time.
+* @param {string} [description] - The description of the timer.
+* @param {number} [precision] - The precision of the timer value.
+*
+* @example
+* ```ts
+*   // Instead of this:
+*   const data = await db.findMany(...);
+*
+*   // do this:
+*   const data = await wrapTime(c, 'query', db.findMany(...));
+* ```
+* */
+async function wrapTime(c, name, callable, description, precision) {
+	startTime(c, name, description);
+	try {
+		return await callable;
+	} finally {
+		endTime(c, name, precision);
+	}
+}
+//#endregion
+export { wrapTime as a, timing as i, setMetric as n, startTime as r, endTime as t };

package/lib/timing.js

@@ -1,183 +1,2 @@
-//#region ../../plugins/acryl-router/src/core/middleware/timing/timing.ts
-const getTime = () => {
-	try {
-		return performance.now();
-	} catch {}
-	return Date.now();
-};
-/**
-* Server-Timing Middleware for Acryl.
-*
-*
-* @param {TimingOptions} [config] - The options for the timing middleware.
-* @param {boolean} [config.total=true] - Show the total response time.
-* @param {boolean | ((c: Context) => boolean)} [config.enabled=true] - Whether timings should be added to the headers or not.
-* @param {string} [config.totalDescription=Total Response Time] - Description for the total response time.
-* @param {boolean} [config.autoEnd=true] - If `startTime()` should end automatically at the end of the request.
-* @param {boolean | string | ((c: Context) => boolean | string)} [config.crossOrigin=false] - The origin this timings header should be readable.
-* @returns {MiddlewareHandler} The middleware handler function.
-*
-* @example
-* ```ts
-* const app = new Acryl()
-*
-* // add the middleware to your router
-* app.use(timing());
-*
-* app.get('/', async (c) => {
-*   // add custom metrics
-*   setMetric(c, 'region', 'europe-west3')
-*
-*   // add custom metrics with timing, must be in milliseconds
-*   setMetric(c, 'custom', 23.8, 'My custom Metric')
-*
-*   // start a new timer
-*   startTime(c, 'db');
-*
-*   const data = await db.findMany(...);
-*
-*   // end the timer
-*   endTime(c, 'db');
-*
-*   return c.json({ response: data });
-* });
-* ```
-*/
-const timing = (config) => {
-	const options = {
-		total: true,
-		enabled: true,
-		totalDescription: "Total Response Time",
-		autoEnd: true,
-		crossOrigin: false,
-		...config
-	};
-	return async function timing(c, next) {
-		const headers = [];
-		const timers = /* @__PURE__ */ new Map();
-		if (c.get("metric")) return await next();
-		c.set("metric", {
-			headers,
-			timers
-		});
-		if (options.total) startTime(c, "total", options.totalDescription);
-		await next();
-		if (options.total) endTime(c, "total");
-		if (options.autoEnd) timers.forEach((_, key) => {
-			endTime(c, key);
-		});
-		if (typeof options.enabled === "function" ? options.enabled(c) : options.enabled) {
-			c.res.headers.append("Server-Timing", headers.join(","));
-			const crossOrigin = typeof options.crossOrigin === "function" ? options.crossOrigin(c) : options.crossOrigin;
-			if (crossOrigin) c.res.headers.append("Timing-Allow-Origin", typeof crossOrigin === "string" ? crossOrigin : "*");
-		}
-	};
-};
-/**
-* Set a metric for the timing middleware.
-*
-* @param {Context} c - The context of the request.
-* @param {string} name - The name of the metric.
-* @param {number | string} [valueDescription] - The value or description of the metric.
-* @param {string} [description] - The description of the metric.
-* @param {number} [precision] - The precision of the metric value.
-*
-* @example
-* ```ts
-* setMetric(c, 'region', 'europe-west3')
-* setMetric(c, 'custom', 23.8, 'My custom Metric')
-* ```
-*/
-const setMetric = (c, name, valueDescription, description, precision) => {
-	const metrics = c.get("metric");
-	if (!metrics) {
-		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
-		return;
-	}
-	if (typeof valueDescription === "number") {
-		const dur = valueDescription.toFixed(precision || 1);
-		const metric = description ? `${name};dur=${dur};desc="${description}"` : `${name};dur=${dur}`;
-		metrics.headers.push(metric);
-	} else {
-		const metric = valueDescription ? `${name};desc="${valueDescription}"` : `${name}`;
-		metrics.headers.push(metric);
-	}
-};
-/**
-* Start a timer for the timing middleware.
-*
-* @param {Context} c - The context of the request.
-* @param {string} name - The name of the timer.
-* @param {string} [description] - The description of the timer.
-*
-* @example
-* ```ts
-* startTime(c, 'db')
-* ```
-*/
-const startTime = (c, name, description) => {
-	const metrics = c.get("metric");
-	if (!metrics) {
-		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
-		return;
-	}
-	metrics.timers.set(name, {
-		description,
-		start: getTime()
-	});
-};
-/**
-* End a timer for the timing middleware.
-*
-* @param {Context} c - The context of the request.
-* @param {string} name - The name of the timer.
-* @param {number} [precision] - The precision of the timer value.
-*
-* @example
-* ```ts
-* endTime(c, 'db')
-* ```
-*/
-const endTime = (c, name, precision) => {
-	const metrics = c.get("metric");
-	if (!metrics) {
-		console.warn("Metrics not initialized! Please add the `timing()` middleware to this route!");
-		return;
-	}
-	const timer = metrics.timers.get(name);
-	if (!timer) {
-		console.warn(`Timer "${name}" does not exist!`);
-		return;
-	}
-	const { description, start } = timer;
-	const duration = getTime() - start;
-	setMetric(c, name, duration, description, precision);
-	metrics.timers.delete(name);
-};
-/**
-* Wrap a Promise to capture its duration.
-* @param {Context} c - The context of the request.
-* @param {string} name - The name of the timer.
-* @param {Promise<T>} callable - The Promise to time.
-* @param {string} [description] - The description of the timer.
-* @param {number} [precision] - The precision of the timer value.
-*
-* @example
-* ```ts
-*   // Instead of this:
-*   const data = await db.findMany(...);
-*
-*   // do this:
-*   const data = await wrapTime(c, 'query', db.findMany(...));
-* ```
-* */
-async function wrapTime(c, name, callable, description, precision) {
-	startTime(c, name, description);
-	try {
-		return await callable;
-	} finally {
-		endTime(c, name, precision);
-	}
-}
-//#endregion
+import { a as wrapTime, i as timing, n as setMetric, r as startTime, t as endTime } from "./timing-Cky7C1Jf.js";
 export { endTime, setMetric, startTime, timing, wrapTime };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acrylblends",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "The Acryl web framework (import { Acryl } from \"acrylblends\") and the acrylblends command that scaffolds Cordis apps.",
   "license": "MIT",
   "type": "module",
@@ -442,6 +442,74 @@
       "types": "./lib/kv/db.d.ts",
       "default": "./lib/kv/db.js"
     },
+    "./db/conformance": {
+      "types": "./lib/db/conformance.d.ts",
+      "default": "./lib/db/conformance.js"
+    },
+    "./kv/conformance": {
+      "types": "./lib/kv/conformance.d.ts",
+      "default": "./lib/kv/conformance.js"
+    },
+    "./door/host": {
+      "types": "./lib/door/host.d.ts",
+      "default": "./lib/door/host.js"
+    },
+    "./door/protocol": {
+      "types": "./lib/door/protocol.d.ts",
+      "default": "./lib/door/protocol.js"
+    },
+    "./door/page": {
+      "types": "./lib/door/page.d.ts",
+      "default": "./lib/door/page.js"
+    },
+    "./cordis/router": {
+      "types": "./lib/cordis/router.d.ts",
+      "default": "./lib/cordis/router.js"
+    },
+    "./cordis/router-http": {
+      "types": "./lib/cordis/router-http.d.ts",
+      "default": "./lib/cordis/router-http.js"
+    },
+    "./cordis/state": {
+      "types": "./lib/cordis/state.d.ts",
+      "default": "./lib/cordis/state.js"
+    },
+    "./cordis/state/react": {
+      "types": "./lib/cordis/state/react.d.ts",
+      "default": "./lib/cordis/state/react.js"
+    },
+    "./cordis/inspect": {
+      "types": "./lib/cordis/inspect.d.ts",
+      "default": "./lib/cordis/inspect.js"
+    },
+    "./cordis/node-server": {
+      "types": "./lib/cordis/node-server.d.ts",
+      "default": "./lib/cordis/node-server.js"
+    },
+    "./cordis/db": {
+      "types": "./lib/cordis/db.d.ts",
+      "default": "./lib/cordis/db.js"
+    },
+    "./cordis/db-sqlite": {
+      "types": "./lib/cordis/db-sqlite.d.ts",
+      "default": "./lib/cordis/db-sqlite.js"
+    },
+    "./cordis/kv": {
+      "types": "./lib/cordis/kv.d.ts",
+      "default": "./lib/cordis/kv.js"
+    },
+    "./cordis/kv-json": {
+      "types": "./lib/cordis/kv-json.d.ts",
+      "default": "./lib/cordis/kv-json.js"
+    },
+    "./cordis/kv-db": {
+      "types": "./lib/cordis/kv-db.d.ts",
+      "default": "./lib/cordis/kv-db.js"
+    },
+    "./cordis/door": {
+      "types": "./lib/cordis/door.d.ts",
+      "default": "./lib/cordis/door.js"
+    },
     "./package.json": "./package.json",
     "./cli": {
       "types": "./dist/index.d.ts",
@@ -480,6 +548,26 @@
     "access": "public"
   },
   "sideEffects": false,
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/schemastery": "~3.18.4",
+    "react": ">=18",
+    "vitest": ">=3"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/cordis": {
+      "optional": true
+    },
+    "@deepseek-ai/schemastery": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "vitest": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "tsdown",
     "clean": "rm -rf dist",

package/plugins/acryl-db/plugin.json

@@ -13,5 +13,10 @@
     "#acryl-db": "acryl-db/src/index.ts",
     "#acryl-db/conformance": "acryl-db/src/conformance.ts"
   },
-  "suite": "src/conformance.ts"
+  "suite": "src/conformance.ts",
+  "entries": {
+    "": "src/index.ts",
+    "/cordis": "src/cordis.ts",
+    "/conformance": "src/conformance.ts"
+  }
 }

package/plugins/acryl-db-sqlite/plugin.json

@@ -12,5 +12,9 @@
   "omit": ["**/*.test.*", "**/*.spec.*", "**/*.case.ts"],
   "imports": {
     "#acryl-db-sqlite": "acryl-db-sqlite/src/index.ts"
+  },
+  "entries": {
+    "": "src/index.ts",
+    "/open": "src/open.ts"
   }
 }

package/plugins/acryl-db-sqlite/src/facade/node.ts

@@ -2,7 +2,7 @@ import { mkdir } from "node:fs/promises";
 import { dirname } from "node:path";
 import type { StatementSync } from "node:sqlite";
 import { DatabaseSync } from "node:sqlite";
-import type { Db, DbExecutor, SqlValue } from "../../../acryl-db/src/index.ts";
+import type { Db, DbExecutor, SqlValue } from "acryl-db";
 
 /** Node SQLite connection settings for a database file. */
 export type NodeSqliteDatabaseOptions = {

package/plugins/acryl-db-sqlite/src/index.ts

@@ -12,8 +12,8 @@ import { dirname, isAbsolute, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
-import { DB_SERVICE } from '../../acryl-db/src/index.ts'
-import type {} from '../../acryl-db/src/cordis.ts'
+import { DB_SERVICE } from 'acryl-db'
+import type {} from 'acryl-db/cordis'
 import { openDb } from './open.ts'
 
 export { NodeSqliteDatabase, openNodeSqliteDatabase, type NodeSqliteDatabaseOptions } from './facade/node.ts'

package/plugins/acryl-db-sqlite/src/open.ts

@@ -6,10 +6,10 @@
  * This entry imports nothing from Cordis.
  */
 
-import { applyMigrations, MIGRATIONS_TABLE, readMigrationFiles, type Db, type SqlValue } from '../../acryl-db/src/index.ts'
+import { applyMigrations, MIGRATIONS_TABLE, readMigrationFiles, type Db, type SqlValue } from 'acryl-db'
 import { openNodeSqliteDatabase } from './facade/node.ts'
 
-export type { Db, DbExecutor, SqlValue } from '../../acryl-db/src/index.ts'
+export type { Db, DbExecutor, SqlValue } from 'acryl-db'
 
 export interface OpenDbOptions {
   /** The database file, its folder created if missing; `:memory:` for a database that lives until `close`. */

package/plugins/acryl-door/plugin.json

@@ -10,5 +10,8 @@
   },
   "mount": "mount it after acryl-node-server and extensions in development builds: root.plugin(door); add <script type=\"module\" src=\"/api/acryl-door/page.js\"></script> to the pages; the command is .acryl/bin/acryl",
   "gitignore": [".acryl/"],
-  "omit": ["**/*.test.*", "**/*.spec.*", "**/*.case.ts"]
+  "omit": ["**/*.test.*", "**/*.spec.*", "**/*.case.ts"],
+  "entries": {
+    "": "src/index.ts"
+  }
 }

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

@@ -5,8 +5,8 @@
  */
 
 import { timingSafeEqual } from 'node:crypto'
-import { Acryl, type Context, type MiddlewareHandler } from '../../../acryl-router/src/index.ts'
-import { bodyLimit, loopbackAuthority, loopbackOnly, methodNotAllowed } from '../../../acryl-router/src/middleware/index.ts'
+import { Acryl, type Context, type MiddlewareHandler } from 'acryl-router'
+import { bodyLimit, loopbackAuthority, loopbackOnly, methodNotAllowed } from 'acryl-router/middleware'
 
 /** Every door route lives below this path. */
 export const DOOR_PREFIX = '/api/acryl-door'

package/plugins/acryl-door/src/host/mcp-routes.ts

@@ -4,7 +4,7 @@
  * operator client sends. The same guard as the operator's routes: loopback, this run's secret.
  */
 
-import { Acryl } from '../../../acryl-router/src/index.ts'
+import { Acryl } from 'acryl-router'
 import { UiControlError } from '../page/protocol.ts'
 import type { Door } from './door.ts'
 import { DoorError } from './door.ts'

package/plugins/acryl-door/src/host/operator-routes.ts

@@ -5,7 +5,7 @@
  * away aborts its call through the request's signal.
  */
 
-import { Acryl } from '../../../acryl-router/src/index.ts'
+import { Acryl } from 'acryl-router'
 import { UiControlError } from '../page/protocol.ts'
 import { Door, DoorError } from './door.ts'
 import { error, INVALID_JSON, jsonBody, operatorOnly, readJson, type ReportError } from './http.ts'

package/plugins/acryl-door/src/host/page-routes.ts

@@ -6,9 +6,9 @@
  * `{ window, message }` (a result, an error or a focus change). Both are for the app's own page only (same origin, loopback).
  */
 
-import { Acryl } from '../../../acryl-router/src/index.ts'
-import { streamSSE } from '../../../acryl-router/src/helpers/index.ts'
-import { loopbackOnly } from '../../../acryl-router/src/middleware/index.ts'
+import { Acryl } from 'acryl-router'
+import { streamSSE } from 'acryl-router/helpers'
+import { loopbackOnly } from 'acryl-router/middleware'
 import { parseChannelToHost, WINDOW_ID } from '../page/protocol.ts'
 import type { UiChannel } from './channel.ts'
 import { error, INVALID_JSON, jsonBody, ownPage, readJson } from './http.ts'

package/plugins/acryl-door/src/index.ts

@@ -12,8 +12,8 @@
 import { join } from 'node:path'
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
-import { Acryl } from '../../acryl-router/src/index.ts'
-import { clientModules } from '../../acryl-node-server/src/client-modules.ts'
+import { Acryl } from 'acryl-router'
+import { clientModules } from 'acryl-node-server/client-modules'
 import { auditPath, AuditLog } from './host/audit.ts'
 import { UiChannel } from './host/channel.ts'
 import { registerChatTools } from './host/chat-tools.ts'

package/plugins/acryl-inspect/plugin.json

@@ -8,5 +8,8 @@
     "@deepseek-ai/cordis": "4.0.4"
   },
   "mount": "root.plugin(inspect); ctx.inspect.plugins(), ctx.inspect.explain('name'), ctx.inspect.render()",
-  "omit": ["**/*.test.*", "**/*.case.ts"]
+  "omit": ["**/*.test.*", "**/*.case.ts"],
+  "entries": {
+    "": "src/index.ts"
+  }
 }

package/plugins/acryl-inspect/src/service.ts

@@ -5,8 +5,8 @@
  */
 
 import { Context, Service } from '@deepseek-ai/cordis'
-import { loopbackOnly } from '../../acryl-router/src/middleware/index.ts'
-import { Acryl } from '../../acryl-router/src/index.ts'
+import { loopbackOnly } from 'acryl-router/middleware'
+import { Acryl } from 'acryl-router'
 import { explain, ownerOf, renderReports, reportFiber, type FiberView, type PluginReport } from './report.ts'
 
 declare module '@deepseek-ai/cordis' {

package/plugins/acryl-kv/plugin.json

@@ -13,5 +13,10 @@
     "#acryl-kv": "acryl-kv/src/index.ts",
     "#acryl-kv/conformance": "acryl-kv/src/conformance.ts"
   },
-  "suite": "src/conformance.ts"
+  "suite": "src/conformance.ts",
+  "entries": {
+    "": "src/index.ts",
+    "/cordis": "src/cordis.ts",
+    "/conformance": "src/conformance.ts"
+  }
 }

package/plugins/acryl-kv-db/plugin.json

@@ -12,5 +12,9 @@
   "omit": ["**/*.test.*", "**/*.spec.*", "**/*.case.ts"],
   "imports": {
     "#acryl-kv-db": "acryl-kv-db/src/index.ts"
+  },
+  "entries": {
+    "": "src/index.ts",
+    "/open": "src/open.ts"
   }
 }

package/plugins/acryl-kv-db/src/index.ts

@@ -8,7 +8,7 @@
 
 import type { Context } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
-import { KV_SERVICE } from '../../acryl-kv/src/index.ts'
+import { KV_SERVICE } from 'acryl-kv'
 import { kvOnDb } from './open.ts'
 
 export { kvOnDb, type KvOnDbOptions } from './open.ts'