fix: V.properties typing

Signed-off-by: Samppa Saarela <samppa.saarela@iki.fi>
finnair · Nov 8, 2024 · 757b676 · 757b676
1 parent 9070e0d
commit 757b676
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/packages/core/src/V.spec.ts b/packages/core/src/V.spec.ts
@@ -417,7 +417,12 @@ describe('objects', () => {
     await expectViolations({ property: 'string' }, validator, defaultViolations.unknownPropertyDenied(ROOT.property('property')));
   });
 
-  test('properties', () => expectValid({ foo: 'bar' }, V.properties(V.string(), V.string())));
+  describe('properties', () => {
+    test('valid properties', async () => {
+      const validator = V.properties(V.string(), V.string());
+      (await expectValid({ foo: 'bar' } satisfies Record<string, string>, validator)) satisfies Record<string, string>;
+    });
+  });
 
   describe('cross-property rules', () => {
     interface IPasswordRequest {

diff --git a/packages/core/src/V.ts b/packages/core/src/V.ts
@@ -186,7 +186,8 @@ export const V = {
 
   size: <T extends { length: number }>(min: number, max: number) => new SizeValidator<T>(min, max),
 
-  properties: (keys: Validator, values: Validator) => new ObjectValidator({ additionalProperties: { keys, values } }),
+  properties: <Key extends keyof any, Value>(keys: Validator<Key>, values: Validator<Value>) => 
+    new ObjectValidator<Record<Key, Value>>({ additionalProperties: { keys, values } }),
 
   allOf: (...validators: [Validator, ...Validator[]]) => new AllOfValidator(validators),
 

diff --git a/packages/core/src/testUtil.spec.ts b/packages/core/src/testUtil.spec.ts
@@ -24,7 +24,7 @@ export function verifyValid<Out>(result: ValidationResult<Out>, value: any, conv
   } else {
     expect(result.getValue()).toEqual(value);
   }
-  return result;
+  return result.getValue();
 }
 
 test.skip('do not fail build because of no tests found', () => { });
diff --git a/packages/luxon/package.json b/packages/luxon/package.json
@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "@finnair/path": ">=6",
-    "@finnair/v-validation": ">=6",
+    "@finnair/v-validation": ">=7",
     "luxon": "^3.4.0"
   },
   "devDependencies": {

diff --git a/packages/moment/package.json b/packages/moment/package.json
@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "@finnair/path": "=>6",
-    "@finnair/v-validation": ">=6",
+    "@finnair/v-validation": ">=7",
     "moment": "^2.30.0"
   },
   "devDependencies": {