acrylblends 1.0.2 → 1.0.3

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

@@ -30,6 +30,11 @@ interface AppHome {
   readonly home: string
 }
 
+/** The project folder of an acrylblends app (`appInstance.root`), when the instance has one: where a relative path in a row's config is read from, since such an app has no Loader base URL. */
+function appRoot(value: unknown): string | undefined {
+  return typeof value === 'object' && value !== null && 'root' in value && typeof value.root === 'string' ? value.root : undefined
+}
+
 function isAppHome(value: unknown): value is AppHome {
   return typeof value === 'object' && value !== null && 'home' in value && typeof value.home === 'string'
 }
@@ -51,12 +56,14 @@ export const Config: z<Config> = z.object({
 /** The file name used in the app home when `path` is not configured. */
 export const DEFAULT_FILE = 'data.sqlite'
 
-/** A configured path as a file path: absolute as given, relative to the Loader's base URL (the app) otherwise. */
+/** A configured path as a file path: absolute as given, relative to the Loader's base URL (the app) otherwise, or to the app's project folder (`appInstance.root`) where there is no base URL. */
 function resolveFromApp(ctx: Context, path: string, option: string): string {
   if (path.startsWith('file:')) return fileURLToPath(path)
   if (isAbsolute(path)) return path
   const base = ctx.baseUrl
   if (base === undefined || !base.startsWith('file:')) {
+    const root = appRoot(ctx.get('appInstance'))
+    if (root !== undefined) return resolve(root, path)
     throw new Error(`acryl-db-sqlite: ${option} ${JSON.stringify(path)} is relative, but this app has no file base URL to resolve it from; give an absolute path`)
   }
   const appDir = base.endsWith('/') ? fileURLToPath(base) : dirname(fileURLToPath(base))

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

@@ -8,7 +8,7 @@
     "@deepseek-ai/cordis": "4.0.4",
     "@deepseek-ai/schemastery": "3.18.4"
   },
-  "mount": "mount it after instance: root.plugin(kvJson, {}) (the file is kv.json in the app home, or set path); then a plugin that declares inject: ['kv'] calls await ctx.kv.set('theme', 'dark') and ctx.kv.update('visits', (n) => (n ?? 0) + 1)",
+  "mount": "mount it after instance, as a row in blend.yaml (`- id: kv` / `name: acryl-kv-json`, registered in src/app.ts as 'acryl-kv-json') or as root.plugin(kvJson, {}) (the file is kv.json in the app home, or set path; a relative path is read from the app's folder); then a plugin that declares inject: ['kv'] calls await ctx.kv.set('theme', 'dark') and ctx.kv.update('visits', (n) => (n ?? 0) + 1)",
   "omit": ["**/*.test.*", "**/*.spec.*", "**/*.case.ts"],
   "imports": {
     "#acryl-kv-json": "acryl-kv-json/src/index.ts"

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

@@ -41,12 +41,19 @@ export const Config: z<Config> = z.object({
 /** The file name used in the app home when `path` is not configured. */
 export const DEFAULT_FILE = 'kv.json'
 
-/** A configured path as a file path: absolute as given, relative to the Loader's base URL (the app) otherwise. */
+/** The project folder of an acrylblends app (`appInstance.root`), when the instance has one: where a relative path in a row's config is read from, since such an app has no Loader base URL. */
+function appRoot(value: unknown): string | undefined {
+  return typeof value === 'object' && value !== null && 'root' in value && typeof value.root === 'string' ? value.root : undefined
+}
+
+/** A configured path as a file path: absolute as given, relative to the Loader's base URL (the app) otherwise, or to the app's project folder (`appInstance.root`) where there is no base URL. */
 function resolveFromApp(ctx: Context, path: string): string {
   if (path.startsWith('file:')) return fileURLToPath(path)
   if (isAbsolute(path)) return path
   const base = ctx.baseUrl
   if (base === undefined || !base.startsWith('file:')) {
+    const root = appRoot(ctx.get('appInstance'))
+    if (root !== undefined) return resolve(root, path)
     throw new Error(`acryl-kv-json: path ${JSON.stringify(path)} is relative, but this app has no file base URL to resolve it from; give an absolute path`)
   }
   const appDir = base.endsWith('/') ? fileURLToPath(base) : dirname(fileURLToPath(base))

package/plugins/acryl-node-server/src/adapter/request.ts

@@ -135,8 +135,9 @@ const readBodyBufferedBeforeDisconnect = (
     result = newBodyUnusableError()
   } else {
     const bodyChunks = chunks ?? []
-    const chunk = incoming.read() as Buffer | string | null
-    if (chunk !== null) {
+    // Drain what is still buffered. On a destroyed stream one read() returns all of it on some Node versions and only the first chunk on others (Node 26), so read until
+    // the stream says there is no more: that is what Readable#read() promises, and it needs nothing of Node's internals.
+    for (let chunk = incoming.read() as Buffer | string | null; chunk !== null; chunk = incoming.read()) {
       bodyChunks.push(toBufferChunk(chunk, incoming.readableEncoding))
     }
     const buffer = bodyChunks.length === 1 ? bodyChunks[0] : Buffer.concat(bodyChunks)