@warlock.js/core 5.31.0 → 5.33.0

package/esm/tooling/check/check-report.types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"check-report.types.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/check-report.types.ts"],"mappings":";;;;cAGa,WAAA;AAAb;AAAA,KAGY,aAAA,WAAwB,WAAW;;;AAHiD;AAGhG;;;KAQY,eAAA;AARmC;AAAA,KAWnC,SAAA;EACV,IAAA,EAAM,aAAA;EACN,MAAA,EAAQ,eAAe;EACvB,UAAA,UANyB;EAQzB,MAAA;AAAA;;;;;;;;;;AAAM;AAgBR;;;cAAa,gBAAA;EAAA;;;;;KAOD,aAAA,WAAwB,gBAAA,eAA+B,gBAAgB;;iBAGnE,aAAA,CAAc,QAAA,WAAmB,cAAA,KAAmB,aAAa;;KAWrE,WAAA;EACV,aAAA,KAZ2B;EAc3B,EAAA;EACA,QAAA,EAAU,aAAA,EAfqC;EAiB/C,OAAA,WAjBkE;EAmBlE,KAAA;EACA,KAAA,EAAO,SAAA,IATG;EAWV,QAAA,EAAU,cAAA;EACV,OAAA;IACE,MAAA;IACA,QAAA,UAHQ;IAKR,IAAA,UALsB;IAOtB,WAAA;EAAA;AAAA"}
+{"version":3,"file":"check-report.types.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/check-report.types.ts"],"mappings":";;;qBAGa;;YAGD,wBAAwB;;;;;;;YAQxB;;YAGA;EACV,MAAM;EACN,QAAQ;EACR;;EAEA;;;;;;;;;;;;;;;qBAgBW;WACX;WACA;WACA;;;YAIU,wBAAwB,+BAA+B;;wBAGnD,cAAc,mBAAmB,mBAAmB;;YAWxD;EACV;;EAEA;EACA,UAAU;;EAEV;;EAEA;EACA,OAAO;;EAEP,UAAU;EACV;IACE;IACA;;IAEA;;IAEA"}

package/esm/tooling/check/code-style-conventions.mjs

@@ -1,10 +1,10 @@
+import { expressionOf, forEachChild, isAwaitExpression, isCallExpression, isClassDeclaration, isComputedPropertyName, isFunctionDeclaration, isIdentifier, isLiteralTypeNode, isPropertySignature, isUnionTypeNode, isVariableStatement, nameNode, topLevelDeclarations, valueText } from "../syntax/ast.mjs";
 import { isMemberAccess, keyName, memberName, unwrap } from "./source-ast.mjs";
-import ts from "typescript";
 
 //#region ../../packages/core/src/tooling/check/code-style-conventions.ts
-const AWAITED_LOGGER_NAMES = new Set(["log", "logger"]);
+const AWAITED_LOGGER_NAMES = /* @__PURE__ */ new Set(["log", "logger"]);
 /** Logger methods that return the logger synchronously since 5.30. */
-const SYNC_LOG_METHODS = new Set([
+const SYNC_LOG_METHODS = /* @__PURE__ */ new Set([
 	"info",
 	"warn",
 	"error",
@@ -15,36 +15,36 @@ const SYNC_LOG_METHODS = new Set([
 	"assert"
 ]);
 function checkAwaitLog(node, findings) {
-	if (!ts.isAwaitExpression(node)) return;
-	const argument = unwrap(node.expression);
-	if (!ts.isCallExpression(argument)) return;
-	const callee = unwrap(argument.expression);
+	if (!isAwaitExpression(node)) return;
+	const argument = unwrap(expressionOf(node));
+	if (!isCallExpression(argument)) return;
+	const callee = unwrap(expressionOf(argument));
 	if (!isMemberAccess(callee)) return;
-	const owner = unwrap(callee.expression);
-	if (!ts.isIdentifier(owner) || !AWAITED_LOGGER_NAMES.has(owner.text)) return;
+	const owner = unwrap(expressionOf(callee));
+	if (!isIdentifier(owner) || !AWAITED_LOGGER_NAMES.has(valueText(owner))) return;
 	const method = memberName(callee);
 	if (!method || !SYNC_LOG_METHODS.has(method)) return;
 	findings.push({
 		code: "WL9010",
 		severity: "warning",
 		node,
-		message: `\`${owner.text}.${method}()\` returns the logger synchronously; \`await\` does nothing here. Remove it (use \`await log.flush()\` to wait for delivery).`
+		message: `\`${valueText(owner)}.${method}()\` returns the logger synchronously; \`await\` does nothing here. Remove it (use \`await log.flush()\` to wait for delivery).`
 	});
 }
 /** Handler type annotations that mark a constant as a controller. */
 const HANDLER_TYPE_PATTERN = /RequestHandler$/;
 const CONTROLLER_NAME_PATTERN = /Controller$/;
 function hasHandlerType(declaration) {
-	const type = declaration.type;
-	return type !== void 0 && ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName) && HANDLER_TYPE_PATTERN.test(type.typeName.text);
+	const type = declaration.id.typeAnnotation?.typeAnnotation;
+	return type?.type === "TSTypeReference" && type.typeName.type === "Identifier" && HANDLER_TYPE_PATTERN.test(type.typeName.name);
 }
 function controllerIdentifiers(statement) {
-	if (ts.isFunctionDeclaration(statement) || ts.isClassDeclaration(statement)) return statement.name && CONTROLLER_NAME_PATTERN.test(statement.name.text) ? [statement.name] : [];
-	if (!ts.isVariableStatement(statement)) return [];
+	if (isFunctionDeclaration(statement) || isClassDeclaration(statement)) return statement.id && CONTROLLER_NAME_PATTERN.test(statement.id.name) ? [statement.id] : [];
+	if (!isVariableStatement(statement)) return [];
 	const found = [];
-	for (const declaration of statement.declarationList.declarations) {
-		if (!ts.isIdentifier(declaration.name)) continue;
-		if (CONTROLLER_NAME_PATTERN.test(declaration.name.text) || hasHandlerType(declaration)) found.push(declaration.name);
+	for (const declaration of statement.declarations) {
+		if (!isIdentifier(declaration.id)) continue;
+		if (CONTROLLER_NAME_PATTERN.test(valueText(declaration.id)) || hasHandlerType(declaration)) found.push(declaration.id);
 	}
 	return found;
 }
@@ -54,7 +54,7 @@ function ordinal(position) {
 	return `${position}th`;
 }
 function checkOneControllerPerFile(sourceFile, findings) {
-	const controllers = sourceFile.statements.flatMap(controllerIdentifiers);
+	const controllers = topLevelDeclarations(sourceFile).flatMap((node) => controllerIdentifiers(node));
 	const first = controllers[0];
 	if (!first) return;
 	controllers.slice(1).forEach((identifier, index) => {
@@ -62,23 +62,23 @@ function checkOneControllerPerFile(sourceFile, findings) {
 			code: "WL9011",
 			severity: "warning",
 			node: identifier,
-			message: `\`${identifier.text}\` is the ${ordinal(index + 2)} controller in this file (after \`${first.text}\`). Move it to its own \`*.controller.ts\` file.`
+			message: `\`${valueText(identifier)}\` is the ${ordinal(index + 2)} controller in this file (after \`${valueText(first)}\`). Move it to its own \`*.controller.ts\` file.`
 		});
 	});
 }
 /** A string/number literal type, or a union made only of them. */
 function isLiteralType(node) {
 	if (!node) return false;
-	if (ts.isLiteralTypeNode(node)) return true;
-	return ts.isUnionTypeNode(node) && node.types.every((member) => ts.isLiteralTypeNode(member));
+	if (isLiteralTypeNode(node)) return true;
+	return isUnionTypeNode(node) && node.types.every((member) => isLiteralTypeNode(member));
 }
 function checkKindDiscriminator(node, findings) {
-	if (!ts.isPropertySignature(node) || ts.isComputedPropertyName(node.name)) return;
-	if (keyName(node.name) !== "kind" || !isLiteralType(node.type)) return;
+	if (!isPropertySignature(node) || isComputedPropertyName(nameNode(node))) return;
+	if (keyName(nameNode(node)) !== "kind" || !isLiteralType(node.typeAnnotation?.typeAnnotation)) return;
 	findings.push({
 		code: "WL9012",
 		severity: "warning",
-		node: node.name,
+		node: nameNode(node),
 		message: "Name this discriminator `type`, not `kind` (the framework's convention for tagged unions)."
 	});
 }
@@ -95,7 +95,7 @@ function codeStyleFindings(sourceFile) {
 	const visit = (node) => {
 		checkAwaitLog(node, findings);
 		checkKindDiscriminator(node, findings);
-		ts.forEachChild(node, visit);
+		forEachChild(node, visit);
 	};
 	visit(sourceFile);
 	return findings;

package/esm/tooling/check/code-style-conventions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"code-style-conventions.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/code-style-conventions.ts"],"sourcesContent":["import ts from \"typescript\";\nimport { isMemberAccess, keyName, memberName, type SourceFinding, unwrap } from \"./source-ast\";\n\n// ── WL9010: await on a synchronous log call ─────────────────────────────────\n\nconst AWAITED_LOGGER_NAMES: ReadonlySet<string> = new Set([\"log\", \"logger\"]);\n\n/** Logger methods that return the logger synchronously since 5.30. */\nconst SYNC_LOG_METHODS: ReadonlySet<string> = new Set([\n  \"info\",\n  \"warn\",\n  \"error\",\n  \"debug\",\n  \"success\",\n  \"fatal\",\n  \"log\",\n  \"assert\",\n]);\n\nfunction checkAwaitLog(node: ts.Node, findings: SourceFinding[]): void {\n  if (!ts.isAwaitExpression(node)) return;\n\n  const argument = unwrap(node.expression);\n\n  if (!ts.isCallExpression(argument)) return;\n\n  const callee = unwrap(argument.expression);\n\n  if (!isMemberAccess(callee)) return;\n\n  const owner = unwrap(callee.expression);\n\n  if (!ts.isIdentifier(owner) || !AWAITED_LOGGER_NAMES.has(owner.text)) return;\n\n  const method = memberName(callee);\n\n  if (!method || !SYNC_LOG_METHODS.has(method)) return;\n\n  findings.push({\n    code: \"WL9010\",\n    severity: \"warning\",\n    node,\n    message: `\\`${owner.text}.${method}()\\` returns the logger synchronously; \\`await\\` does nothing here. Remove it (use \\`await log.flush()\\` to wait for delivery).`,\n  });\n}\n\n// ── WL9011: more than one controller in a file ──────────────────────────────\n\n/** Handler type annotations that mark a constant as a controller. */\nconst HANDLER_TYPE_PATTERN = /RequestHandler$/;\n\nconst CONTROLLER_NAME_PATTERN = /Controller$/;\n\nfunction hasHandlerType(declaration: ts.VariableDeclaration): boolean {\n  const type = declaration.type;\n\n  return (\n    type !== undefined &&\n    ts.isTypeReferenceNode(type) &&\n    ts.isIdentifier(type.typeName) &&\n    HANDLER_TYPE_PATTERN.test(type.typeName.text)\n  );\n}\n\nfunction controllerIdentifiers(statement: ts.Statement): ts.Identifier[] {\n  if (ts.isFunctionDeclaration(statement) || ts.isClassDeclaration(statement)) {\n    return statement.name && CONTROLLER_NAME_PATTERN.test(statement.name.text)\n      ? [statement.name]\n      : [];\n  }\n\n  if (!ts.isVariableStatement(statement)) return [];\n\n  const found: ts.Identifier[] = [];\n\n  for (const declaration of statement.declarationList.declarations) {\n    if (!ts.isIdentifier(declaration.name)) continue;\n\n    if (CONTROLLER_NAME_PATTERN.test(declaration.name.text) || hasHandlerType(declaration)) {\n      found.push(declaration.name);\n    }\n  }\n\n  return found;\n}\n\nfunction ordinal(position: number): string {\n  if (position === 2) return \"2nd\";\n  if (position === 3) return \"3rd\";\n\n  return `${position}th`;\n}\n\nfunction checkOneControllerPerFile(sourceFile: ts.SourceFile, findings: SourceFinding[]): void {\n  const controllers = sourceFile.statements.flatMap(controllerIdentifiers);\n  const first = controllers[0];\n\n  if (!first) return;\n\n  controllers.slice(1).forEach((identifier, index) => {\n    findings.push({\n      code: \"WL9011\",\n      severity: \"warning\",\n      node: identifier,\n      message: `\\`${identifier.text}\\` is the ${ordinal(index + 2)} controller in this file (after \\`${first.text}\\`). Move it to its own \\`*.controller.ts\\` file.`,\n    });\n  });\n}\n\n// ── WL9012: a union discriminator named `kind` ──────────────────────────────\n\n/** A string/number literal type, or a union made only of them. */\nfunction isLiteralType(node: ts.TypeNode | undefined): boolean {\n  if (!node) return false;\n  if (ts.isLiteralTypeNode(node)) return true;\n\n  return ts.isUnionTypeNode(node) && node.types.every((member) => ts.isLiteralTypeNode(member));\n}\n\nfunction checkKindDiscriminator(node: ts.Node, findings: SourceFinding[]): void {\n  if (!ts.isPropertySignature(node) || ts.isComputedPropertyName(node.name)) return;\n  if (keyName(node.name) !== \"kind\" || !isLiteralType(node.type)) return;\n\n  findings.push({\n    code: \"WL9012\",\n    severity: \"warning\",\n    node: node.name,\n    message:\n      \"Name this discriminator `type`, not `kind` (the framework's convention for tagged unions).\",\n  });\n}\n\n/**\n * The code-style conventions in one parsed file, all reported as warnings:\n *\n * - `WL9010` `await` on a synchronous `log.*()` call;\n * - `WL9011` a second (third, …) controller in one file;\n * - `WL9012` a tagged union whose discriminator is `kind` instead of `type`.\n */\nexport function codeStyleFindings(sourceFile: ts.SourceFile): SourceFinding[] {\n  const findings: SourceFinding[] = [];\n\n  checkOneControllerPerFile(sourceFile, findings);\n\n  // Every node, type nodes included: discriminators live in type literals and interfaces.\n  const visit = (node: ts.Node): void => {\n    checkAwaitLog(node, findings);\n    checkKindDiscriminator(node, findings);\n    ts.forEachChild(node, visit);\n  };\n\n  visit(sourceFile);\n\n  return findings;\n}\n"],"mappings":"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"}
+{"version":3,"file":"code-style-conventions.mjs","names":["ast.isAwaitExpression","ast.expressionOf","ast.isCallExpression","ast.isIdentifier","ast.valueText","ast.isFunctionDeclaration","ast.isClassDeclaration","ast.isVariableStatement","ast\n    .topLevelDeclarations","ast.isLiteralTypeNode","ast.isUnionTypeNode","ast.isPropertySignature","ast.isComputedPropertyName","ast.nameNode"],"sources":["../../../../../../../../../packages/core/src/tooling/check/code-style-conventions.ts"],"sourcesContent":["import * as ast from \"../syntax/ast\";\nimport { isMemberAccess, keyName, memberName, type SourceFinding, unwrap } from \"./source-ast\";\n\n// ── WL9010: await on a synchronous log call ─────────────────────────────────\n\nconst AWAITED_LOGGER_NAMES: ReadonlySet<string> = new Set([\"log\", \"logger\"]);\n\n/** Logger methods that return the logger synchronously since 5.30. */\nconst SYNC_LOG_METHODS: ReadonlySet<string> = new Set([\n  \"info\",\n  \"warn\",\n  \"error\",\n  \"debug\",\n  \"success\",\n  \"fatal\",\n  \"log\",\n  \"assert\",\n]);\n\nfunction checkAwaitLog(node: ast.Node, findings: SourceFinding[]): void {\n  if (!ast.isAwaitExpression(node)) return;\n\n  const argument = unwrap(ast.expressionOf(node));\n\n  if (!ast.isCallExpression(argument)) return;\n\n  const callee = unwrap(ast.expressionOf(argument));\n\n  if (!isMemberAccess(callee)) return;\n\n  const owner = unwrap(ast.expressionOf(callee));\n\n  if (!ast.isIdentifier(owner) || !AWAITED_LOGGER_NAMES.has(ast.valueText(owner))) return;\n\n  const method = memberName(callee);\n\n  if (!method || !SYNC_LOG_METHODS.has(method)) return;\n\n  findings.push({\n    code: \"WL9010\",\n    severity: \"warning\",\n    node,\n    message: `\\`${ast.valueText(owner)}.${method}()\\` returns the logger synchronously; \\`await\\` does nothing here. Remove it (use \\`await log.flush()\\` to wait for delivery).`,\n  });\n}\n\n// ── WL9011: more than one controller in a file ──────────────────────────────\n\n/** Handler type annotations that mark a constant as a controller. */\nconst HANDLER_TYPE_PATTERN = /RequestHandler$/;\n\nconst CONTROLLER_NAME_PATTERN = /Controller$/;\n\nfunction hasHandlerType(declaration: ast.VariableDeclarator): boolean {\n  const type = declaration.id.typeAnnotation?.typeAnnotation;\n  return (\n    type?.type === \"TSTypeReference\" &&\n    type.typeName.type === \"Identifier\" &&\n    HANDLER_TYPE_PATTERN.test(type.typeName.name)\n  );\n}\n\nfunction controllerIdentifiers(statement: ast.Node): ast.Identifier[] {\n  if (ast.isFunctionDeclaration(statement) || ast.isClassDeclaration(statement)) {\n    return statement.id && CONTROLLER_NAME_PATTERN.test(statement.id.name) ? [statement.id] : [];\n  }\n\n  if (!ast.isVariableStatement(statement)) return [];\n\n  const found: ast.Identifier[] = [];\n\n  for (const declaration of statement.declarations) {\n    if (!ast.isIdentifier(declaration.id)) continue;\n\n    if (\n      CONTROLLER_NAME_PATTERN.test(ast.valueText(declaration.id)) ||\n      hasHandlerType(declaration)\n    ) {\n      found.push(declaration.id);\n    }\n  }\n\n  return found;\n}\n\nfunction ordinal(position: number): string {\n  if (position === 2) return \"2nd\";\n  if (position === 3) return \"3rd\";\n\n  return `${position}th`;\n}\n\nfunction checkOneControllerPerFile(sourceFile: ast.SourceFile, findings: SourceFinding[]): void {\n  const controllers = ast\n    .topLevelDeclarations(sourceFile)\n    .flatMap((node) => controllerIdentifiers(node));\n  const first = controllers[0];\n\n  if (!first) return;\n\n  controllers.slice(1).forEach((identifier, index) => {\n    findings.push({\n      code: \"WL9011\",\n      severity: \"warning\",\n      node: identifier,\n      message: `\\`${ast.valueText(identifier)}\\` is the ${ordinal(index + 2)} controller in this file (after \\`${ast.valueText(first)}\\`). Move it to its own \\`*.controller.ts\\` file.`,\n    });\n  });\n}\n\n// ── WL9012: a union discriminator named `kind` ──────────────────────────────\n\n/** A string/number literal type, or a union made only of them. */\nfunction isLiteralType(node: ast.Node | undefined): boolean {\n  if (!node) return false;\n  if (ast.isLiteralTypeNode(node)) return true;\n\n  return ast.isUnionTypeNode(node) && node.types.every((member) => ast.isLiteralTypeNode(member));\n}\n\nfunction checkKindDiscriminator(node: ast.Node, findings: SourceFinding[]): void {\n  if (!ast.isPropertySignature(node) || ast.isComputedPropertyName(ast.nameNode(node))) return;\n  if (keyName(ast.nameNode(node)) !== \"kind\" || !isLiteralType(node.typeAnnotation?.typeAnnotation))\n    return;\n\n  findings.push({\n    code: \"WL9012\",\n    severity: \"warning\",\n    node: ast.nameNode(node),\n    message:\n      \"Name this discriminator `type`, not `kind` (the framework's convention for tagged unions).\",\n  });\n}\n\n/**\n * The code-style conventions in one parsed file, all reported as warnings:\n *\n * - `WL9010` `await` on a synchronous `log.*()` call;\n * - `WL9011` a second (third, …) controller in one file;\n * - `WL9012` a tagged union whose discriminator is `kind` instead of `type`.\n */\nexport function codeStyleFindings(sourceFile: ast.SourceFile): SourceFinding[] {\n  const findings: SourceFinding[] = [];\n\n  checkOneControllerPerFile(sourceFile, findings);\n\n  // Every node, type nodes included: discriminators live in type literals and interfaces.\n  const visit = (node: ast.Node): void => {\n    checkAwaitLog(node, findings);\n    checkKindDiscriminator(node, findings);\n    ast.forEachChild(node, visit);\n  };\n\n  visit(sourceFile);\n\n  return findings;\n}\n"],"mappings":";;;;AAKA,MAAM,uCAA4C,IAAI,IAAI,CAAC,OAAO,QAAQ,CAAC;;AAG3E,MAAM,mCAAwC,IAAI,IAAI;CACpD;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF,CAAC;AAED,SAAS,cAAc,MAAgB,UAAiC;CACtE,IAAI,CAACA,kBAAsB,IAAI,GAAG;CAElC,MAAM,WAAW,OAAOC,aAAiB,IAAI,CAAC;CAE9C,IAAI,CAACC,iBAAqB,QAAQ,GAAG;CAErC,MAAM,SAAS,OAAOD,aAAiB,QAAQ,CAAC;CAEhD,IAAI,CAAC,eAAe,MAAM,GAAG;CAE7B,MAAM,QAAQ,OAAOA,aAAiB,MAAM,CAAC;CAE7C,IAAI,CAACE,aAAiB,KAAK,KAAK,CAAC,qBAAqB,IAAIC,UAAc,KAAK,CAAC,GAAG;CAEjF,MAAM,SAAS,WAAW,MAAM;CAEhC,IAAI,CAAC,UAAU,CAAC,iBAAiB,IAAI,MAAM,GAAG;CAE9C,SAAS,KAAK;EACZ,MAAM;EACN,UAAU;EACV;EACA,SAAS,KAAKA,UAAc,KAAK,EAAE,GAAG,OAAO;CAC/C,CAAC;AACH;;AAKA,MAAM,uBAAuB;AAE7B,MAAM,0BAA0B;AAEhC,SAAS,eAAe,aAA8C;CACpE,MAAM,OAAO,YAAY,GAAG,gBAAgB;CAC5C,OACE,MAAM,SAAS,qBACf,KAAK,SAAS,SAAS,gBACvB,qBAAqB,KAAK,KAAK,SAAS,IAAI;AAEhD;AAEA,SAAS,sBAAsB,WAAuC;CACpE,IAAIC,sBAA0B,SAAS,KAAKC,mBAAuB,SAAS,GAC1E,OAAO,UAAU,MAAM,wBAAwB,KAAK,UAAU,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC;CAG7F,IAAI,CAACC,oBAAwB,SAAS,GAAG,OAAO,CAAC;CAEjD,MAAM,QAA0B,CAAC;CAEjC,KAAK,MAAM,eAAe,UAAU,cAAc;EAChD,IAAI,CAACJ,aAAiB,YAAY,EAAE,GAAG;EAEvC,IACE,wBAAwB,KAAKC,UAAc,YAAY,EAAE,CAAC,KAC1D,eAAe,WAAW,GAE1B,MAAM,KAAK,YAAY,EAAE;CAE7B;CAEA,OAAO;AACT;AAEA,SAAS,QAAQ,UAA0B;CACzC,IAAI,aAAa,GAAG,OAAO;CAC3B,IAAI,aAAa,GAAG,OAAO;CAE3B,OAAO,GAAG,SAAS;AACrB;AAEA,SAAS,0BAA0B,YAA4B,UAAiC;CAC9F,MAAM,cAAcI,qBACI,UAAU,CAAC,CAChC,SAAS,SAAS,sBAAsB,IAAI,CAAC;CAChD,MAAM,QAAQ,YAAY;CAE1B,IAAI,CAAC,OAAO;CAEZ,YAAY,MAAM,CAAC,CAAC,CAAC,SAAS,YAAY,UAAU;EAClD,SAAS,KAAK;GACZ,MAAM;GACN,UAAU;GACV,MAAM;GACN,SAAS,KAAKJ,UAAc,UAAU,EAAE,YAAY,QAAQ,QAAQ,CAAC,EAAE,oCAAoCA,UAAc,KAAK,EAAE;EAClI,CAAC;CACH,CAAC;AACH;;AAKA,SAAS,cAAc,MAAqC;CAC1D,IAAI,CAAC,MAAM,OAAO;CAClB,IAAIK,kBAAsB,IAAI,GAAG,OAAO;CAExC,OAAOC,gBAAoB,IAAI,KAAK,KAAK,MAAM,OAAO,WAAWD,kBAAsB,MAAM,CAAC;AAChG;AAEA,SAAS,uBAAuB,MAAgB,UAAiC;CAC/E,IAAI,CAACE,oBAAwB,IAAI,KAAKC,uBAA2BC,SAAa,IAAI,CAAC,GAAG;CACtF,IAAI,QAAQA,SAAa,IAAI,CAAC,MAAM,UAAU,CAAC,cAAc,KAAK,gBAAgB,cAAc,GAC9F;CAEF,SAAS,KAAK;EACZ,MAAM;EACN,UAAU;EACV,MAAMA,SAAa,IAAI;EACvB,SACE;CACJ,CAAC;AACH;;;;;;;;AASA,SAAgB,kBAAkB,YAA6C;CAC7E,MAAM,WAA4B,CAAC;CAEnC,0BAA0B,YAAY,QAAQ;CAG9C,MAAM,SAAS,SAAyB;EACtC,cAAc,MAAM,QAAQ;EAC5B,uBAAuB,MAAM,QAAQ;EACrC,aAAiB,MAAM,KAAK;CAC9B;CAEA,MAAM,UAAU;CAEhB,OAAO;AACT"}

package/esm/tooling/check/conventions-step.d.mts

@@ -1,8 +1,7 @@
 import { ToolingProblem } from "../problem.mjs";
-
 //#region ../../packages/core/src/tooling/check/conventions-step.d.ts
 /** Matches a project-relative path of a file the framework loads by itself. */
-declare function isAutoLoadedFile(relativePath: string): boolean;
+export declare function isAutoLoadedFile(relativePath: string): boolean;
 /**
  * The convention problems in one source file, in source order:
  *
@@ -21,14 +20,13 @@ declare function isAutoLoadedFile(relativePath: string): boolean;
  * A `// warlock-check-ignore WL9006` comment on the problem's line or the line
  * above silences that code there; without codes it silences every one.
  */
-declare function checkFileConventions(relativePath: string, source: string, cwd: string): ToolingProblem[];
+export declare function checkFileConventions(relativePath: string, source: string, cwd: string): ToolingProblem[];
 /** `WL9004` when the project tsconfig turns on legacy decorators. */
-declare function checkTsconfigConventions(cwd: string, project?: string): ToolingProblem[];
+export declare function checkTsconfigConventions(cwd: string, project?: string): ToolingProblem[];
 /**
  * Run every convention check over `files` (project-relative) plus the
  * project tsconfig.
  */
-declare function runConventions(cwd: string, files: readonly string[], project?: string): ToolingProblem[];
+export declare function runConventions(cwd: string, files: readonly string[], project?: string): ToolingProblem[];
 //#endregion
-export { checkFileConventions, checkTsconfigConventions, isAutoLoadedFile, runConventions };
 //# sourceMappingURL=conventions-step.d.mts.map

package/esm/tooling/check/conventions-step.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"conventions-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/conventions-step.ts"],"mappings":";;;;iBAegB,gBAAA,CAAiB,YAAoB;AAArD;;;;AAAqD;AAwLrD;;;;;;;;;AAIiB;AAmBjB;;;AA/MA,iBAwLgB,oBAAA,CACd,YAAA,UACA,MAAA,UACA,GAAA,WACC,cAAc;;iBAmBD,wBAAA,CAAyB,GAAA,UAAa,OAAA,YAA4B,cAAc;;;AAAA;AAyChG;iBAAgB,cAAA,CACd,GAAA,UACA,KAAA,qBACA,OAAA,YACC,cAAc"}
+{"version":3,"file":"conventions-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/conventions-step.ts"],"mappings":";;;wBAiBgB,iBAAiB;;;;;;;;;;;;;;;;;;;wBAiKjB,qBACd,sBACA,gBACA,cACC;;wBAmBa,yBAAyB,aAAa,mBAA4B;;;;;wBAyClE,eACd,aACA,0BACA,mBACC"}

package/esm/tooling/check/conventions-step.mjs

@@ -1,10 +1,12 @@
+import { parseSourceFile } from "../syntax/ast.mjs";
+import { importSpecifiers } from "../syntax/imports.mjs";
 import { createProblem } from "../problem.mjs";
 import { positionOf } from "./source-ast.mjs";
 import { codeStyleFindings } from "./code-style-conventions.mjs";
 import { securityFindings } from "./security-conventions.mjs";
 import path from "node:path";
 import { existsSync, readFileSync } from "node:fs";
-import ts from "typescript";
+import { parse } from "jsonc-parser";
 
 //#region ../../packages/core/src/tooling/check/conventions-step.ts
 /** Extensions tried when resolving an extension-less import. */
@@ -43,20 +45,7 @@ function resolveSpecifier(specifier, importer, cwd) {
 }
 /** Every module specifier a source file imports, with its position. */
 function importsOf(sourceFile) {
-	const found = [];
-	const visit = (node) => {
-		if ((ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) && node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier)) found.push({
-			specifier: node.moduleSpecifier.text,
-			node: node.moduleSpecifier
-		});
-		else if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword && node.arguments[0] && ts.isStringLiteral(node.arguments[0])) found.push({
-			specifier: node.arguments[0].text,
-			node: node.arguments[0]
-		});
-		ts.forEachChild(node, visit);
-	};
-	visit(sourceFile);
-	return found;
+	return importSpecifiers(sourceFile.fileName, sourceFile.text);
 }
 /** `// warlock-check-ignore [WLxxxx …]` on a problem's line or the line above it. */
 const IGNORE_COMMENT = /\/[/*]\s*warlock-check-ignore\b(.*)/;
@@ -135,7 +124,7 @@ function findingProblem(sourceFile, relativePath, finding) {
 * above silences that code there; without codes it silences every one.
 */
 function checkFileConventions(relativePath, source, cwd) {
-	const sourceFile = ts.createSourceFile(relativePath, source, ts.ScriptTarget.Latest, true);
+	const sourceFile = parseSourceFile(relativePath, source);
 	const problems = [...importProblems(sourceFile, relativePath, cwd), ...[...securityFindings(sourceFile), ...codeStyleFindings(sourceFile)].map((finding) => findingProblem(sourceFile, relativePath, finding))];
 	const lines = source.split(/\r?\n/);
 	return problems.filter((problem) => problem.line === null || !isIgnored(lines, problem.line, problem.code)).sort((first, second) => (first.line ?? 0) - (second.line ?? 0) || (first.column ?? 0) - (second.column ?? 0));
@@ -145,8 +134,8 @@ function checkTsconfigConventions(cwd, project = "tsconfig.json") {
 	const file = path.join(cwd, project);
 	if (!existsSync(file)) return [];
 	const text = readFileSync(file, "utf8");
-	const read = ts.parseConfigFileTextToJson(file, text);
-	const options = typeof read.config === "object" && read.config !== null ? Reflect.get(read.config, "compilerOptions") : void 0;
+	const config = parse(text);
+	const options = typeof config === "object" && config !== null ? Reflect.get(config, "compilerOptions") : void 0;
 	if (typeof options !== "object" || options === null || Reflect.get(options, "experimentalDecorators") !== true) return [];
 	const index = text.indexOf("experimentalDecorators");
 	const before = index === -1 ? "" : text.slice(0, index);

package/esm/tooling/check/conventions-step.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"conventions-step.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/conventions-step.ts"],"sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport ts from \"typescript\";\nimport { createProblem, type ToolingProblem } from \"../problem\";\nimport { codeStyleFindings } from \"./code-style-conventions\";\nimport { securityFindings } from \"./security-conventions\";\nimport { positionOf, type SourceFinding } from \"./source-ast\";\n\n/** Extensions tried when resolving an extension-less import. */\nconst RESOLVE_EXTENSIONS = [\".ts\", \".tsx\", \".js\", \".jsx\", \"/index.ts\", \"/index.tsx\"];\n\n/** Test files may import anything on purpose. */\nconst TEST_FILE = /\\.(?:test|spec)\\.[cm]?[jt]sx?$/i;\n\n/** Matches a project-relative path of a file the framework loads by itself. */\nexport function isAutoLoadedFile(relativePath: string): boolean {\n  return (\n    /^src\\/app\\/main\\.tsx?$/.test(relativePath) ||\n    /^src\\/app\\/[^/]+\\/(?:routes|main|worker)\\.tsx?$/.test(relativePath) ||\n    /^src\\/app\\/.+\\/events\\/[^/]+\\.tsx?$/.test(relativePath)\n  );\n}\n\n/** The module folder (`src/app/<module>`) a project-relative path lives in, if any. */\nfunction moduleOf(relativePath: string): string | undefined {\n  return /^src\\/app\\/([^/]+)\\//.exec(relativePath)?.[1];\n}\n\nfunction toPosix(file: string): string {\n  return file.split(path.sep).join(\"/\");\n}\n\n/** Resolve a relative or `app/...` specifier to a project-relative file, if it exists. */\nfunction resolveSpecifier(specifier: string, importer: string, cwd: string): string | undefined {\n  let base: string;\n\n  if (specifier.startsWith(\".\")) {\n    base = path.resolve(path.dirname(path.join(cwd, importer)), specifier);\n  } else if (specifier.startsWith(\"app/\")) {\n    base = path.join(cwd, \"src\", specifier);\n  } else {\n    return undefined;\n  }\n\n  const candidates = [base, ...RESOLVE_EXTENSIONS.map((extension) => `${base}${extension}`)];\n  const withoutJs = base.replace(/\\.jsx?$/, \"\");\n\n  if (withoutJs !== base) {\n    candidates.push(...RESOLVE_EXTENSIONS.map((extension) => `${withoutJs}${extension}`));\n  }\n\n  const found = candidates.find(\n    (candidate) => existsSync(candidate) && path.extname(candidate) !== \"\",\n  );\n\n  return found ? toPosix(path.relative(cwd, found)) : undefined;\n}\n\n/** Every module specifier a source file imports, with its position. */\nfunction importsOf(sourceFile: ts.SourceFile): { specifier: string; node: ts.Node }[] {\n  const found: { specifier: string; node: ts.Node }[] = [];\n\n  const visit = (node: ts.Node) => {\n    if (\n      (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) &&\n      node.moduleSpecifier &&\n      ts.isStringLiteral(node.moduleSpecifier)\n    ) {\n      found.push({ specifier: node.moduleSpecifier.text, node: node.moduleSpecifier });\n    } else if (\n      ts.isCallExpression(node) &&\n      node.expression.kind === ts.SyntaxKind.ImportKeyword &&\n      node.arguments[0] &&\n      ts.isStringLiteral(node.arguments[0])\n    ) {\n      found.push({ specifier: node.arguments[0].text, node: node.arguments[0] });\n    }\n\n    ts.forEachChild(node, visit);\n  };\n\n  visit(sourceFile);\n\n  return found;\n}\n\n/** `// warlock-check-ignore [WLxxxx …]` on a problem's line or the line above it. */\nconst IGNORE_COMMENT = /\\/[/*]\\s*warlock-check-ignore\\b(.*)/;\n\n/** Whether an ignore comment on `line` (1-based) or the line before covers `code`. */\nfunction isIgnored(lines: readonly string[], line: number, code: string): boolean {\n  for (const text of [lines[line - 1], lines[line - 2]]) {\n    const match = text === undefined ? null : IGNORE_COMMENT.exec(text);\n\n    if (!match) continue;\n\n    const codes = match[1]?.match(/WL\\d{4}/g);\n\n    if (!codes || codes.includes(code)) return true;\n  }\n\n  return false;\n}\n\n/** The import conventions (`WL9001`–`WL9003`) of one parsed file. */\nfunction importProblems(\n  sourceFile: ts.SourceFile,\n  relativePath: string,\n  cwd: string,\n): ToolingProblem[] {\n  const problems: ToolingProblem[] = [];\n  const importerModule = moduleOf(relativePath);\n\n  for (const { specifier, node } of importsOf(sourceFile)) {\n    const at = { file: relativePath, ...positionOf(sourceFile, node) };\n\n    if (specifier.startsWith(\".\") && /\\.jsx?$/.test(specifier)) {\n      problems.push(\n        createProblem({\n          code: \"WL9002\",\n          source: \"convention\",\n          message: `Import \"${specifier}\" ends in a .js extension.`,\n          ...at,\n        }),\n      );\n    }\n\n    const target = resolveSpecifier(specifier, relativePath, cwd);\n\n    if (!target) continue;\n\n    if (!TEST_FILE.test(relativePath) && isAutoLoadedFile(target)) {\n      problems.push(\n        createProblem({\n          code: \"WL9001\",\n          source: \"convention\",\n          message: `\"${specifier}\" imports ${target}, which the framework loads by itself.`,\n          ...at,\n        }),\n      );\n    }\n\n    const targetModule = moduleOf(target);\n\n    if (\n      specifier.startsWith(\".\") &&\n      importerModule !== undefined &&\n      targetModule !== undefined &&\n      importerModule !== targetModule\n    ) {\n      const alias = `app/${target.replace(/^src\\/app\\//, \"\").replace(/\\.[cm]?[jt]sx?$/, \"\")}`;\n\n      problems.push(\n        createProblem({\n          code: \"WL9003\",\n          source: \"convention\",\n          message: `\"${specifier}\" reaches from module \"${importerModule}\" into \"${targetModule}\"; import \"${alias}\" instead.`,\n          ...at,\n        }),\n      );\n    }\n  }\n\n  return problems;\n}\n\nfunction findingProblem(\n  sourceFile: ts.SourceFile,\n  relativePath: string,\n  finding: SourceFinding,\n): ToolingProblem {\n  return createProblem({\n    code: finding.code,\n    source: \"convention\",\n    severity: finding.severity ?? \"error\",\n    message: finding.message,\n    file: relativePath,\n    ...positionOf(sourceFile, finding.node),\n  });\n}\n\n/**\n * The convention problems in one source file, in source order:\n *\n * - `WL9001` an import of a file the framework loads by itself (`routes.ts`,\n *   `main.ts`, `worker.ts`, `events/*`) — importing it registers it twice;\n * - `WL9002` a relative import ending in `.js`;\n * - `WL9003` a relative import from one `src/app/<module>` into another, which\n *   should use the `app/<module>/...` alias;\n * - `WL9005`–`WL9009` the security conventions (see `securityFindings`):\n *   `request.all()` into a query or service, a mutating route with no guard\n *   and no `public: true`, a redirect target from request input, sensitive\n *   values in logs, unbounded regexes on request input;\n * - `WL9010`–`WL9012` warnings: `await log.*()`, a second controller in one\n *   file, a `kind` discriminator.\n *\n * A `// warlock-check-ignore WL9006` comment on the problem's line or the line\n * above silences that code there; without codes it silences every one.\n */\nexport function checkFileConventions(\n  relativePath: string,\n  source: string,\n  cwd: string,\n): ToolingProblem[] {\n  const sourceFile = ts.createSourceFile(relativePath, source, ts.ScriptTarget.Latest, true);\n  const problems = [\n    ...importProblems(sourceFile, relativePath, cwd),\n    ...[...securityFindings(sourceFile), ...codeStyleFindings(sourceFile)].map((finding) =>\n      findingProblem(sourceFile, relativePath, finding),\n    ),\n  ];\n  const lines = source.split(/\\r?\\n/);\n\n  return problems\n    .filter((problem) => problem.line === null || !isIgnored(lines, problem.line, problem.code))\n    .sort(\n      (first, second) =>\n        (first.line ?? 0) - (second.line ?? 0) || (first.column ?? 0) - (second.column ?? 0),\n    );\n}\n\n/** `WL9004` when the project tsconfig turns on legacy decorators. */\nexport function checkTsconfigConventions(cwd: string, project = \"tsconfig.json\"): ToolingProblem[] {\n  const file = path.join(cwd, project);\n\n  if (!existsSync(file)) return [];\n\n  const text = readFileSync(file, \"utf8\");\n  const read = ts.parseConfigFileTextToJson(file, text);\n  const options: unknown =\n    typeof read.config === \"object\" && read.config !== null\n      ? Reflect.get(read.config, \"compilerOptions\")\n      : undefined;\n\n  if (\n    typeof options !== \"object\" ||\n    options === null ||\n    Reflect.get(options, \"experimentalDecorators\") !== true\n  ) {\n    return [];\n  }\n\n  const index = text.indexOf(\"experimentalDecorators\");\n  const before = index === -1 ? \"\" : text.slice(0, index);\n  const line = index === -1 ? null : before.split(\"\\n\").length;\n  const column = index === -1 ? null : index - before.lastIndexOf(\"\\n\");\n\n  return [\n    createProblem({\n      code: \"WL9004\",\n      source: \"convention\",\n      message: '\"experimentalDecorators\": true switches TypeScript to legacy decorators.',\n      file: toPosix(project),\n      line,\n      column,\n    }),\n  ];\n}\n\n/**\n * Run every convention check over `files` (project-relative) plus the\n * project tsconfig.\n */\nexport function runConventions(\n  cwd: string,\n  files: readonly string[],\n  project?: string,\n): ToolingProblem[] {\n  const problems = checkTsconfigConventions(cwd, project);\n\n  for (const file of files) {\n    let source: string;\n\n    try {\n      source = readFileSync(path.join(cwd, file), \"utf8\");\n    } catch {\n      continue;\n    }\n\n    problems.push(...checkFileConventions(file, source, cwd));\n  }\n\n  return problems;\n}\n"],"mappings":"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"}
+{"version":3,"file":"conventions-step.mjs","names":["ast.parseSourceFile"],"sources":["../../../../../../../../../packages/core/src/tooling/check/conventions-step.ts"],"sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { parse } from \"jsonc-parser\";\nimport { importSpecifiers } from \"../syntax/imports\";\nimport * as ast from \"../syntax/ast\";\nimport { createProblem, type ToolingProblem } from \"../problem\";\nimport { codeStyleFindings } from \"./code-style-conventions\";\nimport { securityFindings } from \"./security-conventions\";\nimport { positionOf, type SourceFinding } from \"./source-ast\";\n\n/** Extensions tried when resolving an extension-less import. */\nconst RESOLVE_EXTENSIONS = [\".ts\", \".tsx\", \".js\", \".jsx\", \"/index.ts\", \"/index.tsx\"];\n\n/** Test files may import anything on purpose. */\nconst TEST_FILE = /\\.(?:test|spec)\\.[cm]?[jt]sx?$/i;\n\n/** Matches a project-relative path of a file the framework loads by itself. */\nexport function isAutoLoadedFile(relativePath: string): boolean {\n  return (\n    /^src\\/app\\/main\\.tsx?$/.test(relativePath) ||\n    /^src\\/app\\/[^/]+\\/(?:routes|main|worker)\\.tsx?$/.test(relativePath) ||\n    /^src\\/app\\/.+\\/events\\/[^/]+\\.tsx?$/.test(relativePath)\n  );\n}\n\n/** The module folder (`src/app/<module>`) a project-relative path lives in, if any. */\nfunction moduleOf(relativePath: string): string | undefined {\n  return /^src\\/app\\/([^/]+)\\//.exec(relativePath)?.[1];\n}\n\nfunction toPosix(file: string): string {\n  return file.split(path.sep).join(\"/\");\n}\n\n/** Resolve a relative or `app/...` specifier to a project-relative file, if it exists. */\nfunction resolveSpecifier(specifier: string, importer: string, cwd: string): string | undefined {\n  let base: string;\n\n  if (specifier.startsWith(\".\")) {\n    base = path.resolve(path.dirname(path.join(cwd, importer)), specifier);\n  } else if (specifier.startsWith(\"app/\")) {\n    base = path.join(cwd, \"src\", specifier);\n  } else {\n    return undefined;\n  }\n\n  const candidates = [base, ...RESOLVE_EXTENSIONS.map((extension) => `${base}${extension}`)];\n  const withoutJs = base.replace(/\\.jsx?$/, \"\");\n\n  if (withoutJs !== base) {\n    candidates.push(...RESOLVE_EXTENSIONS.map((extension) => `${withoutJs}${extension}`));\n  }\n\n  const found = candidates.find(\n    (candidate) => existsSync(candidate) && path.extname(candidate) !== \"\",\n  );\n\n  return found ? toPosix(path.relative(cwd, found)) : undefined;\n}\n\n/** Every module specifier a source file imports, with its position. */\nfunction importsOf(sourceFile: ast.SourceFile): { specifier: string; node: ast.Node }[] {\n  return importSpecifiers(sourceFile.fileName, sourceFile.text);\n}\n\n/** `// warlock-check-ignore [WLxxxx …]` on a problem's line or the line above it. */\nconst IGNORE_COMMENT = /\\/[/*]\\s*warlock-check-ignore\\b(.*)/;\n\n/** Whether an ignore comment on `line` (1-based) or the line before covers `code`. */\nfunction isIgnored(lines: readonly string[], line: number, code: string): boolean {\n  for (const text of [lines[line - 1], lines[line - 2]]) {\n    const match = text === undefined ? null : IGNORE_COMMENT.exec(text);\n\n    if (!match) continue;\n\n    const codes = match[1]?.match(/WL\\d{4}/g);\n\n    if (!codes || codes.includes(code)) return true;\n  }\n\n  return false;\n}\n\n/** The import conventions (`WL9001`–`WL9003`) of one parsed file. */\nfunction importProblems(\n  sourceFile: ast.SourceFile,\n  relativePath: string,\n  cwd: string,\n): ToolingProblem[] {\n  const problems: ToolingProblem[] = [];\n  const importerModule = moduleOf(relativePath);\n\n  for (const { specifier, node } of importsOf(sourceFile)) {\n    const at = { file: relativePath, ...positionOf(sourceFile, node) };\n\n    if (specifier.startsWith(\".\") && /\\.jsx?$/.test(specifier)) {\n      problems.push(\n        createProblem({\n          code: \"WL9002\",\n          source: \"convention\",\n          message: `Import \"${specifier}\" ends in a .js extension.`,\n          ...at,\n        }),\n      );\n    }\n\n    const target = resolveSpecifier(specifier, relativePath, cwd);\n\n    if (!target) continue;\n\n    if (!TEST_FILE.test(relativePath) && isAutoLoadedFile(target)) {\n      problems.push(\n        createProblem({\n          code: \"WL9001\",\n          source: \"convention\",\n          message: `\"${specifier}\" imports ${target}, which the framework loads by itself.`,\n          ...at,\n        }),\n      );\n    }\n\n    const targetModule = moduleOf(target);\n\n    if (\n      specifier.startsWith(\".\") &&\n      importerModule !== undefined &&\n      targetModule !== undefined &&\n      importerModule !== targetModule\n    ) {\n      const alias = `app/${target.replace(/^src\\/app\\//, \"\").replace(/\\.[cm]?[jt]sx?$/, \"\")}`;\n\n      problems.push(\n        createProblem({\n          code: \"WL9003\",\n          source: \"convention\",\n          message: `\"${specifier}\" reaches from module \"${importerModule}\" into \"${targetModule}\"; import \"${alias}\" instead.`,\n          ...at,\n        }),\n      );\n    }\n  }\n\n  return problems;\n}\n\nfunction findingProblem(\n  sourceFile: ast.SourceFile,\n  relativePath: string,\n  finding: SourceFinding,\n): ToolingProblem {\n  return createProblem({\n    code: finding.code,\n    source: \"convention\",\n    severity: finding.severity ?? \"error\",\n    message: finding.message,\n    file: relativePath,\n    ...positionOf(sourceFile, finding.node),\n  });\n}\n\n/**\n * The convention problems in one source file, in source order:\n *\n * - `WL9001` an import of a file the framework loads by itself (`routes.ts`,\n *   `main.ts`, `worker.ts`, `events/*`) — importing it registers it twice;\n * - `WL9002` a relative import ending in `.js`;\n * - `WL9003` a relative import from one `src/app/<module>` into another, which\n *   should use the `app/<module>/...` alias;\n * - `WL9005`–`WL9009` the security conventions (see `securityFindings`):\n *   `request.all()` into a query or service, a mutating route with no guard\n *   and no `public: true`, a redirect target from request input, sensitive\n *   values in logs, unbounded regexes on request input;\n * - `WL9010`–`WL9012` warnings: `await log.*()`, a second controller in one\n *   file, a `kind` discriminator.\n *\n * A `// warlock-check-ignore WL9006` comment on the problem's line or the line\n * above silences that code there; without codes it silences every one.\n */\nexport function checkFileConventions(\n  relativePath: string,\n  source: string,\n  cwd: string,\n): ToolingProblem[] {\n  const sourceFile = ast.parseSourceFile(relativePath, source);\n  const problems = [\n    ...importProblems(sourceFile, relativePath, cwd),\n    ...[...securityFindings(sourceFile), ...codeStyleFindings(sourceFile)].map((finding) =>\n      findingProblem(sourceFile, relativePath, finding),\n    ),\n  ];\n  const lines = source.split(/\\r?\\n/);\n\n  return problems\n    .filter((problem) => problem.line === null || !isIgnored(lines, problem.line, problem.code))\n    .sort(\n      (first, second) =>\n        (first.line ?? 0) - (second.line ?? 0) || (first.column ?? 0) - (second.column ?? 0),\n    );\n}\n\n/** `WL9004` when the project tsconfig turns on legacy decorators. */\nexport function checkTsconfigConventions(cwd: string, project = \"tsconfig.json\"): ToolingProblem[] {\n  const file = path.join(cwd, project);\n\n  if (!existsSync(file)) return [];\n\n  const text = readFileSync(file, \"utf8\");\n  const config: unknown = parse(text);\n  const options: unknown =\n    typeof config === \"object\" && config !== null\n      ? Reflect.get(config, \"compilerOptions\")\n      : undefined;\n\n  if (\n    typeof options !== \"object\" ||\n    options === null ||\n    Reflect.get(options, \"experimentalDecorators\") !== true\n  ) {\n    return [];\n  }\n\n  const index = text.indexOf(\"experimentalDecorators\");\n  const before = index === -1 ? \"\" : text.slice(0, index);\n  const line = index === -1 ? null : before.split(\"\\n\").length;\n  const column = index === -1 ? null : index - before.lastIndexOf(\"\\n\");\n\n  return [\n    createProblem({\n      code: \"WL9004\",\n      source: \"convention\",\n      message: '\"experimentalDecorators\": true switches TypeScript to legacy decorators.',\n      file: toPosix(project),\n      line,\n      column,\n    }),\n  ];\n}\n\n/**\n * Run every convention check over `files` (project-relative) plus the\n * project tsconfig.\n */\nexport function runConventions(\n  cwd: string,\n  files: readonly string[],\n  project?: string,\n): ToolingProblem[] {\n  const problems = checkTsconfigConventions(cwd, project);\n\n  for (const file of files) {\n    let source: string;\n\n    try {\n      source = readFileSync(path.join(cwd, file), \"utf8\");\n    } catch {\n      continue;\n    }\n\n    problems.push(...checkFileConventions(file, source, cwd));\n  }\n\n  return problems;\n}\n"],"mappings":"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"}

package/esm/tooling/check/environment-step.d.mts

@@ -1,18 +1,16 @@
 import { ToolingProblem } from "../problem.mjs";
-
 //#region ../../packages/core/src/tooling/check/environment-step.d.ts
 /**
  * The oldest Node.js release core supports — `engines.node` in core's
  * package.json (`>=22.15`). `bin/warlock.js` refuses older versions before
  * the CLI loads; this check covers programmatic `runCheck()` calls too.
  */
-declare const MIN_NODE_VERSION = "22.15.0";
+export declare const MIN_NODE_VERSION = "22.15.0";
 /**
  * Check the running Node.js against core's minimum and the app's own
  * `engines.node` (when it is a plain `>=` range). A mismatch is a `WL8001`
  * environment problem.
  */
-declare function checkNodeVersion(cwd: string, running?: string): ToolingProblem[];
+export declare function checkNodeVersion(cwd: string, running?: string): ToolingProblem[];
 //#endregion
-export { MIN_NODE_VERSION, checkNodeVersion };
 //# sourceMappingURL=environment-step.d.mts.map

package/esm/tooling/check/environment-step.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"environment-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/environment-step.ts"],"mappings":";;;;;AASA;;;cAAa,gBAAA;;;;AAoDiF;;iBAA9E,gBAAA,CAAiB,GAAA,UAAa,OAAA,YAAkC,cAAc"}
+{"version":3,"file":"environment-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/environment-step.ts"],"mappings":";;;;;;;qBASa;;;;;;wBAoDG,iBAAiB,aAAa,mBAAkC"}

package/esm/tooling/check/environment-step.mjs

@@ -74,5 +74,5 @@ function checkNodeVersion(cwd, running = process.versions.node) {
 }
 
 //#endregion
-export { MIN_NODE_VERSION, checkNodeVersion };
+export { MIN_NODE_VERSION, checkNodeVersion, minimumOfRange };
 //# sourceMappingURL=environment-step.mjs.map

package/esm/tooling/check/index.mjs

@@ -7,4 +7,4 @@ import { findVitest, parseVitestReport, runVitest } from "./tests-step.mjs";
 import { runCheck } from "./run-check.mjs";
 import { runTests, testRunArguments } from "./run-tests.mjs";
 
-export {  };
+export { CHECK_EXIT_CODES, CHECK_STEPS, MIN_NODE_VERSION, checkExitCode, checkFileConventions, checkNodeVersion, checkTsconfigConventions, findVitest, isAutoLoadedFile, listChangedFiles, parseVitestReport, runCheck, runConventions, runGit, runLint, runTests, runVitest, testRunArguments };

package/esm/tooling/check/lint-step.d.mts

@@ -1,19 +1,12 @@
 import { ToolingProblem } from "../problem.mjs";
-
 //#region ../../packages/core/src/tooling/check/lint-step.d.ts
 /** What the lint step found, and which linters ran. */
-type LintOutcome = {
-  problems: ToolingProblem[]; /** The linters that ran (`eslint`, `oxlint`); empty when the app configures none. */
+export type LintOutcome = {
+  problems: ToolingProblem[];
+  /** The linters that ran (`eslint`, `oxlint`); empty when the app configures none. */
   linters: string[];
 };
-/**
- * Lint `files` (project-relative) with the linters the app configures, the
- * same ones `warlock dev` runs in the background: ESLint when an
- * `eslint.config.*` exists, oxlint when an oxlint config exists and the app
- * has the `oxlint` package. A config without its tool is a `WL8002`
- * environment problem.
- */
-declare function runLint(cwd: string, files: readonly string[]): Promise<LintOutcome>;
+/** Oxlint by default. ESLint requires an explicit selection and a flat config. */
+export declare function runLint(cwd: string, files: readonly string[], selection?: "oxlint" | "eslint"): Promise<LintOutcome>;
 //#endregion
-export { LintOutcome, runLint };
 //# sourceMappingURL=lint-step.d.mts.map

package/esm/tooling/check/lint-step.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"lint-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/lint-step.ts"],"mappings":";;;;KAWY,WAAA;EACV,QAAA,EAAU,cAAc,IADH;EAGrB,OAAA;AAAA;;;;;AAAO;AAuFT;;iBAAsB,OAAA,CAAQ,GAAA,UAAa,KAAA,sBAA2B,OAAO,CAAC,WAAA"}
+{"version":3,"file":"lint-step.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/lint-step.ts"],"mappings":";;;YAWY;EACV,UAAU;;EAEV;;;wBAiFoB,QACpB,aACA,0BACA,kCACC,QAAQ"}

package/esm/tooling/check/lint-step.mjs

@@ -1,5 +1,5 @@
+import { hasEslint, warnEslintDeprecation } from "../../dev-server/health-checker/eslint-support.mjs";
 import { OxlintRunner, findOxlint, hasOxlintConfig } from "../../dev-server/health-checker/oxlint-runner.mjs";
-import { hasEslint } from "../../dev-server/health-checker/default-health-checkers.mjs";
 import { createProblem } from "../problem.mjs";
 import path from "node:path";
 import { ESLint } from "eslint";
@@ -12,8 +12,9 @@ function errorMessage(error) {
 /** A missing package/plugin is the machine's install; anything else is the tool crashing. */
 function toolFailure(tool, error) {
 	const message = errorMessage(error);
+	const missing = /cannot find (?:module|package)|ERR_MODULE_NOT_FOUND/i.test(message);
 	return createProblem({
-		code: /cannot find (?:module|package)|ERR_MODULE_NOT_FOUND/i.test(message) ? "WL8002" : "WL8007",
+		code: missing ? "WL8002" : "WL8007",
 		source: "environment",
 		message: `${tool} could not run: ${message.split("\n")[0]}`
 	});
@@ -64,14 +65,8 @@ async function runOxlint(cwd, files) {
 		await runner.shutdown();
 	}
 }
-/**
-* Lint `files` (project-relative) with the linters the app configures, the
-* same ones `warlock dev` runs in the background: ESLint when an
-* `eslint.config.*` exists, oxlint when an oxlint config exists and the app
-* has the `oxlint` package. A config without its tool is a `WL8002`
-* environment problem.
-*/
-async function runLint(cwd, files) {
+/** Oxlint by default. ESLint requires an explicit selection and a flat config. */
+async function runLint(cwd, files, selection = "oxlint") {
 	const lintable = files.filter((file) => LINTABLE.test(file));
 	const problems = [];
 	const linters = [];
@@ -79,7 +74,16 @@ async function runLint(cwd, files) {
 		problems,
 		linters
 	};
-	if (hasEslint(cwd)) {
+	if (selection === "eslint") {
+		warnEslintDeprecation();
+		if (!hasEslint(cwd)) return {
+			linters: ["eslint"],
+			problems: [createProblem({
+				code: "WL8002",
+				source: "environment",
+				message: "Cannot find ESLint flat config in the app."
+			})]
+		};
 		linters.push("eslint");
 		try {
 			problems.push(...await runEslint(cwd, lintable));
@@ -87,7 +91,7 @@ async function runLint(cwd, files) {
 			problems.push(toolFailure("ESLint", error));
 		}
 	}
-	if (hasOxlintConfig(cwd)) {
+	if (selection === "oxlint" && hasOxlintConfig(cwd)) {
 		linters.push("oxlint");
 		if (!findOxlint(cwd)) problems.push(createProblem({
 			code: "WL8002",

package/esm/tooling/check/lint-step.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"lint-step.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/lint-step.ts"],"sourcesContent":["import { ESLint } from \"eslint\";\nimport path from \"node:path\";\nimport { hasEslint } from \"../../dev-server/health-checker/default-health-checkers\";\nimport {\n  findOxlint,\n  hasOxlintConfig,\n  OxlintRunner,\n} from \"../../dev-server/health-checker/oxlint-runner\";\nimport { createProblem, type ToolingProblem } from \"../problem\";\n\n/** What the lint step found, and which linters ran. */\nexport type LintOutcome = {\n  problems: ToolingProblem[];\n  /** The linters that ran (`eslint`, `oxlint`); empty when the app configures none. */\n  linters: string[];\n};\n\nconst LINTABLE = /\\.[cm]?[jt]sx?$/i;\n\nfunction errorMessage(error: unknown): string {\n  return error instanceof Error ? error.message : String(error);\n}\n\n/** A missing package/plugin is the machine's install; anything else is the tool crashing. */\nfunction toolFailure(tool: string, error: unknown): ToolingProblem {\n  const message = errorMessage(error);\n  const missing = /cannot find (?:module|package)|ERR_MODULE_NOT_FOUND/i.test(message);\n\n  return createProblem({\n    code: missing ? \"WL8002\" : \"WL8007\",\n    source: \"environment\",\n    message: `${tool} could not run: ${message.split(\"\\n\")[0]}`,\n  });\n}\n\nasync function runEslint(cwd: string, files: readonly string[]): Promise<ToolingProblem[]> {\n  // The same flat-config lookup the dev server's ESLint checker uses.\n  const eslint = new ESLint({ cwd, errorOnUnmatchedPattern: false, warnIgnored: false });\n  const results = await eslint.lintFiles([...files]);\n  const problems: ToolingProblem[] = [];\n\n  for (const result of results) {\n    const file = path.relative(cwd, result.filePath).split(path.sep).join(\"/\");\n\n    for (const message of result.messages) {\n      const error = message.severity === 2 || message.fatal === true;\n\n      problems.push(\n        createProblem({\n          code: error ? \"WL7201\" : \"WL7202\",\n          source: \"eslint\",\n          severity: error ? \"error\" : \"warning\",\n          message: message.message,\n          file,\n          line: message.line || null,\n          column: message.column || null,\n          rule: message.ruleId ?? null,\n        }),\n      );\n    }\n  }\n\n  return problems;\n}\n\nasync function runOxlint(cwd: string, files: readonly string[]): Promise<ToolingProblem[]> {\n  const runner = new OxlintRunner();\n\n  runner.initialize(cwd);\n\n  try {\n    const results = await runner.checkFiles(\n      files.map((file) => ({ path: path.join(cwd, file), relativePath: file })),\n    );\n\n    return results.flatMap((result) =>\n      [...result.errors, ...result.warnings].map((message) =>\n        createProblem({\n          code: message.type === \"error\" ? \"WL7201\" : \"WL7202\",\n          source: \"oxlint\",\n          severity: message.type,\n          message: message.message,\n          file: message.relativePath,\n          line: message.lineNumber,\n          column: message.columnNumber,\n          rule: message.ruleId ?? null,\n        }),\n      ),\n    );\n  } finally {\n    await runner.shutdown();\n  }\n}\n\n/**\n * Lint `files` (project-relative) with the linters the app configures, the\n * same ones `warlock dev` runs in the background: ESLint when an\n * `eslint.config.*` exists, oxlint when an oxlint config exists and the app\n * has the `oxlint` package. A config without its tool is a `WL8002`\n * environment problem.\n */\nexport async function runLint(cwd: string, files: readonly string[]): Promise<LintOutcome> {\n  const lintable = files.filter((file) => LINTABLE.test(file));\n  const problems: ToolingProblem[] = [];\n  const linters: string[] = [];\n\n  // ESLint lints the whole directory when handed no pattern; nothing to lint\n  // means nothing to run.\n  if (lintable.length === 0) return { problems, linters };\n\n  if (hasEslint(cwd)) {\n    linters.push(\"eslint\");\n\n    try {\n      problems.push(...(await runEslint(cwd, lintable)));\n    } catch (error) {\n      problems.push(toolFailure(\"ESLint\", error));\n    }\n  }\n\n  if (hasOxlintConfig(cwd)) {\n    linters.push(\"oxlint\");\n\n    if (!findOxlint(cwd)) {\n      problems.push(\n        createProblem({\n          code: \"WL8002\",\n          source: \"environment\",\n          message: \"An oxlint config exists but the oxlint package is not installed in the app.\",\n        }),\n      );\n    } else {\n      try {\n        problems.push(...(await runOxlint(cwd, lintable)));\n      } catch (error) {\n        problems.push(toolFailure(\"oxlint\", error));\n      }\n    }\n  }\n\n  return { problems, linters };\n}\n"],"mappings":";;;;;;;AAiBA,MAAM,WAAW;AAEjB,SAAS,aAAa,OAAwB;CAC5C,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAC9D;;AAGA,SAAS,YAAY,MAAc,OAAgC;CACjE,MAAM,UAAU,aAAa,KAAK;CAGlC,OAAO,cAAc;EACnB,MAHc,uDAAuD,KAAK,OAG9D,IAAI,WAAW;EAC3B,QAAQ;EACR,SAAS,GAAG,KAAK,kBAAkB,QAAQ,MAAM,IAAI,CAAC,CAAC;CACzD,CAAC;AACH;AAEA,eAAe,UAAU,KAAa,OAAqD;CAGzF,MAAM,UAAU,MAAM,IADH,OAAO;EAAE;EAAK,yBAAyB;EAAO,aAAa;CAAM,CACzD,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;CACjD,MAAM,WAA6B,CAAC;CAEpC,KAAK,MAAM,UAAU,SAAS;EAC5B,MAAM,OAAO,KAAK,SAAS,KAAK,OAAO,QAAQ,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG;EAEzE,KAAK,MAAM,WAAW,OAAO,UAAU;GACrC,MAAM,QAAQ,QAAQ,aAAa,KAAK,QAAQ,UAAU;GAE1D,SAAS,KACP,cAAc;IACZ,MAAM,QAAQ,WAAW;IACzB,QAAQ;IACR,UAAU,QAAQ,UAAU;IAC5B,SAAS,QAAQ;IACjB;IACA,MAAM,QAAQ,QAAQ;IACtB,QAAQ,QAAQ,UAAU;IAC1B,MAAM,QAAQ,UAAU;GAC1B,CAAC,CACH;EACF;CACF;CAEA,OAAO;AACT;AAEA,eAAe,UAAU,KAAa,OAAqD;CACzF,MAAM,SAAS,IAAI,aAAa;CAEhC,OAAO,WAAW,GAAG;CAErB,IAAI;EAKF,QAAO,MAJe,OAAO,WAC3B,MAAM,KAAK,UAAU;GAAE,MAAM,KAAK,KAAK,KAAK,IAAI;GAAG,cAAc;EAAK,EAAE,CAC1E,EAEc,CAAC,SAAS,WACtB,CAAC,GAAG,OAAO,QAAQ,GAAG,OAAO,QAAQ,CAAC,CAAC,KAAK,YAC1C,cAAc;GACZ,MAAM,QAAQ,SAAS,UAAU,WAAW;GAC5C,QAAQ;GACR,UAAU,QAAQ;GAClB,SAAS,QAAQ;GACjB,MAAM,QAAQ;GACd,MAAM,QAAQ;GACd,QAAQ,QAAQ;GAChB,MAAM,QAAQ,UAAU;EAC1B,CAAC,CACH,CACF;CACF,UAAU;EACR,MAAM,OAAO,SAAS;CACxB;AACF;;;;;;;;AASA,eAAsB,QAAQ,KAAa,OAAgD;CACzF,MAAM,WAAW,MAAM,QAAQ,SAAS,SAAS,KAAK,IAAI,CAAC;CAC3D,MAAM,WAA6B,CAAC;CACpC,MAAM,UAAoB,CAAC;CAI3B,IAAI,SAAS,WAAW,GAAG,OAAO;EAAE;EAAU;CAAQ;CAEtD,IAAI,UAAU,GAAG,GAAG;EAClB,QAAQ,KAAK,QAAQ;EAErB,IAAI;GACF,SAAS,KAAK,GAAI,MAAM,UAAU,KAAK,QAAQ,CAAE;EACnD,SAAS,OAAO;GACd,SAAS,KAAK,YAAY,UAAU,KAAK,CAAC;EAC5C;CACF;CAEA,IAAI,gBAAgB,GAAG,GAAG;EACxB,QAAQ,KAAK,QAAQ;EAErB,IAAI,CAAC,WAAW,GAAG,GACjB,SAAS,KACP,cAAc;GACZ,MAAM;GACN,QAAQ;GACR,SAAS;EACX,CAAC,CACH;OAEA,IAAI;GACF,SAAS,KAAK,GAAI,MAAM,UAAU,KAAK,QAAQ,CAAE;EACnD,SAAS,OAAO;GACd,SAAS,KAAK,YAAY,UAAU,KAAK,CAAC;EAC5C;CAEJ;CAEA,OAAO;EAAE;EAAU;CAAQ;AAC7B"}
+{"version":3,"file":"lint-step.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/tooling/check/lint-step.ts"],"sourcesContent":["import { ESLint } from \"eslint\";\nimport path from \"node:path\";\nimport { hasEslint, warnEslintDeprecation } from \"../../dev-server/health-checker/eslint-support\";\nimport {\n  findOxlint,\n  hasOxlintConfig,\n  OxlintRunner,\n} from \"../../dev-server/health-checker/oxlint-runner\";\nimport { createProblem, type ToolingProblem } from \"../problem\";\n\n/** What the lint step found, and which linters ran. */\nexport type LintOutcome = {\n  problems: ToolingProblem[];\n  /** The linters that ran (`eslint`, `oxlint`); empty when the app configures none. */\n  linters: string[];\n};\n\nconst LINTABLE = /\\.[cm]?[jt]sx?$/i;\n\nfunction errorMessage(error: unknown): string {\n  return error instanceof Error ? error.message : String(error);\n}\n\n/** A missing package/plugin is the machine's install; anything else is the tool crashing. */\nfunction toolFailure(tool: string, error: unknown): ToolingProblem {\n  const message = errorMessage(error);\n  const missing = /cannot find (?:module|package)|ERR_MODULE_NOT_FOUND/i.test(message);\n\n  return createProblem({\n    code: missing ? \"WL8002\" : \"WL8007\",\n    source: \"environment\",\n    message: `${tool} could not run: ${message.split(\"\\n\")[0]}`,\n  });\n}\n\nasync function runEslint(cwd: string, files: readonly string[]): Promise<ToolingProblem[]> {\n  // The same flat-config lookup the dev server's ESLint checker uses.\n  const eslint = new ESLint({ cwd, errorOnUnmatchedPattern: false, warnIgnored: false });\n  const results = await eslint.lintFiles([...files]);\n  const problems: ToolingProblem[] = [];\n\n  for (const result of results) {\n    const file = path.relative(cwd, result.filePath).split(path.sep).join(\"/\");\n\n    for (const message of result.messages) {\n      const error = message.severity === 2 || message.fatal === true;\n\n      problems.push(\n        createProblem({\n          code: error ? \"WL7201\" : \"WL7202\",\n          source: \"eslint\",\n          severity: error ? \"error\" : \"warning\",\n          message: message.message,\n          file,\n          line: message.line || null,\n          column: message.column || null,\n          rule: message.ruleId ?? null,\n        }),\n      );\n    }\n  }\n\n  return problems;\n}\n\nasync function runOxlint(cwd: string, files: readonly string[]): Promise<ToolingProblem[]> {\n  const runner = new OxlintRunner();\n\n  runner.initialize(cwd);\n\n  try {\n    const results = await runner.checkFiles(\n      files.map((file) => ({ path: path.join(cwd, file), relativePath: file })),\n    );\n\n    return results.flatMap((result) =>\n      [...result.errors, ...result.warnings].map((message) =>\n        createProblem({\n          code: message.type === \"error\" ? \"WL7201\" : \"WL7202\",\n          source: \"oxlint\",\n          severity: message.type,\n          message: message.message,\n          file: message.relativePath,\n          line: message.lineNumber,\n          column: message.columnNumber,\n          rule: message.ruleId ?? null,\n        }),\n      ),\n    );\n  } finally {\n    await runner.shutdown();\n  }\n}\n\n/** Oxlint by default. ESLint requires an explicit selection and a flat config. */\nexport async function runLint(\n  cwd: string,\n  files: readonly string[],\n  selection: \"oxlint\" | \"eslint\" = \"oxlint\",\n): Promise<LintOutcome> {\n  const lintable = files.filter((file) => LINTABLE.test(file));\n  const problems: ToolingProblem[] = [];\n  const linters: string[] = [];\n\n  // ESLint lints the whole directory when handed no pattern; nothing to lint\n  // means nothing to run.\n  if (lintable.length === 0) return { problems, linters };\n\n  if (selection === \"eslint\") {\n    warnEslintDeprecation();\n    if (!hasEslint(cwd)) {\n      return {\n        linters: [\"eslint\"],\n        problems: [\n          createProblem({\n            code: \"WL8002\",\n            source: \"environment\",\n            message: \"Cannot find ESLint flat config in the app.\",\n          }),\n        ],\n      };\n    }\n    linters.push(\"eslint\");\n\n    try {\n      problems.push(...(await runEslint(cwd, lintable)));\n    } catch (error) {\n      problems.push(toolFailure(\"ESLint\", error));\n    }\n  }\n\n  if (selection === \"oxlint\" && hasOxlintConfig(cwd)) {\n    linters.push(\"oxlint\");\n\n    if (!findOxlint(cwd)) {\n      problems.push(\n        createProblem({\n          code: \"WL8002\",\n          source: \"environment\",\n          message: \"An oxlint config exists but the oxlint package is not installed in the app.\",\n        }),\n      );\n    } else {\n      try {\n        problems.push(...(await runOxlint(cwd, lintable)));\n      } catch (error) {\n        problems.push(toolFailure(\"oxlint\", error));\n      }\n    }\n  }\n\n  return { problems, linters };\n}\n"],"mappings":";;;;;;;AAiBA,MAAM,WAAW;AAEjB,SAAS,aAAa,OAAwB;CAC5C,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAC9D;;AAGA,SAAS,YAAY,MAAc,OAAgC;CACjE,MAAM,UAAU,aAAa,KAAK;CAClC,MAAM,UAAU,uDAAuD,KAAK,OAAO;CAEnF,OAAO,cAAc;EACnB,MAAM,UAAU,WAAW;EAC3B,QAAQ;EACR,SAAS,GAAG,KAAK,kBAAkB,QAAQ,MAAM,IAAI,CAAC,CAAC;CACzD,CAAC;AACH;AAEA,eAAe,UAAU,KAAa,OAAqD;CAGzF,MAAM,UAAU,MAAM,IADH,OAAO;EAAE;EAAK,yBAAyB;EAAO,aAAa;CAAM,CACzD,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;CACjD,MAAM,WAA6B,CAAC;CAEpC,KAAK,MAAM,UAAU,SAAS;EAC5B,MAAM,OAAO,KAAK,SAAS,KAAK,OAAO,QAAQ,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG;EAEzE,KAAK,MAAM,WAAW,OAAO,UAAU;GACrC,MAAM,QAAQ,QAAQ,aAAa,KAAK,QAAQ,UAAU;GAE1D,SAAS,KACP,cAAc;IACZ,MAAM,QAAQ,WAAW;IACzB,QAAQ;IACR,UAAU,QAAQ,UAAU;IAC5B,SAAS,QAAQ;IACjB;IACA,MAAM,QAAQ,QAAQ;IACtB,QAAQ,QAAQ,UAAU;IAC1B,MAAM,QAAQ,UAAU;GAC1B,CAAC,CACH;EACF;CACF;CAEA,OAAO;AACT;AAEA,eAAe,UAAU,KAAa,OAAqD;CACzF,MAAM,SAAS,IAAI,aAAa;CAEhC,OAAO,WAAW,GAAG;CAErB,IAAI;EAKF,QAAO,MAJe,OAAO,WAC3B,MAAM,KAAK,UAAU;GAAE,MAAM,KAAK,KAAK,KAAK,IAAI;GAAG,cAAc;EAAK,EAAE,CAC1E,EAEc,CAAC,SAAS,WACtB,CAAC,GAAG,OAAO,QAAQ,GAAG,OAAO,QAAQ,CAAC,CAAC,KAAK,YAC1C,cAAc;GACZ,MAAM,QAAQ,SAAS,UAAU,WAAW;GAC5C,QAAQ;GACR,UAAU,QAAQ;GAClB,SAAS,QAAQ;GACjB,MAAM,QAAQ;GACd,MAAM,QAAQ;GACd,QAAQ,QAAQ;GAChB,MAAM,QAAQ,UAAU;EAC1B,CAAC,CACH,CACF;CACF,UAAU;EACR,MAAM,OAAO,SAAS;CACxB;AACF;;AAGA,eAAsB,QACpB,KACA,OACA,YAAiC,UACX;CACtB,MAAM,WAAW,MAAM,QAAQ,SAAS,SAAS,KAAK,IAAI,CAAC;CAC3D,MAAM,WAA6B,CAAC;CACpC,MAAM,UAAoB,CAAC;CAI3B,IAAI,SAAS,WAAW,GAAG,OAAO;EAAE;EAAU;CAAQ;CAEtD,IAAI,cAAc,UAAU;EAC1B,sBAAsB;EACtB,IAAI,CAAC,UAAU,GAAG,GAChB,OAAO;GACL,SAAS,CAAC,QAAQ;GAClB,UAAU,CACR,cAAc;IACZ,MAAM;IACN,QAAQ;IACR,SAAS;GACX,CAAC,CACH;EACF;EAEF,QAAQ,KAAK,QAAQ;EAErB,IAAI;GACF,SAAS,KAAK,GAAI,MAAM,UAAU,KAAK,QAAQ,CAAE;EACnD,SAAS,OAAO;GACd,SAAS,KAAK,YAAY,UAAU,KAAK,CAAC;EAC5C;CACF;CAEA,IAAI,cAAc,YAAY,gBAAgB,GAAG,GAAG;EAClD,QAAQ,KAAK,QAAQ;EAErB,IAAI,CAAC,WAAW,GAAG,GACjB,SAAS,KACP,cAAc;GACZ,MAAM;GACN,QAAQ;GACR,SAAS;EACX,CAAC,CACH;OAEA,IAAI;GACF,SAAS,KAAK,GAAI,MAAM,UAAU,KAAK,QAAQ,CAAE;EACnD,SAAS,OAAO;GACd,SAAS,KAAK,YAAY,UAAU,KAAK,CAAC;EAC5C;CAEJ;CAEA,OAAO;EAAE;EAAU;CAAQ;AAC7B"}

package/esm/tooling/check/request-input.mjs

@@ -1,14 +1,14 @@
+import { expressionOf, isCallExpression, isIdentifier, valueText } from "../syntax/ast.mjs";
 import { isMemberAccess, isValueReference, memberName, resolveInitializer, unwrap, walk } from "./source-ast.mjs";
-import ts from "typescript";
 
 //#region ../../packages/core/src/tooling/check/request-input.ts
 /** Identifiers the source checks treat as the incoming request. */
-const REQUEST_NAMES = new Set(["request", "req"]);
+const REQUEST_NAMES = /* @__PURE__ */ new Set(["request", "req"]);
 /**
 * Request members that return client-controlled input. Reading any of them
 * (as a property or a call) yields data the client chose.
 */
-const REQUEST_INPUT_MEMBERS = new Set([
+const REQUEST_INPUT_MEMBERS = /* @__PURE__ */ new Set([
 	"all",
 	"allExceptParams",
 	"heavy",
@@ -39,7 +39,7 @@ const REQUEST_INPUT_MEMBERS = new Set([
 	"referrer"
 ]);
 /** Request members that return the whole (or most of the) request body. */
-const REQUEST_BODY_MEMBERS = new Set([
+const REQUEST_BODY_MEMBERS = /* @__PURE__ */ new Set([
 	"all",
 	"allExceptParams",
 	"heavy",
@@ -60,18 +60,18 @@ const REQUEST_BODY_MEMBERS = new Set([
 */
 function requestMemberAccess(node) {
 	let current = unwrap(node);
-	if (ts.isCallExpression(current)) current = unwrap(current.expression);
+	if (isCallExpression(current)) current = unwrap(expressionOf(current));
 	if (!isMemberAccess(current)) return void 0;
 	let member = current;
 	for (;;) {
-		const object = unwrap(member.expression);
-		if (ts.isIdentifier(object)) return REQUEST_NAMES.has(object.text) ? memberName(member) : void 0;
+		const object = unwrap(expressionOf(member));
+		if (isIdentifier(object)) return REQUEST_NAMES.has(valueText(object)) ? memberName(member) : void 0;
 		if (isMemberAccess(object)) {
 			member = object;
 			continue;
 		}
-		if (ts.isCallExpression(object)) {
-			const callee = unwrap(object.expression);
+		if (isCallExpression(object)) {
+			const callee = unwrap(expressionOf(object));
 			if (!isMemberAccess(callee)) return void 0;
 			member = callee;
 			continue;
@@ -85,8 +85,8 @@ function isRequestInputExpression(node) {
 	return member !== void 0 && REQUEST_INPUT_MEMBERS.has(member);
 }
 function isSanitizerCall(call, sanitizers) {
-	const callee = unwrap(call.expression);
-	if (ts.isIdentifier(callee)) return sanitizers.has(callee.text);
+	const callee = unwrap(expressionOf(call));
+	if (isIdentifier(callee)) return sanitizers.has(valueText(callee));
 	if (isMemberAccess(callee)) {
 		const name = memberName(callee);
 		return name !== void 0 && sanitizers.has(name);
@@ -103,14 +103,14 @@ function containsRequestInput(node, options = {}, seen = /* @__PURE__ */ new Set
 	const sanitizers = options.sanitizers ?? /* @__PURE__ */ new Set();
 	walk(node, (child) => {
 		if (found) return false;
-		if (ts.isCallExpression(child) && isSanitizerCall(child, sanitizers)) return false;
-		if (isMemberAccess(child) || ts.isCallExpression(child)) {
+		if (isCallExpression(child) && isSanitizerCall(child, sanitizers)) return false;
+		if (isMemberAccess(child) || isCallExpression(child)) {
 			if (isRequestInputExpression(child) || options.isSource?.(child) === true) {
 				found = true;
 				return false;
 			}
 		}
-		if (ts.isIdentifier(child) && !seen.has(child)) {
+		if (isIdentifier(child) && !seen.has(child)) {
 			seen.add(child);
 			if (isValueReference(child)) {
 				const initializer = resolveInitializer(child);
@@ -128,5 +128,5 @@ function containsRequestInput(node, options = {}, seen = /* @__PURE__ */ new Set
 }
 
 //#endregion
-export { REQUEST_BODY_MEMBERS, REQUEST_NAMES, containsRequestInput, requestMemberAccess };
+export { REQUEST_BODY_MEMBERS, REQUEST_NAMES, containsRequestInput, isRequestInputExpression, requestMemberAccess };
 //# sourceMappingURL=request-input.mjs.map