polen 0.11.0-next.11 → 0.11.0-next.13

package/src/api/schema-source/schema-source.ts

@@ -1,6 +1,7 @@
 import { Schema } from '#api/schema/index'
-import { Grafaid } from '#lib/grafaid/index'
-import type { GraphqlChangeset } from '#lib/graphql-changeset/index'
+import { Grafaid } from '#lib/grafaid'
+import { GraphqlChangeset } from '#lib/graphql-changeset'
+import { SchemaLifecycle } from '#lib/schema-lifecycle'
 import { astToSchema } from '#template/lib/schema-utils/schema-utils'
 import { Cache } from '@wollybeard/kit'
 import type { GraphQLSchema } from 'graphql'
@@ -34,17 +35,20 @@ interface SchemaSourceConfig {
   }
   versions: string[]
   assetsPath: string
+  debug?: boolean
 }
 
 export const createSchemaSource = (config: SchemaSourceConfig) => {
   const getSchemaPath = (version: string) => `${config.assetsPath}/schemas/${version}.json`
 
-  const getChangelogPath = (version: string) => `${config.assetsPath}/schemas/${version}.changelog.json`
+  const getChangelogPath = (version: string) => `${config.assetsPath}/schemas/${version}.release.changelog.json`
 
   const getSchemasDirectory = () => `${config.assetsPath}/schemas`
 
   const getMetadataPath = () => `${config.assetsPath}/schemas/metadata.json`
 
+  const getLifecyclePath = () => `${config.assetsPath}/schemas/lifecycle.json`
+
   const ioWrite = config.io.write || NoImplementationWriteFile
   const ioClearDirectory = config.io.clearDirectory || NoImplementationClearDirectory
   const ioRemoveFile = config.io.removeFile || NoImplementationRemoveFile
@@ -59,12 +63,12 @@ export const createSchemaSource = (config: SchemaSourceConfig) => {
     return schema
   }
 
-  const getChangelog = async (version: string): Promise<Schema.ChangelogData> => {
+  const getChangelog = async (version: string): Promise<GraphqlChangeset.ChangeSet> => {
     const content = await ioReadMemoized(getChangelogPath(version))
-    return JSON.parse(content)
+    return GraphqlChangeset.fromJson(content)
   }
 
-  const getAllChangesets = async (): Promise<GraphqlChangeset.ChangeSet[]> => {
+  const getAllChangesets = async (): Promise<GraphqlChangeset.Changelog> => {
     const changesets: GraphqlChangeset.ChangeSet[] = []
 
     for (let i = 0; i < config.versions.length; i++) {
@@ -82,28 +86,33 @@ export const createSchemaSource = (config: SchemaSourceConfig) => {
 
       if (changelogData) {
         const prevVersion = config.versions[i + 1]
-        const prevSchema = prevVersion ? await get(prevVersion) : null
 
-        if (prevSchema) {
+        if (prevVersion) {
+          const prevSchema = await get(prevVersion)
           changesets.push({
-            after: schema,
-            before: prevSchema,
-            changes: changelogData.changes,
+            type: 'IntermediateChangeSet',
+            after: { data: schema, version },
+            before: { data: prevSchema, version: prevVersion },
+            changes: GraphqlChangeset.isIntermediateChangeSet(changelogData) ? changelogData.changes : [],
             date: new Date(changelogData.date),
           })
         }
       } else {
         // Oldest version - no changelog, use existing utility
         changesets.push({
-          after: schema,
-          before: Grafaid.Schema.empty,
-          changes: [],
+          type: 'InitialChangeSet',
           date: Schema.versionStringToDate(version),
+          after: { data: schema, version },
         })
       }
     }
 
-    return changesets
+    return changesets as GraphqlChangeset.Changelog
+  }
+
+  const getLifecycle = async (): Promise<SchemaLifecycle.SchemaLifecycle> => {
+    const content = await ioReadMemoized(getLifecyclePath())
+    return SchemaLifecycle.fromJson(content)
   }
 
   return {
@@ -119,6 +128,7 @@ export const createSchemaSource = (config: SchemaSourceConfig) => {
     get,
     getChangelog,
     getAllChangesets,
+    getLifecycle,
 
     // Expose the memoized reader's clear method
     clearCache: ioReadMemoized.clear,
@@ -129,8 +139,15 @@ export const createSchemaSource = (config: SchemaSourceConfig) => {
       await ioWrite(getSchemaPath(version), JSON.stringify(ast))
     },
 
-    writeChangelog: async (version: string, changelog: Schema.ChangelogData) => {
-      await ioWrite(getChangelogPath(version), JSON.stringify(changelog))
+    writeChangelog: async (version: string, changelog: GraphqlChangeset.ChangeSet) => {
+      await ioWrite(
+        getChangelogPath(version),
+        GraphqlChangeset.toJson(changelog),
+      )
+    },
+
+    writeLifecycle: async (lifecycle: SchemaLifecycle.SchemaLifecycle) => {
+      await ioWrite(getLifecyclePath(), SchemaLifecycle.toJson(lifecycle))
     },
 
     // Directory operations
@@ -157,33 +174,43 @@ export const createSchemaSource = (config: SchemaSourceConfig) => {
     },
 
     writeAllAssets: async (
-      schemaData: Awaited<ReturnType<typeof Schema.readOrThrow>>['data'],
+      changelog: GraphqlChangeset.Changelog,
       metadata: Schema.SchemaMetadata,
+      lifecycle?: SchemaLifecycle.SchemaLifecycle,
     ) => {
-      if (!schemaData) return
+      if (!changelog) return
 
       // Write schema and changelog files
-      for (const [index, version] of schemaData!.entries()) {
-        const versionName = index === 0 ? Schema.VERSION_LATEST : Schema.dateToVersionString(version.date)
+      for (const [index, changeset] of changelog.entries()) {
+        const versionName = index === 0 ? Schema.VERSION_LATEST : Schema.dateToVersionString(changeset.date)
 
         // Write schema file
-        await ioWrite(
-          getSchemaPath(versionName),
-          JSON.stringify(Grafaid.Schema.AST.parse(Grafaid.Schema.print(version.after))),
-        )
+        if (changeset.after?.data) {
+          await ioWrite(
+            getSchemaPath(versionName),
+            JSON.stringify(Grafaid.Schema.AST.parse(Grafaid.Schema.print(changeset.after.data))),
+          )
+        }
 
-        // Write changelog file (except for the oldest/last version)
-        if (Schema.shouldVersionHaveChangelog(index, schemaData!.length)) {
-          const changelogData = {
-            changes: version.changes,
-            date: version.date.toISOString(),
-          }
-          await ioWrite(getChangelogPath(versionName), JSON.stringify(changelogData))
+        // Write changelog file only for intermediate changesets
+        if (GraphqlChangeset.isIntermediateChangeSet(changeset)) {
+          await ioWrite(
+            getChangelogPath(versionName),
+            GraphqlChangeset.toJson(changeset),
+          )
         }
       }
 
       // Write metadata file
       await ioWrite(getMetadataPath(), JSON.stringify(metadata, null, 2))
+
+      // Write lifecycle file if provided
+      if (lifecycle) {
+        await ioWrite(
+          getLifecyclePath(),
+          SchemaLifecycle.toJson(lifecycle),
+        )
+      }
     },
   }
 }

package/src/api/vite/plugins/build.ts

@@ -1,7 +1,7 @@
 import type { Config } from '#api/config/index'
 import type { PolenBuildManifest } from '#api/static/manifest'
 import { Vite } from '#dep/vite/index'
-import { ViteVirtual } from '#lib/vite-virtual/index'
+import { ViteVirtual } from '#lib/vite-virtual'
 import { debugPolen } from '#singletons/debug'
 import { Fs, Path } from '@wollybeard/kit'
 import packageJson from '../../../../package.json' with { type: 'json' }

package/src/api/vite/plugins/core.ts

@@ -1,15 +1,16 @@
 import type { Config } from '#api/config/index'
 import { Content } from '#api/content/$'
-import { createNavbar } from '#api/content/navbar'
+import { createNavbar, type NavbarItem } from '#api/content/navbar'
 import { Api } from '#api/index'
 import { VitePluginSelfContainedMode } from '#cli/_/self-contained-mode'
 import type { ReactRouter } from '#dep/react-router/index'
 import type { Vite } from '#dep/vite/index'
-import { VitePluginJson } from '#lib/vite-plugin-json/index'
-import { ViteVirtual } from '#lib/vite-virtual/index'
+import { VitePluginJson } from '#lib/vite-plugin-json'
+import { ViteVirtual } from '#lib/vite-virtual'
 import { debugPolen } from '#singletons/debug'
 import { superjson } from '#singletons/superjson'
 import { Json, Str } from '@wollybeard/kit'
+import { fileURLToPath } from 'node:url'
 import type { ProjectData } from '../../../project-data.js'
 import { SchemaAugmentation } from '../../schema-augmentation/index.js'
 import { Schema } from '../../schema/index.js'
@@ -37,7 +38,9 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
       })
       // todo: augmentations scoped to a version
       schemaResult.data?.forEach(version => {
-        SchemaAugmentation.apply(version.after, config.schemaAugmentations)
+        if (version.after) {
+          SchemaAugmentation.apply(version.after.data, config.schemaAugmentations)
+        }
       })
       schemaCache = schemaResult
     }
@@ -60,7 +63,7 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
   const jsonsuper = VitePluginJson.create({
     codec: {
       validate: superjson,
-      importPath: import.meta.resolve(`#singletons/superjson`),
+      importPath: `#singletons/superjson`,
       importExport: `superjson`,
     },
     filter: {
@@ -104,10 +107,16 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
         const match = Str.match(id, find)
         if (!match) return null
 
-        const to = `${config.paths.framework.sourceDir}/${match.groups.path}${config.paths.framework.sourceExtension}`
-        // debug(`did resolve`, { from: id, to })
-
-        return to
+        // Use Node's resolver to handle package.json imports correctly
+        try {
+          const resolved = import.meta.resolve(id)
+          const to = fileURLToPath(resolved)
+          // debug(`did resolve`, { from: id, to })
+          return to
+        } catch {
+          // If resolution fails, return null to let other resolvers handle it
+          return null
+        }
       },
     },
     jsonsuper,
@@ -189,7 +198,7 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
 
             const schemaResult = await readSchema()
 
-            const navbar = []
+            const navbar: NavbarItem[] = []
 
             // ━ Schema presence causes adding some navbar items
             if (schemaResult.data) {
@@ -198,9 +207,9 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
               // hydration mismatches between SSR (where base path is prepended) and client
               // (where basename is configured). This ensures consistent behavior.
               const referencePath = Api.Schema.Routing.createReferenceBasePath()
-              navbar.push({ pathExp: referencePath, title: `Reference` })
+              navbar.push({ pathExp: referencePath, title: `Reference`, position: 'left' })
               if (schemaResult.data.length > 1) {
-                navbar.push({ pathExp: `/changelog`, title: `Changelog` })
+                navbar.push({ pathExp: `/changelog`, title: `Changelog`, position: 'right' })
               }
             }
 

package/src/api/vite/plugins/pages.ts

@@ -2,8 +2,8 @@ import type { Config } from '#api/config/index'
 import { Content } from '#api/content/$'
 import { polenVirtual } from '#api/vite/vi'
 import type { Vite } from '#dep/vite/index'
+import { FileRouter } from '#lib/file-router'
 import { reportDiagnostics } from '#lib/file-router/diagnostic-reporter'
-import { FileRouter } from '#lib/file-router/index'
 import { debugPolen } from '#singletons/debug'
 import { superjson } from '#singletons/superjson'
 import mdx from '@mdx-js/rollup'

package/src/api/vite/plugins/schema-assets.ts

@@ -3,13 +3,13 @@ import { SchemaAugmentation } from '#api/schema-augmentation/index'
 import { createSchemaSource } from '#api/schema-source/index'
 import { Schema } from '#api/schema/index'
 import type { Vite } from '#dep/vite/index'
-import { Grafaid } from '#lib/grafaid/index'
-import { ViteVirtual } from '#lib/vite-virtual/index'
+import { GraphqlChangeset } from '#lib/graphql-changeset'
+import { SchemaLifecycle } from '#lib/schema-lifecycle'
+import { ViteVirtual } from '#lib/vite-virtual'
 import { debugPolen } from '#singletons/debug'
 import { Cache } from '@wollybeard/kit'
 import * as NodeFs from 'node:fs/promises'
 import * as NodePath from 'node:path'
-import type { NonEmptyChangeSets } from '../../schema/schema.js'
 import { polenVirtual } from '../vi.js'
 
 export const viProjectSchemaMetadata = polenVirtual([`project`, `schema-metadata`])
@@ -52,7 +52,9 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
 
     // Apply augmentations
     schemaResult.data.forEach(version => {
-      SchemaAugmentation.apply(version.after, config.schemaAugmentations)
+      if (version.after) {
+        SchemaAugmentation.apply(version.after.data, config.schemaAugmentations)
+      }
     })
 
     // Build metadata
@@ -103,9 +105,17 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
     })
   }
 
+  // Helper to create lifecycle data from schema data
+  const createLifecycleData = (
+    schemaData: GraphqlChangeset.ChangelogLinked,
+    metadata: Schema.SchemaMetadata,
+  ): SchemaLifecycle.SchemaLifecycle => {
+    return SchemaLifecycle.create(schemaData)
+  }
+
   // Helper to write assets using schema-source API
   const writeDevAssets = async (
-    schemaData: NonEmptyChangeSets,
+    schemaData: GraphqlChangeset.ChangelogLinked,
     metadata: Schema.SchemaMetadata,
   ) => {
     // schemaData is now guaranteed to be non-null NonEmptyChangeSets
@@ -113,8 +123,10 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
     const devAssetsDir = config.paths.framework.devAssets.schemas
     await NodeFs.mkdir(devAssetsDir, { recursive: true })
 
+    const lifecycle = createLifecycleData(schemaData, metadata)
+
     const schemaSource = createDevSchemaSource(metadata)
-    await schemaSource.writeAllAssets(schemaData, metadata)
+    await schemaSource.writeAllAssets(schemaData, metadata, lifecycle)
     debug(`devAssetsWritten`, { versionCount: schemaData.length })
   }
 
@@ -288,8 +300,10 @@ export const SchemaAssets = (config: Config.Config): Vite.Plugin => {
         assetsPath: config.paths.framework.devAssets.absolute,
       })
 
+      const lifecycle = createLifecycleData(schemaData, metadata)
+
       // Emit all assets using the high-level API
-      await schemaSource.writeAllAssets(schemaData, metadata)
+      await schemaSource.writeAllAssets(schemaData, metadata, lifecycle)
       debug(`buildMode:allAssetsEmitted`, { versionCount: schemaData.length })
     },
 

package/src/api/vite/vi.ts

@@ -1,4 +1,4 @@
-import { ViteVirtual } from '#lib/vite-virtual/index'
+import { ViteVirtual } from '#lib/vite-virtual'
 
 export const polenVirtual = ViteVirtual.Identifier.createFactory({
   namespace: `polen`,

package/src/cli/commands/cache/$default.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+console.error(`Usage: polen cache <command>
+
+Commands:
+  delete    Delete all Polen-generated caches
+  show      Display information about Polen caches
+`)
+
+process.exit(1)

package/src/cli/commands/cache/delete.ts

@@ -0,0 +1,27 @@
+import { Api } from '#api/index'
+import { projectParameter } from '#cli/_/parameters'
+import { ensureOptionalAbsoluteWithCwd } from '#lib/kit-temp'
+import { Command } from '@molt/command'
+import consola from 'consola'
+
+const args = Command.create()
+  .parameter(
+    `--project -p`,
+    projectParameter,
+  )
+  .settings({
+    parameters: {
+      environment: {
+        $default: {
+          prefix: `POLEN_CACHE_`,
+          enabled: false,
+        },
+      },
+    },
+  })
+  .parse()
+
+const dir = ensureOptionalAbsoluteWithCwd(args.project)
+
+await Api.Cache.deleteAll(dir)
+consola.success(`Polen caches deleted`)

package/src/cli/commands/cache/show.ts

@@ -0,0 +1,99 @@
+import { Api } from '#api/index'
+import { Command } from '@molt/command'
+import { z } from 'zod'
+
+const args = Command.create()
+  .parameter(
+    `--depth -d`,
+    z.number().min(0).max(5).default(2).describe(`Maximum depth for directory tree display`),
+  )
+  .settings({
+    parameters: {
+      environment: {
+        $default: {
+          prefix: `POLEN_CACHE_`,
+          enabled: false,
+        },
+      },
+    },
+  })
+  .parse()
+
+// Helper to format bytes
+const formatBytes = (bytes: number): string => {
+  if (bytes < 1024) return `${bytes} B`
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
+  if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`
+}
+
+// Helper to render directory tree
+const renderTree = (nodes: Api.Cache.TreeNode[], prefix = ``, isLast = true): string[] => {
+  const lines: string[] = []
+
+  nodes.forEach((node, index) => {
+    const isLastNode = index === nodes.length - 1
+    const connector = isLastNode ? `└─` : `├─`
+    const extension = isLastNode ? `  ` : `│ `
+
+    let line = `${prefix}${connector} ${node.name}`
+    if (node.type === `file` && node.size !== undefined) {
+      line += ` (${formatBytes(node.size)})`
+    }
+    lines.push(line)
+
+    if (node.children && node.children.length > 0) {
+      const childLines = renderTree(node.children, prefix + extension, isLastNode)
+      lines.push(...childLines)
+    }
+  })
+
+  return lines
+}
+
+// Get cache info
+const info = await Api.Cache.info({ depth: args.depth })
+
+console.log(`Root: ${info.rootPath}`)
+console.log()
+
+// Development assets
+console.log(`Development assets: ${info.developmentAssets.path.replace(info.rootPath + `/`, ``)}`)
+if (info.developmentAssets.exists) {
+  const size = info.developmentAssets.size ? ` (${formatBytes(info.developmentAssets.size)})` : ``
+  console.log(`  Status: exists${size}`)
+
+  if (info.developmentAssets.tree && info.developmentAssets.tree.length > 0) {
+    console.log(`  Contents:`)
+    const treeLines = renderTree(info.developmentAssets.tree, `    `)
+    treeLines.forEach(line => console.log(line))
+  }
+} else {
+  console.log(`  Status: empty`)
+}
+
+console.log()
+
+// Vite cache
+console.log(`Vite:`)
+if (info.vite.exists) {
+  const size = info.vite.size ? ` (${formatBytes(info.vite.size)})` : ``
+  console.log(`  Status: exists${size}`)
+
+  if (info.vite.optimizedDependencies && info.vite.optimizedDependencies.length > 0) {
+    const deps = info.vite.optimizedDependencies
+    const showing = Math.min(10, deps.length)
+    const more = deps.length - showing
+
+    console.log(`  Optimized dependencies (${deps.length}):`)
+    deps.slice(0, showing).forEach(dep => {
+      console.log(`    ${dep.name} (${formatBytes(dep.size)})`)
+    })
+
+    if (more > 0) {
+      console.log(`    ... (${more} more)`)
+    }
+  }
+} else {
+  console.log(`  Status: empty`)
+}

package/src/cli/commands/cache.ts

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+import { Cli, Path } from '@wollybeard/kit'
+
+// Remove the "cache" argument before dispatching to subcommands
+process.argv = process.argv.slice(0, 2).concat(process.argv.slice(3))
+
+const commandsDir = Path.join(import.meta.dirname, `cache`)
+await Cli.dispatch(commandsDir)

package/src/cli/commands/config.ts

@@ -2,5 +2,8 @@
 
 import { Cli, Path } from '@wollybeard/kit'
 
+// Remove the "config" argument before dispatching to subcommands
+process.argv = process.argv.slice(0, 2).concat(process.argv.slice(3))
+
 const commandsDir = Path.join(import.meta.dirname, `config`)
 await Cli.dispatch(commandsDir)

package/src/cli/commands/open.ts

@@ -9,8 +9,8 @@
 
 import { Api } from '#api/index'
 import { Vite } from '#dep/vite/index'
-import { Grafaid } from '#lib/grafaid/index'
-import { GraphqlSchemaLoader } from '#lib/graphql-schema-loader/index'
+import { Grafaid } from '#lib/grafaid'
+import { GraphqlSchemaLoader } from '#lib/graphql-schema-loader'
 import { Command } from '@molt/command'
 import type { Fn } from '@wollybeard/kit'
 import { Err, Fs, Json, Path, Rec } from '@wollybeard/kit'

package/src/cli/commands/static.ts

@@ -2,5 +2,8 @@
 
 import { Cli, Path } from '@wollybeard/kit'
 
+// Remove the "static" argument before dispatching to subcommands
+process.argv = process.argv.slice(0, 2).concat(process.argv.slice(3))
+
 const commandsDir = Path.join(import.meta.dirname, `static`)
 await Cli.dispatch(commandsDir)

package/src/lib/errors/$.ts

@@ -0,0 +1 @@
+export * as Errors from './$$.js'

package/src/lib/file-router/$.ts

@@ -0,0 +1 @@
+export * as FileRouter from './$$.js'

package/src/lib/file-router/index.test.ts

@@ -1,7 +1,7 @@
 import { Fn } from '@wollybeard/kit'
 import { describe, expect } from 'vitest'
 import { test } from '../../../tests/unit/helpers/test.js'
-import { FileRouter } from './index.js'
+import { FileRouter } from './$.js'
 
 /* Note
 

package/src/lib/grafaid/$.ts

@@ -0,0 +1 @@
+export * as Grafaid from './$$.js'

package/src/lib/grafaid/schema/type.ts

@@ -3,6 +3,7 @@ import {
   type GraphQLInputObjectType,
   type GraphQLInterfaceType,
   type GraphQLList,
+  type GraphQLNamedType,
   type GraphQLNonNull,
   type GraphQLObjectType,
   type GraphQLScalarType,

package/src/lib/graphql-change/{graphql-change.ts → $$.ts}

@@ -1,5 +1,5 @@
 import { GraphqlInspector } from '#dep/graphql-inspector/index'
-import type { GrafaidOld } from '#lib/grafaid-old/index'
+import type { GrafaidOld } from '#lib/grafaid-old'
 import type { Change } from './change-types.js'
 
 export * from './change-types.js'

package/src/lib/graphql-change/$.ts

@@ -0,0 +1 @@
+export * as GraphqlChange from './$$.js'