@michaelthielemann/kestrel 4.0.0 → 4.0.2

package/layers/admin/app/utils/edit-form.ts

@@ -1,3 +1,4 @@
+import { toRaw } from 'vue'
 import type { FieldDef, SerializedField } from '@michaelthielemann/kestrel-core'
 import { resolveFieldEmpty } from '../../../ui/app/utils/field-empty'
 
@@ -42,8 +43,12 @@ export function readFetchError(e: unknown): FetchErrorInfo {
   }
 }
 
+// `field.default` on a block-picker's field comes from `useBlocks()`'s `useState`-backed list — a Vue
+// reactive Proxy for any object/array value. `structuredClone` cannot clone a Proxy (`DataCloneError`,
+// deterministic, not a race) — `toRaw` unwraps it first, same fix `cloneBlockTree` reaches for via a JSON
+// round-trip; `toRaw` + `structuredClone` keeps real Date/Map values a JSON round-trip would mangle.
 function cloneDefault(value: unknown): unknown {
-  return value !== null && typeof value === 'object' ? structuredClone(value) : value
+  return value !== null && typeof value === 'object' ? structuredClone(toRaw(value)) : value
 }
 
 function emptyForField(field: SerializedField): unknown {

package/layers/core/modules/auto-discovery/index.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { addComponentsDir, addTemplate, addTypeTemplate, createResolver, defineNuxtModule } from '@nuxt/kit'
-import { collectBlockSfcs, collectDefinitions, collectManifestFiles, renderPackageConcatRegistry, renderPackageMergedRegistry, renderRegistry } from './scan'
+import { collectBlockSfcs, collectDefinitions, collectManifestFiles, renderPackageConcatRegistry, renderPackageMergedRegistry, renderRegistry, resolvePackageEntry } from './scan'
 import { renderBlockRegistry } from './extract-block'
 import { offerableLayouts, renderLayoutRegistry } from '../../app/utils/layouts'
 import { PACKAGE_COLLECTIONS, PACKAGE_MANIFESTS, PACKAGE_SCHEMA_TABLES } from './package-registry'
@@ -38,9 +38,10 @@ export default defineNuxtModule({
       nitro.virtual ||= {}
       // `@michaelthielemann/kestrel-fields`'s built-in descriptors (text/richtext/number/…) seed `core`'s field-type registry
       // as a side effect of importing the package itself — core cannot import fields, so this is the one
-      // place that import happens. A bare package specifier: no filesystem path-guessing across
-      // `nuxt.options._layers` for a `layers/fields` root — the package IS the seed's real, resolvable
-      // location, so there is nothing left to guess. Prepended so it always runs, even with zero consumer
+      // place that import happens. Resolved to a real file path (`resolvePackageEntry`), not left as the
+      // bare specifier: a Nitro virtual module has no real file of its own for a bundler to resolve a bare
+      // import FROM, so it falls back to the project root — where, under a real consumer's pnpm install,
+      // this package isn't visible (only the engine directly depends on it). Prepended so it always runs, even with zero consumer
       // field types (an empty `collectDefinitions` result would otherwise generate `export default []`,
       // importing nothing). Consumer field types register as a side effect on import too, and the schema
       // engine builds a table the moment a collection/block module loads — so the collections/blocks/
@@ -48,7 +49,7 @@ export default defineNuxtModule({
       // now reach a package's `buildCollection()` call transitively via `kestrelDiscovery`, per ADR-0029 —
       // an ESM barrel is an eager, whole-module-graph load — so all four need the same guard, not only the
       // two that directly build collections themselves).
-      const importFieldTypesSeed = `import { fieldTypes as __kestrelSeed } from '@michaelthielemann/kestrel-fields'\n`
+      const importFieldTypesSeed = `import { fieldTypes as __kestrelSeed } from ${JSON.stringify(resolvePackageEntry('@michaelthielemann/kestrel-fields'))}\n`
         + `if (!__kestrelSeed || typeof __kestrelSeed !== 'object') throw new Error('[kestrel] built-in field types failed to seed')\n`
       // A real runtime check on the imported binding, not a bare `import "path"` or a discarded `void x`
       // — Nitro's dev build tree-shakes an import whose binding has no provable effect, silently dropping
@@ -68,7 +69,7 @@ export default defineNuxtModule({
 
       nitro.virtual['#kestrel/collections'] = () =>
         renderPackageMergedRegistry({
-          packages: PACKAGE_COLLECTIONS,
+          packages: PACKAGE_COLLECTIONS.map(resolvePackageEntry),
           property: 'collections',
           consumerFiles: collectDefinitions(roots, 'server/collections'),
           nameOfExpr: '(x) => x.name',
@@ -87,7 +88,7 @@ export default defineNuxtModule({
       // hardcoding upper-layer tables.
       nitro.virtual['#kestrel/schema-tables'] = () =>
         renderPackageMergedRegistry({
-          packages: PACKAGE_SCHEMA_TABLES,
+          packages: PACKAGE_SCHEMA_TABLES.map(resolvePackageEntry),
           property: 'schemaTables',
           consumerFiles: collectDefinitions(roots, 'server/schema-tables'),
           nameOfExpr: '(x) => __kestrelTableName(x)',
@@ -101,7 +102,7 @@ export default defineNuxtModule({
       // distinct module (see `collectManifestFiles`'s own TSDoc).
       nitro.virtual['#kestrel/module-manifests'] = () =>
         renderPackageConcatRegistry({
-          packages: PACKAGE_MANIFESTS,
+          packages: PACKAGE_MANIFESTS.map(resolvePackageEntry),
           property: 'manifest',
           consumerFiles: collectManifestFiles(roots),
           preamble: importFieldTypesVirtual,

package/layers/core/modules/auto-discovery/scan.ts

@@ -1,9 +1,24 @@
 import { readdirSync } from 'node:fs'
 import { basename, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { blockNameFromFile } from './extract-block'
 
 type Lister = (dir: string) => string[]
 
+/**
+ * Resolves a bare `@michaelthielemann/kestrel-*` package specifier to its real entry FILE PATH, via Node's
+ * own ESM resolution from THIS module's own location — not the bare specifier itself, which a Nitro
+ * virtual module (no real file path of its own) cannot resolve reliably: Rollup falls back to resolving a
+ * virtual's imports from the project root, and under pnpm's isolated `node_modules` a package the
+ * CONSUMER never declared a direct dependency on (only the engine did, transitively) is invisible there —
+ * observed as `Cannot find package` at runtime, npm's flat hoisting having accidentally masked it in
+ * testing. This module's own file, once installed, sits inside the engine's package tree, so resolving
+ * from here walks the engine's OWN nested `node_modules`, where pnpm DID link the real dependency.
+ */
+export function resolvePackageEntry(spec: string): string {
+  return fileURLToPath(import.meta.resolve(spec))
+}
+
 const isDefinition = (name: string) =>
   name.endsWith('.ts') && !name.endsWith('.test.ts') && !name.endsWith('.d.ts')
 
@@ -118,7 +133,7 @@ export function renderPackageMergedRegistry(opts: {
   return [
     opts.preamble ?? '',
     opts.extraImports ?? '',
-    `import { mergeKestrelDiscovered } from '@michaelthielemann/kestrel-core'`,
+    `import { mergeKestrelDiscovered } from ${JSON.stringify(resolvePackageEntry('@michaelthielemann/kestrel-core'))}`,
     ...pkgImports,
     ...consumerImports,
     `export default mergeKestrelDiscovered([${pkgSpread}], [${consumerArr}], ${opts.nameOfExpr})`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michaelthielemann/kestrel",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "A slim, collection-driven Nuxt 4 CMS meta-layer with a runtime schema engine. Add `extends: ['@michaelthielemann/kestrel']`, define collections, and the database migrates itself.",
   "license": "Apache-2.0",
   "author": "Michael Thielemann <283621694+MichaelThielemann@users.noreply.github.com>",
@@ -77,15 +77,15 @@
     "typescript": "^6.0.3",
     "zod": "^4.4.3",
     "@michaelthielemann/kestrel-access": "0.1.0",
-    "@michaelthielemann/kestrel-auth": "0.1.0",
-    "@michaelthielemann/kestrel-core": "0.1.0",
-    "@michaelthielemann/kestrel-contracts": "0.1.0",
     "@michaelthielemann/kestrel-collections": "0.1.0",
+    "@michaelthielemann/kestrel-contracts": "0.1.0",
+    "@michaelthielemann/kestrel-core": "0.1.0",
+    "@michaelthielemann/kestrel-auth": "0.1.0",
     "@michaelthielemann/kestrel-delivery-live": "0.1.0",
-    "@michaelthielemann/kestrel-delivery-static": "0.1.0",
     "@michaelthielemann/kestrel-fields": "0.1.0",
     "@michaelthielemann/kestrel-media": "0.1.0",
-    "@michaelthielemann/kestrel-publishing": "0.1.0"
+    "@michaelthielemann/kestrel-publishing": "0.1.0",
+    "@michaelthielemann/kestrel-delivery-static": "0.1.0"
   },
   "//peers": "Framework singletons the layer sources import by bare specifier. Peers, not dependencies: a second copy breaks identity (two Vue instances; an h3 v1 `createError` handed to an h3 v2 error handler, which surfaces our 400/404/409 as bare 500s). All optional, because kestrel's own `nuxt` dependency already supplies them transitively — the entry pins identity where a copy exists rather than demanding one, and a required peer would ERESOLVE-fail npm installs on any Nuxt whose bundled range we did not anticipate. Each is also a devDependency so this repo resolves it without auto-install-peers writing a phantom root dependency into the lockfile.",
   "peerDependencies": {

package/scripts/consumer-template-ci.mjs

@@ -27,8 +27,11 @@ log(`work dir: ${work}`)
 
 let server
 try {
+  // `pnpm --filter "@michaelthielemann/kestrel-*" -r build` does NOT reliably respect the dependency
+  // graph (observed: kestrel-access started before kestrel-core/kestrel-auth finished) — `build:packages`
+  // builds in explicit topological order instead.
   log('building @michaelthielemann/kestrel-* packages (dist/ must exist before pnpm pack)')
-  run('pnpm', ['--filter', '@michaelthielemann/kestrel-*', '-r', 'build'], { cwd: root })
+  run('pnpm', ['build:packages'], { cwd: root })
 
   log('packing the engine + every @michaelthielemann/kestrel-* package as npm publish would')
   const tarball = {}