@amritk/lint 0.6.1 → 0.6.2

package/dist/index.d.ts

@@ -140,8 +140,9 @@ export type IFixResult = {
 };
 /**
  * Lints a document and applies the supplied `fixers` repeatedly until the
- * document stops changing (or {@link MAX_FIX_PASSES} is reached), then re-lints
- * so `remaining` reflects the fixed document. A one-call convenience over
+ * document stops changing (or {@link MAX_FIX_PASSES} is reached). `remaining`
+ * reflects the fixed document: the converging pass already linted it, so only
+ * a run that hit the cap lints once more. A one-call convenience over
  * {@link lintDocumentWithResult} + `createFixPlugin`. With no `fixers` this is a
  * no-op that just returns the findings.
  */

package/dist/index.js

@@ -83,10 +83,12 @@ const fixDocument = async (input, options = {}) => {
   let converged = false;
   const applied = [];
   const seen = /* @__PURE__ */ new Set();
+  let convergedDiagnostics;
   for (let pass = 0; pass < MAX_FIX_PASSES; pass++) {
     const result = await runLint(current, ruleset, { ...lintOptions, plugins: [plugin] });
     if (result.output === void 0 || result.output === current) {
       converged = true;
+      convergedDiagnostics = result.diagnostics;
       break;
     }
     current = result.output;
@@ -102,7 +104,7 @@ const fixDocument = async (input, options = {}) => {
       }
     }
   }
-  const remaining = (await runLint(current, ruleset, lintOptions)).diagnostics;
+  const remaining = convergedDiagnostics ?? (await runLint(current, ruleset, lintOptions)).diagnostics;
   return { output: current, fixed: current !== input, remaining, applied, converged, passes };
 };
 export {

package/dist/parsers/json.js

@@ -1,4 +1,4 @@
-import { findNodeAtLocation, getNodeValue, parseTree, printParseErrorCode } from "jsonc-parser";
+import { getNodeValue, parseTree, printParseErrorCode } from "jsonc-parser";
 import { findExcessiveNesting, MAX_NESTING_DEPTH } from "./depth.js";
 import { createLineMap } from "./lines.js";
 import { DiagnosticSeverity } from "./types.js";
@@ -35,7 +35,7 @@ const parseJson = (source) => {
       return void 0;
     const p = path.slice();
     while (true) {
-      const node = findNodeAtLocation(root, p);
+      const node = findNode(root, p);
       if (node) {
         return {
           range: {
@@ -51,6 +51,25 @@ const parseJson = (source) => {
   };
   return { data, diagnostics, getLocationForJsonPath };
 };
+const ARRAY_INDEX = /^(?:0|[1-9]\d*)$/;
+const findNode = (root, path) => {
+  let node = root;
+  for (const segment of path) {
+    if (node === void 0)
+      return void 0;
+    if (node.type === "object") {
+      const key = String(segment);
+      const property = node.children?.find((child) => child.children?.length === 2 && child.children[0]?.value === key);
+      node = property?.children?.[1];
+    } else if (node.type === "array") {
+      const text = String(segment);
+      node = ARRAY_INDEX.test(text) ? node.children?.[Number(text)] : void 0;
+    } else {
+      return void 0;
+    }
+  }
+  return node;
+};
 export {
   parseJson
 };

package/dist/parsers/yaml.js

@@ -1,7 +1,14 @@
 import { isAlias, isMap, isPair, isScalar, isSeq, parseAllDocuments } from "@amritk/yaml";
 import { createLineMap } from "./lines.js";
 import { DiagnosticSeverity } from "./types.js";
-const pathKey = (path) => path.map((segment) => typeof segment === "number" ? `[${segment}]` : `.${segment}`).join("");
+const pathKey = (path) => {
+  let key = "";
+  for (const segment of path) {
+    const text = String(segment);
+    key += `${text.length}:${text}`;
+  }
+  return key;
+};
 const serializeComplexKey = (node) => {
   if (isSeq(node)) {
     return node.items.length === 0 ? "[]" : `[ ${node.items.map(flowText).join(", ")} ]`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amritk/lint",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A fast, format-agnostic JSON/YAML style-guide linter with JSON Schema and custom rules.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -69,12 +69,12 @@
     }
   },
   "dependencies": {
-    "@amritk/runtime-validators": "^0.15.0",
-    "@amritk/yaml": "^0.7.2",
+    "@amritk/runtime-validators": "^0.15.1",
+    "@amritk/yaml": "^0.7.3",
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
-    "@amritk/resolve-refs": "^0.7.1",
+    "@amritk/resolve-refs": "^0.8.0",
     "@stoplight/spectral-core": "^1.23.1",
     "@stoplight/spectral-parsers": "^1.0.5",
     "@stoplight/spectral-rulesets": "^1.22.7"