@timber-js/app 0.2.0-alpha.111 → 0.2.0-alpha.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.111",
+  "version": "0.2.0-alpha.112",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/cli-schema-sync.ts

@@ -8,9 +8,10 @@
  */
 
 import { readFileSync, writeFileSync, existsSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { join } from 'node:path';
 import { scanRoutes } from './routing/scanner.js';
 import type { SegmentNode } from './routing/types.js';
+import { resolveAppDir } from './plugin-context.js';
 
 /**
  * Collect all unique bracket-keyed dynamic segment names from the route tree.
@@ -151,11 +152,7 @@ export interface SchemaSyncResult {
  * Run the schema sync: scan filesystem, diff against schema, append missing.
  */
 export function runSchemaSync(projectRoot: string): SchemaSyncResult {
-  const appDir = resolve(projectRoot, 'app');
-
-  if (!existsSync(appDir)) {
-    throw new Error(`[timber] No app/ directory found at ${appDir}`);
-  }
+  const appDir = resolveAppDir(projectRoot);
 
   const filesystemSegments = collectDynamicSegments(appDir);
 

package/dist/_chunks/cli-schema-sync-BvvuK8Rp.js

@@ -1,137 +0,0 @@
-import { t as scanRoutes } from "./scanner-DmfoB7iK.js";
-import { join, resolve } from "node:path";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-//#region src/cli-schema-sync.ts
-/**
-* `timber schema sync` — scan filesystem for dynamic segments and append
-* missing entries to app/schema.ts with `codec.string` defaults.
-*
-* Only adds, never removes or modifies existing entries.
-*
-* Design doc: design/41-global-params.md §Auto-Scaffolding
-*/
-/**
-* Collect all unique bracket-keyed dynamic segment names from the route tree.
-* Returns entries like '[artistSlug]', '[...slug]', '[[...topic]]'.
-*/
-function collectDynamicSegments(appDir) {
-	const tree = scanRoutes(appDir);
-	const segments = /* @__PURE__ */ new Set();
-	walkSegments(tree.root, segments);
-	return [...segments].sort();
-}
-function walkSegments(node, segments) {
-	if (node.paramName) segments.add(node.segmentName);
-	for (const child of node.children) walkSegments(child, segments);
-	for (const slot of Object.values(node.slots)) walkSegments(slot, segments);
-}
-/**
-* Parse existing bracket keys from an app/schema.ts file.
-* Uses regex to find keys in segmentParams: { '[key]': ... } blocks.
-*/
-function parseExistingSchemaKeys(content) {
-	const keys = [];
-	const re = /['"](\[{1,2}(?:\.{3})?\w+\]{1,2})['"]\s*:/g;
-	let m;
-	while ((m = re.exec(content)) !== null) keys.push(m[1]);
-	return keys;
-}
-/** Schema file extensions to check. */
-var SCHEMA_EXTENSIONS = [
-	".ts",
-	".tsx",
-	".js",
-	".jsx"
-];
-/**
-* Find the schema file path if it exists.
-*/
-function findSchemaFile(appDir) {
-	for (const ext of SCHEMA_EXTENSIONS) {
-		const p = join(appDir, `schema${ext}`);
-		if (existsSync(p)) return p;
-	}
-}
-/**
-* Generate the content for a new app/schema.ts with the given segment keys.
-*/
-function generateNewSchema(segments) {
-	const lines = [];
-	lines.push("import { defineSchema, codec } from '@timber-js/app';");
-	lines.push("");
-	lines.push("export default defineSchema({");
-	lines.push("  segmentParams: {");
-	for (const seg of segments) lines.push(`    '${seg}': codec.string,`);
-	lines.push("  },");
-	lines.push("});");
-	lines.push("");
-	return lines.join("\n");
-}
-/**
-* Append missing segment entries to an existing schema file.
-* Inserts new entries before the closing `}` of segmentParams.
-*/
-function appendToSchema(content, newSegments) {
-	const spIndex = content.indexOf("segmentParams");
-	if (spIndex === -1) throw new Error("[timber] Could not find segmentParams in schema file. Expected a defineSchema({ segmentParams: { ... } }) call.");
-	const openBrace = content.indexOf("{", spIndex + 13);
-	if (openBrace === -1) throw new Error("[timber] Could not find opening brace for segmentParams.");
-	let depth = 1;
-	let i = openBrace + 1;
-	while (i < content.length && depth > 0) {
-		if (content[i] === "{") depth++;
-		else if (content[i] === "}") depth--;
-		i++;
-	}
-	const closeBrace = i - 1;
-	const existingLine = content.slice(openBrace, closeBrace).match(/^(\s+)['"]\[/m);
-	const indent = existingLine ? existingLine[1] : "    ";
-	const insertion = newSegments.map((seg) => `${indent}'${seg}': codec.string,`).join("\n");
-	const before = content.slice(0, closeBrace);
-	const after = content.slice(closeBrace);
-	return before + (before.trimEnd().endsWith(",") ? "\n" : "\n") + insertion + "\n" + after;
-}
-/**
-* Run the schema sync: scan filesystem, diff against schema, append missing.
-*/
-function runSchemaSync(projectRoot) {
-	const appDir = resolve(projectRoot, "app");
-	if (!existsSync(appDir)) throw new Error(`[timber] No app/ directory found at ${appDir}`);
-	const filesystemSegments = collectDynamicSegments(appDir);
-	if (filesystemSegments.length === 0) return {
-		filesystemSegments: [],
-		existingSegments: [],
-		addedSegments: [],
-		created: false
-	};
-	const schemaPath = findSchemaFile(appDir);
-	if (!schemaPath) {
-		writeFileSync(join(appDir, "schema.ts"), generateNewSchema(filesystemSegments), "utf-8");
-		return {
-			filesystemSegments,
-			existingSegments: [],
-			addedSegments: filesystemSegments,
-			created: true
-		};
-	}
-	const content = readFileSync(schemaPath, "utf-8");
-	const existingSegments = parseExistingSchemaKeys(content);
-	const missing = filesystemSegments.filter((seg) => !existingSegments.includes(seg));
-	if (missing.length === 0) return {
-		filesystemSegments,
-		existingSegments,
-		addedSegments: [],
-		created: false
-	};
-	writeFileSync(schemaPath, appendToSchema(content, missing), "utf-8");
-	return {
-		filesystemSegments,
-		existingSegments,
-		addedSegments: missing,
-		created: false
-	};
-}
-//#endregion
-export { runSchemaSync as i, findSchemaFile as n, parseExistingSchemaKeys as r, collectDynamicSegments as t };
-
-//# sourceMappingURL=cli-schema-sync-BvvuK8Rp.js.map

package/dist/_chunks/cli-schema-sync-BvvuK8Rp.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli-schema-sync-BvvuK8Rp.js","names":[],"sources":["../../src/cli-schema-sync.ts"],"sourcesContent":["/**\n * `timber schema sync` — scan filesystem for dynamic segments and append\n * missing entries to app/schema.ts with `codec.string` defaults.\n *\n * Only adds, never removes or modifies existing entries.\n *\n * Design doc: design/41-global-params.md §Auto-Scaffolding\n */\n\nimport { readFileSync, writeFileSync, existsSync } from 'node:fs';\nimport { join, resolve } from 'node:path';\nimport { scanRoutes } from './routing/scanner.js';\nimport type { SegmentNode } from './routing/types.js';\n\n/**\n * Collect all unique bracket-keyed dynamic segment names from the route tree.\n * Returns entries like '[artistSlug]', '[...slug]', '[[...topic]]'.\n */\nexport function collectDynamicSegments(appDir: string): string[] {\n  const tree = scanRoutes(appDir);\n  const segments = new Set<string>();\n  walkSegments(tree.root, segments);\n  return [...segments].sort();\n}\n\nfunction walkSegments(node: SegmentNode, segments: Set<string>): void {\n  if (node.paramName) {\n    // Reconstruct bracket key from segmentName (already has brackets)\n    segments.add(node.segmentName);\n  }\n  for (const child of node.children) {\n    walkSegments(child, segments);\n  }\n  for (const slot of Object.values(node.slots)) {\n    walkSegments(slot, segments);\n  }\n}\n\n/**\n * Parse existing bracket keys from an app/schema.ts file.\n * Uses regex to find keys in segmentParams: { '[key]': ... } blocks.\n */\nexport function parseExistingSchemaKeys(content: string): string[] {\n  const keys: string[] = [];\n  // Match quoted bracket keys like '[artistSlug]', '[...slug]', '[[...topic]]'\n  const re = /['\"](\\[{1,2}(?:\\.{3})?\\w+\\]{1,2})['\"]\\s*:/g;\n  let m: RegExpExecArray | null;\n  while ((m = re.exec(content)) !== null) {\n    keys.push(m[1]);\n  }\n  return keys;\n}\n\n/** Schema file extensions to check. */\nconst SCHEMA_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx'];\n\n/**\n * Find the schema file path if it exists.\n */\nexport function findSchemaFile(appDir: string): string | undefined {\n  for (const ext of SCHEMA_EXTENSIONS) {\n    const p = join(appDir, `schema${ext}`);\n    if (existsSync(p)) return p;\n  }\n  return undefined;\n}\n\n/**\n * Generate the content for a new app/schema.ts with the given segment keys.\n */\nfunction generateNewSchema(segments: string[]): string {\n  const lines: string[] = [];\n  lines.push(\"import { defineSchema, codec } from '@timber-js/app';\");\n  lines.push('');\n  lines.push('export default defineSchema({');\n  lines.push('  segmentParams: {');\n  for (const seg of segments) {\n    lines.push(`    '${seg}': codec.string,`);\n  }\n  lines.push('  },');\n  lines.push('});');\n  lines.push('');\n  return lines.join('\\n');\n}\n\n/**\n * Append missing segment entries to an existing schema file.\n * Inserts new entries before the closing `}` of segmentParams.\n */\nfunction appendToSchema(content: string, newSegments: string[]): string {\n  // Find the closing brace of segmentParams object.\n  // Strategy: find the last entry in segmentParams block, insert after it.\n  // Look for the pattern: segmentParams: { ... }\n  // We find the closing `},` or `}` that ends segmentParams.\n\n  // Find \"segmentParams\" key position\n  const spIndex = content.indexOf('segmentParams');\n  if (spIndex === -1) {\n    throw new Error(\n      '[timber] Could not find segmentParams in schema file. ' +\n        'Expected a defineSchema({ segmentParams: { ... } }) call.'\n    );\n  }\n\n  // Find the opening brace after segmentParams\n  const openBrace = content.indexOf('{', spIndex + 'segmentParams'.length);\n  if (openBrace === -1) {\n    throw new Error('[timber] Could not find opening brace for segmentParams.');\n  }\n\n  // Count braces to find the matching close\n  let depth = 1;\n  let i = openBrace + 1;\n  while (i < content.length && depth > 0) {\n    if (content[i] === '{') depth++;\n    else if (content[i] === '}') depth--;\n    i++;\n  }\n  // i now points to just after the closing brace\n  const closeBrace = i - 1;\n\n  // Detect indentation from existing entries\n  const existingLine = content.slice(openBrace, closeBrace).match(/^(\\s+)['\"]\\[/m);\n  const indent = existingLine ? existingLine[1] : '    ';\n\n  // Build insertion text\n  const insertion = newSegments.map((seg) => `${indent}'${seg}': codec.string,`).join('\\n');\n\n  // Insert before the closing brace\n  const before = content.slice(0, closeBrace);\n  const after = content.slice(closeBrace);\n\n  // Add newline if the content before doesn't end with one\n  const separator = before.trimEnd().endsWith(',') ? '\\n' : '\\n';\n\n  return before + separator + insertion + '\\n' + after;\n}\n\nexport interface SchemaSyncResult {\n  /** Segments found in the filesystem. */\n  filesystemSegments: string[];\n  /** Segments already defined in app/schema.ts. */\n  existingSegments: string[];\n  /** Segments that were added. */\n  addedSegments: string[];\n  /** Whether a new schema file was created. */\n  created: boolean;\n}\n\n/**\n * Run the schema sync: scan filesystem, diff against schema, append missing.\n */\nexport function runSchemaSync(projectRoot: string): SchemaSyncResult {\n  const appDir = resolve(projectRoot, 'app');\n\n  if (!existsSync(appDir)) {\n    throw new Error(`[timber] No app/ directory found at ${appDir}`);\n  }\n\n  const filesystemSegments = collectDynamicSegments(appDir);\n\n  if (filesystemSegments.length === 0) {\n    return {\n      filesystemSegments: [],\n      existingSegments: [],\n      addedSegments: [],\n      created: false,\n    };\n  }\n\n  const schemaPath = findSchemaFile(appDir);\n\n  if (!schemaPath) {\n    // Create new schema file\n    const newPath = join(appDir, 'schema.ts');\n    writeFileSync(newPath, generateNewSchema(filesystemSegments), 'utf-8');\n    return {\n      filesystemSegments,\n      existingSegments: [],\n      addedSegments: filesystemSegments,\n      created: true,\n    };\n  }\n\n  // Read existing schema and find missing segments\n  const content = readFileSync(schemaPath, 'utf-8');\n  const existingSegments = parseExistingSchemaKeys(content);\n  const missing = filesystemSegments.filter((seg) => !existingSegments.includes(seg));\n\n  if (missing.length === 0) {\n    return {\n      filesystemSegments,\n      existingSegments,\n      addedSegments: [],\n      created: false,\n    };\n  }\n\n  // Append missing segments\n  const updated = appendToSchema(content, missing);\n  writeFileSync(schemaPath, updated, 'utf-8');\n\n  return {\n    filesystemSegments,\n    existingSegments,\n    addedSegments: missing,\n    created: false,\n  };\n}\n"],"mappings":"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"}

package/dist/_chunks/cli-schema-sync-i2OEL2-p.js

@@ -1,2 +0,0 @@
-import { i as runSchemaSync } from "./cli-schema-sync-BvvuK8Rp.js";
-export { runSchemaSync };