Revert "added limited support for conditional property values" (#141)

Reverts #135, I did not see the alternative PR sorry!
jsonnext · Sep 6, 2024 · 5806807 · 5806807
1 parent 917333e
commit 5806807
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 69 deletions.
diff --git a/.changeset/nine-timers-develop.md b/.changeset/nine-timers-develop.md
diff --git a/src/features/__tests__/__fixtures__/schemas.ts b/src/features/__tests__/__fixtures__/schemas.ts
@@ -140,7 +140,7 @@ export const testSchemaConditionalProperties = {
   properties: {
     type: {
       type: "string",
-      enum: ["Test_1", "Test_2", "Test_3"],
+      enum: ["Test_1", "Test_2"],
     },
     props: {
       type: "object",
@@ -181,17 +181,5 @@ export const testSchemaConditionalProperties = {
         },
       },
     },
-    {
-      if: {
-        properties: {
-          type: { const: "Test_3" },
-        },
-      },
-      then: {
-        properties: {
-          props: { type: "string", enum: ["ace", "abu", "bay"] },
-        },
-      },
-    },
   ],
 } as JSONSchema7;
diff --git a/src/features/__tests__/json-completion.spec.ts b/src/features/__tests__/json-completion.spec.ts
@@ -409,24 +409,6 @@ describe.each([
     ],
     schema: testSchemaConditionalProperties,
   },
-  {
-    name: "autocomplete for a schema with conditional property values",
-    mode: MODES.JSON,
-    docs: ['{ "type": "Test_3", "props": "a|"'],
-    expectedResults: [
-      {
-        type: "string",
-        label: "ace",
-        apply: '"ace"',
-      },
-      {
-        type: "string",
-        label: "abu",
-        apply: '"abu"',
-      },
-    ],
-    schema: testSchemaConditionalProperties,
-  },
   // JSON5
   {
     name: "return bare property key when no quotes are used",

diff --git a/src/features/completion.ts b/src/features/completion.ts
@@ -837,50 +837,19 @@ export class JSONCompletion {
     if (
       !subSchema ||
       subSchema.name === "UnknownPropertyError" ||
-      // TODO: Looking into why this is needed
       subSchema.enum ||
       subSchema.type === "undefined" ||
       subSchema.type === "null"
     ) {
-      debug.log(
-        "xxx",
-        "no schema for pointer. Try parent pointer..",
-        pointer,
-        subSchema
-      );
       pointer = pointer.replace(/\/[^/]*$/, "/");
-      pointer = "/" ? "" : pointer; // root pointer should be empty ("/" is a JSON pointer for an empty string key)
-      subSchema = draft.getSchema({ pointer, data: data ?? undefined });
-      debug.log(
-        "xxx",
-        "subSchema for parent pointer",
-        subSchema,
-        pointer,
-        data
-      );
-      // resolve all direct child schemas
-      // TODO: This is a bit hacky, but it works for now
-      if (subSchema?.properties) {
-        Object.entries(subSchema.properties).forEach(([key, value]) => {
-          if (subSchema?.properties && typeof value === "object") {
-            subSchema.properties[key] = {
-              ...value,
-              ...draft.getSchema({
-                pointer: pointer + "/" + key,
-                data: data ?? undefined,
-              }),
-            };
-          }
-        });
-        debug.log("xxx", "direct children resolved", subSchema);
-      }
+      subSchema = draft.getSchema({ pointer });
     }
 
     debug.log("xxx", "pointer..", JSON.stringify(pointer));
 
     // For some reason, it returns undefined schema for the root pointer
     // We use the root schema in that case as the relevant (sub)schema
-    if (!subSchema && (!pointer || pointer === "/")) {
+    if (!pointer || pointer === "/") {
       subSchema = this.expandSchemaProperty(schema, schema) ?? schema;
     }
     // const subSchema = new Draft07(this.schema).getSchema(pointer);