@mrsf/cli 0.4.3 → 0.6.0

package/dist/lib/validator.js

@@ -1,15 +1,11 @@
 /**
  * MRSF Validator — JSON Schema + cross-field validation per §10.
  */
-import AjvModule from "ajv";
-import addFormatsModule from "ajv-formats";
-// ESM interop: handle both default and namespace imports
-const Ajv = AjvModule.default ?? AjvModule;
-const addFormats = addFormatsModule.default ?? addFormatsModule;
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { computeHash } from "./writer.js";
+import { validateCrossFields, validateSchema } from "./validate-core.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 let _schemaCache = null;
 async function loadSchema() {
@@ -44,114 +40,9 @@ export async function validate(doc, options = {}) {
     const warnings = [];
     // ── JSON Schema validation ──
     const rawSchema = await loadSchema();
-    // Ajv 8 doesn't natively support 2020-12; strip $schema to use draft-07 mode
-    const { $schema, ...schema } = rawSchema;
-    const ajv = new Ajv({ allErrors: true, strict: false });
-    addFormats(ajv);
-    const ajvValidate = ajv.compile(schema);
-    const schemaValid = ajvValidate(doc);
-    if (!schemaValid && ajvValidate.errors) {
-        for (const err of ajvValidate.errors) {
-            errors.push({
-                severity: "error",
-                message: `${err.instancePath || "/"}: ${err.message ?? "schema error"}`,
-                path: err.instancePath || "/",
-            });
-        }
-    }
+    validateSchema(doc, rawSchema, errors);
     // ── Cross-field validation (§10) ──
-    if (Array.isArray(doc.comments)) {
-        const ids = new Set();
-        for (let i = 0; i < doc.comments.length; i++) {
-            const c = doc.comments[i];
-            const prefix = `/comments/${i}`;
-            // Unique id check
-            if (c.id) {
-                if (ids.has(c.id)) {
-                    errors.push({
-                        severity: "error",
-                        message: `Duplicate comment id "${c.id}"`,
-                        path: `${prefix}/id`,
-                        commentId: c.id,
-                    });
-                }
-                ids.add(c.id);
-            }
-            // end_line ≥ line
-            if (c.line != null && c.end_line != null && c.end_line < c.line) {
-                errors.push({
-                    severity: "error",
-                    message: `end_line (${c.end_line}) must be ≥ line (${c.line})`,
-                    path: `${prefix}/end_line`,
-                    commentId: c.id,
-                });
-            }
-            // end_column ≥ start_column when same line
-            if (c.start_column != null &&
-                c.end_column != null &&
-                (c.line == null || c.end_line == null || c.line === c.end_line) &&
-                c.end_column < c.start_column) {
-                errors.push({
-                    severity: "error",
-                    message: `end_column (${c.end_column}) must be ≥ start_column (${c.start_column}) on the same line`,
-                    path: `${prefix}/end_column`,
-                    commentId: c.id,
-                });
-            }
-            // selected_text length
-            if (c.selected_text && c.selected_text.length > 4096) {
-                errors.push({
-                    severity: "error",
-                    message: `selected_text exceeds 4096 characters (${c.selected_text.length})`,
-                    path: `${prefix}/selected_text`,
-                    commentId: c.id,
-                });
-            }
-            // text length
-            if (c.text && c.text.length > 16384) {
-                warnings.push({
-                    severity: "warning",
-                    message: `text exceeds recommended 16384 characters (${c.text.length})`,
-                    path: `${prefix}/text`,
-                    commentId: c.id,
-                });
-            }
-            // selected_text_hash consistency
-            if (c.selected_text && c.selected_text_hash) {
-                const expected = computeHash(c.selected_text);
-                if (c.selected_text_hash !== expected) {
-                    warnings.push({
-                        severity: "warning",
-                        message: `selected_text_hash mismatch (expected ${expected.slice(0, 12)}…, got ${c.selected_text_hash.slice(0, 12)}…)`,
-                        path: `${prefix}/selected_text_hash`,
-                        commentId: c.id,
-                    });
-                }
-            }
-            // reply_to resolution
-            if (c.reply_to && !ids.has(c.reply_to)) {
-                // Check forward references too
-                const allIds = doc.comments.map((x) => x.id);
-                if (!allIds.includes(c.reply_to)) {
-                    warnings.push({
-                        severity: "warning",
-                        message: `reply_to "${c.reply_to}" does not resolve to any comment id in this file`,
-                        path: `${prefix}/reply_to`,
-                        commentId: c.id,
-                    });
-                }
-            }
-            // Missing selected_text warning
-            if (c.line != null && !c.selected_text) {
-                warnings.push({
-                    severity: "warning",
-                    message: `Comment has line anchors but no selected_text — anchoring will be fragile across edits`,
-                    path: `${prefix}/selected_text`,
-                    commentId: c.id,
-                });
-            }
-        }
-    }
+    validateCrossFields(doc, errors, warnings, computeHash);
     const valid = errors.length === 0 && (!options.strict || warnings.length === 0);
     return { valid, errors, warnings };
 }
@@ -170,6 +61,7 @@ export async function validateFile(filePath, options = {}) {
             errors: [
                 {
                     severity: "error",
+                    code: "parse-error",
                     message: `Failed to parse: ${e.message}`,
                 },
             ],

package/dist/lib/writer.d.ts

@@ -21,14 +21,7 @@ export declare function computeHash(text: string): string;
  * If selected_text is absent, removes the hash.
  */
 export declare function syncHash(comment: Comment): Comment;
-/**
- * Serialize an MrsfDocument to YAML (for new files / non-round-trip use).
- */
-export declare function toYaml(doc: MrsfDocument): string;
-/**
- * Serialize an MrsfDocument to JSON.
- */
-export declare function toJson(doc: MrsfDocument): string;
+export { toYaml, toJson } from "./serialize.js";
 /**
  * Write an MrsfDocument to disk.
  *

package/dist/lib/writer.js

@@ -14,7 +14,8 @@ import { readFile, writeFile, rename, unlink } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { createHash, randomBytes } from "node:crypto";
 import path from "node:path";
-import { Document, Parser, CST, parse as yamlParse } from "yaml";
+import { Parser, CST, parse as yamlParse } from "yaml";
+import { toYaml, toJson } from "./serialize.js";
 /* ------------------------------------------------------------------ */
 /*  Per-file write serialization                                       */
 /* ------------------------------------------------------------------ */
@@ -327,19 +328,9 @@ function deepEqual(a, b) {
 /* ------------------------------------------------------------------ */
 /*  Public API                                                         */
 /* ------------------------------------------------------------------ */
-/**
- * Serialize an MrsfDocument to YAML (for new files / non-round-trip use).
- */
-export function toYaml(doc) {
-    const yamlDoc = new Document(doc);
-    return yamlDoc.toString({ lineWidth: 0 });
-}
-/**
- * Serialize an MrsfDocument to JSON.
- */
-export function toJson(doc) {
-    return JSON.stringify(doc, null, 2) + "\n";
-}
+// `toYaml` / `toJson` now live in the Node-free serialize module; re-exported
+// here so existing `@mrsf/cli` import paths keep working.
+export { toYaml, toJson } from "./serialize.js";
 /**
  * Write an MrsfDocument to disk.
  *

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@mrsf/cli",
-  "version": "0.4.3",
+  "version": "0.6.0",
   "description": "CLI and library for the Markdown Review Sidecar Format (MRSF)",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     },
     "./browser": {
+      "types": "./dist/browser.d.ts",
+      "browser": "./dist/browser.js",
       "import": "./dist/browser.js",
-      "types": "./dist/browser.d.ts"
+      "require": "./dist/browser.cjs"
     }
   },
   "bin": {
@@ -22,7 +25,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && node esbuild.config.mjs",
     "dev": "tsc --watch",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -57,6 +60,8 @@
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
+    "dist/**/*.cjs",
+    "dist/**/*.cjs.map",
     "mrsf.schema.json",
     "README.md",
     "LICENSE"
@@ -78,6 +83,9 @@
     "@types/uuid": "^10.0.0",
     "@vitest/coverage-v8": "^4.0.18",
     "typescript": "^5.8.2",
-    "vitest": "^4.0.18"
-  }
+    "vitest": "^4.0.18",
+    "esbuild": "^0.27.3"
+  },
+  "module": "./dist/index.js",
+  "sideEffects": false
 }