@junejs/server 0.1.0-dev.7 → 0.1.1

package/dist/agent-durable.d.ts

@@ -2,12 +2,13 @@ import { Channel, ChannelFactory } from "@junejs/core/agent-config";
 import { Model, Msg, SessionStore, Tool } from "@junejs/core/agent-runtime";
 import { Resources } from "@junejs/core/resources";
 //#region src/agent-durable.d.ts
-interface SqlStorageCursor<T = Record<string, unknown>> {
+type SqlStorageValue = ArrayBuffer | string | number | null;
+interface SqlStorageCursor<T extends Record<string, SqlStorageValue> = Record<string, SqlStorageValue>> {
   toArray(): T[];
   one(): T;
 }
 interface SqlStorage {
-  exec<T = Record<string, unknown>>(query: string, ...bindings: unknown[]): SqlStorageCursor<T>;
+  exec<T extends Record<string, SqlStorageValue> = Record<string, SqlStorageValue>>(query: string, ...bindings: unknown[]): SqlStorageCursor<T>;
 }
 interface DurableStorage {
   sql: SqlStorage;
@@ -69,4 +70,4 @@ declare function durableChannelSurface(getNamespace: () => DurableObjectNamespac
   waitUntil?: (p: Promise<unknown>) => void;
 }): (req: Request) => Promise<Response | null>;
 //#endregion
-export { AgentDurableObject, DoAgentDef, DoSessionStore, DurableObjectNamespace, DurableObjectState, DurableObjectStub, DurableStorage, SqlStorage, SqlStorageCursor, durableAgentSurface, durableChannelSurface, durableFetch };
+export { AgentDurableObject, DoAgentDef, DoSessionStore, DurableObjectNamespace, DurableObjectState, DurableObjectStub, DurableStorage, SqlStorage, SqlStorageCursor, SqlStorageValue, durableAgentSurface, durableChannelSurface, durableFetch };

package/dist/app.js

@@ -98,6 +98,8 @@ function createApp({ appDir: appDirInput, config = {} }) {
 		return [...own, ...gen].sort();
 	};
 	const resources = memoizeResources(config.resources);
+	let servicesCache;
+	const services = config.services ? () => (servicesCache ??= { v: config.services.make(process.env) }).v : void 0;
 	config.dataLayer?.install();
 	let pipelinePromise;
 	const getPipeline = () => pipelinePromise ??= buildPipeline();
@@ -143,6 +145,7 @@ function createApp({ appDir: appDirInput, config = {} }) {
 			routeList: routePaths,
 			earlyHints: config.earlyHints,
 			resources,
+			services,
 			notFoundComponent,
 			resolve: async (pathname) => {
 				const match = await matchRouteTree(appDir, pathname, { pageConvention: true }) ?? (hasJuneRoutes ? await matchRouteTree(juneRoutesDir, pathname, { pageConvention: true }) : null);

package/dist/build.js

@@ -411,6 +411,12 @@ async function juneBuild(appRoot, options = {}) {
 	const dataLayerModule = fullConfig.dataLayer?.module;
 	if (dataLayerModule) imports.push(`import { installDataLayer } from ${JSON.stringify(dataLayerModule)};`);
 	const dataLayerBoot = dataLayerModule ? "\ninstallDataLayer();\n" : "";
+	const servicesModule = fullConfig.services?.module;
+	if (servicesModule) {
+		const spec = /^[./]/.test(servicesModule) ? importPath(genDir, resolve(appRoot, servicesModule)) : servicesModule;
+		imports.push(`import { services as __appServices } from ${JSON.stringify(spec)};`);
+	}
+	const servicesField = servicesModule ? `\n  services: __appServices,` : "";
 	const entry = `// AUTO-GENERATED by \`june build\` — do not edit. Regenerate: june build .
 ${adapterEntry.imports.join("\n")}
 ${imports.join("\n")}
@@ -430,7 +436,7 @@ ${loadings.join("\n")}
   },
   document: ${JSON.stringify(frozen.document, null, 2).replace(/\n/g, "\n  ")},
   agent: ${JSON.stringify(frozen.agent)},${frozen.i18n ? `\n  i18n: ${JSON.stringify(frozen.i18n)},` : ""}
-  earlyHints: ${JSON.stringify(frozen.earlyHints)},${builtExtraFile ? "\n  extra," : ""}${resourcesField}
+  earlyHints: ${JSON.stringify(frozen.earlyHints)},${builtExtraFile ? "\n  extra," : ""}${resourcesField}${servicesField}
 });
 
 ${adapterEntry.wrap("pipeline")}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { AdapterCapabilities, AdapterEmitContext, AdapterEntry, JuneAdapter, ResourcePlan, deno, staticSite, vercel, workers } from "./adapter.js";
 import { CreateAppOptions, JuneApp, createApp } from "./app.js";
 import { R2Bucket, localBlob, r2 } from "./blob.js";
-import { a as Pipeline, d as createPipeline, n as LayoutComponent, o as PipelineConfig, s as Resolved, u as RouteResolver } from "./pipeline-B2V6tKfO.js";
+import { a as Pipeline, d as createPipeline, n as LayoutComponent, o as PipelineConfig, s as Resolved, u as RouteResolver } from "./pipeline-CCp9idQ4.js";
 import { WorkerManifest, createWorker } from "./worker.js";
 import { BuildResult, buildManifest, freezeConfig, generateContent, juneBuild, scanRoutes } from "./build.js";
 import { loadJuneConfig } from "./config-loader.js";
@@ -22,5 +22,6 @@ import { MatchOptions, RouteMatch, RouteTreeMatch, SegmentMatch, listRoutes, mat
 import { installAsyncContext } from "./instrumentation.js";
 import { Negotiated, negotiate } from "./negotiate.js";
 import { blob, currentServices, db, kv } from "@junejs/db";
+import { ServicesConfig, defineServices } from "@junejs/core/config";
 import { I18nConfig, LOCALE_COOKIE, LocaleConfig, LocaleMatch, dirForLang, localeDir, localeHref, matchPinnedLocale, negotiateLocale, parseAcceptLanguage, resolveRequestLocale } from "@junejs/core/i18n";
-export { type AdapterCapabilities, type AdapterEmitContext, type AdapterEntry, type BuildResult, type ContentEntry, type CreateAppOptions, type D1Database, type D1Exec, type DeployResult, type DevServer, type DevServerOptions, type I18nConfig, type JuneAdapter, type JuneApp, type JuneDb, type JuneHost, LOCALE_COOKIE, type LayoutComponent, type LocaleConfig, type LocaleMatch, type MatchOptions, type MigrateResult, type Migration, type Negotiated, type Pipeline, type PipelineConfig, type R2Bucket, type Resolved, type ResourceFlags, type ResourcePlan, type RouteMatch, type RouteResolver, type RouteTreeMatch, type RunResult, type SegmentMatch, type ServeHandle, type SpawnedModule, type WorkerEnv, type WorkerManifest, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, deno, dirForLang, entry, freezeConfig, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };
+export { type AdapterCapabilities, type AdapterEmitContext, type AdapterEntry, type BuildResult, type ContentEntry, type CreateAppOptions, type D1Database, type D1Exec, type DeployResult, type DevServer, type DevServerOptions, type I18nConfig, type JuneAdapter, type JuneApp, type JuneDb, type JuneHost, LOCALE_COOKIE, type LayoutComponent, type LocaleConfig, type LocaleMatch, type MatchOptions, type MigrateResult, type Migration, type Negotiated, type Pipeline, type PipelineConfig, type R2Bucket, type Resolved, type ResourceFlags, type ResourcePlan, type RouteMatch, type RouteResolver, type RouteTreeMatch, type RunResult, type SegmentMatch, type ServeHandle, type ServicesConfig, type SpawnedModule, type WorkerEnv, type WorkerManifest, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, defineServices, deno, dirForLang, entry, freezeConfig, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };

package/dist/index.js

@@ -22,5 +22,6 @@ import { host } from "./host.js";
 import { startDevServer } from "./dev.js";
 import { memoryKv, redisKv } from "./kv.js";
 import { blob, currentServices, db, kv } from "@junejs/db";
+import { defineServices } from "@junejs/core/config";
 import { LOCALE_COOKIE, dirForLang, localeDir, localeHref, matchPinnedLocale, negotiateLocale, parseAcceptLanguage, resolveRequestLocale } from "@junejs/core/i18n";
-export { LOCALE_COOKIE, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, deno, dirForLang, entry, freezeConfig, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };
+export { LOCALE_COOKIE, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, defineServices, deno, dirForLang, entry, freezeConfig, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };

package/dist/{pipeline-B2V6tKfO.d.ts → pipeline-CCp9idQ4.d.ts}

@@ -31,6 +31,7 @@ type PipelineConfig = {
   routeList: () => Promise<string[]> | string[];
   resolve: RouteResolver;
   resources?: () => Promise<Resources> | Resources;
+  services?: () => Promise<unknown> | unknown;
   earlyHints?: string[];
   htmlCacheControl?: string;
   notFoundComponent?: React.ComponentType<{

package/dist/pipeline.d.ts

@@ -1,2 +1,2 @@
-import { a as Pipeline, c as ResolvedResource, d as createPipeline, i as MiddlewareHandler, l as ResourceHandler, n as LayoutComponent, o as PipelineConfig, r as LoadingComponent, s as Resolved, t as ExtraHandler, u as RouteResolver } from "./pipeline-B2V6tKfO.js";
+import { a as Pipeline, c as ResolvedResource, d as createPipeline, i as MiddlewareHandler, l as ResourceHandler, n as LayoutComponent, o as PipelineConfig, r as LoadingComponent, s as Resolved, t as ExtraHandler, u as RouteResolver } from "./pipeline-CCp9idQ4.js";
 export { ExtraHandler, LayoutComponent, LoadingComponent, MiddlewareHandler, Pipeline, PipelineConfig, Resolved, ResolvedResource, ResourceHandler, RouteResolver, createPipeline };

package/dist/pipeline.js

@@ -228,7 +228,10 @@ function createPipeline(cfg) {
 	}
 	return { async fetch(request) {
 		await ensureScope();
-		return runInScope({ resources: cfg.resources ? await cfg.resources() : {} }, () => handleRequest(request));
+		return runInScope({
+			resources: cfg.resources ? await cfg.resources() : {},
+			services: cfg.services ? await cfg.services() : void 0
+		}, () => handleRequest(request));
 	} };
 }
 //#endregion

package/dist/worker.d.ts

@@ -1,4 +1,4 @@
-import { l as ResourceHandler, n as LayoutComponent, r as LoadingComponent, t as ExtraHandler } from "./pipeline-B2V6tKfO.js";
+import { l as ResourceHandler, n as LayoutComponent, r as LoadingComponent, t as ExtraHandler } from "./pipeline-CCp9idQ4.js";
 import { BrandedRoute } from "@junejs/core/route";
 import { AgentConfig } from "@junejs/core/config";
 import React from "react";
@@ -33,6 +33,7 @@ type WorkerManifest = {
   }>;
   extra?: ExtraHandler;
   resources?: (env?: unknown) => Promise<Resources> | Resources;
+  services?: (env?: unknown) => unknown;
 };
 declare function createWorker(manifest: WorkerManifest): {
   fetch(request: Request, env?: unknown): Promise<Response>;

package/dist/worker.js

@@ -62,6 +62,8 @@ function createWorker(manifest) {
 	const boundaryFor = (key) => manifest.layoutBoundaries?.[key] ?? null;
 	let currentEnv;
 	const provider = manifest.resources;
+	const servicesProvider = manifest.services;
+	let servicesCache;
 	const agentSurface = manifest.agent.runtime.enabled && manifest.agentName ? (() => {
 		const route = durableAgentSurface(() => currentEnv?.AGENT, {
 			agentName: manifest.agentName,
@@ -80,6 +82,7 @@ function createWorker(manifest) {
 		notFoundComponent: manifest.notFound,
 		extra: manifest.extra,
 		resources: provider ? () => provider(currentEnv) : void 0,
+		services: servicesProvider ? () => (servicesCache ??= { v: servicesProvider(currentEnv) }).v : void 0,
 		resolve: async (pathname) => {
 			const staticDef = manifest.routes[pathname];
 			if (staticDef) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "0.1.0-dev.7",
+  "version": "0.1.1",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -125,8 +125,8 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@junejs/core": ">=0.1.0-dev.5",
-    "@junejs/db": ">=0.0.33-dev.2",
+    "@junejs/core": ">=0.1.0",
+    "@junejs/db": ">=0.0.33",
     "@momiji-rs/sparkdown": "^0.0.4",
     "lightningcss": "^1.27.0",
     "oxc-parser": "^0.137.0",

package/src/agent-durable.ts

@@ -37,12 +37,23 @@ import {
 import { ensureScope, runInScope } from "@junejs/db";
 
 // ── minimal structural Cloudflare surface (no @cloudflare/workers-types dep) ──
-export interface SqlStorageCursor<T = Record<string, unknown>> {
+// SqlStorage row values are exactly what workerd's SQLite returns. Mirroring
+// @cloudflare/workers-types' `T extends Record<string, SqlStorageValue>` constraint
+// STRUCTURALLY (not importing it) makes `this.ctx.storage` directly assignable to
+// these interfaces, so a DO shell needs no `as unknown as JuneDoState` cast. The
+// constraint (not just a default) is what lets the two `exec` signatures unify:
+// an unconstrained `T` promises `toArray(): T[]` for arbitrary T, which workerd's
+// cursor — only ever `Record<string, SqlStorageValue>` rows — cannot satisfy.
+export type SqlStorageValue = ArrayBuffer | string | number | null;
+export interface SqlStorageCursor<T extends Record<string, SqlStorageValue> = Record<string, SqlStorageValue>> {
   toArray(): T[];
   one(): T;
 }
 export interface SqlStorage {
-  exec<T = Record<string, unknown>>(query: string, ...bindings: unknown[]): SqlStorageCursor<T>;
+  exec<T extends Record<string, SqlStorageValue> = Record<string, SqlStorageValue>>(
+    query: string,
+    ...bindings: unknown[]
+  ): SqlStorageCursor<T>;
 }
 export interface DurableStorage {
   sql: SqlStorage;

package/src/app.ts

@@ -182,6 +182,15 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
 
   const resources = memoizeResources(config.resources);
 
+  // Build the app-services bag once from process.env (dev's env; stable across the
+  // process) and hand the pipeline a memoized provider — the dev twin of the worker
+  // binding services from its per-isolate env. The `{ v }` box memoizes even a
+  // null/undefined result. Absent config → no provider → currentServices() undefined.
+  let servicesCache: { v: unknown } | undefined;
+  const services = config.services
+    ? () => (servicesCache ??= { v: config.services!.make(process.env) }).v
+    : undefined;
+
   // Boot the opt-in Tier-3 data layer (e.g. `dataLayer: junoDataLayer()`) once:
   // its install() wires the ambient `db` (Juno registers its SQL tagger). Explicit
   // and config-declared — no import-time side-effect, and the framework still never
@@ -245,6 +254,7 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
       routeList: routePaths,
       earlyHints: config.earlyHints,
       resources,
+      services,
       notFoundComponent,
       resolve: async (pathname) => {
         const match =

package/src/build.ts

@@ -706,6 +706,23 @@ export async function juneBuild(
   }
   const dataLayerBoot = dataLayerModule ? "\ninstallDataLayer();\n" : "";
 
+  // App services: import the app's `(env) => services` factory (the named `services`
+  // export of the declared module) into the entry and hand it to createWorker, which
+  // binds it from the worker env per request — the prod twin of app.ts building it from
+  // process.env. Like resources, the module (not the config) is imported, so the config's
+  // host-only bits never enter the worker graph. Emitted only when declared.
+  //
+  // The specifier is rebased like a route import: an app-relative path (`./app/services.ts`)
+  // is resolved against appRoot then made relative to the entry's dir (.june), since the
+  // generated entry lives there; a bare specifier (a shared package, like dataLayer.module)
+  // is used verbatim.
+  const servicesModule = fullConfig.services?.module;
+  if (servicesModule) {
+    const spec = /^[./]/.test(servicesModule) ? importPath(genDir, resolve(appRoot, servicesModule)) : servicesModule;
+    imports.push(`import { services as __appServices } from ${JSON.stringify(spec)};`);
+  }
+  const servicesField = servicesModule ? `\n  services: __appServices,` : "";
+
   const entry = `// AUTO-GENERATED by \`june build\` — do not edit. Regenerate: june build .
 ${adapterEntry.imports.join("\n")}
 ${imports.join("\n")}
@@ -725,7 +742,7 @@ ${loadings.join("\n")}
   },
   document: ${JSON.stringify(frozen.document, null, 2).replace(/\n/g, "\n  ")},
   agent: ${JSON.stringify(frozen.agent)},${frozen.i18n ? `\n  i18n: ${JSON.stringify(frozen.i18n)},` : ""}
-  earlyHints: ${JSON.stringify(frozen.earlyHints)},${builtExtraFile ? "\n  extra," : ""}${resourcesField}
+  earlyHints: ${JSON.stringify(frozen.earlyHints)},${builtExtraFile ? "\n  extra," : ""}${resourcesField}${servicesField}
 });
 
 ${adapterEntry.wrap("pipeline")}

package/src/index.ts

@@ -31,6 +31,9 @@ export { db, kv, blob } from "@junejs/db";
 // read the isolate's app-defined bag from any tool or loader. The app builds it from
 // env at the isolate entry and types it here — `currentServices<AppServices>()`.
 export { currentServices } from "@junejs/db";
+// Declare that bag for the Worker side in june.config.ts (`services: defineServices(...)`)
+// — the twin of the DO's constructor injection, seeded into loaders/views/actions.
+export { defineServices, type ServicesConfig } from "@junejs/core/config";
 export { loadJuneConfig } from "./config-loader";
 export {
   migrate,

package/src/pipeline.ts

@@ -121,6 +121,11 @@ export type PipelineConfig = {
   // Opened data resources (db/kv/blob) injected onto ctx before load(). A
   // provider so opening is lazy/memoized; absent → no resources on ctx.
   resources?: () => Promise<Resources> | Resources;
+  // The app-defined services bag, built from the isolate's env (config `services`).
+  // A provider like `resources` (lazy/memoized); seeded into the request scope so
+  // `currentServices()` resolves in loaders/views/actions. Absent → currentServices()
+  // is undefined. This is the Worker-side twin of a Durable Object seeding services.
+  services?: () => Promise<unknown> | unknown;
   earlyHints?: string[];
   htmlCacheControl?: string;
   notFoundComponent?: React.ComponentType<{ pathname: string }>;
@@ -578,7 +583,8 @@ export function createPipeline(cfg: PipelineConfig): Pipeline {
       // async-context provider on first request (no static node:* import).
       await ensureScope();
       const resources = cfg.resources ? await cfg.resources() : {};
-      return runInScope({ resources }, () => handleRequest(request));
+      const services = cfg.services ? await cfg.services() : undefined;
+      return runInScope({ resources, services }, () => handleRequest(request));
     },
   };
 }

package/src/worker.ts

@@ -59,6 +59,11 @@ export type WorkerManifest = {
   // bindings come from env, so the generated entry passes an ENV-AWARE provider
   // (bindWorkerResources) — the worker threads its env through on each fetch.
   resources?: (env?: unknown) => Promise<Resources> | Resources;
+  // App-defined services (config `services`), built from the worker's env. The build
+  // imports the app's `(env) => services` factory into the entry and sets it here; the
+  // worker threads its env through and createWorker memoizes it per isolate. Seeded
+  // into the request scope so `currentServices()` resolves in loaders/views/actions.
+  services?: (env?: unknown) => unknown;
 };
 
 type Compiled = { regex: RegExp; names: string[]; def: BrandedRoute; pattern: string };
@@ -133,6 +138,12 @@ export function createWorker(
   let currentEnv: unknown;
   const provider = manifest.resources;
 
+  // App services: the build sets a raw `(env) => services` factory here; memoize it per
+  // isolate (env is stable per isolate, like the resources provider). The `{ v }` box
+  // caches even a null/undefined result. Absent → currentServices() stays undefined.
+  const servicesProvider = manifest.services;
+  let servicesCache: { v: unknown } | undefined;
+
   // Durable agent (edge): route the chat endpoint to the per-session DO bound at
   // env.AGENT. Built only when the app has an agent (manifest.agentName) and the
   // runtime is enabled; the surface is inert (null → fall through) until env.AGENT
@@ -159,6 +170,7 @@ export function createWorker(
     notFoundComponent: manifest.notFound,
     extra: manifest.extra,
     resources: provider ? () => provider(currentEnv) : undefined,
+    services: servicesProvider ? () => (servicesCache ??= { v: servicesProvider(currentEnv) }).v : undefined,
     resolve: async (pathname): Promise<Resolved | ResolvedResource | null> => {
       const staticDef = manifest.routes[pathname];
       if (staticDef) {