fix: should be able to reach nullable operand

Hrdtr · Jul 4, 2024 · c53675c · c53675c
1 parent 7ff7a47
commit c53675c
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -4,9 +4,9 @@ type ContextField<
   Prefix extends string = "$context."
 > = `context.${string}` | {
   [K in keyof Context]: K extends string | number
-    ? Context[K] extends Record<string, unknown>
-      ? ContextField<Context[K], T, `${Prefix}${K}.`>
-      : T extends Context[K] ? `${Prefix}${K}` : never
+    ? NonNullable<Context[K]> extends Record<string, unknown>
+      ? Extract<Context[K], null | undefined> extends never ? ContextField<NonNullable<Context[K]>, T, `${Prefix}${K}.`> : ContextField<NonNullable<Context[K]>, T, `${Prefix}${K}?.`>
+      : T extends NonNullable<Context[K]> ? `${Prefix}${K}` : never
     : never
 }[keyof Context];
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -78,6 +78,7 @@ export const isContextualOperand = (path: unknown): path is string => typeof pat
  */
 export const getContextValue = <T extends Record<string, unknown>, U>(context: T, path: string): U | undefined => {
   return (path.replace(path.startsWith('$') ? '$context.' : 'context.', ''))
+    .replaceAll('?.', '.')
     .split('.')
     // eslint-disable-next-line unicorn/no-array-reduce
     .reduce((o, k) => (o || {})[k], (context ?? {}) as Record<string, any>) as U | undefined

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -310,6 +310,60 @@ describe('Guantr.can', () => {
     expect(guantr.can('read', ['user', mockUser])).toBe(false)
   })
 
+  it('should be able to reach nullable context', () => {
+    const mockContext1 = {
+      address: null
+    } as { address: { line1: string } | null }
+    const mockContext2 = {
+      address: { line1: '123 Main St', }
+    } as { address: { line1: string } | null }
+
+    const guantr1 = createGuantr<MockMeta>().withContext(mockContext1)
+    guantr1.setPermissions([
+      {
+        resource: 'user',
+        action: 'read',
+        condition: {
+          address: {
+            line1: ['equals', '$context.address?.line1']
+          }
+        },
+        inverted: false
+      },
+    ])
+
+    const guantr2 = createGuantr<MockMeta>().withContext(mockContext2)
+    guantr2.setPermissions([
+      {
+        resource: 'user',
+        action: 'read',
+        condition: {
+          address: {
+            line1: ['equals', '$context.address?.line1']
+          }
+        },
+        inverted: false
+      },
+    ])
+
+    const mockUser: MockResourceMap['user'] = {
+      id: 1,
+      name: 'John Doe',
+      suspended: null,
+      roles: [{ id: 1, name: 'admin' }, { id: 2, name: 'user' }],
+      address: {
+        line1: '123 Main St',
+        line2: 'Apt 4B',
+        city: 'AnyTown',
+        state: 'CA',
+        zip: '12345',
+        country: 'ID'
+      }
+    }
+    expect(guantr1.can('read', ['user', mockUser])).toBe(false)
+    expect(guantr2.can('read', ['user', mockUser])).toBe(true)
+  })
+
   it('should handle inverted rule correctly', () => {
     const guantr = createGuantr<MockMeta>()
     guantr.setPermissions([
@@ -341,4 +395,3 @@ describe('Guantr.can', () => {
     expect(guantr.can('read', ['post', { ...post, published: false }])).toBe(false)
   })
 })
-