@trojs/openapi-dereference 1.2.1 → 2.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@trojs/openapi-dereference",
     "description": "OpenAPI dereference",
-    "version": "1.2.1",
+    "version": "2.0.0",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://trojs.org/"
@@ -12,6 +12,7 @@
         "lint:report": "eslint src/*.js -f json -o report.json",
         "lint:fix": "eslint --fix",
         "lint:rules": "eslint --print-config file.js > eslintconfig.json",
+        "lint:types": "tsc --noEmit --project tsconfig.json --skipLibCheck",
         "test": "node --test --experimental-test-coverage --test-reporter=spec --test-reporter=lcov --test-reporter-destination=stdout --test-reporter-destination=./coverage/lcov.info",
         "test:watch": "node --watch --test --experimental-test-coverage --test-reporter=spec --test-reporter=lcov --test-reporter-destination=stdout --test-reporter-destination=./coverage/lcov.info",
         "cpd": "node_modules/jscpd/bin/jscpd src",
@@ -26,13 +27,17 @@
         "src/types.d.ts"
     ],
     "main": "src/index.js",
+    "source": "src/index.js",
+    "module": "src/index.js",
     "types": "src/types.d.ts",
     "devDependencies": {
         "@trojs/lint": "^0.3.0",
+        "@types/node": "^24.9.2",
         "eslint": "^9.15.0",
         "globals": "^16.0.0",
         "jscpd": "^4.0.0",
-        "json-schema": "^0.4.0"
+        "json-schema": "^0.4.0",
+        "typescript": "^5.9.3"
     },
     "repository": {
         "type": "git",

package/src/dereference.js

@@ -2,8 +2,9 @@ import { klona } from './klona.js'
 import { resolveRefSync } from './resolveRef.js'
 
 /**
- * @typedef {import('./types').JSONSchema} JSONSchema
- * @typedef {import('./types').DereferencedJSONSchema} DereferencedJSONSchema
+ * @typedef {import('./types.d.ts').JSONSchema} JSONSchema
+ * @typedef {import('./types.d.ts').DereferencedJSONSchema} DereferencedJSONSchema
+ * @typedef {WeakMap<{[key: string]: string}, any>} WeakMapRefAny
  */
 
 const PROHIBITED_KEYS = new Set(['__proto__', 'constructor', 'prototype'])
@@ -35,6 +36,7 @@ export const dereferenceSync = (schema) => {
     : schema
 
   const cloned = klona(filtered)
+  /** @type {WeakMapRefAny} */
   const seen = new WeakMap()
 
   /**
@@ -49,10 +51,14 @@ export const dereferenceSync = (schema) => {
     // Handle circular references
     if (seen.has(current)) return seen.get(current)
 
-    // Handle arrays
+    // Handle arrays (register before descending)
     if (Array.isArray(current)) {
-      const arr = current.map((item, i) => resolve(item, `${path}/${i}`))
+      const arr = new Array(current.length)
+      // @ts-expect-error WeakMap type
       seen.set(current, arr)
+      for (let i = 0; i < current.length; i++) {
+        arr[i] = resolve(current[i], `${path}/${i}`)
+      }
       return arr
     }
 
@@ -62,28 +68,22 @@ export const dereferenceSync = (schema) => {
       if (!ref) {
         return null
       }
-      if (seen.has(ref)) {
+      // @ts-expect-error WeakMap type
+      if (typeof ref === 'object' && ref !== null && seen.has(ref)) {
+        // @ts-expect-error WeakMap type
         return seen.get(ref)
       }
-      if (Array.isArray(ref)) {
-        const resolvedArray = resolve(ref, current.$ref)
-        seen.set(ref, resolvedArray)
-        return resolvedArray
-      }
-      const placeholder = {}
-      seen.set(current, placeholder)
-      const resolved = resolve(ref, current.$ref)
-      Object.assign(placeholder, resolved)
-      return resolved
+      // Resolve the referenced value (object/array/primitive)
+      return resolve(ref, current.$ref)
     }
 
-    // Handle objects
-    const obj = Object.fromEntries(
-      Object.entries(current)
-        .filter(([key]) => !PROHIBITED_KEYS.has(key))
-        .map(([key, value]) => [key, resolve(value, `${path}/${key}`)])
-    )
+    // Handle objects (register before descending)
+    const obj = {}
     seen.set(current, obj)
+    for (const [key, value] of Object.entries(current)) {
+      if (PROHIBITED_KEYS.has(key)) continue
+      obj[key] = resolve(value, `${path}/${key}`)
+    }
     return obj
   }
 

package/src/index.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./types').JSONSchema} JSONSchema
- * @typedef {import('./types').DereferencedJSONSchema} DereferencedJSONSchema
+ * @typedef {import('./types.js').JSONSchema} JSONSchema
+ * @typedef {import('./types.js').DereferencedJSONSchema} DereferencedJSONSchema
  */
 export * from './dereference.js'
 export * from './resolveRef.js'

package/src/resolveRef.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./types').JSONSchema} JSONSchema
- * @typedef {import('./types').DereferencedJSONSchema} DereferencedJSONSchema
+ * @typedef {import('./types.d.ts').JSONSchema} JSONSchema
+ * @typedef {import('./types.d.ts').DereferencedJSONSchema} DereferencedJSONSchema
  */
 
 const cache = new Map()