fix: object schema (#15)

Co-authored-by: Vladimir Klepov <vklepov@ozon.ru>

package.json

@@ -19,7 +19,9 @@
     "node": "^14 || ^16 || >=18"
   },
   "scripts": {
-    "test": "rm -rf dist/tests && tsc -p tests/tsconfig.json && uvu dist/tests '.test.js$'",
+    "test:types": "tsc && tsc -p tests/tsconfig.dts.json --noEmit",
+    "test:runtime": "rm -f dist/tests/**/*.{ts,js} && tsc -p tests/tsconfig.json && uvu dist/tests '.test.js$'",
+    "test": "npm run test:types && npm run test:runtime",
     "test:coverage": "c8 --100 --exclude dist/tests npm test",
     "lint:all": "prettier --check --loglevel warn .",
     "format": "prettier --loglevel silent --write",

src/index.ts

@@ -83,7 +83,7 @@ export const record = <Item>(
   });
 
 export const object = <T = Record<string, never>>(schema: {
-  [K in keyof Required<T>]: Cast<T[K]>;
+  [K in keyof T]-?: Cast<T[K]>;
 }) =>
   instance(Object).map((raw: any) => {
     const res = {} as T;
@@ -96,7 +96,7 @@ export const object = <T = Record<string, never>>(schema: {
 export const objectLoose = <
   T extends Record<string, unknown> = Record<string, never>
 >(schema: {
-  [K in keyof Required<T>]: Cast<T[K]>;
+  [K in keyof T]-?: Cast<T[K]>;
 }) =>
   instance(Object).map((raw: any) => {
     const res = { ...raw };

tests/tsconfig.dts.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "paths": {
+      "$lib/*": ["../dist/*"]
+    },
+    "incremental": true
+  },
+  "extends": "../tsconfig.json",
+  "include": ["./typings"]
+}

tests/tsconfig.json

@@ -1,6 +1,11 @@
 {
   "compilerOptions": {
-    "module": "esnext"
+    "module": "esnext",
+    "paths": {
+      "$lib/*": ["../src/*"]
+    },
+    "incremental": true,
+    "tsBuildInfoFile": "../dist/test.tsbuildinfo"
   },
   "extends": "../tsconfig.json",
   "include": ["./**/*.ts"]

tests/typings/Banditype.ts

@@ -15,7 +15,7 @@ import {
   optional,
   set,
   unknown,
-} from "../../src";
+} from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(array(string())).toEqualTypeOf<Banditype<Array<string>>>();

tests/typings/any.ts

@@ -1,4 +1,4 @@
 import { expectTypeOf } from "expect-type";
-import { banditype } from "../../src";
+import { banditype } from "$lib/index.js";
 
 expectTypeOf(banditype<any>((raw) => raw)).returns.toEqualTypeOf<any>();

tests/typings/array.ts

@@ -1,4 +1,4 @@
-import { array, number, unknown } from "../../src";
+import { array, number, unknown } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(array(unknown())).returns.toEqualTypeOf<unknown[]>();

tests/typings/assign.ts

@@ -1,4 +1,4 @@
-import { object, number, string } from "../../src";
+import { object, number, string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 const schemaA = { a: number() };

tests/typings/boolean.ts

@@ -1,4 +1,4 @@
-import { boolean } from "../../src";
+import { boolean } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(boolean()).returns.toEqualTypeOf<boolean>();

tests/typings/coerce.ts

@@ -1,4 +1,4 @@
-import { string } from "../../src";
+import { string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/date.ts

@@ -1,4 +1,4 @@
-import { instance, fail } from "../../src";
+import { instance, fail } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/defaulted.ts

@@ -1,4 +1,4 @@
-import { string } from "../../src";
+import { string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string().or(() => "default")).returns.toEqualTypeOf<string>();

tests/typings/empty.ts

@@ -1,4 +1,4 @@
-import { string, array, map, set, fail, unknown } from "../../src";
+import { string, array, map, set, fail, unknown } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/enums.ts

@@ -1,4 +1,4 @@
-import { enums } from "../../src";
+import { enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf((x) => {

tests/typings/func.ts

@@ -1,4 +1,4 @@
-import { func } from "../../src";
+import { func } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(func()).returns.toEqualTypeOf<(...args: unknown[]) => unknown>();

tests/typings/infer.ts

@@ -1,4 +1,4 @@
-import { type Infer, object } from "../../src";
+import { type Infer, object } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 const Struct = object({});

tests/typings/instance.ts

@@ -1,4 +1,4 @@
-import { instance } from "../../src";
+import { instance } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(instance(Date)).returns.toEqualTypeOf<Date>();

tests/typings/integer.ts

@@ -1,4 +1,4 @@
-import { fail, number } from "../../src";
+import { fail, number } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/lazy.ts

@@ -1,4 +1,4 @@
-import { lazy, string } from "../../src";
+import { lazy, string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(lazy(() => string())).returns.toEqualTypeOf<string>();

tests/typings/literal.ts

@@ -1,4 +1,4 @@
-import { enums } from "../../src";
+import { enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(enums([true])).returns.toEqualTypeOf<true>();

tests/typings/map.ts

@@ -1,4 +1,4 @@
-import { map, string, number } from "../../src";
+import { map, string, number } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(map(string(), number())).returns.toEqualTypeOf<

tests/typings/max.ts

@@ -1,4 +1,4 @@
-import { number, fail } from "../../src";
+import { number, fail } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/min.ts

@@ -1,4 +1,4 @@
-import { number, fail } from "../../src";
+import { number, fail } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/never.ts

@@ -1,4 +1,4 @@
-import { never } from "../../src";
+import { never } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(never()).returns.toEqualTypeOf<never>();

tests/typings/nullable.ts

@@ -1,4 +1,4 @@
-import { string, object, enums } from "../../src";
+import { string, object, enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string().or(enums([null]))).returns.toEqualTypeOf<string | null>();

tests/typings/number.ts

@@ -1,4 +1,4 @@
-import { number } from "../../src";
+import { number } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(number()).returns.toEqualTypeOf<number>();

tests/typings/object.ts

@@ -1,4 +1,4 @@
-import { object, number, string, Banditype } from "../../src";
+import { object, number, string, Cast } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(object({})).returns.toEqualTypeOf<Record<string, never>>();
@@ -13,10 +13,8 @@ expectTypeOf(
   b: string;
 }>();
 
-expectTypeOf(
-  object<{ key?: string }>({
-    key: string(),
-  })
-).parameters.toEqualTypeOf<{
-  key: Banditype<string>;
-}>;
+expectTypeOf(object<{ key?: string }>)
+  .parameter(0)
+  .toEqualTypeOf<{
+    key: Cast<string | undefined>;
+  }>();

tests/typings/objectLoose.ts

@@ -1,4 +1,4 @@
-import { objectLoose, number } from "../../src";
+import { objectLoose, number } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(objectLoose({ a: number() })).returns.toEqualTypeOf<{

tests/typings/optional.ts

@@ -1,4 +1,4 @@
-import { optional, string, number, object, enums } from "../../src";
+import { optional, string, number, object, enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string().or(optional())).returns.toEqualTypeOf<

tests/typings/pattern.ts

@@ -1,4 +1,4 @@
-import { fail, string } from "../../src";
+import { fail, string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/record.ts

@@ -1,4 +1,4 @@
-import { record, number } from "../../src";
+import { record, number } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(record(number())).returns.toEqualTypeOf<Record<string, number>>();

tests/typings/refine.ts

@@ -1,4 +1,4 @@
-import { string } from "../../src";
+import { string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string().map((x) => x)).returns.toEqualTypeOf<string>();

tests/typings/regexp.ts

@@ -1,4 +1,4 @@
-import { instance } from "../../src";
+import { instance } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(instance(RegExp)).returns.toEqualTypeOf<RegExp>();

tests/typings/set.ts

@@ -1,4 +1,4 @@
-import { set, string } from "../../src";
+import { set, string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(set(string())).returns.toEqualTypeOf<Set<string>>();

tests/typings/string.ts

@@ -1,4 +1,4 @@
-import { string } from "../../src";
+import { string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string()).returns.toEqualTypeOf<string>();

tests/typings/struct.ts

@@ -1,4 +1,4 @@
-import { banditype } from "../../src";
+import { banditype } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/trimmed.ts

@@ -1,4 +1,4 @@
-import { string } from "../../src";
+import { string } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(string().map((x) => x.trim())).returns.toEqualTypeOf<string>();

tests/typings/tuple.ts

@@ -1,4 +1,4 @@
-import { tuple, string, number, enums } from "../../src";
+import { tuple, string, number, enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(tuple([string(), number()] as const)).returns.toEqualTypeOf<

tests/typings/union.ts

@@ -1,4 +1,4 @@
-import { object, string, enums } from "../../src";
+import { object, string, enums } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(

tests/typings/unknown.ts

@@ -1,4 +1,4 @@
-import { unknown } from "../../src";
+import { unknown } from "$lib/index.js";
 import { expectTypeOf } from "expect-type";
 
 expectTypeOf(unknown()).returns.toEqualTypeOf<unknown>();

tsconfig.json

@@ -13,7 +13,8 @@
     "outDir": "dist",
     "rootDirs": ["./src"],
     "strictNullChecks": true,
-    "target": "ES2018"
+    "target": "ES2018",
+    "incremental": true
   },
   "include": ["src"]
 }