@rafters/veneer 0.0.3 → 0.0.5

package/dist/bin.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { i as relativeFile } from "./lint-Tvq5uHHS.mjs";
-import { t as check } from "./check-CbVCXbX6.mjs";
+import { i as relativeFile } from "./lint-9HD2n_oJ.mjs";
+import { t as check } from "./check-BWUfShkM.mjs";
 import path from "node:path";
 import { existsSync, realpathSync } from "node:fs";
 import { parseArgs } from "node:util";

package/dist/{check-CbVCXbX6.mjs → check-BWUfShkM.mjs}

@@ -1,4 +1,4 @@
-import { a as resolveComponents, c as readConfig, n as report, o as ProjectError, r as compareCodePoints, s as openProject, t as lint } from "./lint-Tvq5uHHS.mjs";
+import { a as resolveComponents, c as readConfig, n as report, o as ProjectError, r as compareCodePoints, s as openProject, t as lint } from "./lint-9HD2n_oJ.mjs";
 import path from "node:path";
 import { mkdir, rename, rm, writeFile } from "node:fs/promises";
 import { lstatSync } from "node:fs";

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { n as report, o as ProjectError, s as openProject, t as lint } from "./lint-Tvq5uHHS.mjs";
-import { n as writeDocs, t as check } from "./check-CbVCXbX6.mjs";
+import { n as report, o as ProjectError, s as openProject, t as lint } from "./lint-9HD2n_oJ.mjs";
+import { n as writeDocs, t as check } from "./check-BWUfShkM.mjs";
 export { ProjectError, check, lint, openProject, report, writeDocs };

package/dist/{lint-Tvq5uHHS.mjs → lint-9HD2n_oJ.mjs}

@@ -812,6 +812,7 @@ const CLASS_ATTRIBUTES = /* @__PURE__ */ new Set([
 ]);
 const MAX_RESOLVE_STEPS = 8;
 const realPath = (file) => existsSync(file) ? realpathSync(file) : file;
+const isClassesFile = (file) => file.endsWith(".classes.ts");
 function qualifies(reader, sourceFile) {
 	const { fileName } = sourceFile;
 	const stem = fileName.replace(/\.(tsx|astro)$/, "");
@@ -879,11 +880,21 @@ function utilityOf(className) {
 	}
 	return className.slice(start);
 }
-function constString(reader, identifier) {
+function constInitializer(reader, identifier) {
 	const { ts, tc } = reader;
 	const declaration = resolveSymbol(reader, tc.getSymbolAtLocation(identifier))?.valueDeclaration;
-	if (!declaration || !ts.isVariableDeclaration(declaration) || !(ts.getCombinedNodeFlags(declaration) & ts.NodeFlags.Const) || !declaration.initializer) return;
-	return ts.isStringLiteralLike(declaration.initializer) ? declaration.initializer : void 0;
+	return declaration && ts.isVariableDeclaration(declaration) && ts.getCombinedNodeFlags(declaration) & ts.NodeFlags.Const ? declaration.initializer : void 0;
+}
+function constString(reader, identifier) {
+	const initializer = constInitializer(reader, identifier);
+	return initializer && reader.ts.isStringLiteralLike(initializer) ? initializer : void 0;
+}
+function constProperty(reader, { expression, name }) {
+	const { ts } = reader;
+	let object = ts.isIdentifier(expression) ? constInitializer(reader, expression) : void 0;
+	while (object && (ts.isAsExpression(object) || ts.isSatisfiesExpression(object))) object = object.expression;
+	if (!object || !ts.isObjectLiteralExpression(object)) return void 0;
+	for (const property of object.properties) if (ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && property.name.text === name.text) return ts.isStringLiteralLike(property.initializer) ? property.initializer : void 0;
 }
 function collectClassStrings(reader, sourceFile, isOwnSource, node, found) {
 	const { ts } = reader;
@@ -894,9 +905,17 @@ function collectClassStrings(reader, sourceFile, isOwnSource, node, found) {
 		if (!literal || !declaredIn) return;
 		if (declaredIn === sourceFile) found.set(literal, literal);
 		else if (isOwnSource(declaredIn.fileName)) found.set(node, literal);
-	} else ts.forEachChild(node, (child) => {
-		collectClassStrings(reader, sourceFile, isOwnSource, child, found);
-	});
+	} else {
+		const literal = ts.isPropertyAccessExpression(node) ? constProperty(reader, node) : void 0;
+		const declaredIn = literal?.getSourceFile();
+		if (literal && declaredIn && (declaredIn === sourceFile || isOwnSource(declaredIn.fileName))) {
+			found.set(node, literal);
+			return;
+		}
+		ts.forEachChild(node, (child) => {
+			collectClassStrings(reader, sourceFile, isOwnSource, child, found);
+		});
+	}
 }
 function bracketsInLiteral(reader, file, sourceFile, at, literal) {
 	return [...literal.getText(literal.getSourceFile()).slice(1, -1).matchAll(/\S+/g)].flatMap((match) => {
@@ -920,8 +939,12 @@ function bracketsInLiteral(reader, file, sourceFile, at, literal) {
 function bracketValues(reader, file, sourceFile, isOwnSource) {
 	const { ts } = reader;
 	const strings = /* @__PURE__ */ new Map();
+	const everyLiteral = isClassesFile(sourceFile.fileName);
+	if (everyLiteral && !isOwnSource(sourceFile.fileName)) return [];
 	const visit = (node) => {
-		if (ts.isJsxAttribute(node) && node.initializer) {
+		if (everyLiteral) {
+			if (ts.isStringLiteralLike(node)) strings.set(node, node);
+		} else if (ts.isJsxAttribute(node) && node.initializer) {
 			const { name } = node;
 			const attribute = ts.isJsxNamespacedName(name) ? `${name.namespace.text}:${name.name.text}` : name.text;
 			if (CLASS_ATTRIBUTES.has(attribute)) collectClassStrings(reader, sourceFile, isOwnSource, node.initializer, strings);
@@ -968,8 +991,19 @@ function valueAttributes({ ts }, sourceFile) {
 	visit(sourceFile);
 	return found;
 }
+const FREEHAND_HELP = "use Container or Grid for layout";
+function openingElements({ ts }, sourceFile) {
+	const found = [];
+	const visit = (node) => {
+		if (ts.isJsxOpeningLikeElement(node)) found.push(node);
+		ts.forEachChild(node, visit);
+	};
+	visit(sourceFile);
+	return found;
+}
+const isDiv = (ts, { tagName }) => ts.isIdentifier(tagName) && tagName.text === "div";
 async function lint(project, options) {
-	const files = options.files ?? project.checker.getRootFileNames().filter((file) => file.endsWith(".tsx") || file.endsWith(".astro")).map((file) => relativeFile(project.root, file));
+	const files = options.files?.filter((file) => !file.endsWith(".ts") || isClassesFile(file)) ?? project.checker.getRootFileNames().filter((file) => file.endsWith(".tsx") || file.endsWith(".astro") || isClassesFile(file)).map((file) => relativeFile(project.root, file));
 	const perFile = [];
 	for (const file of files) perFile.push([file, await project.diagnostics(file)]);
 	const program = project.program();
@@ -1081,6 +1115,33 @@ async function lint(project, options) {
 		}
 		return flagged;
 	};
+	const isComponentUse = (element) => {
+		if (isDiv(ts, element)) return false;
+		const component = resolveTag(reader, element);
+		const declaration = component?.valueDeclaration ?? component?.declarations?.[0];
+		return declaration !== void 0 && isCheckedUse(declaration.getSourceFile());
+	};
+	const freehandDivs = (file, sourceFile) => {
+		const elements = openingElements(reader, sourceFile);
+		const divs = elements.filter((element) => isDiv(ts, element));
+		if (divs.length === 0 || !elements.some(isComponentUse)) return [];
+		return divs.flatMap(({ tagName }) => {
+			const start = positionOf(reader, sourceFile, tagName.getStart(sourceFile));
+			const end = positionOf(reader, sourceFile, tagName.end);
+			if (!start || !end) return [];
+			return [{
+				file,
+				line: start.line,
+				column: start.column,
+				endLine: end.line,
+				endColumn: end.column,
+				severity: "warning",
+				code: "rafters(freehand-div)",
+				message: "a div laid by hand around rafters components",
+				help: FREEHAND_HELP
+			}];
+		});
+	};
 	const found = [];
 	for (const [file, diagnostics] of perFile) {
 		const absolute = path.join(project.root, file);
@@ -1093,17 +1154,18 @@ async function lint(project, options) {
 		if (!isExempt(sourceFile)) {
 			found.push(...bracketValues(reader, file, sourceFile, isOwnSource));
 			found.push(...await badValues(file, sourceFile));
+			found.push(...freehandDivs(file, sourceFile));
 		}
 	}
 	return found.sort((a, b) => compareCodePoints(a.file, b.file) || a.line - b.line || a.column - b.column);
 }
-function firstLine(message) {
-	return (typeof message === "string" ? message : message.value).split(/\r\n|\r|\n/, 1)[0] ?? "";
+function messageLines(message) {
+	return (typeof message === "string" ? message : message.value).split(/\r\n|\r|\n/);
 }
 function report(diagnostics) {
 	const lines = diagnostics.flatMap(({ file, line, column, severity, code, message, help }) => {
-		const entry = `${file}:${line}:${column} ${severity} ${code} ${firstLine(message)}`;
-		return help === void 0 ? [entry] : [entry, `  help: ${help}`];
+		const entry = messageLines(message).map((text, index) => index === 0 ? `${file}:${line}:${column} ${severity} ${code} ${text}` : `  ${text}`);
+		return help === void 0 ? entry : [...entry, `  help: ${help}`];
 	});
 	const count = diagnostics.length;
 	lines.push(count === 1 ? "1 problem" : `${count} problems`);

package/dist/worker.mjs

@@ -1,4 +1,4 @@
-import { c as readConfig, s as openProject, t as lint } from "./lint-Tvq5uHHS.mjs";
+import { c as readConfig, s as openProject, t as lint } from "./lint-9HD2n_oJ.mjs";
 import path from "node:path";
 import { existsSync } from "node:fs";
 import { promisify } from "node:util";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rafters/veneer",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Docs, rafters check and the composite compile for rafters projects",
   "license": "MIT",
   "repository": {