@naturalcycles/js-lib 15.40.2 → 15.41.0

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -101,9 +101,10 @@ export declare class JsonSchemaStringBuilder<T extends string = string, Opt exte
     languageTag: () => this;
     countryCode: () => this;
     currency: () => this;
-    trim: (trim?: boolean) => this;
-    toLowerCase: (toLowerCase?: boolean) => this;
-    toUpperCase: (toUpperCase?: boolean) => this;
+    trim(trim?: boolean): this;
+    toLowerCase(toLowerCase?: boolean): this;
+    toUpperCase(toUpperCase?: boolean): this;
+    truncate(toLength: number): this;
     branded<B extends string>(): JsonSchemaStringBuilder<B>;
     /**
      * Accepts only the `YYYY-MM-DD` shape from all ISO 8601 variants.
@@ -115,11 +116,10 @@ export declare class JsonSchemaStringBuilder<T extends string = string, Opt exte
      */
     isoDateTime(): JsonSchemaStringBuilder<IsoDateTime>;
     jwt(): this;
-    private transformModify;
 }
 export declare class JsonSchemaObjectBuilder<T extends AnyObject, Opt extends boolean = false> extends JsonSchemaAnyBuilder<T, JsonSchemaObject<T>, Opt> {
     constructor();
-    addProperties(props: {
+    addProperties(props?: {
         [k in keyof T]: JsonSchemaBuilder<T[k]>;
     }): this;
     /**
@@ -144,14 +144,14 @@ export declare class JsonSchemaArrayBuilder<ITEM, Opt extends boolean = false> e
 export declare class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilder<T, JsonSchemaTuple<T>> {
     constructor(items: JsonSchemaBuilder[]);
 }
-declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props: P): JsonSchemaObjectBuilder<{
+declare function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(props?: P): JsonSchemaObjectBuilder<{
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? never : K : never]: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
 } & {
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt> ? Opt extends true ? K : never : never]?: P[K] extends JsonSchemaAnyBuilder<infer U, any, any> ? U : never;
 } extends infer O ? {
     [K in keyof O]: O[K];
 } : never>;
-declare function object<T extends AnyObject>(props: {
+declare function object<T extends AnyObject>(props?: {
     [K in keyof T]: JsonSchemaAnyBuilder<T[K]>;
 }): JsonSchemaObjectBuilder<T>;
 export {};

package/dist/json-schema/jsonSchemaBuilder.js

@@ -54,9 +54,7 @@ export const j = {
         });
     },
     buffer() {
-        return new JsonSchemaAnyBuilder({
-            instanceof: 'Buffer',
-        });
+        return new JsonSchemaAnyBuilder({ instanceof: 'Buffer' });
     },
     // number types
     number() {
@@ -144,7 +142,7 @@ export class JsonSchemaAnyBuilder {
         return this;
     }
     instanceof(of) {
-        this.schema.instanceof = of;
+        Object.assign(this.schema, { type: 'object', instanceof: of });
         return this;
     }
     optional(optional = true) {
@@ -280,9 +278,22 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     languageTag = () => this.format('languageTag');
     countryCode = () => this.format('countryCode');
     currency = () => this.format('currency');
-    trim = (trim = true) => this.transformModify('trim', trim);
-    toLowerCase = (toLowerCase = true) => this.transformModify('toLowerCase', toLowerCase);
-    toUpperCase = (toUpperCase = true) => this.transformModify('toUpperCase', toUpperCase);
+    trim(trim = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, trim } });
+        return this;
+    }
+    toLowerCase(toLowerCase = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase } });
+        return this;
+    }
+    toUpperCase(toUpperCase = true) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase } });
+        return this;
+    }
+    truncate(toLength) {
+        Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } });
+        return this;
+    }
     branded() {
         return this;
     }
@@ -302,15 +313,6 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
     jwt() {
         return this.regex(JWT_REGEX);
     }
-    transformModify(t, add) {
-        if (add) {
-            this.schema.transform = _uniq([...(this.schema.transform || []), t]);
-        }
-        else {
-            this.schema.transform = this.schema.transform?.filter(s => s !== t);
-        }
-        return this;
-    }
 }
 export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
     constructor() {
@@ -322,6 +324,8 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         });
     }
     addProperties(props) {
+        if (!props)
+            return this;
         Object.entries(props).forEach(([k, builder]) => {
             const schema = builder.build();
             if (!schema.optionalField) {

package/dist/promise/pTimeout.js

@@ -44,6 +44,7 @@ export async function pTimeout(fn, opt) {
                     _typeCast(err);
                     // keep original stack
                     err.stack = fakeError.stack.replace('Error: TimeoutError', err.name + ': ' + err.message);
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                     reject(_errorDataAppend(err, opt.errorData));
                 }
                 return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.40.2",
+  "version": "15.41.0",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",

package/src/json-schema/jsonSchemaBuilder.ts

@@ -101,9 +101,7 @@ export const j = {
     })
   },
   buffer() {
-    return new JsonSchemaAnyBuilder<Buffer, JsonSchemaAny<Buffer>>({
-      instanceof: 'Buffer',
-    })
+    return new JsonSchemaAnyBuilder<Buffer, JsonSchemaAny<Buffer>>({ instanceof: 'Buffer' })
   },
 
   // number types
@@ -215,7 +213,7 @@ export class JsonSchemaAnyBuilder<
   }
 
   instanceof(of: string): this {
-    this.schema.instanceof = of
+    Object.assign(this.schema, { type: 'object', instanceof: of })
     return this
   }
 
@@ -395,9 +393,25 @@ export class JsonSchemaStringBuilder<
   countryCode = (): this => this.format('countryCode')
   currency = (): this => this.format('currency')
 
-  trim = (trim = true): this => this.transformModify('trim', trim)
-  toLowerCase = (toLowerCase = true): this => this.transformModify('toLowerCase', toLowerCase)
-  toUpperCase = (toUpperCase = true): this => this.transformModify('toUpperCase', toUpperCase)
+  trim(trim = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, trim } })
+    return this
+  }
+
+  toLowerCase(toLowerCase = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, toLowerCase } })
+    return this
+  }
+
+  toUpperCase(toUpperCase = true): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, toUpperCase } })
+    return this
+  }
+
+  truncate(toLength: number): this {
+    Object.assign(this.schema, { transform: { ...this.schema.transform, truncate: toLength } })
+    return this
+  }
 
   branded<B extends string>(): JsonSchemaStringBuilder<B> {
     return this as unknown as JsonSchemaStringBuilder<B>
@@ -422,15 +436,6 @@ export class JsonSchemaStringBuilder<
     return this.regex(JWT_REGEX)
   }
 
-  private transformModify(t: 'trim' | 'toLowerCase' | 'toUpperCase', add: boolean): this {
-    if (add) {
-      this.schema.transform = _uniq([...(this.schema.transform || []), t])
-    } else {
-      this.schema.transform = this.schema.transform?.filter(s => s !== t)
-    }
-    return this
-  }
-
   // contentMediaType?: string
   // contentEncoding?: string
 }
@@ -448,7 +453,9 @@ export class JsonSchemaObjectBuilder<
     })
   }
 
-  addProperties(props: { [k in keyof T]: JsonSchemaBuilder<T[k]> }): this {
+  addProperties(props?: { [k in keyof T]: JsonSchemaBuilder<T[k]> }): this {
+    if (!props) return this
+
     Object.entries(props).forEach(([k, builder]: [keyof T, JsonSchemaBuilder]) => {
       const schema = builder.build()
       if (!schema.optionalField) {
@@ -555,7 +562,7 @@ export class JsonSchemaTupleBuilder<T extends any[]> extends JsonSchemaAnyBuilde
 }
 
 function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
-  props: P,
+  props?: P,
 ): JsonSchemaObjectBuilder<
   {
     [K in keyof P as P[K] extends JsonSchemaAnyBuilder<any, any, infer Opt>
@@ -573,10 +580,10 @@ function object<P extends Record<string, JsonSchemaAnyBuilder<any, any, any>>>(
     ? { [K in keyof O]: O[K] }
     : never
 >
-function object<T extends AnyObject>(props: {
+function object<T extends AnyObject>(props?: {
   [K in keyof T]: JsonSchemaAnyBuilder<T[K]>
 }): JsonSchemaObjectBuilder<T>
 
-function object(props: any): any {
+function object(props?: any): any {
   return new JsonSchemaObjectBuilder<any>().addProperties(props)
 }

package/src/promise/pTimeout.ts

@@ -88,6 +88,7 @@ export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions)
           _typeCast<Error>(err)
           // keep original stack
           err.stack = fakeError.stack!.replace('Error: TimeoutError', err.name + ': ' + err.message)
+          // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
           reject(_errorDataAppend(err, opt.errorData))
         }
         return