feat(utils): add support for 1.2 in code completions

openfga · Aug 22, 2024 · 35647a9 · 35647a9
1 parent bdc2f3c
commit 35647a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/constants/schema-version.ts b/src/constants/schema-version.ts
@@ -1,4 +1,5 @@
 export enum SchemaVersion {
   OneDotZero = "1.0",
   OneDotOne = "1.1",
+  OneDotTwo = "1.2",
 }
diff --git a/src/tools/monaco/providers/code-actions.ts b/src/tools/monaco/providers/code-actions.ts
@@ -48,6 +48,14 @@ const errorFixesByErrorCodeAndSchema: Partial<
         text: `${SINGLE_INDENTATION}${SINGLE_INDENTATION}${Keyword.DEFINE} ${relation}: [typeName]\n${lineContent}`,
       };
     },
+    [SchemaVersion.OneDotTwo]: ({ model, marker, relation }) => {
+      const lineContent = model.getLineContent(marker.startLineNumber);
+      return {
+        startColumn: 0,
+        title: `Fix: add definition for \`${relation}\`.`,
+        text: `${SINGLE_INDENTATION}${SINGLE_INDENTATION}${Keyword.DEFINE} ${relation}: [typeName]\n${lineContent}`,
+      };
+    },
   },
   [errors.ValidationError.SelfError]: {
     [SchemaVersion.OneDotZero]: ({ text }) => ({
@@ -58,6 +66,10 @@ const errorFixesByErrorCodeAndSchema: Partial<
       title: `Fix: replace \`${text}\` with type restrictions.`,
       text: "[typeName]",
     }),
+    [SchemaVersion.OneDotTwo]: ({ text }) => ({
+      title: `Fix: replace \`${text}\` with type restrictions.`,
+      text: "[typeName]",
+    }),
   },
   [errors.ValidationError.DuplicatedError]: {
     [SchemaVersion.OneDotZero]: ({ model, marker, markerRange, text }) => ({
@@ -72,6 +84,12 @@ const errorFixesByErrorCodeAndSchema: Partial<
       title: `Fix: remove duplicated \`${text}\`.`,
       text: "",
     }),
+    [SchemaVersion.OneDotTwo]: ({ model, marker, markerRange, text }) => ({
+      startLineNumber: markerRange.startLineNumber - 1,
+      startColumn: model.getLineContent(marker.startLineNumber - 1).length + 1,
+      title: `Fix: remove duplicated \`${text}\`.`,
+      text: "",
+    }),
   },
 };
 

diff --git a/src/tools/monaco/providers/completion.ts b/src/tools/monaco/providers/completion.ts
@@ -37,7 +37,7 @@ function getSuggestions(
         label: `sample-${key}`,
         kind: monaco.languages.CompletionItemKind.Struct,
         insertText: transformer.transformJSONToDSL(
-          schemaVersion === SchemaVersion.OneDotOne
+          schemaVersion === SchemaVersion.OneDotOne || schemaVersion === SchemaVersion.OneDotTwo
             ? sampleModel
             : {
                 schema_version: SchemaVersion.OneDotZero,
@@ -228,6 +228,7 @@ export const provideCompletionItems =
   ) =>
   (model: editor.ITextModel, position: Position): languages.ProviderResult<languages.CompletionList> => {
     switch (schemaVersion) {
+      case SchemaVersion.OneDotTwo:
       case SchemaVersion.OneDotOne:
         return provideCompletionItemsOneDotOne(monaco, completionExtraOptions)(model, position);
       case SchemaVersion.OneDotZero: