@konvert7/klint 0.19.2 → 0.20.0

package/README.md

@@ -141,6 +141,7 @@ Rust currently supports:
 
 - `arch` rules: imports, forbidden patterns, singleton locations
 - `no-unguarded-json-parse`
+- `no-sync-in-async`
 - `no-nested-template-literals`
 - `no-consecutive-array-push`
 - `no-string-match`

package/cli.ts

@@ -31,6 +31,7 @@ const RUST_SUPPORTED_TYPESCRIPT_RULES = new Set([
   "no-consecutive-array-push",
   "no-nested-template-literals",
   "no-string-match",
+  "no-sync-in-async",
   "no-unguarded-json-parse",
 ]);
 

package/core/arch.ts

@@ -1,10 +1,9 @@
-import { dirname, isAbsolute, relative, resolve } from "node:path";
+import { dirname, isAbsolute, resolve } from "node:path";
 import ts from "typescript";
 import { walkAst } from "./ast";
+import { relativeSlashPath, toSlashPath } from "./paths";
 import type { ArchConfig, Severity, Violation } from "./types";
 
-const toSlash = (p: string) => p.replaceAll("\\", "/");
-
 interface AliasEntry {
   /** The prefix to match (pattern with `/*` stripped, e.g. `"@"` from `"@/*"`). */
   prefix: string;
@@ -31,7 +30,7 @@ function loadPathAliases(root: string): AliasEntry[] {
     const prefix = isWildcard ? pattern.slice(0, -2) : pattern;
     const targetStr = targets[0];
     const targetBase = targetStr.endsWith("/*") ? targetStr.slice(0, -2) : targetStr;
-    entries.push({ prefix, base: toSlash(resolve(base, targetBase)), isWildcard });
+    entries.push({ prefix, base: toSlashPath(resolve(base, targetBase)), isWildcard });
   }
   return entries;
 }
@@ -41,7 +40,7 @@ function resolveAlias(importPath: string, aliases: AliasEntry[]): string | undef
     if (alias.isWildcard) {
       const matchPrefix = `${alias.prefix}/`;
       if (importPath.startsWith(matchPrefix)) {
-        return toSlash(resolve(alias.base, importPath.slice(matchPrefix.length)));
+        return toSlashPath(resolve(alias.base, importPath.slice(matchPrefix.length)));
       }
     } else if (importPath === alias.prefix) {
       return alias.base;
@@ -62,7 +61,7 @@ function isBareSpecifier(path: string): boolean {
 }
 
 function globToPrefix(glob: string, root: string): string {
-  return toSlash(resolve(root, glob.split("/**")[0].split("/*")[0].split("*")[0]));
+  return toSlashPath(resolve(root, glob.split("/**")[0].split("/*")[0].split("*")[0]));
 }
 
 function resolveGlobs(
@@ -145,7 +144,7 @@ function scanImports(
     if (isBareSpecifier(path)) {
       resolved = resolveAlias(path, aliases) ?? path;
     } else {
-      resolved = toSlash(resolve(fileDir, path));
+      resolved = toSlashPath(resolve(fileDir, path));
     }
     const { line } = src.getLineAndCharacterOfPosition(specifierNode.getStart());
     records.push({ path, resolved, isTypeOnly, line: line + 1 });
@@ -176,7 +175,7 @@ export function runArchRules(
         if (isBareSpecifier(imp.resolved)) continue;
         if (rule["type-only"] === "allow" && imp.isTypeOnly) continue;
 
-        const relFile = relative(root, file).replaceAll("\\", "/");
+        const relFile = relativeSlashPath(root, file);
 
         if (rule.deny !== undefined) {
           const denyPrefixes = resolveLayerPrefixes(rule.deny, layers, root);
@@ -235,7 +234,7 @@ export function runArchRules(
 
   for (const rule of arch.singleton ?? []) {
     const severity: Severity = rule.severity ?? "error";
-    const onlyFile = toSlash(resolve(root, rule.only));
+    const onlyFile = toSlashPath(resolve(root, rule.only));
     const inFiles = rule.in
       ? resolveLayerFiles(rule.in, layers, root, allFiles)
       : allFiles;
@@ -294,7 +293,7 @@ function scanJsxElements(
       if (!targets.has(tagName.text)) return;
       const { line } = src.getLineAndCharacterOfPosition(tagName.getStart());
       violations.push({
-        file: relative(root, file).replaceAll("\\", "/"),
+        file: relativeSlashPath(root, file),
         line: line + 1,
         message,
         rule: ruleName,
@@ -321,7 +320,7 @@ function scanLinesForPattern(
     for (let i = 0; i < lines.length; i++) {
       if (lines[i].includes(pattern)) {
         violations.push({
-          file: relative(root, file).replaceAll("\\", "/"),
+          file: relativeSlashPath(root, file),
           line: i + 1,
           message,
           rule: ruleName,

package/core/paths.ts

@@ -0,0 +1,9 @@
+import { relative } from "node:path";
+
+export function toSlashPath(path: string): string {
+  return path.replaceAll("\\", "/");
+}
+
+export function relativeSlashPath(from: string, to: string): string {
+  return toSlashPath(relative(from, to));
+}

package/core/rule-helpers.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { createProgram } from "./ast";
+import { relativeSlashPath } from "./paths";
 import type { KlintRule, RawViolation, RuleMeta } from "./types";
 import { defineRule } from "./types";
 
@@ -34,7 +34,7 @@ export function defineAstRule(opts: {
           report(node, message) {
             const { line } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
             violations.push({
-              file: relative(root, sourceFile.fileName),
+              file: relativeSlashPath(root, sourceFile.fileName),
               line: line + 1,
               message,
             });

package/core/runner.ts

@@ -1,9 +1,10 @@
 import { readdirSync, readFileSync } from "node:fs";
-import { join, relative, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { BUILT_IN_PLUGINS } from "../plugins/index";
 import { BUILT_IN_RULES } from "../rules/index";
 import { runArchRules } from "./arch";
 import { clearAstCache } from "./ast";
+import { relativeSlashPath, toSlashPath } from "./paths";
 import type {
   KlintConfig,
   KlintRule,
@@ -29,7 +30,7 @@ function walk(dir: string, root: string, excludes: string[] = []): string[] {
   const out: string[] = [];
   for (const entry of readdirSync(dir, { withFileTypes: true })) {
     const full = join(dir, entry.name);
-    const rel = relative(root, full).replaceAll("\\", "/");
+    const rel = relativeSlashPath(root, full);
     if (entry.isDirectory()) {
       if (
         excludes.some(
@@ -38,8 +39,7 @@ function walk(dir: string, root: string, excludes: string[] = []): string[] {
       )
         continue;
       out.push(...walk(full, root, excludes));
-    } else if (/\.(tsx?|jsx?|mts|cts)$/.test(entry.name))
-      out.push(full.replaceAll("\\", "/"));
+    } else if (/\.(tsx?|jsx?|mts|cts)$/.test(entry.name)) out.push(toSlashPath(full));
   }
   return out;
 }
@@ -68,8 +68,8 @@ function resolveFiles(
 }
 
 function matchPattern(relPath: string, pattern: string): boolean {
-  const norm = relPath.replaceAll("\\", "/");
-  const p = pattern.replaceAll("\\", "/");
+  const norm = toSlashPath(relPath);
+  const p = toSlashPath(pattern);
   if (p === "." || p === "**") return true;
   if (!p.includes("*")) return norm === p || norm.startsWith(`${p}/`);
   return globToRegExp(p).test(norm);
@@ -107,7 +107,7 @@ function applyPatterns(files: string[], patterns: string[], root: string): strin
   const includes = patterns.filter((p) => !p.startsWith("!"));
   const excludes = patterns.filter((p) => p.startsWith("!")).map((p) => p.slice(1));
   return files.filter((file) => {
-    const rel = relative(root, file).replaceAll("\\", "/");
+    const rel = relativeSlashPath(root, file);
     const included = includes.length === 0 || includes.some((p) => matchPattern(rel, p));
     const excluded = excludes.some((p) => matchPattern(rel, p));
     return included && !excluded;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konvert7/klint",
-  "version": "0.19.2",
+  "version": "0.20.0",
   "description": "Architecture-as-Code linter for TypeScript. Enforce layer boundaries, import rules, and singleton patterns in YAML.",
   "type": "module",
   "bin": {
@@ -62,10 +62,10 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "@konvert7/klint-darwin-arm64": "0.19.2",
-    "@konvert7/klint-darwin-x64": "0.19.2",
-    "@konvert7/klint-linux-x64": "0.19.2",
-    "@konvert7/klint-win32-x64": "0.19.2"
+    "@konvert7/klint-darwin-arm64": "0.20.0",
+    "@konvert7/klint-darwin-x64": "0.20.0",
+    "@konvert7/klint-linux-x64": "0.20.0",
+    "@konvert7/klint-win32-x64": "0.20.0"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.7",

package/rules/no-consecutive-array-push.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const noConsecutiveArrayPush: KlintRule = {
@@ -26,7 +26,7 @@ export const noConsecutiveArrayPush: KlintRule = {
               statements[runStart].getStart()
             );
             violations.push({
-              file: relative(root, file).replaceAll("\\", "/"),
+              file: relativeSlashPath(root, file),
               line: line + 1,
               message: `${upTo - runStart} consecutive .push() calls on \`${runReceiver}\` — combine into a single .push(a, b, …) call.`,
             });

package/rules/no-nested-template-literals.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const noNestedTemplateLiterals: KlintRule = {
@@ -32,7 +32,7 @@ function findNestedTemplate(
   if (ts.isTemplateExpression(node) || ts.isNoSubstitutionTemplateLiteral(node)) {
     const { line } = src.getLineAndCharacterOfPosition(node.getStart());
     violations.push({
-      file: relative(root, file).replaceAll("\\", "/"),
+      file: relativeSlashPath(root, file),
       line: line + 1,
       message:
         "Nested template literal — extract the inner template to a variable to improve readability.",

package/rules/no-object-in-template.ts

@@ -87,7 +87,7 @@ function wouldRenderAsObjectObject(type: ts.Type, checker: ts.TypeChecker): bool
     const fileName = d.getSourceFile().fileName;
     return (
       !fileName.includes("/typescript/lib/lib") &&
-      !fileName.includes("\\typescript\\lib\\lib")
+      !fileName.includes(String.raw`\typescript\lib\lib`)
     );
   });
 

package/rules/no-single-char-class.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import { buildNodeReplacementFix } from "../core/rule-helpers";
 import type { KlintRule } from "../core/types";
 
@@ -99,7 +99,7 @@ export const noSingleCharClass: KlintRule = {
         const fix = buildNodeReplacementFix(src, node, fixedRegex);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: fix.startLine,
           message: `Character class [${toFix[0].inner}] contains a single element — remove the brackets.`,
           fix,

package/rules/no-string-match.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const noStringMatch: KlintRule = {
@@ -45,7 +45,7 @@ export const noStringMatch: KlintRule = {
                   })()
                 : undefined;
             violations.push({
-              file: relative(root, file).replaceAll("\\", "/"),
+              file: relativeSlashPath(root, file),
               line: s + 1,
               message: `Use RegExp.exec() instead of String.match() for non-global regexes — use new RegExp(${regexText}).exec(${strText}) instead.`,
               fix,

package/rules/no-sync-in-async.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { nearestFunctionIsAsync, walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const noSyncInAsync: KlintRule = {
@@ -31,7 +31,7 @@ export const noSyncInAsync: KlintRule = {
           ) {
             const { line } = src.getLineAndCharacterOfPosition(node.getStart());
             violations.push({
-              file: relative(root, file),
+              file: relativeSlashPath(root, file),
               line: line + 1,
               message: `${name}() blocks the event loop inside an async function — use the async equivalent from node:fs/promises.`,
             });

package/rules/no-unguarded-json-parse.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { isInsideTry, walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const noUnguardedJsonParse: KlintRule = {
@@ -23,7 +23,7 @@ export const noUnguardedJsonParse: KlintRule = {
         ) {
           const { line } = src.getLineAndCharacterOfPosition(node.getStart());
           violations.push({
-            file: relative(root, file).replaceAll("\\", "/"),
+            file: relativeSlashPath(root, file),
             line: line + 1,
             message:
               "JSON.parse() called without a surrounding try/catch — a malformed payload will throw an unhandled exception.",

package/rules/prefer-at.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import { buildNodeReplacementFix } from "../core/rule-helpers";
 import type { KlintRule } from "../core/types";
 
@@ -35,7 +35,7 @@ export const preferAt: KlintRule = {
         const fix = buildNodeReplacementFix(src, node, fixedCall);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: fix.startLine,
           message: `Prefer ${baseText}.at(-${n}) over ${baseText}[${baseText}.length - ${n}] for cleaner negative indexing.`,
           fix,

package/rules/prefer-nullish-coalescing-assign.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const preferNullishCoalescingAssign: KlintRule = {
@@ -33,7 +33,7 @@ export const preferNullishCoalescingAssign: KlintRule = {
         const indent = getIndent(src, node);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: s + 1,
           message: `Prefer \`${xText} ??= ${yText}\` over \`if (!${xText}) ${xText} = ${yText}\` — ??= only assigns when null or undefined.`,
           fix: {

package/rules/prefer-string-raw-regexp.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import type { KlintRule } from "../core/types";
 
 export const preferStringRawRegexp: KlintRule = {
@@ -47,7 +47,7 @@ export const preferStringRawRegexp: KlintRule = {
           linesText.slice(0, argOffset) + fixedArg + linesText.slice(argEndOffset);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: line + 1,
           message:
             "Use String.raw`...` for RegExp template argument to avoid double backslashes (Sonar S7780).",

package/rules/prefer-string-raw.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import { buildNodeReplacementFix } from "../core/rule-helpers";
 import type { KlintRule } from "../core/types";
 
@@ -27,7 +27,7 @@ export const preferStringRaw: KlintRule = {
         const fix = buildNodeReplacementFix(src, node, fixedNode);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: fix.startLine,
           message:
             "String literal with escaped backslashes — use String.raw`...` for clarity (Sonar S6535).",

package/rules/prefer-string-replaceall.ts

@@ -1,6 +1,6 @@
-import { relative } from "node:path";
 import ts from "typescript";
 import { walkAst } from "../core/ast";
+import { relativeSlashPath } from "../core/paths";
 import { buildNodeReplacementFix } from "../core/rule-helpers";
 import type { KlintRule } from "../core/types";
 
@@ -35,13 +35,13 @@ export const preferStringReplaceall: KlintRule = {
         ).expression.getText(src);
         const replacementText = node.arguments[1].getText(src);
         const patternLit = pattern.includes('"')
-          ? `'${pattern.replaceAll("'", "\\'")}'`
+          ? `'${pattern.replaceAll("'", String.raw`\'`)}'`
           : `"${pattern}"`;
         const fixedCall = `${strText}.replaceAll(${patternLit}, ${replacementText})`;
         const fix = buildNodeReplacementFix(src, node, fixedCall);
 
         violations.push({
-          file: relative(root, file),
+          file: relativeSlashPath(root, file),
           line: fix.startLine,
           message: `Prefer \`${strText}.replaceAll(${patternLit}, ...)\` over \`.replace(/${pattern}/g, ...)\` — replaceAll() with a string is clearer and avoids regex escaping pitfalls.`,
           fix,

package/tools/semantic-release-root-npm.js

@@ -28,22 +28,31 @@ export async function prepare(_, context) {
 
   const packageJson = readPackageJson(cwd);
   packageJson.version = version;
-  packageJson.optionalDependencies ??= {};
-  for (const packageName of NATIVE_PACKAGE_NAMES) {
-    packageJson.optionalDependencies[packageName] = version;
-  }
   writePackageJson(cwd, packageJson);
 }
 
-export async function publish(_, context) {
+export async function publish(pluginConfig = {}, context) {
   const cwd = context.cwd ?? process.cwd();
+  const spawn = pluginConfig.spawnSync ?? spawnSync;
+  const version = context.nextRelease?.version;
 
   if (context.options?.dryRun) {
     context.logger?.log("Dry run: skipping npm publish");
     return;
   }
 
-  const result = spawnSync("npm", ["publish", "--access", "public"], {
+  if (!version) {
+    throw new Error("semantic-release did not provide nextRelease.version");
+  }
+
+  const packageJson = readPackageJson(cwd);
+  packageJson.optionalDependencies ??= {};
+  for (const packageName of NATIVE_PACKAGE_NAMES) {
+    packageJson.optionalDependencies[packageName] = version;
+  }
+  writePackageJson(cwd, packageJson);
+
+  const result = spawn("npm", ["publish", "--access", "public"], {
     cwd,
     encoding: "utf-8",
     stdio: "inherit",