acrylblends 0.4.1 → 0.5.1

package/package.json

@@ -1,36 +1,326 @@
 {
   "name": "acrylblends",
-  "version": "0.4.1",
-  "description": "Scaffold Cordis apps: acrylblends init.",
+  "version": "0.5.1",
+  "description": "The Acryl web framework (import { Acryl } from \"acrylblends\") and the acrylblends command that scaffolds Cordis apps.",
   "license": "MIT",
   "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "bin": {
     "acrylblends": "./bin/acrylblends.js"
   },
   "exports": {
     ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./request": {
+      "types": "./lib/request.d.ts",
+      "default": "./lib/request.js"
+    },
+    "./types": {
+      "types": "./lib/types.d.ts",
+      "default": "./lib/types.js"
+    },
+    "./acryl-base": {
+      "types": "./lib/acryl-base.d.ts",
+      "default": "./lib/acryl-base.js"
+    },
+    "./http-exception": {
+      "types": "./lib/http-exception.d.ts",
+      "default": "./lib/http-exception.js"
+    },
+    "./basic-auth": {
+      "types": "./lib/basic-auth.d.ts",
+      "default": "./lib/basic-auth.js"
+    },
+    "./bearer-auth": {
+      "types": "./lib/bearer-auth.d.ts",
+      "default": "./lib/bearer-auth.js"
+    },
+    "./body-limit": {
+      "types": "./lib/body-limit.d.ts",
+      "default": "./lib/body-limit.js"
+    },
+    "./combine": {
+      "types": "./lib/combine.d.ts",
+      "default": "./lib/combine.js"
+    },
+    "./compress": {
+      "types": "./lib/compress.d.ts",
+      "default": "./lib/compress.js"
+    },
+    "./context-storage": {
+      "types": "./lib/context-storage.d.ts",
+      "default": "./lib/context-storage.js"
+    },
+    "./cors": {
+      "types": "./lib/cors.d.ts",
+      "default": "./lib/cors.js"
+    },
+    "./csrf": {
+      "types": "./lib/csrf.d.ts",
+      "default": "./lib/csrf.js"
+    },
+    "./etag": {
+      "types": "./lib/etag.d.ts",
+      "default": "./lib/etag.js"
+    },
+    "./ip-restriction": {
+      "types": "./lib/ip-restriction.d.ts",
+      "default": "./lib/ip-restriction.js"
+    },
+    "./jwk": {
+      "types": "./lib/jwk.d.ts",
+      "default": "./lib/jwk.js"
+    },
+    "./jwt": {
+      "types": "./lib/jwt.d.ts",
+      "default": "./lib/jwt.js"
+    },
+    "./language": {
+      "types": "./lib/language.d.ts",
+      "default": "./lib/language.js"
+    },
+    "./logger": {
+      "types": "./lib/logger.d.ts",
+      "default": "./lib/logger.js"
+    },
+    "./method-not-allowed": {
+      "types": "./lib/method-not-allowed.d.ts",
+      "default": "./lib/method-not-allowed.js"
+    },
+    "./method-override": {
+      "types": "./lib/method-override.d.ts",
+      "default": "./lib/method-override.js"
+    },
+    "./powered-by": {
+      "types": "./lib/powered-by.d.ts",
+      "default": "./lib/powered-by.js"
+    },
+    "./pretty-json": {
+      "types": "./lib/pretty-json.d.ts",
+      "default": "./lib/pretty-json.js"
+    },
+    "./request-id": {
+      "types": "./lib/request-id.d.ts",
+      "default": "./lib/request-id.js"
+    },
+    "./secure-headers": {
+      "types": "./lib/secure-headers.d.ts",
+      "default": "./lib/secure-headers.js"
+    },
+    "./serve-static": {
+      "types": "./lib/serve-static.d.ts",
+      "default": "./lib/serve-static.js"
+    },
+    "./timeout": {
+      "types": "./lib/timeout.d.ts",
+      "default": "./lib/timeout.js"
+    },
+    "./timing": {
+      "types": "./lib/timing.d.ts",
+      "default": "./lib/timing.js"
+    },
+    "./trailing-slash": {
+      "types": "./lib/trailing-slash.d.ts",
+      "default": "./lib/trailing-slash.js"
+    },
+    "./accepts": {
+      "types": "./lib/accepts.d.ts",
+      "default": "./lib/accepts.js"
+    },
+    "./adapter": {
+      "types": "./lib/adapter.d.ts",
+      "default": "./lib/adapter.js"
+    },
+    "./cookie": {
+      "types": "./lib/cookie.d.ts",
+      "default": "./lib/cookie.js"
+    },
+    "./factory": {
+      "types": "./lib/factory.d.ts",
+      "default": "./lib/factory.js"
+    },
+    "./html": {
+      "types": "./lib/html.d.ts",
+      "default": "./lib/html.js"
+    },
+    "./route": {
+      "types": "./lib/route.d.ts",
+      "default": "./lib/route.js"
+    },
+    "./streaming": {
+      "types": "./lib/streaming.d.ts",
+      "default": "./lib/streaming.js"
+    },
+    "./testing": {
+      "types": "./lib/testing.d.ts",
+      "default": "./lib/testing.js"
+    },
+    "./ws": {
+      "types": "./lib/ws.d.ts",
+      "default": "./lib/ws.js"
+    },
+    "./conninfo": {
+      "types": "./lib/conninfo.d.ts",
+      "default": "./lib/conninfo.js"
+    },
+    "./validator": {
+      "types": "./lib/validator.d.ts",
+      "default": "./lib/validator.js"
+    },
+    "./client": {
+      "types": "./lib/client.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./router": {
+      "types": "./lib/router.d.ts",
+      "default": "./lib/router.js"
+    },
+    "./router/reg-exp-router": {
+      "types": "./lib/router/reg-exp-router.d.ts",
+      "default": "./lib/router/reg-exp-router.js"
+    },
+    "./router/smart-router": {
+      "types": "./lib/router/smart-router.d.ts",
+      "default": "./lib/router/smart-router.js"
+    },
+    "./router/trie-router": {
+      "types": "./lib/router/trie-router.d.ts",
+      "default": "./lib/router/trie-router.js"
+    },
+    "./router/pattern-router": {
+      "types": "./lib/router/pattern-router.d.ts",
+      "default": "./lib/router/pattern-router.js"
+    },
+    "./router/linear-router": {
+      "types": "./lib/router/linear-router.d.ts",
+      "default": "./lib/router/linear-router.js"
+    },
+    "./utils/jwt": {
+      "types": "./lib/utils/jwt.d.ts",
+      "default": "./lib/utils/jwt.js"
+    },
+    "./utils/accept": {
+      "types": "./lib/utils/accept.d.ts",
+      "default": "./lib/utils/accept.js"
+    },
+    "./utils/basic-auth": {
+      "types": "./lib/utils/basic-auth.d.ts",
+      "default": "./lib/utils/basic-auth.js"
+    },
+    "./utils/body": {
+      "types": "./lib/utils/body.d.ts",
+      "default": "./lib/utils/body.js"
+    },
+    "./utils/buffer": {
+      "types": "./lib/utils/buffer.d.ts",
+      "default": "./lib/utils/buffer.js"
+    },
+    "./utils/color": {
+      "types": "./lib/utils/color.d.ts",
+      "default": "./lib/utils/color.js"
+    },
+    "./utils/compress": {
+      "types": "./lib/utils/compress.d.ts",
+      "default": "./lib/utils/compress.js"
+    },
+    "./utils/concurrent": {
+      "types": "./lib/utils/concurrent.d.ts",
+      "default": "./lib/utils/concurrent.js"
+    },
+    "./utils/constants": {
+      "types": "./lib/utils/constants.d.ts",
+      "default": "./lib/utils/constants.js"
+    },
+    "./utils/cookie": {
+      "types": "./lib/utils/cookie.d.ts",
+      "default": "./lib/utils/cookie.js"
+    },
+    "./utils/crypto": {
+      "types": "./lib/utils/crypto.d.ts",
+      "default": "./lib/utils/crypto.js"
+    },
+    "./utils/encode": {
+      "types": "./lib/utils/encode.d.ts",
+      "default": "./lib/utils/encode.js"
+    },
+    "./utils/filepath": {
+      "types": "./lib/utils/filepath.d.ts",
+      "default": "./lib/utils/filepath.js"
+    },
+    "./utils/handler": {
+      "types": "./lib/utils/handler.d.ts",
+      "default": "./lib/utils/handler.js"
+    },
+    "./utils/headers": {
+      "types": "./lib/utils/headers.d.ts",
+      "default": "./lib/utils/headers.js"
+    },
+    "./utils/html": {
+      "types": "./lib/utils/html.d.ts",
+      "default": "./lib/utils/html.js"
+    },
+    "./utils/http-status": {
+      "types": "./lib/utils/http-status.d.ts",
+      "default": "./lib/utils/http-status.js"
+    },
+    "./utils/ipaddr": {
+      "types": "./lib/utils/ipaddr.d.ts",
+      "default": "./lib/utils/ipaddr.js"
+    },
+    "./utils/mime": {
+      "types": "./lib/utils/mime.d.ts",
+      "default": "./lib/utils/mime.js"
+    },
+    "./utils/stream": {
+      "types": "./lib/utils/stream.d.ts",
+      "default": "./lib/utils/stream.js"
+    },
+    "./utils/types": {
+      "types": "./lib/utils/types.d.ts",
+      "default": "./lib/utils/types.js"
+    },
+    "./utils/url": {
+      "types": "./lib/utils/url.d.ts",
+      "default": "./lib/utils/url.js"
+    },
+    "./loopback-only": {
+      "types": "./lib/loopback-only.d.ts",
+      "default": "./lib/loopback-only.js"
+    },
+    "./schema-validator": {
+      "types": "./lib/schema-validator.d.ts",
+      "default": "./lib/schema-validator.js"
+    },
+    "./node-server": {
+      "types": "./lib/node-server.d.ts",
+      "default": "./lib/node-server.js"
+    },
+    "./node-server/serve-static": {
+      "types": "./lib/node-server/serve-static.d.ts",
+      "default": "./lib/node-server/serve-static.js"
+    },
+    "./node-server/conninfo": {
+      "types": "./lib/node-server/conninfo.d.ts",
+      "default": "./lib/node-server/conninfo.js"
+    },
+    "./package.json": "./package.json",
+    "./cli": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
+    }
   },
   "files": [
     "bin",
     "dist",
+    "lib",
     "templates",
     "shared",
     "plugins",
     "docs"
   ],
-  "scripts": {
-    "build": "tsdown",
-    "clean": "rm -rf dist",
-    "test": "vitest run",
-    "prepack": "pnpm run build && node scripts-pack.mjs copy",
-    "postpack": "node scripts-pack.mjs remove"
-  },
   "engines": {
     "node": ">=22.19.0"
   },
@@ -41,6 +331,8 @@
   },
   "homepage": "https://acrylblends.github.io",
   "keywords": [
+    "acryl",
+    "web-framework",
     "cordis",
     "scaffold"
   ],
@@ -50,5 +342,11 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsdown",
+    "clean": "rm -rf dist",
+    "test": "vitest run"
   }
-}
+}

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

@@ -6,7 +6,7 @@
 
 import { Context, Service } from '@deepseek-ai/cordis'
 import { loopbackOnly } from '../../acryl-router/src/middleware/index.ts'
-import { App } from '../../acryl-router/src/index.ts'
+import { Acryl } from '../../acryl-router/src/index.ts'
 import { explain, ownerOf, renderReports, reportFiber, type FiberView, type PluginReport } from './report.ts'
 
 declare module '@deepseek-ai/cordis' {
@@ -54,7 +54,7 @@ export function apply(ctx: Context): void {
   // The same facts on the router, for any surface; present only where a router is. A request over a socket must come from this machine to this app;
   // the terminal calls the router in process and is the host's own code.
   ctx.inject(['router'], inner => {
-    const api = new App()
+    const api = new Acryl()
       .use(loopbackOnly({ inProcess: 'allow' }))
       .get('/plugins', c => c.json(inspect.plugins()))
       .get('/plugins/:name', c => {

package/plugins/acryl-inspect/tests/service.spec.ts

@@ -4,7 +4,7 @@
  */
 
 import { Context } from '@deepseek-ai/cordis'
-import { App, apply as routerApply, name as routerName } from '../../acryl-router/src/index.ts'
+import { Acryl, apply as routerApply, name as routerName } from '../../acryl-router/src/index.ts'
 import { afterEach, describe, expect, it } from 'vitest'
 import { apply, name, type PluginReport } from '../src/index.ts'
 
@@ -18,7 +18,7 @@ const market = {
   name: 'demo-market',
   inject: ['router'],
   apply(ctx: Context): void {
-    ctx.router.route('/api/demo', new App()
+    ctx.router.route('/api/demo', new Acryl()
       .use(async (_c, next) => { await next() })
       .get('/state', c => c.json({ ok: true }))
       .post('/sources', c => c.json({ ok: true }, 201)))
@@ -46,7 +46,7 @@ describe('acryl-inspect', () => {
     ctx.plugin({
       name: 'demo-inline',
       apply(inner: Context): void {
-        inner.inject(['router'], deeper => { deeper.router.route('/', new App().get('/api/inline', c => c.json({ ok: true }))) })
+        inner.inject(['router'], deeper => { deeper.router.route('/', new Acryl().get('/api/inline', c => c.json({ ok: true }))) })
       },
     })
     await settle()

package/plugins/acryl-inspect/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-inspect",
-    "commit": "64e7c9d2e787f74b2da82492644fbbb46a601074"
+    "commit": "5743482e4199ded676a77f594bce15fd4aa0ca2f"
   },
   "vendored": [
     "src",
@@ -10,7 +10,7 @@
     "LICENSE"
   ],
   "rewrittenSpecifiers": 3,
-  "digest": "sha256:434ed3cf6b9028da90ad6b395209affbc917a62aa994f2b3c8f1d98a26398ea7",
+  "digest": "sha256:0a9aa6845197e3e0b3b9b3511fcad4980de29511c7dfdf7c38bf388d16c89d78",
   "testsNotRun": {},
   "notice": [
     "LICENSE"

package/plugins/acryl-node-server/tests/adapter/app.ts

@@ -1,7 +1,7 @@
 import { Response as PonyfillResponse } from '@whatwg-node/fetch'
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 
-export const app = new App()
+export const app = new Acryl()
 
 app.get('/', (c) => c.text('Hello! Node!'))
 app.get('/url', (c) => c.text(c.req.url))

package/plugins/acryl-node-server/tests/adapter/assets/static/acryl.html

@@ -1 +1 @@
-<h1>This is App.html</h1>
+<h1>This is Acryl.html</h1>

package/plugins/acryl-node-server/tests/adapter/assets/static/index.html

@@ -1 +1 @@
-<h1>Hello App</h1>
+<h1>Hello Acryl</h1>

package/plugins/acryl-node-server/tests/adapter/conninfo.test.ts

@@ -1,10 +1,10 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import type { AddressType, ConnInfo } from '../../../acryl-router/src/helpers/index.ts'
 import { getConnInfo } from '../../src/adapter/conninfo.ts'
 
 describe('ConnInfo', () => {
   it('Should works', async () => {
-    const app = new App().get('/', (c) => c.json(getConnInfo(c)))
+    const app = new Acryl().get('/', (c) => c.json(getConnInfo(c)))
 
     const socket = {
       remoteAddress: '0.0.0.0',

package/plugins/acryl-node-server/tests/adapter/content-length.test.ts

@@ -1,4 +1,4 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { once } from 'node:events'
 import { createServer } from 'node:http'
 import type { IncomingMessage, ServerResponse } from 'node:http'
@@ -31,7 +31,7 @@ describe('automatic Content-Length compatibility', () => {
   })
 
   it('preserves the byte length for c.json()', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.get('/', (c) => c.json({ message: 'hello' }))
     const server = createServer(getRequestListener(app.fetch))
     const res = await requestServer(server, { path: '/' })
@@ -60,7 +60,7 @@ describe('automatic Content-Length compatibility', () => {
   })
 
   it('uses the UTF-8 byte length for automatic Content-Length with c.text()', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.get('/', (c) => c.text('こんにちは'))
     let writeHeadCalls: unknown[][] = []
     const listener = getRequestListener(app.fetch)
@@ -175,7 +175,7 @@ describe('automatic Content-Length compatibility', () => {
   })
 
   it('honors strictContentLength for JSON', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.get('/', (c) => c.json({ message: 'hello' }))
     const listener = getRequestListener(app.fetch)
     const server = createServer((incoming, outgoing) => {

package/plugins/acryl-node-server/tests/adapter/early-hints.test.ts

@@ -1,5 +1,5 @@
 import type { Context, MiddlewareHandler } from '../../../acryl-router/src/index.ts'
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { describe, it, expect, expectTypeOf, vi } from 'vitest'
 import http, { createServer } from 'node:http'
 import http2 from 'node:http2'
@@ -9,7 +9,7 @@ import { getRequestListener } from '../../src/adapter/listener.ts'
 
 describe('HTTP/1.1 Early Hints Middleware', () => {
   it('should send a 103 early hints response before the final response using a string link', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '*',
       earlyHints({
@@ -73,7 +73,7 @@ describe('HTTP/1.1 Early Hints Middleware', () => {
   })
 
   it('should send early hints with an array of link headers', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '*',
       earlyHints({
@@ -139,7 +139,7 @@ describe('HTTP/1.1 Early Hints Middleware', () => {
   })
 
   it('should evaluate dynamic link function with Context', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '*',
       earlyHints({
@@ -208,7 +208,7 @@ describe('HTTP/1.1 Early Hints Middleware', () => {
 
 describe('HTTP/2 Early Hints Middleware', () => {
   it('should send a 103 early hints response over HTTP/2', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '*',
       earlyHints({

package/plugins/acryl-node-server/tests/adapter/request-client-disconnect.test.ts

@@ -1,5 +1,5 @@
 import type { Context } from '../../../acryl-router/src/index.ts'
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { request as requestHTTP } from 'node:http'
 import type { ClientRequest, OutgoingHttpHeaders } from 'node:http'
 import type { AddressInfo } from 'node:net'
@@ -47,7 +47,7 @@ const readBodyAfterDisconnect = async (
     reportResult = resolve
   })
 
-  const app = new App<{ Bindings: HttpBindings }>()
+  const app = new Acryl<{ Bindings: HttpBindings }>()
   app.post('/', async (c) => {
     try {
       const incoming = c.env.incoming