@michaelthielemann/kestrel 4.1.1 → 4.1.3

package/layers/core/modules/kestrel/auto-imports.ts

@@ -1,38 +1,44 @@
 /**
- * The consumer-facing authoring API, registered as Nuxt/Nitro auto-imports so a site built on Kestrel
- * can write `defineCollection({...})` without importing it. Every name here is also importable
- * explicitly from its package; the auto-import is a convenience, not the only path.
+ * Kestrel's authoring API, registered as Nuxt/Nitro auto-imports so a site built on Kestrel can write
+ * `defineCollection({...})` or `getCollection('pages')` without importing — the same surface a 3.x site
+ * had when this code still lived in the layers' `server/utils`. The names are read off the packages'
+ * real exports at build time, so a new public function is auto-importable the moment it is exported;
+ * every name stays importable explicitly from its package as well.
  */
 export interface AutoImportEntry {
   name: string
   from: string
 }
 
-const CORE = '@michaelthielemann/kestrel-core'
-const FIELDS = '@michaelthielemann/kestrel-fields'
-const ACCESS = '@michaelthielemann/kestrel-access'
+const PKG = '@michaelthielemann/kestrel-'
 
-const entries = (from: string, names: string[]): AutoImportEntry[] => names.map((name) => ({ name, from }))
+/** Order matters: a name exported by several packages (re-exports) is registered from the first one. */
+const SERVER_PACKAGES = ['core', 'fields', 'contracts', 'auth', 'access', 'media', 'collections', 'publishing', 'delivery-live', 'delivery-static']
+const APP_PACKAGES = ['core/client', 'fields/client']
 
-/** Server-only (Nitro) authoring API: collections, pipelines, revisions, field populators, access. */
-export const serverAutoImports: AutoImportEntry[] = [
-  ...entries(CORE, [
-    'defineCollection',
-    'buildCollection',
-    'definePipeline',
-    'registerPipeline',
-    'registerAfterStep',
-    'syncStep',
-    'asyncStep',
-    'eventsOf',
-    'getFieldPopulator',
-    'readRevisions',
-    'registerRevisionUpcast',
-    'useDb',
-  ]),
-  ...entries(FIELDS, ['defineFieldType', 'constrain', 'opt']),
-  ...entries(ACCESS, ['registerAccessGrant']),
-]
+/** `kestrelDiscovery`: module manifests for the discovery module, never something a site calls.
+ *  `renderRouteLive`: the public layer's own `server/utils` wrapper of the same name is the wired one, and
+ *  Nitro's directory scan already auto-imports it — registering the package export too only draws a
+ *  "duplicated imports" warning on every build. */
+const EXCLUDED = new Set(['default', 'kestrelDiscovery', 'renderRouteLive'])
 
-/** App-side (Vue) authoring API: block definitions live next to their components. */
-export const appAutoImports: AutoImportEntry[] = entries(`${FIELDS}/client`, ['defineBlock'])
+async function collect(packages: string[]): Promise<AutoImportEntry[]> {
+  const seen = new Set<string>()
+  const entries: AutoImportEntry[] = []
+  for (const pkg of packages) {
+    const from = PKG + pkg
+    const mod = (await import(from)) as Record<string, unknown>
+    for (const name of Object.keys(mod)) {
+      if (EXCLUDED.has(name) || seen.has(name)) continue
+      seen.add(name)
+      entries.push({ name, from })
+    }
+  }
+  return entries
+}
+
+/** Server-only (Nitro) authoring API: every runtime export of the server packages. */
+export const serverAutoImports = (): Promise<AutoImportEntry[]> => collect(SERVER_PACKAGES)
+
+/** App-side (Vue) authoring API: every runtime export of the client entry points. */
+export const appAutoImports = (): Promise<AutoImportEntry[]> => collect(APP_PACKAGES)

package/layers/core/modules/kestrel/index.ts

@@ -13,18 +13,30 @@ import { appAutoImports, serverAutoImports } from './auto-imports'
  */
 export default defineNuxtModule<KestrelConfig>({
   meta: { name: 'kestrel', configKey: 'kestrel' },
-  setup(options, nuxt) {
+  async setup(options, nuxt) {
     const c = resolveKestrel(options, process.env, nuxt.options.rootDir)
 
     // Registered through hooks rather than `addImports`/`addServerImports`, which need an active Kit
     // instance (`useNuxt()`) that plain `setup()` callers (tests) do not provide.
+    const [app, server] = await Promise.all([appAutoImports(), serverAutoImports()])
+    // The packages' own compiled output must not be rewritten by the auto-import transform: it would
+    // inject an import for a symbol a dist file declares itself. Only the `kestrel-*` packages are
+    // excluded — never `node_modules` as a whole: in a consumer the engine's own layers live there too,
+    // and their server plugins rely on the transform for Nitro's `defineNitroPlugin` & co.
+    const ownDist = /[\\/](node_modules|packages)[\\/](@michaelthielemann[\\/])?kestrel-[^\\/]+[\\/]/
+    const imports = (nuxt.options.imports ||= {} as typeof nuxt.options.imports)
+    imports.transform ||= {}
+    imports.transform.exclude = [...(imports.transform.exclude ?? []), ownDist]
     nuxt.hook('imports:extend', (imports) => {
-      imports.push(...appAutoImports)
+      imports.push(...app)
     })
     nuxt.hook('nitro:config', (config) => {
       config.imports ||= {}
       config.imports.imports ||= []
-      config.imports.imports.push(...serverAutoImports)
+      config.imports.imports.push(...server)
+      const prior = config.imports.exclude
+      const excluded = Array.isArray(prior) ? [...prior] : prior ? [prior] : []
+      config.imports.exclude = [...excluded, ownDist]
     })
 
     // `app:resolve` is the first hook where `mainComponent` is settled across all layers. In dev it fires

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michaelthielemann/kestrel",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "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>",
@@ -76,16 +76,16 @@
     "thumbhash": "^0.1.1",
     "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-access": "0.1.0",
+    "@michaelthielemann/kestrel-collections": "0.1.0",
+    "@michaelthielemann/kestrel-core": "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-collections": "0.1.0",
-    "@michaelthielemann/kestrel-publishing": "0.1.0",
-    "@michaelthielemann/kestrel-fields": "0.1.0"
+    "@michaelthielemann/kestrel-publishing": "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": {