chore: moved store validation to language

pkg/java/src/main/java/dev/openfga/language/validation/ValidationOptions.java

@@ -2,8 +2,8 @@
 
 public class ValidationOptions {
 
-    private static final String DEFAULT_TYPE_PATTERN = "^[^:#@\\s]{1,254}$";
-    private static final String DEFAULT_RELATION_PATTERN = "^[^:#@\\s]{1,50}$";
+    private static final String DEFAULT_TYPE_PATTERN = "^[^:#@\\*\\s]{1,254}$";
+    private static final String DEFAULT_RELATION_PATTERN = "^[^:#@\\*\\s]{1,50}$";
 
     private String typePattern = DEFAULT_TYPE_PATTERN;
     private String relationPattern = DEFAULT_RELATION_PATTERN;

pkg/js/package.json

@@ -30,6 +30,7 @@
   ],
   "author": "OpenFGA",
   "dependencies": {
+    "ajv": "^8.16.0",
     "antlr4": "^4.13.1",
     "yaml": "^2.4.5"
   },

pkg/js/tests/_testcases.ts

@@ -8,6 +8,7 @@ import {
   ModelValidationSingleError,
 } from "../errors";
 import { ModuleFile } from "../transformer";
+import { ErrorObject } from "ajv";
 
 interface ValidTestCase {
   name: string;
@@ -60,6 +61,13 @@ interface ModuleTestCase extends ValidTestCase {
   expected_errors?: BaseError[];
 }
 
+interface MultipleInvalidStoreTestCase {
+  name: string;
+  store: string;
+  skip?: boolean;
+  expected_errors: ErrorObject[];
+}
+
 export function loadValidTransformerTestCases(): ValidTestCase[] {
   const testDataPath = path.join(__dirname, "../../../tests", "data", "transformer");
   const entries = fs.readdirSync(testDataPath, { withFileTypes: true });
@@ -201,3 +209,32 @@ export function loadModuleTestCases(): ModuleTestCase[] {
 
   return testCases;
 }
+
+export function loadStoreTestCases(): MultipleInvalidStoreTestCase[] {
+  const testDataPath = path.join(__dirname, "../../../tests", "data", "stores");
+  const entries = fs.readdirSync(testDataPath, { withFileTypes: true });
+
+  const errors: MultipleInvalidStoreTestCase[] = [];
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+
+    const testCase: Partial<MultipleInvalidStoreTestCase> = {
+      name: entry.name,
+    };
+
+    testCase.store = path.join(testDataPath, testCase.name!, "store.fga.yaml");
+
+    const errorsPath = path.join(testDataPath, testCase.name!, "expected_errors.json");
+    if (fs.existsSync(errorsPath)) {
+      const expectedErrors = fs.readFileSync(errorsPath);
+      testCase.expected_errors = JSON.parse(expectedErrors.toString("utf8"));
+    }
+
+    errors.push(testCase as MultipleInvalidStoreTestCase);
+  }
+
+  return errors;
+}

pkg/js/tests/valdiate-store.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "@jest/globals";
+import { YamlStoreValidator, isStringValue } from "../validator/validate-store";
+import { transformDSLToJSONObject } from "../transformer";
+import { ValidateFunction } from "ajv";
+import * as fs from "fs";
+import * as YAML from "yaml";
+import { loadStoreTestCases } from "./_testcases";
+import path from "path";
+
+describe("validate valid store file", () => {
+  const testCases = loadStoreTestCases();
+
+  testCases.forEach((testCase) => {
+    const testFn = testCase.skip ? it.skip : it;
+
+    testFn(`should valdiate ${testCase.name} `, () => {
+      const schemaValidator: ValidateFunction = YamlStoreValidator();
+
+      const yaml = YAML.parseDocument(fs.readFileSync(testCase.store).toString());
+
+      let jsonModel;
+      if (yaml.has("model") && isStringValue(yaml.get("model"))) {
+        jsonModel = transformDSLToJSONObject(String(yaml.get("model", false)));
+      }
+
+      if (yaml.has("model_file") && isStringValue(yaml.get("model_file"))) {
+        jsonModel = transformDSLToJSONObject(
+          fs.readFileSync(path.join(testCase.store, "..", String(yaml.get("model_file", false))), "utf-8"),
+        );
+      }
+
+      if (!schemaValidator.call({ jsonModel }, yaml.toJSON())) {
+        if (schemaValidator.errors) {
+          expect(schemaValidator.errors).toEqual(testCase.expected_errors);
+        }
+      }
+    });
+  });
+});