fix: instancePath using incorrect value for tests (#295)

Author: d-jeffery

pkg/js/tests/validate-rules.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from "@jest/globals";
 import { Validator } from "../validator/validate-rules";
 
 // These tests are a subset of bad formats that all validation rules that should fail
-const validatedBadStructure = (validator: any) => {
+const validatedBadStructure = (validator: (value: string) => boolean) => {
   it("should fail if '::' is the delimiter", () => {
     expect(validator("item::1")).toBeFalsy();
   });

pkg/js/validator/index.ts

@@ -1 +1,3 @@
 export * from "./validate-dsl";
+export * from "./validate-rules";
+export * from "./validate-store";

pkg/js/validator/validate-store.ts

@@ -12,7 +12,7 @@ import Ajv, { Schema, ValidateFunction, SchemaValidateFunction } from "ajv";
 import { Validator } from "./validate-rules";
 
 export function isStringValue(str: unknown) {
-  return typeof str == "string";
+  return typeof str == "string" || String;
 }
 
 type Store = {
@@ -34,16 +34,20 @@ type Test = {
 
 type CheckTest = Omit<CheckRequestTupleKey, "relation"> & {
   assertions: Record<string, boolean>;
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   context: Record<string, any>;
 };
 
 type ListObjectTest = Omit<ListObjectsRequest, "relation"> & {
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   assertions: Record<string, any>;
 };
 
 type ListUsersTest = Omit<ListUsersRequest, "relation" | "user_filters"> & {
   object: string;
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   user_filter: Record<string, any>;
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   assertions: Record<string, any>;
 };
 
@@ -418,6 +422,7 @@ function validateUserField(model: AuthorizationModel, types: string[], userField
 function validateAssertionField(
   model: AuthorizationModel,
   typeField: string,
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   assertions: Record<string, any>,
   instancePath: string,
 ) {
@@ -649,7 +654,7 @@ function validateTestTypes(store: Store, model: AuthorizationModel, instancePath
 
     // Validate check
     if (test.check) {
-      for (const singleCheckTest of test.check) {
+      for (const [testNumber, singleCheckTest] of Object.entries(test.check)) {
         if (!singleCheckTest.user || !singleCheckTest.object) {
           return false;
         }
@@ -659,15 +664,15 @@ function validateTestTypes(store: Store, model: AuthorizationModel, instancePath
             singleCheckTest,
             tuples,
             params,
-            instancePath + `/tests/${singleTest}/check/${singleCheckTest}`,
+            instancePath + `/tests/${singleTest}/check/${testNumber}`,
           ),
         );
       }
     }
 
     // Validate list objects
     if (test.list_objects) {
-      for (const singleListObjectTest of test.list_objects) {
+      for (const [testNumber, singleListObjectTest] of Object.entries(test.list_objects)) {
         if (!singleListObjectTest.user || !singleListObjectTest.type) {
           return false;
         }
@@ -677,15 +682,15 @@ function validateTestTypes(store: Store, model: AuthorizationModel, instancePath
             singleListObjectTest,
             tuples,
             params,
-            instancePath + `/tests/${singleTest}/list_objects/${singleListObjectTest}`,
+            instancePath + `/tests/${singleTest}/list_objects/${testNumber}`,
           ),
         );
       }
     }
 
     // Validate list users
     if (test.list_users) {
-      for (const singleListUsersTest of test.list_users) {
+      for (const [testNumber, singleListUsersTest] of Object.entries(test.list_users)) {
         if (!singleListUsersTest.object || !singleListUsersTest.user_filter) {
           return false;
         }
@@ -695,7 +700,7 @@ function validateTestTypes(store: Store, model: AuthorizationModel, instancePath
             singleListUsersTest,
             tuples,
             params,
-            instancePath + `/tests/${singleTest}/list_users/${singleListUsersTest}`,
+            instancePath + `/tests/${singleTest}/list_users/${testNumber}`,
           ),
         );
       }