Revert JSON Schema changes

Author: LeeGathercole

eventcatalog/src/components/SchemaExplorer/JSONSchemaViewer.tsx

@@ -1,5 +1,4 @@
 import { useState, useEffect, useRef, useMemo } from 'react';
-import $RefParser from '@apidevtools/json-schema-ref-parser';
 
 interface JSONSchemaViewerProps {
   schema: any;
@@ -101,16 +100,107 @@ function mergeAllOfSchemas(schemaWithProcessor: any): any {
   return mergedSchema;
 }
 
-async function processSchema(schema: any, rootSchema?: any): Promise<any> {
+function processSchema(schema: any, rootSchema?: any): any {
   if (!schema) return schema;
 
-  let dereferencedSchema = await $RefParser.dereference(schema, {
-    dereference: {
-      circular: true, // Don't allow circular $refs
-    },
-  });
-  console.log(dereferencedSchema);
-  return dereferencedSchema;
+  const root = rootSchema || schema;
+
+  // Handle $ref
+  if (schema.$ref) {
+    const refPath = schema.$ref;
+    let resolvedSchema = null;
+    let defName = '';
+
+    // Try draft-7 style first: #/definitions/
+    if (refPath.startsWith('#/definitions/')) {
+      defName = refPath.replace('#/definitions/', '');
+      if (root.definitions && root.definitions[defName]) {
+        resolvedSchema = root.definitions[defName];
+      }
+    }
+    // Try 2020-12 style: #/$defs/
+    else if (refPath.startsWith('#/$defs/')) {
+      defName = refPath.replace('#/$defs/', '');
+      if (root.$defs && root.$defs[defName]) {
+        resolvedSchema = root.$defs[defName];
+      }
+    }
+    // Try other common patterns
+    else if (refPath.startsWith('#/components/schemas/')) {
+      defName = refPath.replace('#/components/schemas/', '');
+      if (root.components && root.components.schemas && root.components.schemas[defName]) {
+        resolvedSchema = root.components.schemas[defName];
+      }
+    }
+
+    if (resolvedSchema) {
+      const processedSchema = processSchema(resolvedSchema, root);
+      return {
+        ...processedSchema,
+        _refPath: refPath,
+        _refName: defName,
+        _originalRef: schema.$ref,
+      };
+    }
+
+    return {
+      type: 'string',
+      description: `Reference to ${refPath} (definition not found in root schema)`,
+      title: defName || refPath.split('/').pop(),
+      _refPath: refPath,
+      _refName: defName,
+      _refNotFound: true,
+    };
+  }
+
+  if (schema.allOf) {
+    return mergeAllOfSchemas({ ...schema, processSchema: (s: any) => processSchema(s, root) });
+  }
+
+  if (schema.oneOf) {
+    const processedVariants = schema.oneOf.map((variant: any) => {
+      const processedVariant = processSchema(variant, root);
+      return {
+        title: processedVariant.title || variant.title || 'Unnamed Variant',
+        required: processedVariant.required || variant.required || [],
+        properties: processedVariant.properties || {},
+        ...processedVariant,
+      };
+    });
+
+    const allProperties: Record<string, any> = {};
+    processedVariants.forEach((variant: any) => {
+      if (variant.properties) {
+        Object.assign(allProperties, variant.properties);
+      }
+    });
+
+    return {
+      ...schema,
+      type: schema.type || 'object',
+      properties: {
+        ...(schema.properties || {}),
+        ...allProperties,
+      },
+      variants: processedVariants,
+    };
+  }
+
+  // Process nested schemas in properties
+  if (schema.properties) {
+    const processedProperties: Record<string, any> = {};
+    Object.entries(schema.properties).forEach(([key, prop]: [string, any]) => {
+      processedProperties[key] = processSchema(prop, root);
+    });
+    schema = { ...schema, properties: processedProperties };
+  }
+
+  // Process array items
+  if (schema.type === 'array' && schema.items) {
+    schema = { ...schema, items: processSchema(schema.items, root) };
+  }
+
+  return schema;
 }
 
 // SchemaProperty component

eventcatalog/src/types/fhir-react.d.ts

@@ -98,7 +98,6 @@
     "diff2html": "^3.4.48",
     "dotenv": "^16.5.0",
     "elkjs": "^0.10.0",
-    "fhir-react": "^1.0.2",
     "glob": "^10.5.0",
     "gray-matter": "^4.0.3",
     "html-to-image": "^1.11.11",