@unispechq/unispec-core 0.2.3 → 0.2.4

package/dist/cjs/validator/index.js

@@ -8,6 +8,7 @@ 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 unispec_schema_1 = require("@unispechq/unispec-schema");
 const ajv = new _2020_js_1.default({
     allErrors: true,
@@ -15,16 +16,53 @@ const ajv = new _2020_js_1.default({
 });
 // Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
 ajv.addFormat("uri", true);
+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() {
+    const localRequire = typeof require !== "undefined" ? require : (0, module_1.createRequire)(path_1.default.join(process.cwd(), "package.json"));
+    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");
+    }
+}
 // 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 schemaDir = getUniSpecSchemaDir();
     const types = unispec_schema_1.manifest?.types ?? {};
     const typeSchemaPaths = Object.values(types).map((rel) => String(rel));
-    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);
+    for (const relPath of typeSchemaPaths) {
+        try {
+            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);
+        }
+        catch {
+            // Ignore individual schema registration failures to keep the validator usable.
+        }
+    }
 }
 catch {
     // If subschemas cannot be loaded for some reason, validation will still work for
@@ -73,7 +111,7 @@ async function validateUniSpec(doc, _options = {}) {
  */
 async function validateUniSpecTests(doc, _options = {}) {
     if (!validateTestsFn) {
-        const schemaDir = path_1.default.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
+        const schemaDir = getUniSpecSchemaDir();
         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);

package/dist/validator/index.js

@@ -1,6 +1,7 @@
 import Ajv2020 from "ajv/dist/2020.js";
 import fs from "fs";
 import path from "path";
+import { createRequire } from "module";
 import { unispec as unispecSchema, manifest as unispecManifest } from "@unispechq/unispec-schema";
 const ajv = new Ajv2020({
     allErrors: true,
@@ -8,16 +9,53 @@ const ajv = new Ajv2020({
 });
 // Register minimal URI format to satisfy UniSpec schemas (service.environments[*].baseUrl)
 ajv.addFormat("uri", true);
+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() {
+    const localRequire = typeof require !== "undefined" ? require : createRequire(path.join(process.cwd(), "package.json"));
+    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");
+    }
+}
 // 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 schemaDir = getUniSpecSchemaDir();
     const types = unispecManifest?.types ?? {};
     const typeSchemaPaths = Object.values(types).map((rel) => String(rel));
-    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);
+    for (const relPath of typeSchemaPaths) {
+        try {
+            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);
+        }
+        catch {
+            // Ignore individual schema registration failures to keep the validator usable.
+        }
+    }
 }
 catch {
     // If subschemas cannot be loaded for some reason, validation will still work for
@@ -66,7 +104,7 @@ export async function validateUniSpec(doc, _options = {}) {
  */
 export async function validateUniSpecTests(doc, _options = {}) {
     if (!validateTestsFn) {
-        const schemaDir = path.join(process.cwd(), "node_modules", "@unispechq", "unispec-schema", "schema");
+        const schemaDir = getUniSpecSchemaDir();
         const testsSchemaPath = path.join(schemaDir, "unispec-tests.schema.json");
         const testsSchema = JSON.parse(fs.readFileSync(testsSchemaPath, "utf8"));
         validateTestsFn = ajv.compile(testsSchema);

package/package.json

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