is-kit 1.8.0 → 1.8.1

package/dist/index.d.mts

@@ -31,20 +31,26 @@ type SchemaField = Predicate<unknown> | OptionalSchemaField<Predicate<unknown>>;
  * Object schema consumed by `struct`.
  */
 type Schema = Readonly<Record<string, SchemaField>>;
-type Simplify$1<T> = {
+/**
+ * Object schema shape preserving concrete keys.
+ */
+type SchemaShape<S extends object> = Readonly<{
+    [K in keyof S]: SchemaField;
+}>;
+type Simplify<T> = {
     [K in keyof T]: T[K];
 };
 type InferSchemaField<F> = F extends Predicate<unknown> ? GuardedOf<F> : F extends OptionalSchemaField<infer G> ? GuardedOf<G> : never;
-type RequiredSchemaKeys<S extends Schema> = {
+type RequiredSchemaKeys<S extends SchemaShape<S>> = {
     [K in keyof S]-?: S[K] extends OptionalSchemaField<Predicate<unknown>> ? never : K;
 }[keyof S];
-type OptionalSchemaKeys<S extends Schema> = {
+type OptionalSchemaKeys<S extends SchemaShape<S>> = {
     [K in keyof S]-?: S[K] extends OptionalSchemaField<Predicate<unknown>> ? K : never;
 }[keyof S];
 /**
  * Infers the readonly object type produced by a `struct` schema.
  */
-type InferSchema<S extends Schema> = Simplify$1<{
+type InferSchema<S extends SchemaShape<S>> = Simplify<{
     readonly [K in RequiredSchemaKeys<S>]: InferSchemaField<S[K]>;
 } & {
     readonly [K in OptionalSchemaKeys<S>]?: InferSchemaField<S[K]>;
@@ -549,14 +555,10 @@ declare function optionalKey<G extends Predicate<unknown>>(guard: G): OptionalSc
  * @param options When `{ exact: true }`, disallows properties not in `schema`.
  * @returns Predicate that narrows to the inferred struct type.
  */
-declare function struct<S extends Schema>(schema: S, options?: {
+declare function struct<const S extends SchemaShape<S>>(schema: S, options?: {
     exact?: boolean;
 }): Predicate<InferSchema<S>>;
 
-type Simplify<T> = {
-    [K in keyof T]: T[K];
-};
-type StringKeyOf<T> = Extract<keyof T, string>;
 type OptionalKeys<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? K : never;
 }[keyof T];
@@ -569,7 +571,7 @@ type TypedStructShape<T extends object> = {
 type NoExtraKeys<S, Shape> = S & {
     readonly [K in Exclude<keyof S, keyof Shape>]: never;
 };
-type TypedStructTarget<T extends object> = Simplify<Readonly<Pick<T, StringKeyOf<T>>>>;
+type TypedStructFields<T extends object, S extends TypedStructShape<T>> = NoExtraKeys<S, TypedStructShape<T>>;
 /**
  * Creates a `struct` builder checked against an existing object type.
  * Optional target keys must also be declared with `optionalKey` so type drift
@@ -577,9 +579,9 @@ type TypedStructTarget<T extends object> = Simplify<Readonly<Pick<T, StringKeyOf
  *
  * @returns Builder that rejects missing, extra, or incompatible struct fields.
  */
-declare function typedStruct<T extends object>(): <const S extends TypedStructShape<T>>(fields: NoExtraKeys<S, TypedStructShape<T>>, options?: {
+declare function typedStruct<T extends object>(): <const S extends TypedStructShape<T>>(fields: TypedStructFields<T, S>, options?: {
     exact?: boolean;
-}) => Predicate<TypedStructTarget<T>>;
+}) => Predicate<InferSchema<TypedStructFields<T, S>>>;
 
 /**
  * Validates a fixed-length tuple by applying element-wise guards.

package/dist/index.d.ts

@@ -31,20 +31,26 @@ type SchemaField = Predicate<unknown> | OptionalSchemaField<Predicate<unknown>>;
  * Object schema consumed by `struct`.
  */
 type Schema = Readonly<Record<string, SchemaField>>;
-type Simplify$1<T> = {
+/**
+ * Object schema shape preserving concrete keys.
+ */
+type SchemaShape<S extends object> = Readonly<{
+    [K in keyof S]: SchemaField;
+}>;
+type Simplify<T> = {
     [K in keyof T]: T[K];
 };
 type InferSchemaField<F> = F extends Predicate<unknown> ? GuardedOf<F> : F extends OptionalSchemaField<infer G> ? GuardedOf<G> : never;
-type RequiredSchemaKeys<S extends Schema> = {
+type RequiredSchemaKeys<S extends SchemaShape<S>> = {
     [K in keyof S]-?: S[K] extends OptionalSchemaField<Predicate<unknown>> ? never : K;
 }[keyof S];
-type OptionalSchemaKeys<S extends Schema> = {
+type OptionalSchemaKeys<S extends SchemaShape<S>> = {
     [K in keyof S]-?: S[K] extends OptionalSchemaField<Predicate<unknown>> ? K : never;
 }[keyof S];
 /**
  * Infers the readonly object type produced by a `struct` schema.
  */
-type InferSchema<S extends Schema> = Simplify$1<{
+type InferSchema<S extends SchemaShape<S>> = Simplify<{
     readonly [K in RequiredSchemaKeys<S>]: InferSchemaField<S[K]>;
 } & {
     readonly [K in OptionalSchemaKeys<S>]?: InferSchemaField<S[K]>;
@@ -549,14 +555,10 @@ declare function optionalKey<G extends Predicate<unknown>>(guard: G): OptionalSc
  * @param options When `{ exact: true }`, disallows properties not in `schema`.
  * @returns Predicate that narrows to the inferred struct type.
  */
-declare function struct<S extends Schema>(schema: S, options?: {
+declare function struct<const S extends SchemaShape<S>>(schema: S, options?: {
     exact?: boolean;
 }): Predicate<InferSchema<S>>;
 
-type Simplify<T> = {
-    [K in keyof T]: T[K];
-};
-type StringKeyOf<T> = Extract<keyof T, string>;
 type OptionalKeys<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? K : never;
 }[keyof T];
@@ -569,7 +571,7 @@ type TypedStructShape<T extends object> = {
 type NoExtraKeys<S, Shape> = S & {
     readonly [K in Exclude<keyof S, keyof Shape>]: never;
 };
-type TypedStructTarget<T extends object> = Simplify<Readonly<Pick<T, StringKeyOf<T>>>>;
+type TypedStructFields<T extends object, S extends TypedStructShape<T>> = NoExtraKeys<S, TypedStructShape<T>>;
 /**
  * Creates a `struct` builder checked against an existing object type.
  * Optional target keys must also be declared with `optionalKey` so type drift
@@ -577,9 +579,9 @@ type TypedStructTarget<T extends object> = Simplify<Readonly<Pick<T, StringKeyOf
  *
  * @returns Builder that rejects missing, extra, or incompatible struct fields.
  */
-declare function typedStruct<T extends object>(): <const S extends TypedStructShape<T>>(fields: NoExtraKeys<S, TypedStructShape<T>>, options?: {
+declare function typedStruct<T extends object>(): <const S extends TypedStructShape<T>>(fields: TypedStructFields<T, S>, options?: {
     exact?: boolean;
-}) => Predicate<TypedStructTarget<T>>;
+}) => Predicate<InferSchema<TypedStructFields<T, S>>>;
 
 /**
  * Validates a fixed-length tuple by applying element-wise guards.

package/dist/index.js

@@ -459,7 +459,9 @@ function struct(schema, options) {
   const requiredEntries = [];
   const optionalEntries = [];
   const schemaKeys = [];
-  for (const [key, field] of Object.entries(schema)) {
+  for (const key in schema) {
+    if (!Object.hasOwn(schema, key)) continue;
+    const field = schema[key];
     schemaKeys.push(key);
     if (isOptionalSchemaField(field)) {
       optionalEntries.push([key, field.guard]);

package/dist/index.mjs

@@ -359,7 +359,9 @@ function struct(schema, options) {
   const requiredEntries = [];
   const optionalEntries = [];
   const schemaKeys = [];
-  for (const [key, field] of Object.entries(schema)) {
+  for (const key in schema) {
+    if (!Object.hasOwn(schema, key)) continue;
+    const field = schema[key];
     schemaKeys.push(key);
     if (isOptionalSchemaField(field)) {
       optionalEntries.push([key, field.guard]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "is-kit",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Make 'isXXX' easier. Let's make your code type safe and more readable!",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",