@unispechq/unispec-core 0.2.6 → 0.2.8

package/dist/cjs/validator/index.js

@@ -8,114 +8,30 @@ exports.validateUniSpecTests = validateUniSpecTests;
 const _2020_js_1 = __importDefault(require("ajv/dist/2020.js"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const module_1 = require("module");
-const url_1 = require("url");
 const unispec_schema_1 = require("@unispechq/unispec-schema");
-function getThisModuleUrl() {
-    if (typeof __filename === "string" && __filename.length > 0) {
-        return (0, url_1.pathToFileURL)(__filename).href;
-    }
-    const stack = new Error().stack ?? "";
-    const fileUrlMatch = stack.match(/file:\/\/\/[^\s)]+/);
-    if (fileUrlMatch?.[0]) {
-        return fileUrlMatch[0];
-    }
-    const winPathMatch = stack.match(/[A-Za-z]:\\[^\s)]+/);
-    if (winPathMatch?.[0]) {
-        return (0, url_1.pathToFileURL)(winPathMatch[0]).href;
-    }
-    throw new Error("Cannot determine current module URL for createRequire()");
-}
-function getLocalRequire() {
-    return (0, module_1.createRequire)(getThisModuleUrl());
-}
-function assertValidSchemaDir(schemaDir) {
-    const requiredFiles = [
-        path_1.default.join(schemaDir, "types", "service.schema.json"),
-        path_1.default.join(schemaDir, "unispec-tests.schema.json"),
-    ];
-    const missing = requiredFiles.filter((p) => !fs_1.default.existsSync(p));
-    if (missing.length === 0) {
-        return;
-    }
-    const hints = [
-        `UniSpec schema directory is invalid or incomplete: ${schemaDir}`,
-        `Missing schema files:`,
-        ...missing.map((p) => `- ${p}`),
-        `You can override the schema directory via ValidateOptions.schemaDir or UNISPEC_SCHEMA_DIR env var.`,
-        `In bundled environments (e.g. Next.js), module resolution can be altered; make sure @unispechq/unispec-schema is installed and accessible at runtime.`,
-    ];
-    throw new Error(hints.join("\n"));
-}
-function findPackageRoot(startFilePath) {
-    let dir = path_1.default.dirname(startFilePath);
-    for (let i = 0; i < 50; i++) {
-        const pkgJsonPath = path_1.default.join(dir, "package.json");
-        if (fs_1.default.existsSync(pkgJsonPath)) {
-            return dir;
-        }
-        const parent = path_1.default.dirname(dir);
-        if (parent === dir) {
-            break;
-        }
-        dir = parent;
-    }
-    throw new Error(`Cannot locate package.json for resolved path: ${startFilePath}`);
-}
-function getUniSpecSchemaDir(options = {}) {
-    const override = options.schemaDir ?? process.env.UNISPEC_SCHEMA_DIR;
-    if (override) {
-        return override;
-    }
-    const localRequire = getLocalRequire();
-    try {
-        const pkgJsonPath = localRequire.resolve("@unispechq/unispec-schema/package.json");
-        return path_1.default.join(path_1.default.dirname(pkgJsonPath), "schema");
-    }
-    catch {
-        const entryPath = localRequire.resolve("@unispechq/unispec-schema");
-        const pkgRoot = findPackageRoot(entryPath);
-        return path_1.default.join(pkgRoot, "schema");
-    }
-}
-const validatorCache = new Map();
-function getCompiledValidator(options = {}) {
-    const schemaDir = getUniSpecSchemaDir(options);
-    assertValidSchemaDir(schemaDir);
-    const cached = validatorCache.get(schemaDir);
-    if (cached) {
-        return cached;
-    }
-    const ajv = new _2020_js_1.default({
-        allErrors: true,
-        strict: true,
-    });
-    // Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
-    ajv.addFormat("uri", true);
-    // Register all UniSpec subschemas so that Ajv can resolve internal $ref links
+const ajv = new _2020_js_1.default({
+    allErrors: true,
+    strict: true,
+});
+// Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
+ajv.addFormat("uri", true);
+// Register all UniSpec subschemas so that Ajv can resolve internal $ref links
+try {
+    const schemaDir = path_1.default.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
     const types = unispec_schema_1.manifest?.types ?? {};
     const typeSchemaPaths = Object.values(types).map((rel) => String(rel));
-    for (const relPath of typeSchemaPaths) {
-        const filePath = path_1.default.join(schemaDir, relPath);
-        if (!fs_1.default.existsSync(filePath)) {
-            continue;
-        }
-        const schema = JSON.parse(fs_1.default.readFileSync(filePath, "utf8"));
-        const normalizedRelPath = String(relPath).replace(/^\.\//, "");
-        const fallbackId = `https://unispec.dev/schema/${normalizedRelPath}`;
-        ajv.addSchema(schema, fallbackId);
-    }
-    const validateFn = ajv.compile(unispec_schema_1.unispec);
-    const testsSchemaPath = path_1.default.join(schemaDir, "unispec-tests.schema.json");
-    const testsSchema = JSON.parse(fs_1.default.readFileSync(testsSchemaPath, "utf8"));
-    const validateTestsFn = ajv.compile(testsSchema);
-    const compiled = {
-        validateFn,
-        validateTestsFn,
-    };
-    validatorCache.set(schemaDir, compiled);
-    return compiled;
+    const loadedTypeSchemas = typeSchemaPaths
+        .map((relPath) => path_1.default.join(schemaDir, relPath))
+        .filter((filePath) => fs_1.default.existsSync(filePath))
+        .map((filePath) => JSON.parse(fs_1.default.readFileSync(filePath, "utf8")));
+    ajv.addSchema(loadedTypeSchemas);
 }
+catch {
+    // If subschemas cannot be loaded for some reason, validation will still work for
+    // parts of the schema that do not rely on those $ref references.
+}
+const validateFn = ajv.compile(unispec_schema_1.unispec);
+let validateTestsFn;
 function mapAjvErrors(errors) {
     if (!errors)
         return [];
@@ -129,7 +45,6 @@ function mapAjvErrors(errors) {
  * Validate a UniSpec document against the UniSpec JSON Schema.
  */
 async function validateUniSpec(doc, _options = {}) {
-    const { validateFn } = getCompiledValidator(_options);
     const docForValidation = {
         unispecVersion: "0.0.0",
         service: {
@@ -157,7 +72,12 @@ async function validateUniSpec(doc, _options = {}) {
  * Validate a UniSpec Tests document against the UniSpec Tests JSON Schema.
  */
 async function validateUniSpecTests(doc, _options = {}) {
-    const { validateTestsFn } = getCompiledValidator(_options);
+    if (!validateTestsFn) {
+        const schemaDir = path_1.default.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
+        const testsSchemaPath = path_1.default.join(schemaDir, "unispec-tests.schema.json");
+        const testsSchema = JSON.parse(fs_1.default.readFileSync(testsSchemaPath, "utf8"));
+        validateTestsFn = ajv.compile(testsSchema);
+    }
     const valid = validateTestsFn(doc);
     if (valid) {
         return {

package/dist/validator/index.d.ts

@@ -1,6 +1,5 @@
 import { UniSpecDocument, UniSpecTestsDocument, ValidationResult } from "../types";
 export interface ValidateOptions {
-    schemaDir?: string;
 }
 /**
  * Validate a UniSpec document against the UniSpec JSON Schema.

package/dist/validator/index.js

@@ -1,114 +1,30 @@
 import Ajv2020 from "ajv/dist/2020.js";
 import fs from "fs";
 import path from "path";
-import { createRequire } from "module";
-import { pathToFileURL } from "url";
 import { unispec as unispecSchema, manifest as unispecManifest } from "@unispechq/unispec-schema";
-function getThisModuleUrl() {
-    if (typeof __filename === "string" && __filename.length > 0) {
-        return pathToFileURL(__filename).href;
-    }
-    const stack = new Error().stack ?? "";
-    const fileUrlMatch = stack.match(/file:\/\/\/[^\s)]+/);
-    if (fileUrlMatch?.[0]) {
-        return fileUrlMatch[0];
-    }
-    const winPathMatch = stack.match(/[A-Za-z]:\\[^\s)]+/);
-    if (winPathMatch?.[0]) {
-        return pathToFileURL(winPathMatch[0]).href;
-    }
-    throw new Error("Cannot determine current module URL for createRequire()");
-}
-function getLocalRequire() {
-    return createRequire(getThisModuleUrl());
-}
-function assertValidSchemaDir(schemaDir) {
-    const requiredFiles = [
-        path.join(schemaDir, "types", "service.schema.json"),
-        path.join(schemaDir, "unispec-tests.schema.json"),
-    ];
-    const missing = requiredFiles.filter((p) => !fs.existsSync(p));
-    if (missing.length === 0) {
-        return;
-    }
-    const hints = [
-        `UniSpec schema directory is invalid or incomplete: ${schemaDir}`,
-        `Missing schema files:`,
-        ...missing.map((p) => `- ${p}`),
-        `You can override the schema directory via ValidateOptions.schemaDir or UNISPEC_SCHEMA_DIR env var.`,
-        `In bundled environments (e.g. Next.js), module resolution can be altered; make sure @unispechq/unispec-schema is installed and accessible at runtime.`,
-    ];
-    throw new Error(hints.join("\n"));
-}
-function findPackageRoot(startFilePath) {
-    let dir = path.dirname(startFilePath);
-    for (let i = 0; i < 50; i++) {
-        const pkgJsonPath = path.join(dir, "package.json");
-        if (fs.existsSync(pkgJsonPath)) {
-            return dir;
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir) {
-            break;
-        }
-        dir = parent;
-    }
-    throw new Error(`Cannot locate package.json for resolved path: ${startFilePath}`);
-}
-function getUniSpecSchemaDir(options = {}) {
-    const override = options.schemaDir ?? process.env.UNISPEC_SCHEMA_DIR;
-    if (override) {
-        return override;
-    }
-    const localRequire = getLocalRequire();
-    try {
-        const pkgJsonPath = localRequire.resolve("@unispechq/unispec-schema/package.json");
-        return path.join(path.dirname(pkgJsonPath), "schema");
-    }
-    catch {
-        const entryPath = localRequire.resolve("@unispechq/unispec-schema");
-        const pkgRoot = findPackageRoot(entryPath);
-        return path.join(pkgRoot, "schema");
-    }
-}
-const validatorCache = new Map();
-function getCompiledValidator(options = {}) {
-    const schemaDir = getUniSpecSchemaDir(options);
-    assertValidSchemaDir(schemaDir);
-    const cached = validatorCache.get(schemaDir);
-    if (cached) {
-        return cached;
-    }
-    const ajv = new Ajv2020({
-        allErrors: true,
-        strict: true,
-    });
-    // Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
-    ajv.addFormat("uri", true);
-    // Register all UniSpec subschemas so that Ajv can resolve internal $ref links
+const ajv = new Ajv2020({
+    allErrors: true,
+    strict: true,
+});
+// Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
+ajv.addFormat("uri", true);
+// Register all UniSpec subschemas so that Ajv can resolve internal $ref links
+try {
+    const schemaDir = path.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
     const types = unispecManifest?.types ?? {};
     const typeSchemaPaths = Object.values(types).map((rel) => String(rel));
-    for (const relPath of typeSchemaPaths) {
-        const filePath = path.join(schemaDir, relPath);
-        if (!fs.existsSync(filePath)) {
-            continue;
-        }
-        const schema = JSON.parse(fs.readFileSync(filePath, "utf8"));
-        const normalizedRelPath = String(relPath).replace(/^\.\//, "");
-        const fallbackId = `https://unispec.dev/schema/${normalizedRelPath}`;
-        ajv.addSchema(schema, fallbackId);
-    }
-    const validateFn = ajv.compile(unispecSchema);
-    const testsSchemaPath = path.join(schemaDir, "unispec-tests.schema.json");
-    const testsSchema = JSON.parse(fs.readFileSync(testsSchemaPath, "utf8"));
-    const validateTestsFn = ajv.compile(testsSchema);
-    const compiled = {
-        validateFn,
-        validateTestsFn,
-    };
-    validatorCache.set(schemaDir, compiled);
-    return compiled;
+    const loadedTypeSchemas = typeSchemaPaths
+        .map((relPath) => path.join(schemaDir, relPath))
+        .filter((filePath) => fs.existsSync(filePath))
+        .map((filePath) => JSON.parse(fs.readFileSync(filePath, "utf8")));
+    ajv.addSchema(loadedTypeSchemas);
 }
+catch {
+    // If subschemas cannot be loaded for some reason, validation will still work for
+    // parts of the schema that do not rely on those $ref references.
+}
+const validateFn = ajv.compile(unispecSchema);
+let validateTestsFn;
 function mapAjvErrors(errors) {
     if (!errors)
         return [];
@@ -122,7 +38,6 @@ function mapAjvErrors(errors) {
  * Validate a UniSpec document against the UniSpec JSON Schema.
  */
 export async function validateUniSpec(doc, _options = {}) {
-    const { validateFn } = getCompiledValidator(_options);
     const docForValidation = {
         unispecVersion: "0.0.0",
         service: {
@@ -150,7 +65,12 @@ export async function validateUniSpec(doc, _options = {}) {
  * Validate a UniSpec Tests document against the UniSpec Tests JSON Schema.
  */
 export async function validateUniSpecTests(doc, _options = {}) {
-    const { validateTestsFn } = getCompiledValidator(_options);
+    if (!validateTestsFn) {
+        const schemaDir = path.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
+        const testsSchemaPath = path.join(schemaDir, "unispec-tests.schema.json");
+        const testsSchema = JSON.parse(fs.readFileSync(testsSchemaPath, "utf8"));
+        validateTestsFn = ajv.compile(testsSchema);
+    }
     const valid = validateTestsFn(doc);
     if (valid) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unispechq/unispec-core",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Central UniSpec Core Engine providing parsing, validation, normalization, diffing, and conversion of UniSpec specs.",
   "license": "MIT",
   "repository": {