@mitre/hdf-diff 2.0.0 → 3.0.1

package/dist/validate.d.ts

@@ -10,8 +10,8 @@ export interface ValidationResult {
 /**
  * Validate a document against the hdf-comparison schema.
  *
- * Loads and compiles all required schemas from the sibling hdf-schema package.
- * The compiled validator is cached for performance on subsequent calls.
+ * Delegates to @mitre/hdf-validators which loads schemas from embedded
+ * bundled JSON (no filesystem access, no hardcoded version URLs).
  *
  * @param doc - The document to validate (typically the output of `diffHdf()`)
  * @returns Validation result with `valid` boolean and optional `errors` array

package/dist/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kDAAkD;IAClD,KAAK,EAAE,OAAO,CAAC;IACf,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAkGD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAQjE"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kDAAkD;IAClD,KAAK,EAAE,OAAO,CAAC;IACf,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAWjE"}

package/dist/validate.js

@@ -1,108 +1,19 @@
-import Ajv2020 from 'ajv/dist/2020.js';
-import addFormats from 'ajv-formats';
-import { readFileSync } from 'node:fs';
-import { resolve, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-/** Schema ID for the hdf-comparison schema */
-const COMPARISON_SCHEMA_ID = 'https://mitre.github.io/hdf-libs/schemas/hdf-comparison/v1.0.0';
-/**
- * Resolve the path to the hdf-schema package's schemas directory.
- *
- * In the monorepo layout, hdf-schema is a sibling package at `../hdf-schema`.
- * The schemas are in `src/schemas/` within that package.
- */
-function schemasDir() {
-    // From src/validate.ts (or dist/validate.js), go up to hdf-diff root, then to sibling
-    return resolve(__dirname, '..', '..', 'hdf-schema', 'src', 'schemas');
-}
-/**
- * Load a JSON schema file from the hdf-schema package.
- */
-function loadSchema(relativePath) {
-    const fullPath = resolve(schemasDir(), relativePath);
-    return JSON.parse(readFileSync(fullPath, 'utf-8'));
-}
-/** Cached compiled validator function */
-let cachedValidator = null;
-/**
- * Build and cache an Ajv 2020-12 validator for the hdf-comparison schema.
- *
- * Loads schemas in dependency order:
- * 1. All primitive schemas (common, platform, target, runner, statistics, result, extensions, comparison)
- * 2. hdf-results schema (defines Evaluated_Requirement, referenced by comparison)
- * 3. hdf-comparison schema (the top-level schema we validate against)
- *
- * The validator is compiled once and cached for all subsequent calls.
- */
-function getValidator() {
-    if (cachedValidator)
-        return cachedValidator;
-    const ajv = new Ajv2020({
-        strict: false,
-        allErrors: true,
-        validateFormats: true,
-    });
-    addFormats(ajv);
-    // Load all primitive schemas first (order matters for $ref resolution)
-    const primitiveFiles = [
-        'primitives/common.schema.json',
-        'primitives/platform.schema.json',
-        'primitives/target.schema.json',
-        'primitives/runner.schema.json',
-        'primitives/statistics.schema.json',
-        'primitives/result.schema.json',
-        'primitives/amendments.schema.json',
-        'primitives/extensions.schema.json',
-        'primitives/parameter.schema.json',
-        'primitives/component.schema.json',
-        'primitives/data-flow.schema.json',
-        'primitives/system.schema.json',
-        'primitives/comparison.schema.json',
-    ];
-    for (const file of primitiveFiles) {
-        ajv.addSchema(loadSchema(file));
-    }
-    // Load hdf-results (defines Evaluated_Requirement referenced by comparison)
-    ajv.addSchema(loadSchema('hdf-results.schema.json'));
-    // Load and compile hdf-comparison (the top-level schema we validate against)
-    ajv.addSchema(loadSchema('hdf-comparison.schema.json'));
-    // getSchema compiles on first access; the schema was just added so this always succeeds
-    cachedValidator = ajv.getSchema(COMPARISON_SCHEMA_ID);
-    return cachedValidator;
-}
-/**
- * Format Ajv validation errors into human-readable strings.
- */
-function formatErrors(validate) {
-    /* c8 ignore next -- Ajv always populates errors array when validation fails */
-    return (validate.errors ?? []).map((err) => {
-        const path = err.instancePath || '/';
-        /* c8 ignore next -- Ajv always populates err.message */
-        const msg = err.message ?? 'unknown error';
-        // Ajv always populates err.params on validation errors.
-        // The else branch exists for defensive typing since params is typed as optional.
-        /* c8 ignore start */
-        return err.params
-            ? `${path}: ${msg} (${JSON.stringify(err.params)})`
-            : `${path}: ${msg}`;
-        /* c8 ignore stop */
-    });
-}
+import { validateComparison as validatorsValidateComparison } from '@mitre/hdf-validators';
 /**
  * Validate a document against the hdf-comparison schema.
  *
- * Loads and compiles all required schemas from the sibling hdf-schema package.
- * The compiled validator is cached for performance on subsequent calls.
+ * Delegates to @mitre/hdf-validators which loads schemas from embedded
+ * bundled JSON (no filesystem access, no hardcoded version URLs).
  *
  * @param doc - The document to validate (typically the output of `diffHdf()`)
  * @returns Validation result with `valid` boolean and optional `errors` array
  */
 export function validateComparison(doc) {
-    const validate = getValidator();
-    if (validate(doc)) {
+    const result = validatorsValidateComparison(doc);
+    if (result.valid) {
         return { valid: true };
     }
-    return { valid: false, errors: formatErrors(validate) };
+    const errors = result.errors.map(e => e.field === '(root)' ? e.message : `${e.field}: ${e.message}`);
+    return { valid: false, errors };
 }
 //# sourceMappingURL=validate.js.map

package/dist/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAY3F;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAY;IAC7C,MAAM,MAAM,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;IAEjD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACnC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAC9D,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mitre/hdf-diff",
-  "version": "2.0.0",
+  "version": "3.0.1",
   "description": "Structured comparison of HDF evaluation results — tracks what changed, why, and by how much",
   "publishConfig": {
     "access": "public"
@@ -17,6 +17,18 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "pnpm clean && tsc",
+    "clean": "rimraf dist",
+    "test": "pnpm run test:ts",
+    "test:ts": "vitest run",
+    "test:go": "echo 'No Go tests yet in hdf-diff'",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "type-check": "tsc --noEmit",
+    "lint": "eslint src test",
+    "lint:fix": "eslint src test --fix"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/mitre/hdf-libs.git",
@@ -25,8 +37,7 @@
   "author": "MITRE Corporation",
   "license": "Apache-2.0",
   "dependencies": {
-    "ajv": "^8.17.0",
-    "ajv-formats": "^3.0.0"
+    "@mitre/hdf-validators": "workspace:*"
   },
   "engines": {
     "node": ">=20.0.0"
@@ -38,17 +49,5 @@
     "comparison",
     "security",
     "compliance"
-  ],
-  "scripts": {
-    "build": "pnpm clean && tsc",
-    "clean": "rimraf dist",
-    "test": "pnpm run test:ts",
-    "test:ts": "vitest run",
-    "test:go": "echo 'No Go tests yet in hdf-diff'",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "type-check": "tsc --noEmit",
-    "lint": "eslint src test",
-    "lint:fix": "eslint src test --fix"
-  }
-}
+  ]
+}

package/LICENSE.md

@@ -1,55 +0,0 @@
-# License
-
-Copyright © 2025 The MITRE Corporation.
-
-Approved for Public Release; Distribution Unlimited. Case Number 18-3678.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may
-not use this file except in compliance with the License. You may obtain a
-copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-
-## Redistribution Terms
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright/digital
-  rights legend, this list of conditions and the following Notice.
-- Redistributions in binary form must reproduce the above
-  copyright/digital rights legend, this list of conditions and the
-  following Notice in the documentation and/or other materials provided
-  with the distribution.
-- Neither the name of The MITRE Corporation nor the names of its contributors
-  may be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-## Notice
-
-The MITRE Corporation grants permission to reproduce, distribute, modify, and
-otherwise use this software to the extent permitted by the licensed terms
-provided in the LICENSE file included with this project.
-
-This software was produced by The MITRE Corporation for the U.S. Government
-under contract. As such the U.S. Government has certain use and data
-rights in this software. No use other than those granted to the U.S.
-Government, or to those acting on behalf of the U.S. Government, under
-these contract arrangements is authorized without the express written
-permission of The MITRE Corporation.
-
-Some files in this codebase were generated by generative AI, under the
-direction and review of The MITRE Corporation employees, for the purpose of
-development efficiency. All AI-generated code functionality was validated
-by standard quality and assurance testing.
-
-For further information, please contact The MITRE Corporation,
-Contracts Management Office, 7515 Colshire Drive, McLean, VA 22102-7539,
-(703) 983-6000.