@strav/spring 1.0.0-alpha.31 → 1.0.0-alpha.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strav/spring",
-  "version": "1.0.0-alpha.31",
+  "version": "1.0.0-alpha.33",
   "description": "Strav project scaffolder — `bunx @strav/spring my-app` writes a working app skeleton (bin/, bootstrap/, config/, routes/, …) per spec/directory-structure.md. Two templates: --api (headless REST) and --web (Vue islands + .strav views). Runtime-independent of the framework — no @strav/* runtime deps.",
   "type": "module",
   "main": "./src/index.ts",

package/src/cli.ts

@@ -12,7 +12,7 @@ import { parseArgs, type Template, toSnakeCase } from './args.ts'
 import { input, select } from './prompts.ts'
 import { scaffold } from './scaffold.ts'
 import { SpringError } from './spring_error.ts'
-import { STRAV_VERSION } from './version.ts'
+import { SPRING_VERSION, STRAV_VERSION } from './version.ts'
 
 const bold = (s: string): string => `\x1b[1m${s}\x1b[0m`
 const dim = (s: string): string => `\x1b[2m${s}\x1b[0m`
@@ -20,8 +20,6 @@ const green = (s: string): string => `\x1b[32m${s}\x1b[0m`
 const red = (s: string): string => `\x1b[31m${s}\x1b[0m`
 const cyan = (s: string): string => `\x1b[36m${s}\x1b[0m`
 
-const SPRING_VERSION = '1.0.0-alpha.30'
-
 function printUsage(): void {
   process.stdout.write(`
   ${bold('@strav/spring')} ${dim(`v${SPRING_VERSION}`)}

package/src/templates/shared/bootstrap/providers.ts

@@ -1,11 +1,12 @@
 import { HttpConsoleProvider, HttpProvider } from '@strav/http'
-import { ConfigProvider, LoggerProvider, type ServiceProvider } from '@strav/kernel'
+import { ConfigProvider, LoggerProvider, type ServiceProviderEntry } from '@strav/kernel'
 import { AppProvider } from '../app/providers/app_provider.ts'
 
 /**
  * Default provider list. Order is not load-bearing — the container does a
- * dependency-aware topo sort at boot. Keep providers grouped by package
- * for readability.
+ * dependency-aware topo sort at boot. Entries can be a `ServiceProvider`
+ * instance, a zero-arg constructor, or a closure returning one (used here
+ * for `ConfigProvider.fromDirectory`, which is async).
  *
  * `ConfigProvider.fromDirectory('config')` auto-discovers every
  * `config/*.ts` file and keys them by basename — `config/app.ts` →
@@ -13,12 +14,12 @@ import { AppProvider } from '../app/providers/app_provider.ts'
  * a new config slot, drop a file with a `default export` into
  * `config/`. No edits to this list required.
  */
-export async function providers(): Promise<ServiceProvider[]> {
+export function providers(): ServiceProviderEntry[] {
   return [
-    await ConfigProvider.fromDirectory('config'),
-    new LoggerProvider(),
-    new HttpProvider(),
-    new HttpConsoleProvider(),
-    new AppProvider(),
+    () => ConfigProvider.fromDirectory('config'),
+    LoggerProvider,
+    HttpProvider,
+    HttpConsoleProvider,
+    AppProvider,
   ]
 }

package/src/templates/web/bootstrap/providers.ts

@@ -1,12 +1,13 @@
 import { HttpConsoleProvider, HttpProvider } from '@strav/http'
-import { ConfigProvider, LoggerProvider, type ServiceProvider } from '@strav/kernel'
+import { ConfigProvider, LoggerProvider, type ServiceProviderEntry } from '@strav/kernel'
 import { ViewConsoleProvider, ViewProvider } from '@strav/view'
 import { AppProvider } from '../app/providers/app_provider.ts'
 
 /**
  * Default provider list. Order is not load-bearing — the container does a
- * dependency-aware topo sort at boot. Keep providers grouped by package
- * for readability.
+ * dependency-aware topo sort at boot. Entries can be a `ServiceProvider`
+ * instance, a zero-arg constructor, or a closure returning one (used here
+ * for `ConfigProvider.fromDirectory`, which is async).
  *
  * `ConfigProvider.fromDirectory('config')` auto-discovers every
  * `config/*.ts` file and keys them by basename — `config/view.ts` →
@@ -18,14 +19,14 @@ import { AppProvider } from '../app/providers/app_provider.ts'
  * and registers a route for each at boot. `ViewConsoleProvider` adds the
  * `view:build` / `view:cache` / `view:clear` commands.
  */
-export async function providers(): Promise<ServiceProvider[]> {
+export function providers(): ServiceProviderEntry[] {
   return [
-    await ConfigProvider.fromDirectory('config'),
-    new LoggerProvider(),
-    new HttpProvider(),
-    new HttpConsoleProvider(),
-    new ViewProvider(),
-    new ViewConsoleProvider(),
-    new AppProvider(),
+    () => ConfigProvider.fromDirectory('config'),
+    LoggerProvider,
+    HttpProvider,
+    HttpConsoleProvider,
+    ViewProvider,
+    ViewConsoleProvider,
+    AppProvider,
   ]
 }

package/src/version.ts

@@ -1,9 +1,16 @@
 /**
- * Framework version that scaffolded apps pin to in their generated
- * `package.json`. Bumped manually at release; see the template-strategy ADR.
+ * Version constants for `@strav/spring`. Both derive from this package's own
+ * `package.json` so a single `./scripts/sync-versions.sh` bump propagates
+ * everywhere — no hand-maintained mirrors to drift.
  *
- * Spring's own `package.json` version tracks the workspace alpha for now,
- * but this constant is what *generated apps* depend on — keep them in sync
- * on each release until spring formally cuts independent versions.
+ *   - `SPRING_VERSION` — printed by `--version` and the banner.
+ *   - `STRAV_VERSION`  — pinned into scaffolded apps' `package.json` as a
+ *     caret range. Valid only while spring tracks the workspace alpha in
+ *     lockstep; when spring eventually cuts its own cadence, replace with
+ *     a hand-maintained constant.
  */
-export const STRAV_VERSION = '^1.0.0-alpha.30'
+
+import pkg from '../package.json' with { type: 'json' }
+
+export const SPRING_VERSION: string = pkg.version
+export const STRAV_VERSION = `^${pkg.version}` as const