feature: add better support for json schema refs (#78)

Author: levivilet

packages/json-worker/src/parts/JsonCompletionProperty/JsonCompletionProperty.ts

@@ -4,20 +4,23 @@ import * as PropertyKeyToCompletionOption from '../PropertyKeyToCompletionOption
 import * as ResolveSchemaRef from '../ResolveSchemaRef/ResolveSchemaRef.ts'
 import type { JsonSchema } from '../JsonSchema/JsonSchema.ts'
 
-const getSchemaProperties = (schema: JsonSchema): JsonSchema['properties'] => {
+const getSchemaProperties = (
+  rootSchema: JsonSchema,
+  schema: JsonSchema,
+): JsonSchema['properties'] => {
   if (schema.properties) {
     return schema.properties
   }
 
   if (schema.$ref) {
-    const resolved = ResolveSchemaRef.resolveSchemaRef(schema, schema.$ref)
-    return resolved.properties || {}
+    const resolved = ResolveSchemaRef.resolveSchemaRef(rootSchema, schema.$ref)
+    return getSchemaProperties(rootSchema, resolved)
   }
 
   if (schema.allOf) {
     const properties: { [key: string]: JsonSchema } = {}
     for (const subSchema of schema.allOf) {
-      const subProperties = getSchemaProperties(subSchema)
+      const subProperties = getSchemaProperties(rootSchema, subSchema)
       Object.assign(properties, subProperties)
     }
     return properties
@@ -26,7 +29,7 @@ const getSchemaProperties = (schema: JsonSchema): JsonSchema['properties'] => {
   if (schema.anyOf) {
     const properties: { [key: string]: JsonSchema } = {}
     for (const subSchema of schema.anyOf) {
-      const subProperties = getSchemaProperties(subSchema)
+      const subProperties = getSchemaProperties(rootSchema, subSchema)
       Object.assign(properties, subProperties)
     }
     return properties
@@ -39,7 +42,7 @@ export const jsonCompletionProperty = (
   schema: JsonSchema,
   node: AstNode,
 ): readonly CompletionItem[] => {
-  const properties = getSchemaProperties(schema)
+  const properties = getSchemaProperties(schema, schema)
   const keys = Object.keys(properties || {})
   return keys.map(PropertyKeyToCompletionOption.propertyKeyToCompletionOption)
 }

packages/json-worker/test/JsonCompletionProperty.test.ts

@@ -1,7 +1,8 @@
 import { jest, test, expect } from '@jest/globals'
 import * as JsonCompletionProperty from '../src/parts/JsonCompletionProperty/JsonCompletionProperty.ts'
+import * as CompletionType from '../src/parts/CompletionType/CompletionType.ts'
 
-test.skip('handles schema references', () => {
+test('handles schema references', () => {
   const schema = {
     allOf: [
       {
@@ -34,7 +35,7 @@ test.skip('handles schema references', () => {
   const result = JsonCompletionProperty.jsonCompletionProperty(schema, node)
   expect(result).toEqual([
     {
-      kind: 10,
+      kind: CompletionType.Property,
       label: 'compilerOptions',
     },
   ])