@tailorkit/vite 0.1.0-beta.34 → 0.1.0-beta.36

package/dist/builder.mjs

@@ -1,4 +1,4 @@
-import { d as createTailorKitUploadManifest, f as tailorkitUploadManifestSchema, l as drizzleGenerateArguments, o as checkAppSchema, r as getClientSourceFiles, u as appDatabasePaths } from "./file-routes-CjOIw7fH.mjs";
+import { d as createTailorKitUploadManifest, f as tailorkitUploadManifestSchema, l as drizzleGenerateArguments, o as checkAppSchema, r as getClientSourceFiles, u as appDatabasePaths } from "./file-routes-7N97Zavb.mjs";
 import { loadTailorKitConfig } from "./config-loader.mjs";
 import { spawn } from "node:child_process";
 import { access } from "node:fs/promises";

package/dist/{file-routes-CjOIw7fH.mjs → file-routes-7N97Zavb.mjs}

@@ -187,6 +187,14 @@ const callScopes = (program) => {
 		if (node.kind === "var") while (!target.functionScope && target.parent) target = target.parent;
 		for (const declaration of node.declarations) bind(declaration.id, target);
 	};
+	const visitFunction = (node, scope, visit) => {
+		if (node.type === "FunctionDeclaration") bind(node.id, scope);
+		const parameters = createScope(scope, true);
+		if (node.type !== "ArrowFunctionExpression") bind(node.id, parameters);
+		for (const parameter of node.params) bind(parameter, parameters);
+		for (const parameter of node.params) visit(parameter, parameters);
+		if (node.body) visit(node.body, createScope(parameters, true));
+	};
 	const visit = (node, initialScope) => {
 		let scope = initialScope;
 		scopes.set(node, scope);
@@ -200,7 +208,7 @@ const callScopes = (program) => {
 			case "FunctionDeclaration":
 			case "FunctionExpression":
 			case "ArrowFunctionExpression":
-				visitFunction(node, scope);
+				visitFunction(node, scope, visit);
 				return;
 			case "ClassDeclaration":
 			case "ClassExpression":
@@ -230,14 +238,6 @@ const callScopes = (program) => {
 		}
 		for (const child of childNodes(node)) visit(child, scope);
 	};
-	const visitFunction = (node, scope) => {
-		if (node.type === "FunctionDeclaration") bind(node.id, scope);
-		const parameters = createScope(scope, true);
-		if (node.type !== "ArrowFunctionExpression") bind(node.id, parameters);
-		for (const parameter of node.params) bind(parameter, parameters);
-		for (const parameter of node.params) visit(parameter, parameters);
-		if (node.body) visit(node.body, createScope(parameters, true));
-	};
 	visit(program, createScope(void 0, true));
 	return scopes;
 };
@@ -257,9 +257,10 @@ const createDefineViewMatcher = (program) => {
 //#region src/builder/file-routes.ts
 const isObjectValue = (value) => typeof value === "object" && value !== null;
 const clientRuntimeImport = "tailorkit:file-client-runtime";
-const routePath = (name, filename) => {
+const routePath = (name, filename, indexView = false) => {
 	const segments = name.split(/[./]/u);
 	if (segments.some((segment) => !segment || segment === "..")) throw new Error(`${filename} has an empty route segment. Use route.nested-route.view.tsx.`);
+	if (indexView && segments.at(-1) === "index") segments.pop();
 	return `/${segments.join("/")}`;
 };
 const fileViewLocation = (filename, root) => {
@@ -269,10 +270,22 @@ const fileViewLocation = (filename, root) => {
 	if (!(slot !== void 0 && slot !== null && slot !== "")) return;
 	const basename = routeSegments.join("/").slice(0, -9);
 	return {
-		path: routePath(basename, filename),
+		path: routePath(basename, filename, true),
 		slot
 	};
 };
+const validateViewOptions = (options, expected, filename) => {
+	const properties = /* @__PURE__ */ new Set();
+	for (const property of options.properties) {
+		if (property.type !== "Property" || property.computed && property.key.type !== "Literal") throw new Error(`${filename}: use named defineView properties so the build can validate the slot and view against the file location.`);
+		let key;
+		if (property.key.type === "Identifier") key = property.key.name;
+		else if (property.key.type === "Literal") key = String(property.key.value);
+		if ((key === "slot" || key === "view") && (property.kind !== "init" || property.method || property.value.type !== "Literal" || property.value.value !== expected[key])) throw new Error(`${filename}: defineView ${key} must be ${JSON.stringify(expected[key])} to match the file location. Omit ${key} to infer it, or move the file to the matching location.`);
+		if (key !== void 0) properties.add(key);
+	}
+	return properties;
+};
 /** Fill missing defineView options before instance extraction, on both build sides. */
 const inferFileView = (initialSource, filename, root) => {
 	let source = initialSource;
@@ -287,12 +300,10 @@ const inferFileView = (initialSource, filename, root) => {
 		if (isDefineViewCall(node)) {
 			const [options] = node.arguments;
 			if (options?.type !== "ObjectExpression") throw new Error(`${filename}: file views require defineView with an inline options object.`);
-			const properties = new Set(options.properties.flatMap((property) => {
-				if (property.type !== "Property" || property.computed) return [];
-				if (property.key.type === "Identifier") return [property.key.name];
-				if (property.key.type === "Literal") return [String(property.key.value)];
-				return [];
-			}));
+			const properties = validateViewOptions(options, {
+				slot,
+				view: viewPath
+			}, filename);
 			const defaults = [properties.has("slot") ? "" : `slot: ${JSON.stringify(slot)},`, properties.has("view") ? "" : `view: ${JSON.stringify(viewPath)},`].join("");
 			if (defaults) edits.push({
 				position: options.start + 1,
@@ -327,10 +338,10 @@ const discoverFileRoutes = async (root) => {
 			if (entry.isDirectory()) await scan(filename, slot ?? entry.name, slot !== void 0 && slot !== null && slot !== "" ? `${prefix}${entry.name}/` : "");
 			else if (entry.isFile() && slot !== void 0 && slot !== null && slot !== "") {
 				if (entry.name.endsWith(".view.tsx")) {
-					fileViewLocation(filename, root);
-					views.push({
+					const location = fileViewLocation(filename, root);
+					if (location) views.push({
 						filename,
-						slot
+						...location
 					});
 				} else if (entry.name === "root.tsx" && !prefix) roots.push({
 					filename,
@@ -380,7 +391,7 @@ const fileClientSource = async (root) => {
 	const rootModule = discovered.root ? `${module(discovered.root)} }` : "undefined";
 	const roots = discovered.roots.map((entry) => `${module(entry)}, slot: ${JSON.stringify(entry.slot)} }`);
 	const layouts = discovered.layouts.map((entry) => `${module(entry)}, slot: ${JSON.stringify(entry.slot)}, path: ${JSON.stringify(entry.path)} }`);
-	const views = discovered.views.map((entry) => `${module(entry)}, slot: ${JSON.stringify(entry.slot)} }`);
+	const views = discovered.views.map((entry) => `${module(entry)}, slot: ${JSON.stringify(entry.slot)}, path: ${JSON.stringify(entry.path)} }`);
 	return `${imports.join("\n")}\nexport default createFileClient({ root: ${rootModule}, roots: [${roots.join(",")}], layouts: [${layouts.join(",")}], views: [${views.join(",")}] });`;
 };
 /** A generated entry in build output lets the bundler track imports normally.

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as createDefineViewMatcher, c as getBuildEnvironment, d as createTailorKitUploadManifest, f as tailorkitUploadManifestSchema, i as inferFileView, n as fileRoutesPlugin, o as checkAppSchema, s as isMissingFile, t as createFileRouteEntry, u as appDatabasePaths } from "./file-routes-CjOIw7fH.mjs";
+import { a as createDefineViewMatcher, c as getBuildEnvironment, d as createTailorKitUploadManifest, f as tailorkitUploadManifestSchema, i as inferFileView, n as fileRoutesPlugin, o as checkAppSchema, s as isMissingFile, t as createFileRouteEntry, u as appDatabasePaths } from "./file-routes-7N97Zavb.mjs";
 import { loadTailorKitConfig } from "./config-loader.mjs";
 import { createRequire } from "node:module";
 import { z } from "zod";
@@ -162,6 +162,18 @@ const isFunction = (node) => [
 /** Lexical references, excluding property names and bindings local to a function/block. */
 const freeNames = (root) => {
 	const references = /* @__PURE__ */ new Set();
+	const pattern = (node, scope, visit) => {
+		if (node.type === "AssignmentPattern") {
+			visit(node.right, scope);
+			pattern(node.left, scope, visit);
+		} else if (node.type === "ObjectPattern") for (const p of node.properties) if (p.type === "Property") {
+			if (p.computed) visit(p.key, scope);
+			pattern(p.value, scope, visit);
+		} else pattern(p.argument, scope, visit);
+		else if (node.type === "ArrayPattern") {
+			for (const element of node.elements) if (element) pattern(element, scope, visit);
+		} else if (node.type === "RestElement") pattern(node.argument, scope, visit);
+	};
 	const visit = (node, parent) => {
 		if (node.type === "Identifier") {
 			if (!parent.has(node.name)) references.add(node.name);
@@ -184,7 +196,7 @@ const freeNames = (root) => {
 				for (const child of children(body)) hoisted(child);
 			};
 			if (node.body) hoisted(node.body);
-			for (const p of node.params) pattern(p, scope);
+			for (const p of node.params) pattern(p, scope, visit);
 			if (node.body) visit(node.body, scope);
 			return;
 		}
@@ -194,7 +206,7 @@ const freeNames = (root) => {
 			return;
 		}
 		if (node.type === "VariableDeclarator") {
-			pattern(node.id, parent);
+			pattern(node.id, parent, visit);
 			if (node.init) visit(node.init, parent);
 			return;
 		}
@@ -210,7 +222,7 @@ const freeNames = (root) => {
 		}
 		if (node.type === "CatchClause") {
 			const scope = /* @__PURE__ */ new Set([...parent, ...boundNames(node.param)]);
-			if (node.param) pattern(node.param, scope);
+			if (node.param) pattern(node.param, scope, visit);
 			visit(node.body, scope);
 			return;
 		}
@@ -233,18 +245,6 @@ const freeNames = (root) => {
 		if (node.type === "BreakStatement" || node.type === "ContinueStatement") return;
 		for (const child of children(node)) visit(child, parent);
 	};
-	const pattern = (node, scope) => {
-		if (node.type === "AssignmentPattern") {
-			visit(node.right, scope);
-			pattern(node.left, scope);
-		} else if (node.type === "ObjectPattern") for (const p of node.properties) if (p.type === "Property") {
-			if (p.computed) visit(p.key, scope);
-			pattern(p.value, scope);
-		} else pattern(p.argument, scope);
-		else if (node.type === "ArrayPattern") {
-			for (const element of node.elements) if (element) pattern(element, scope);
-		} else if (node.type === "RestElement") pattern(node.argument, scope);
-	};
 	visit(root, /* @__PURE__ */ new Set());
 	return references;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailorkit/vite",
-  "version": "0.1.0-beta.34",
+  "version": "0.1.0-beta.36",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@tailorkit/app": "0.1.0-beta.34",
+    "@tailorkit/app": "0.1.0-beta.36",
     "cosmiconfig": "^10.0.1",
     "zod": "^4.6.5"
   },