@drunkcod/argis 0.0.19 → 0.0.20

package/lib/Json.d.ts

@@ -9,17 +9,11 @@ export type JsonError<T, Data = {}> = Tagged<typeof JsonError, T, Data>;
 export type JsonCycleError<T> = JsonError<'cycle-detected', {
     data: T;
 }>;
-type JsonProperty<T, P extends keyof T = keyof T> = P extends string | number ? (_Json<T[P]> extends never ? never : P) : never;
-type OptionalKeys<T, K> = K extends keyof T ? IfOptional<T, K, K, never> : never;
-type Keys<T, K extends keyof T, Optional = OptionalKeys<T, K>> = {
-    required: Exclude<K, Optional>;
-    optional: Optional;
-};
-type JsonObject<T> = _JsonObject<T, Keys<T, JsonProperty<T>>>;
-type _JsonObject<T, K extends Keys<T, any>> = {
-    [P in K['required']]: Pretty<_Json<T[P]>>;
+type JsonProperty<T, P extends keyof T> = P extends string | number ? (_Json<T[P]> extends never ? never : P) : never;
+type JsonObject<T> = {
+    [P in keyof T as IfOptional<T, P, never, JsonProperty<T, P>>]: Pretty<_Json<T[P]>>;
 } & {
-    [P in K['optional']]?: Pretty<_Json<T[P]>>;
+    [P in keyof T as IfOptional<T, P, JsonProperty<T, P>, never>]?: Pretty<_Json<T[P]>>;
 };
 type _Json<T, IsRoot = true> = IsAny<T> extends true ? any : T extends TagCycle<infer X> ? (X extends Jsonable<infer J> ? Json<J, false> : JsonCycleError<X>) : T extends Jsonable<infer J> ? (IsRoot extends true ? Json<J, false> : _Json<Omit<T, 'toJSON'>>) : T extends NeverJson ? never : T extends EmptyJson ? Record<string, never> : T extends bigint ? JsonError<'bigint-not-serializeable'> : T extends readonly any[] ? {
     [I in keyof T]: [_Json<T[I]>] extends [never] ? null : Pretty<_Json<T[I]>>;

package/lib/cjs/Json.d.ts

@@ -9,17 +9,11 @@ export type JsonError<T, Data = {}> = Tagged<typeof JsonError, T, Data>;
 export type JsonCycleError<T> = JsonError<'cycle-detected', {
     data: T;
 }>;
-type JsonProperty<T, P extends keyof T = keyof T> = P extends string | number ? (_Json<T[P]> extends never ? never : P) : never;
-type OptionalKeys<T, K> = K extends keyof T ? IfOptional<T, K, K, never> : never;
-type Keys<T, K extends keyof T, Optional = OptionalKeys<T, K>> = {
-    required: Exclude<K, Optional>;
-    optional: Optional;
-};
-type JsonObject<T> = _JsonObject<T, Keys<T, JsonProperty<T>>>;
-type _JsonObject<T, K extends Keys<T, any>> = {
-    [P in K['required']]: Pretty<_Json<T[P]>>;
+type JsonProperty<T, P extends keyof T> = P extends string | number ? (_Json<T[P]> extends never ? never : P) : never;
+type JsonObject<T> = {
+    [P in keyof T as IfOptional<T, P, never, JsonProperty<T, P>>]: Pretty<_Json<T[P]>>;
 } & {
-    [P in K['optional']]?: Pretty<_Json<T[P]>>;
+    [P in keyof T as IfOptional<T, P, JsonProperty<T, P>, never>]?: Pretty<_Json<T[P]>>;
 };
 type _Json<T, IsRoot = true> = IsAny<T> extends true ? any : T extends TagCycle<infer X> ? (X extends Jsonable<infer J> ? Json<J, false> : JsonCycleError<X>) : T extends Jsonable<infer J> ? (IsRoot extends true ? Json<J, false> : _Json<Omit<T, 'toJSON'>>) : T extends NeverJson ? never : T extends EmptyJson ? Record<string, never> : T extends bigint ? JsonError<'bigint-not-serializeable'> : T extends readonly any[] ? {
     [I in keyof T]: [_Json<T[I]>] extends [never] ? null : Pretty<_Json<T[I]>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@drunkcod/argis",
   "type": "module",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "A tiny, type-first toolkit for runtime argument validation and structural object utilities.",
   "scripts": {
     "clean": "rimraf lib",