@naturalcycles/nodejs-lib 15.97.0 → 15.97.1

package/dist/validation/ajv/jSchema.d.ts

@@ -361,17 +361,17 @@ interface JObjectOpts {
     patternProperties?: StringMap<JsonSchema<any>>;
     keySchema?: JsonSchema;
 }
-export declare class JObjectInfer<PROPS extends Record<string, JBuilder<any, any>>, Opt extends boolean = false> extends JBuilder<Expand<{
-    [K in keyof PROPS as PROPS[K] extends JBuilder<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: PROPS[K] extends JBuilder<infer OUT, any> ? OUT : never;
+export declare class JObjectInfer<PROPS extends Record<string, JSchema<any, any>>, Opt extends boolean = false> extends JBuilder<Expand<{
+    [K in keyof PROPS as PROPS[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: PROPS[K] extends JSchema<infer OUT, any> ? OUT : never;
 } & {
-    [K in keyof PROPS as PROPS[K] extends JBuilder<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: PROPS[K] extends JBuilder<infer OUT, any> ? OUT : never;
+    [K in keyof PROPS as PROPS[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: PROPS[K] extends JSchema<infer OUT, any> ? OUT : never;
 }>, Opt> {
     constructor(props?: PROPS);
     /**
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend<NEW_PROPS extends Record<string, JBuilder<any, any>>>(props: NEW_PROPS): JObjectInfer<{
+    extend<NEW_PROPS extends Record<string, JSchema<any, any>>>(props: NEW_PROPS): JObjectInfer<{
         [K in keyof PROPS | keyof NEW_PROPS]: K extends keyof NEW_PROPS ? NEW_PROPS[K] : K extends keyof PROPS ? PROPS[K] : never;
     }, Opt>;
     /**
@@ -408,7 +408,7 @@ declare function object(props: AnyObject): never;
 declare function object<OUT extends AnyObject>(props: {
     [K in keyof Required<OUT>]-?: JSchema<OUT[K], any>;
 }): JObject<OUT, false>;
-declare function objectInfer<P extends Record<string, JBuilder<any, any>>>(props: P): JObjectInfer<P, false>;
+declare function objectInfer<P extends Record<string, JSchema<any, any>>>(props: P): JObjectInfer<P, false>;
 declare function objectDbEntity(props: AnyObject): never;
 declare function objectDbEntity<OUT extends BaseDBEntity, EXTRA_KEYS extends Exclude<keyof OUT, keyof BaseDBEntity> = Exclude<keyof OUT, keyof BaseDBEntity>>(props: {
     [K in EXTRA_KEYS]-?: BuilderFor<OUT[K]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.97.0",
+  "version": "15.97.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/validation/ajv/jSchema.ts

@@ -1144,22 +1144,22 @@ interface JObjectOpts {
 }
 
 export class JObjectInfer<
-  PROPS extends Record<string, JBuilder<any, any>>,
+  PROPS extends Record<string, JSchema<any, any>>,
   Opt extends boolean = false,
 > extends JBuilder<
   Expand<
     {
-      [K in keyof PROPS as PROPS[K] extends JBuilder<any, infer IsOpt>
+      [K in keyof PROPS as PROPS[K] extends JSchema<any, infer IsOpt>
         ? IsOpt extends true
           ? never
           : K
-        : never]: PROPS[K] extends JBuilder<infer OUT, any> ? OUT : never
+        : never]: PROPS[K] extends JSchema<infer OUT, any> ? OUT : never
     } & {
-      [K in keyof PROPS as PROPS[K] extends JBuilder<any, infer IsOpt>
+      [K in keyof PROPS as PROPS[K] extends JSchema<any, infer IsOpt>
         ? IsOpt extends true
           ? K
           : never
-        : never]?: PROPS[K] extends JBuilder<infer OUT, any> ? OUT : never
+        : never]?: PROPS[K] extends JSchema<infer OUT, any> ? OUT : never
     }
   >,
   Opt
@@ -1183,7 +1183,7 @@ export class JObjectInfer<
     return this.cloneAndUpdateSchema({ additionalProperties: true })
   }
 
-  extend<NEW_PROPS extends Record<string, JBuilder<any, any>>>(
+  extend<NEW_PROPS extends Record<string, JSchema<any, any>>>(
     props: NEW_PROPS,
   ): JObjectInfer<
     {
@@ -1326,7 +1326,7 @@ function object<OUT extends AnyObject>(props: {
   return new JObject<OUT, false>(props)
 }
 
-function objectInfer<P extends Record<string, JBuilder<any, any>>>(
+function objectInfer<P extends Record<string, JSchema<any, any>>>(
   props: P,
 ): JObjectInfer<P, false> {
   return new JObjectInfer<P, false>(props)