@naturalcycles/js-lib 14.109.1 → 14.109.2

package/dist/error/error.util.d.ts

@@ -17,8 +17,8 @@ export declare function _anyToError<ERROR_TYPE extends Error = Error>(o: any, er
  */
 export declare function _anyToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(o: any, opt?: StringifyAnyOptions): ErrorObject<DATA_TYPE>;
 export declare function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(e: AppError<DATA_TYPE> | Error, includeErrorStack?: boolean): ErrorObject<DATA_TYPE>;
-export declare function _errorObjectToAppError<DATA_TYPE>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE>;
-export declare function _errorObjectToError<DATA_TYPE, ERROR_TYPE extends Error>(o: ErrorObject<DATA_TYPE>, errorClass?: Class<ERROR_TYPE>): ERROR_TYPE;
+export declare function _errorObjectToAppError<DATA_TYPE extends ErrorData>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE>;
+export declare function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(o: ErrorObject<DATA_TYPE>, errorClass?: Class<ERROR_TYPE>): ERROR_TYPE;
 export declare function _isHttpErrorResponse(o: any): o is HttpErrorResponse;
 export declare function _isHttpErrorObject(o: any): o is ErrorObject<HttpErrorData>;
 /**

package/dist/json-schema/from-data/generateJsonSchemaFromData.d.ts

@@ -4,4 +4,4 @@ import type { JsonSchemaObject, AnyObject } from '../..';
  *
  * `additionalProperties` is set to `true`, cause it's safer.
  */
-export declare function generateJsonSchemaFromData<T = unknown>(rows: AnyObject[]): JsonSchemaObject<T>;
+export declare function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(rows: AnyObject[]): JsonSchemaObject<T>;

package/dist/json-schema/jsonSchema.model.d.ts

@@ -1,5 +1,5 @@
 import type { AnyObject, StringMap } from '../types';
-export declare type JsonSchema<T = unknown> = JsonSchemaAny<T> | JsonSchemaOneOf<T> | JsonSchemaAllOf<T> | JsonSchemaAnyOf<T> | JsonSchemaNot<T> | JsonSchemaRef<T> | JsonSchemaConst<T> | JsonSchemaEnum<T> | JsonSchemaString | JsonSchemaNumber | JsonSchemaBoolean | JsonSchemaNull | JsonSchemaObject<T> | JsonSchemaArray<T> | JsonSchemaTuple<T>;
+export declare type JsonSchema<T = unknown> = JsonSchemaAny<T> | JsonSchemaOneOf<T> | JsonSchemaAllOf<T> | JsonSchemaAnyOf<T> | JsonSchemaNot<T> | JsonSchemaRef<T> | JsonSchemaConst<T> | JsonSchemaEnum<T> | JsonSchemaString | JsonSchemaNumber | JsonSchemaBoolean | JsonSchemaNull | JsonSchemaObject | JsonSchemaArray<T> | JsonSchemaTuple<T>;
 export interface JsonSchemaAny<T = unknown> {
     $schema?: string;
     $id?: string;

package/dist/json-schema/jsonSchema.util.d.ts

@@ -1,7 +1,8 @@
+import { AnyObject } from '../index';
 import type { JsonSchemaObject } from './jsonSchema.model';
 /**
  * Merges s2 into s1 (mutates s1) and returns s1.
  * Does not mutate s2.
  * API similar to Object.assign(s1, s2)
  */
-export declare function mergeJsonSchemaObjects<T1, T2>(s1: JsonSchemaObject<T1>, s2: JsonSchemaObject<T2>): JsonSchemaObject<T1 & T2>;
+export declare function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(s1: JsonSchemaObject<T1>, s2: JsonSchemaObject<T2>): JsonSchemaObject<T1 & T2>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.109.1",
+  "version": "14.109.2",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -17,7 +17,7 @@
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/node": "^18.0.0",
     "expect-type": "^0.13.0",
-    "jest": "^28.0.3",
+    "jest": "^29.0.0",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",

package/src/error/error.util.ts

@@ -87,11 +87,13 @@ export function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(
   return obj
 }
 
-export function _errorObjectToAppError<DATA_TYPE>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE> {
+export function _errorObjectToAppError<DATA_TYPE extends ErrorData>(
+  o: ErrorObject<DATA_TYPE>,
+): AppError<DATA_TYPE> {
   return _errorObjectToError(o, AppError)
 }
 
-export function _errorObjectToError<DATA_TYPE, ERROR_TYPE extends Error>(
+export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(
   o: ErrorObject<DATA_TYPE>,
   errorClass: Class<ERROR_TYPE> = Error as any,
 ): ERROR_TYPE {

package/src/json-schema/from-data/generateJsonSchemaFromData.ts

@@ -20,7 +20,9 @@ type Type = PrimitiveType | 'array' | 'object'
  *
  * `additionalProperties` is set to `true`, cause it's safer.
  */
-export function generateJsonSchemaFromData<T = unknown>(rows: AnyObject[]): JsonSchemaObject<T> {
+export function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(
+  rows: AnyObject[],
+): JsonSchemaObject<T> {
   return objectToJsonSchema(rows as any) as JsonSchemaObject<T>
 }
 

package/src/json-schema/jsonSchema.model.ts

@@ -14,7 +14,7 @@ export type JsonSchema<T = unknown> =
   | JsonSchemaNumber
   | JsonSchemaBoolean
   | JsonSchemaNull
-  | JsonSchemaObject<T>
+  | JsonSchemaObject
   | JsonSchemaArray<T>
   | JsonSchemaTuple<T>
 

package/src/json-schema/jsonSchema.util.ts

@@ -1,4 +1,4 @@
-import { _uniq } from '../index'
+import { _uniq, AnyObject } from '../index'
 import { _filterNullishValues } from '../object/object.util'
 import type { JsonSchemaObject } from './jsonSchema.model'
 
@@ -7,7 +7,7 @@ import type { JsonSchemaObject } from './jsonSchema.model'
  * Does not mutate s2.
  * API similar to Object.assign(s1, s2)
  */
-export function mergeJsonSchemaObjects<T1, T2>(
+export function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(
   s1: JsonSchemaObject<T1>,
   s2: JsonSchemaObject<T2>,
 ): JsonSchemaObject<T1 & T2> {