@junejs/server 1.0.0-dev.19 → 1.0.0-dev.20

package/dist/content-freeze.js

@@ -0,0 +1,83 @@
+import { findJuneConfigPath, loadJuneConfig } from "./config-loader.js";
+import { generateContentModule } from "./content.js";
+import { existsSync } from "node:fs";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+import { execFileSync } from "node:child_process";
+//#region src/content-freeze.ts
+async function generateContent(appRoot) {
+	const contentDir = join(appRoot, "content");
+	await mkdir(join(appRoot, "app"), { recursive: true });
+	const emit = async (sources, knownLocales) => {
+		const { code, names } = generateContentModule(contentDir, knownLocales, sources);
+		await writeFile(join(appRoot, "app", "_content.ts"), code);
+		return names;
+	};
+	const resolveSources = (sources) => sources.map((s) => ({
+		...s,
+		dir: resolve(appRoot, s.dir)
+	}));
+	const declaredLocales = (config) => config.i18n ? [.../* @__PURE__ */ new Set([config.i18n.defaultLocale, ...Object.keys(config.i18n.locales)])] : [];
+	let config = null;
+	try {
+		config = await loadJuneConfig(appRoot);
+	} catch {}
+	if (config) return emit(resolveSources(config.content?.sources ?? []), declaredLocales(config));
+	const names = await emit([], void 0);
+	await seedContentImports(appRoot);
+	const probed = probeConfigFresh(appRoot);
+	if (probed === null) {
+		console.warn("[june gen] june.config.ts failed to load — content.sources/i18n locales (if any) not applied");
+		return names;
+	}
+	return emit(resolveSources(probed.sources), probed.locales);
+}
+async function seedContentImports(appRoot) {
+	const cfgPath = findJuneConfigPath(appRoot);
+	if (!cfgPath) return;
+	const contentFile = join(appRoot, "app", "_content.ts");
+	const current = existsSync(contentFile) ? await readFile(contentFile, "utf8") : "";
+	const cfgSrc = await readFile(cfgPath, "utf8");
+	const isIdent = (s) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(s);
+	const seen = /* @__PURE__ */ new Set();
+	const stubs = [];
+	for (const m of cfgSrc.matchAll(/import\s*(?:type\s+)?\{([^}]*)\}\s*from\s*["'][^"']*app\/_content(?:\.\w+)?["']/g)) {
+		const inner = (m[1] ?? "").replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/[^\n]*/g, "");
+		for (const part of inner.split(",")) {
+			const name = part.replace(/\btype\b/g, "").split(/\s+as\s+/).pop()?.trim();
+			if (!name || !isIdent(name) || seen.has(name)) continue;
+			seen.add(name);
+			const reName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+			if (!new RegExp(`export (?:const|function|type) ${reName}\\b`).test(current)) stubs.push(`export const ${name}: ContentEntry[] = [];`);
+		}
+	}
+	if (stubs.length) await writeFile(contentFile, current + stubs.join("\n") + "\n");
+}
+function probeConfigFresh(appRoot) {
+	const path = findJuneConfigPath(appRoot);
+	if (!path) return {
+		sources: [],
+		locales: []
+	};
+	const code = `import(${JSON.stringify(pathToFileURL(path).href)}).then((m) => { const c = m.default ?? {}; process.stdout.write("\\n__JUNE_CONTENT__" + JSON.stringify({ sources: c.content?.sources ?? [], locales: c.i18n ? [...new Set([c.i18n.defaultLocale, ...Object.keys(c.i18n.locales ?? {})])] : [] }) + "__END__"); }, () => process.exit(42));`;
+	try {
+		const m = execFileSync(process.execPath, [
+			...process.execArgv,
+			"-e",
+			code
+		], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}).match(/__JUNE_CONTENT__(.*?)__END__/s);
+		return m ? JSON.parse(m[1]) : null;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+export { generateContent };

package/dist/index.d.ts

@@ -1,11 +1,16 @@
-import { AdapterCapabilities, AdapterEmitContext, AdapterEntry, JuneAdapter, ResourcePlan, deno, staticSite, vercel, workers } from "./adapter.js";
+import { a as ResourcePlan, c as staticSite, i as JuneAdapter, l as vercel, n as AdapterEmitContext, o as deno, r as AdapterEntry, t as AdapterCapabilities, u as workers } from "./adapter-DcZ-W1-7.js";
 import { AGENT_MODULE_FILE, AgentDirScan, emitAgentModule, findAgentDir, generateAgentModule, scanAgentDir } from "./agent-compile.js";
 import { CreateAppOptions, JuneApp, createApp } from "./app.js";
 import { R2Bucket, localBlob, r2 } from "./blob.js";
+import { r as scanRoutes } from "./route-scan-DMlwoESy.js";
+import { t as generateContent } from "./content-freeze-CyiW2fRK.js";
 import { a as Pipeline, d as createPipeline, n as LayoutComponent, o as PipelineConfig, s as Resolved, u as RouteResolver } from "./pipeline-cCR6MGNK.js";
-import { WorkerManifest, createWorker } from "./worker.js";
-import { BuildResult, buildManifest, freezeConfig, generateContent, juneBuild, scanRoutes } from "./build.js";
+import { n as WorkerManifest, r as createWorker } from "./worker-BkFHGtxp.js";
+import { t as freezeConfig } from "./config-freeze-DwI-Rmvq.js";
+import { n as buildManifest } from "./manifest-gcNWqWoI.js";
+import { BuildResult, juneBuild } from "./build.js";
 import { loadJuneConfig } from "./config-loader.js";
+import { AccountTokenStore, BetterAuthLike, ConnectionAuth, LinkedAccountAuthOptions, betterAuthAccessToken, betterAuthAccountTokenStore, linkedAccountAuth } from "./connection-auth.js";
 import { ContentEntry, collection, entry } from "./content.js";
 import { a as blockedMessage, c as migrateApp, l as readMigrations, n as MigrateResult, o as classify, r as Migration, s as migrate, u as typesApp } from "./migrate-BbWt-PuB.js";
 import { D1Exec, migrateD1, resolveD1Database, wranglerD1 } from "./d1-migrate.js";
@@ -25,4 +30,4 @@ 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 { AGENT_MODULE_FILE, type AdapterCapabilities, type AdapterEmitContext, type AdapterEntry, type AgentDirScan, 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, emitAgentModule, entry, findAgentDir, freezeConfig, generateAgentModule, 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, scanAgentDir, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };
+export { AGENT_MODULE_FILE, type AccountTokenStore, type AdapterCapabilities, type AdapterEmitContext, type AdapterEntry, type AgentDirScan, type BetterAuthLike, type BuildResult, type ConnectionAuth, 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 LinkedAccountAuthOptions, 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, betterAuthAccessToken, betterAuthAccountTokenStore, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, defineServices, deno, dirForLang, emitAgentModule, entry, findAgentDir, freezeConfig, generateAgentModule, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, linkedAccountAuth, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanAgentDir, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };

package/dist/index.js

@@ -8,9 +8,14 @@ import { bindWorkerResources, memoizeResources } from "./resources.js";
 import { createApp } from "./app.js";
 import { localBlob, r2 } from "./blob.js";
 import { loadJuneConfig } from "./config-loader.js";
+import { freezeConfig } from "./config-freeze.js";
 import { collection, entry } from "./content.js";
+import { generateContent } from "./content-freeze.js";
 import { createWorker } from "./worker.js";
-import { buildManifest, freezeConfig, generateContent, juneBuild, scanRoutes } from "./build.js";
+import { scanRoutes } from "./route-scan.js";
+import { buildManifest } from "./manifest.js";
+import { juneBuild } from "./build.js";
+import { betterAuthAccessToken, betterAuthAccountTokenStore, linkedAccountAuth } from "./connection-auth.js";
 import { blockedMessage, classify, migrate, migrateApp, readMigrations, typesApp } from "./migrate.js";
 import { migrateD1, resolveD1Database, wranglerD1 } from "./d1-migrate.js";
 import { postgres } from "./postgres-driver.js";
@@ -25,4 +30,4 @@ 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 { AGENT_MODULE_FILE, LOCALE_COOKIE, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, defineServices, deno, dirForLang, emitAgentModule, entry, findAgentDir, freezeConfig, generateAgentModule, 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, scanAgentDir, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };
+export { AGENT_MODULE_FILE, LOCALE_COOKIE, betterAuthAccessToken, betterAuthAccountTokenStore, bindWorkerResources, blob, blockedMessage, buildManifest, classify, collection, createApp, createPipeline, createWorker, currentServices, d1, db, defineServices, deno, dirForLang, emitAgentModule, entry, findAgentDir, freezeConfig, generateAgentModule, generateContent, host, installAsyncContext, juneBuild, juneDeploy, kv, linkedAccountAuth, listRoutes, loadJuneConfig, localBlob, localeDir, localeHref, matchPinnedLocale, matchRoute, matchRouteTree, memoizeResources, memoryKv, migrate, migrateApp, migrateD1, mysql, negotiate, negotiateLocale, parseAcceptLanguage, postgres, r2, readMigrations, redisKv, resolveD1Database, resolveNotFound, resolveRequestLocale, scanAgentDir, scanRoutes, sqlite, startDevServer, staticSite, turso, typesApp, vercel, workers, wranglerD1 };

package/dist/manifest-gcNWqWoI.d.ts

@@ -0,0 +1,11 @@
+import { n as LayoutComponent } from "./pipeline-cCR6MGNK.js";
+import { n as WorkerManifest } from "./worker-BkFHGtxp.js";
+//#region src/manifest.d.ts
+type ImportedLayout = {
+  component: LayoutComponent;
+  boundary: boolean;
+};
+declare function importLayout(file: string): Promise<ImportedLayout | null>;
+declare function buildManifest(appRoot: string): Promise<WorkerManifest>;
+//#endregion
+export { buildManifest as n, importLayout as r, ImportedLayout as t };

package/dist/manifest.d.ts

@@ -0,0 +1,2 @@
+import { n as buildManifest, r as importLayout, t as ImportedLayout } from "./manifest-gcNWqWoI.js";
+export { ImportedLayout, buildManifest, importLayout };

package/dist/manifest.js

@@ -0,0 +1,111 @@
+import { findMiddlewareFile } from "./router.js";
+import { resolveBoundary } from "./segment.js";
+import { freezeConfig } from "./config-freeze.js";
+import { scanAppRoutes } from "./route-scan.js";
+import { existsSync } from "node:fs";
+import { basename, join } from "node:path";
+import { pathToFileURL } from "node:url";
+import { routeFromModule } from "@junejs/core/route";
+//#region src/manifest.ts
+async function importLayout(file) {
+	const mod = await import(pathToFileURL(file).href);
+	return typeof mod.default === "function" ? {
+		component: mod.default,
+		boundary: mod.segmentBoundary === true
+	} : null;
+}
+async function buildManifest(appRoot) {
+	const appDir = join(appRoot, "app");
+	const frozen = await freezeConfig(appRoot);
+	const scanned = await scanAppRoutes(appRoot);
+	const layoutCache = /* @__PURE__ */ new Map();
+	const loadCached = async (f) => {
+		if (!layoutCache.has(f)) layoutCache.set(f, await importLayout(f));
+		return layoutCache.get(f) ?? null;
+	};
+	const componentsFor = async (files) => {
+		const items = [];
+		for (const f of files) {
+			const c = await loadCached(f);
+			items.push({
+				file: f,
+				entry: c?.component ?? null,
+				boundary: !!c?.boundary
+			});
+		}
+		return resolveBoundary(items);
+	};
+	const loadingCache = /* @__PURE__ */ new Map();
+	const loadingFor = async (file) => {
+		if (!file) return void 0;
+		if (!loadingCache.has(file)) {
+			const loaded = await importLayout(file);
+			loadingCache.set(file, loaded ? loaded.component : null);
+		}
+		return loadingCache.get(file) ?? void 0;
+	};
+	const routes = {};
+	const dynamicRoutes = [];
+	const resourceRoutes = [];
+	const layoutChains = {};
+	const layoutBoundaries = {};
+	const loadings = {};
+	for (const r of scanned) {
+		const mod = await import(pathToFileURL(r.file).href);
+		if (r.resource) {
+			const handler = mod.default;
+			if (typeof handler === "function") resourceRoutes.push({
+				pattern: r.path,
+				handler
+			});
+			continue;
+		}
+		const def = routeFromModule(mod);
+		if (!def) continue;
+		const { chain, boundaryIndex, key } = await componentsFor(r.layouts);
+		const loading = await loadingFor(r.loading);
+		if (r.dynamic) {
+			dynamicRoutes.push({
+				pattern: r.path,
+				def
+			});
+			layoutChains[r.path] = chain;
+		} else {
+			routes[r.path] = def;
+			layoutChains[r.path] = chain;
+		}
+		if (boundaryIndex !== null && key !== null) layoutBoundaries[r.path] = {
+			index: boundaryIndex,
+			key
+		};
+		if (loading) loadings[r.path] = loading;
+	}
+	let extra;
+	const extraFile = findMiddlewareFile(appDir);
+	if (extraFile) {
+		const mod = await import(pathToFileURL(extraFile).href);
+		if (typeof mod.default === "function") extra = mod.default;
+	}
+	let agentName;
+	const agentDir = join(appDir, frozen.agent.runtime.dir);
+	if (frozen.agent.runtime.enabled && existsSync(agentDir)) {
+		const cfgFile = join(agentDir, "agent.ts");
+		agentName = (existsSync(cfgFile) ? (await import(pathToFileURL(cfgFile).href)).default : void 0)?.name ?? basename(agentDir);
+	}
+	return {
+		routes,
+		dynamicRoutes,
+		resourceRoutes,
+		layoutChains,
+		layoutBoundaries,
+		loadings,
+		document: frozen.document,
+		agent: frozen.agent,
+		agentName,
+		i18n: frozen.i18n,
+		earlyHints: frozen.earlyHints,
+		extra
+	};
+}
+//#endregion
+export { buildManifest, importLayout };

package/dist/route-scan-DMlwoESy.d.ts

@@ -0,0 +1,13 @@
+//#region src/route-scan.d.ts
+type RouteEntry = {
+  path: string;
+  file: string;
+  dynamic: boolean;
+  resource?: boolean;
+  layouts: string[];
+  loading?: string;
+};
+declare function scanRoutes(appDir: string, dir?: string, layouts?: string[], out?: RouteEntry[], loading?: string): Promise<RouteEntry[]>;
+declare function scanAppRoutes(appRoot: string): Promise<RouteEntry[]>;
+//#endregion
+export { scanAppRoutes as n, scanRoutes as r, RouteEntry as t };

package/dist/route-scan.d.ts

@@ -0,0 +1,2 @@
+import { n as scanAppRoutes, r as scanRoutes, t as RouteEntry } from "./route-scan-DMlwoESy.js";
+export { RouteEntry, scanAppRoutes, scanRoutes };

package/dist/route-scan.js

@@ -0,0 +1,55 @@
+import { existsSync } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { basename, join, relative, sep } from "node:path";
+//#region src/route-scan.ts
+const PAGE_BASENAMES = /* @__PURE__ */ new Set(["page", "index"]);
+const ROUTE_EXTS = [
+	".tsx",
+	".jsx",
+	".ts",
+	".js"
+];
+const isRouteGroup = (name) => /^\(.+\)$/.test(name);
+function segmentFile(dir, base) {
+	return ROUTE_EXTS.map((e) => join(dir, `${base}${e}`)).find(existsSync);
+}
+async function scanRoutes(appDir, dir = appDir, layouts = [], out = [], loading) {
+	const ownLayout = segmentFile(dir, "layout");
+	const chain = ownLayout ? [...layouts, ownLayout] : layouts;
+	const nearestLoading = segmentFile(dir, "loading") ?? loading;
+	const entries = await readdir(dir, { withFileTypes: true }).catch(() => []);
+	for (const e of entries) {
+		if (e.name.startsWith("_") || e.name.startsWith(".")) continue;
+		const full = join(dir, e.name);
+		if (e.isDirectory()) {
+			await scanRoutes(appDir, full, chain, out, nearestLoading);
+			continue;
+		}
+		const ext = e.name.match(/\.[^.]+$/)?.[0] ?? "";
+		if (!ROUTE_EXTS.includes(ext)) continue;
+		const base = basename(e.name, ext);
+		const resource = base === "route";
+		if (!PAGE_BASENAMES.has(base) && !resource) continue;
+		const relDir = relative(appDir, dir);
+		const path = "/" + (relDir === "" ? [] : relDir.split(sep).filter((s) => !isRouteGroup(s))).join("/");
+		out.push({
+			path: path === "/" ? "/" : path,
+			file: full,
+			dynamic: /\[.+\]/.test(path),
+			resource,
+			layouts: chain,
+			loading: nearestLoading
+		});
+	}
+	return out;
+}
+async function scanAppRoutes(appRoot) {
+	const appDir = join(appRoot, "app");
+	const juneRoutesDir = join(appRoot, ".june", "routes");
+	const appRoutes = await scanRoutes(appDir);
+	const frameworkRoutes = existsSync(juneRoutesDir) ? await scanRoutes(juneRoutesDir) : [];
+	const appPaths = new Set(appRoutes.map((r) => r.path));
+	return [...appRoutes, ...frameworkRoutes.filter((r) => !appPaths.has(r.path))].sort((a, b) => a.path.localeCompare(b.path));
+}
+//#endregion
+export { scanAppRoutes, scanRoutes };

package/dist/worker-BkFHGtxp.d.ts

@@ -0,0 +1,61 @@
+import { l as ResourceHandler, n as LayoutComponent, r as LoadingComponent, t as ExtraHandler } from "./pipeline-cCR6MGNK.js";
+import { Channel, ChannelFactory } from "@junejs/core/agent-config";
+import { BrandedRoute } from "@junejs/core/route";
+import { AgentConfig } from "@junejs/core/config";
+import React from "react";
+import { DocumentConfig } from "@junejs/core/document";
+import { I18nConfig } from "@junejs/core/i18n";
+import { Resources } from "@junejs/core/resources";
+//#region src/worker.d.ts
+type WorkerExecutionContext = {
+  waitUntil?(p: Promise<unknown>): void;
+};
+type WorkerManifest = {
+  routes: Record<string, BrandedRoute>;
+  dynamicRoutes?: Array<{
+    pattern: string;
+    def: BrandedRoute;
+  }>;
+  resourceRoutes?: Array<{
+    pattern: string;
+    handler: ResourceHandler;
+  }>;
+  layoutChains?: Record<string, LayoutComponent[]>;
+  layoutBoundaries?: Record<string, {
+    index: number;
+    key: string;
+  }>;
+  loadings?: Record<string, LoadingComponent>;
+  document: DocumentConfig;
+  agent: AgentConfig;
+  agentName?: string;
+  agentChannels?: (Channel | ChannelFactory)[];
+  i18n?: I18nConfig;
+  earlyHints?: string[];
+  htmlCacheControl?: string;
+  notFound?: React.ComponentType<{
+    pathname: string;
+  }>;
+  extra?: ExtraHandler;
+  resources?: (env?: unknown) => Promise<Resources> | Resources;
+  services?: (env?: unknown) => unknown;
+};
+declare function createWorker(manifest: WorkerManifest): {
+  fetch(request: Request, env?: unknown, ctx?: WorkerExecutionContext): Promise<Response>;
+};
+type AssetEnv = {
+  ASSETS?: {
+    fetch(request: Request): Promise<Response>;
+  };
+};
+type FetchPipeline = {
+  fetch(request: Request, env?: unknown, ctx?: WorkerExecutionContext): Promise<Response>;
+};
+declare function withAssets(pipeline: FetchPipeline, opts?: {
+  link?: string | null;
+}): {
+  fetch(request: Request, env?: AssetEnv, ctx?: WorkerExecutionContext): Promise<Response>;
+};
+declare function withDenoAssets(pipeline: FetchPipeline): (request: Request) => Promise<Response>;
+//#endregion
+export { withDenoAssets as a, withAssets as i, WorkerManifest as n, createWorker as r, WorkerExecutionContext as t };

package/dist/worker.d.ts

@@ -1,61 +1,2 @@
-import { l as ResourceHandler, n as LayoutComponent, r as LoadingComponent, t as ExtraHandler } from "./pipeline-cCR6MGNK.js";
-import { Channel, ChannelFactory } from "@junejs/core/agent-config";
-import { BrandedRoute } from "@junejs/core/route";
-import { AgentConfig } from "@junejs/core/config";
-import React from "react";
-import { DocumentConfig } from "@junejs/core/document";
-import { I18nConfig } from "@junejs/core/i18n";
-import { Resources } from "@junejs/core/resources";
-//#region src/worker.d.ts
-type WorkerExecutionContext = {
-  waitUntil?(p: Promise<unknown>): void;
-};
-type WorkerManifest = {
-  routes: Record<string, BrandedRoute>;
-  dynamicRoutes?: Array<{
-    pattern: string;
-    def: BrandedRoute;
-  }>;
-  resourceRoutes?: Array<{
-    pattern: string;
-    handler: ResourceHandler;
-  }>;
-  layoutChains?: Record<string, LayoutComponent[]>;
-  layoutBoundaries?: Record<string, {
-    index: number;
-    key: string;
-  }>;
-  loadings?: Record<string, LoadingComponent>;
-  document: DocumentConfig;
-  agent: AgentConfig;
-  agentName?: string;
-  agentChannels?: (Channel | ChannelFactory)[];
-  i18n?: I18nConfig;
-  earlyHints?: string[];
-  htmlCacheControl?: string;
-  notFound?: React.ComponentType<{
-    pathname: string;
-  }>;
-  extra?: ExtraHandler;
-  resources?: (env?: unknown) => Promise<Resources> | Resources;
-  services?: (env?: unknown) => unknown;
-};
-declare function createWorker(manifest: WorkerManifest): {
-  fetch(request: Request, env?: unknown, ctx?: WorkerExecutionContext): Promise<Response>;
-};
-type AssetEnv = {
-  ASSETS?: {
-    fetch(request: Request): Promise<Response>;
-  };
-};
-type FetchPipeline = {
-  fetch(request: Request, env?: unknown, ctx?: WorkerExecutionContext): Promise<Response>;
-};
-declare function withAssets(pipeline: FetchPipeline, opts?: {
-  link?: string | null;
-}): {
-  fetch(request: Request, env?: AssetEnv, ctx?: WorkerExecutionContext): Promise<Response>;
-};
-declare function withDenoAssets(pipeline: FetchPipeline): (request: Request) => Promise<Response>;
-//#endregion
+import { a as withDenoAssets, i as withAssets, n as WorkerManifest, r as createWorker, t as WorkerExecutionContext } from "./worker-BkFHGtxp.js";
 export { WorkerExecutionContext, WorkerManifest, createWorker, withAssets, withDenoAssets };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "1.0.0-dev.19",
+  "version": "1.0.0-dev.20",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -138,7 +138,7 @@
     "rolldown": "^1.1.0"
   },
   "peerDependencies": {
-    "@junejs/core": ">=0.2.0-dev.36",
+    "@junejs/core": ">=0.2.0-dev.38",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-server-dom-webpack": "19.2.7",

package/src/agent-discover.ts

@@ -6,7 +6,9 @@
 //     agent.ts                  → default-exports a plain config { name, model?, surfaces? }
 //     instructions.md           → base system prompt
 //     instructions.<source>.md  → per-surface instruction variant (#149)
-//     tools/*.ts                → each default-exports a defineAction (a tool)
+//     tools/*.ts                → each default-exports a defineAction (a tool),
+//                                 OR an array of defineActions (an integration
+//                                 shipping several tools, e.g. googleDriveTools())
 //     skills/*.md               → each a procedure, loaded on demand (progressive disclosure)
 //     channels/*.ts             → each default-exports a Channel (an inbound edge — pure transport)
 //     channels/*.md             → DEPRECATED overlay location (warned; use instructions.<source>.md)
@@ -24,8 +26,7 @@ import { readdir, readFile } from "node:fs/promises";
 import { basename, extname, join } from "node:path";
 import { pathToFileURL } from "node:url";
 
-import type { AnyAction } from "@junejs/core/agent";
-import { assembleAgent, parseSkill, type AgentConfigFile, type AgentDefinition, type AgentModule, type Channel, type ChannelFactory, type Skill } from "@junejs/core/agent-config";
+import { assembleAgent, parseSkill, type AgentConfigFile, type AgentDefinition, type AgentModule, type Channel, type ChannelFactory, type Skill, type ToolEntry } from "@junejs/core/agent-config";
 import type { Connection } from "@junejs/core/connections";
 
 // `_`-prefixed files are private by convention (mirrors the app/ router) — most
@@ -72,10 +73,12 @@ export async function discoverAgentModule(dir: string): Promise<AgentModule> {
     }
   }
 
-  const tools: AnyAction[] = [];
+  // A tool file default-exports one tool OR an array of tools (an integration
+  // like googleDriveTools()); assembly flattens arrays.
+  const tools: ToolEntry[] = [];
   for (const f of await scan(join(dir, "tools"), ".ts")) {
     const mod = await import(pathToFileURL(f).href);
-    if (mod.default) tools.push(mod.default as AnyAction);
+    if (mod.default) tools.push(mod.default as ToolEntry);
   }
 
   const skills: Skill[] = [];