@tstdl/base 0.88.0-alpha4 → 0.88.0-alpha6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.88.0-alpha4",
+  "version": "0.88.0-alpha6",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/schema/constraints/maximum-length.d.ts

@@ -4,7 +4,7 @@ import { SchemaValueConstraint } from '../types/schema-value-constraint.js';
 import type { ConstraintContext, ConstraintResult } from '../types/types.js';
 export declare class MaximumLengthConstraint extends SchemaValueConstraint {
     private readonly maximumLength;
-    readonly suitableTypes: (ArrayConstructor | ArrayBufferConstructor | Int8ArrayConstructor | Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | BigInt64ArrayConstructor | BigUint64ArrayConstructor | StringConstructor)[];
+    readonly suitableTypes: (ArrayBufferConstructor | Int8ArrayConstructor | Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | BigInt64ArrayConstructor | BigUint64ArrayConstructor | ArrayConstructor | StringConstructor)[];
     readonly expects: string;
     constructor(maximumLength: number);
     validate(value: string, path: JsonPath, context: ConstraintContext): ConstraintResult;

package/schema/constraints/minimum-length.d.ts

@@ -4,7 +4,7 @@ import { SchemaValueConstraint } from '../types/schema-value-constraint.js';
 import type { ConstraintContext, ConstraintResult } from '../types/types.js';
 export declare class MinimumLengthConstraint extends SchemaValueConstraint {
     private readonly minimumLength;
-    readonly suitableTypes: (ArrayConstructor | ArrayBufferConstructor | Int8ArrayConstructor | Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | BigInt64ArrayConstructor | BigUint64ArrayConstructor | StringConstructor)[];
+    readonly suitableTypes: (ArrayBufferConstructor | Int8ArrayConstructor | Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | BigInt64ArrayConstructor | BigUint64ArrayConstructor | ArrayConstructor | StringConstructor)[];
     readonly expects: string;
     constructor(minimumLength: number);
     validate(value: string | ArrayLike<any> | ArrayBuffer, path: JsonPath, context: ConstraintContext): ConstraintResult;

package/schema/types/types.js

@@ -39,12 +39,11 @@ export function isTypeSchema(schema) {
         return false;
     }
     const type = schema.type;
-    return isObject(schema)
-        && (isFunction(type)
-            || (isObject(type) && isFunction(type.deferred))
-            || (type == 'undefined')
-            || (type == 'null')
-            || (type == 'any'));
+    return isFunction(type)
+        || (isObject(type) && isFunction(type.deferred))
+        || (type == 'undefined')
+        || (type == 'null')
+        || (type == 'any');
 }
 export function isDeferredValueType(value) {
     return isObject(value) && isFunction(value.deferred);

package/text/localization.service.js

@@ -190,11 +190,11 @@ export function enumerationLocalization(enumeration, nameOrLocalization, localiz
     return [enumeration, isLocalizeItem(nameOrLocalization) ? nameOrLocalization : undefined, localizationOrNothing ?? nameOrLocalization];
 }
 function _autoEnumerationLocalization(enumeration, name) {
-    if (isObject(enumeration)) {
-        return [enumeration, name, Object.fromEntries(enumEntries(enumeration).map(([key, value]) => [value, key]))];
+    if (isArray(enumeration)) {
+        const arrayEntries = enumeration.map((value) => [value, value]);
+        return [enumeration, name, Object.fromEntries(arrayEntries)];
     }
-    const arrayEntries = enumeration.map((value) => [value, value]);
-    return [enumeration, name, Object.fromEntries(arrayEntries)];
+    return [enumeration, name, Object.fromEntries(enumEntries(enumeration).map(([key, value]) => [value, key]))];
 }
 function buildMappedLocalization({ language, keys, enums }) {
     const enumsEntries = enums.map((entry) => [entry[0], { name: entry[1], values: entry[2] }]);

package/types.d.ts

@@ -21,7 +21,7 @@ export type NestedObject<T> = {
 export type NestedArray<T> = T[];
 export type FilledArray<T> = [T, ...(T)[]];
 export type FilledReadonlyArray<T> = readonly [T, ...(T)[]];
-export type Primitive = string | number | boolean | bigint | null | undefined | symbol;
+export type Primitive = string | number | boolean | bigint | symbol | null | undefined;
 export type PrimitiveValue = Primitive | PrimitiveObject | PrimitiveArray;
 export type PrimitiveObject = {
     [key: string]: PrimitiveValue;

package/utils/merge.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { assertArray, assertMap, assertObject, assertSet, isArray, isMap, isObject, isSet, isUndefined } from './type-guards.js';
+import { assertArray, assertLiteralObject, assertMap, assertSet, isArray, isLiteralObject, isMap, isSet, isUndefined } from './type-guards.js';
 export function merge(a, b) {
     if (isUndefined(a)) {
         return b;
@@ -7,8 +7,8 @@ export function merge(a, b) {
     if (isUndefined(b)) {
         return a;
     }
-    if (isObject(a)) {
-        assertObject(b, 'Cannot merge object into non-object.');
+    if (isLiteralObject(a)) {
+        assertLiteralObject(b, 'Cannot merge object into non-object.');
         return { ...a, ...b };
     }
     else if (isArray(a)) {

package/utils/object/decycle.js

@@ -1,6 +1,6 @@
 import { JsonPath } from '../../json-path/json-path.js';
 import { clone } from '../clone.js';
-import { isArray, isDate, isDefined, isFunction, isNotNull, isObject, isPrimitive, isRegExp, isString, isWritableArray } from '../type-guards.js';
+import { isArray, isDate, isDefined, isFunction, isObject, isPrimitive, isRegExp, isString, isWritableArray } from '../type-guards.js';
 import { getCachedDereference } from './dereference.js';
 import { hasOwnProperty, mapObjectValues, objectKeys } from './object.js';
 export function decycle(_value, replacer) {
@@ -47,7 +47,7 @@ export function recycle(_value, _clone = true) {
                 }
             }
         }
-        else if (isObject(node) && isNotNull(node)) {
+        else if (isObject(node)) {
             for (const key of objectKeys(node)) {
                 const ref = getRef(node[key]);
                 if (isDefined(ref)) {

package/utils/repl.js

@@ -1,3 +1,4 @@
+import { dynamicImport } from '../import.js';
 import { objectEntries } from './object/object.js';
 import { isDefined } from './type-guards.js';
 /**
@@ -5,7 +6,7 @@ import { isDefined } from './type-guards.js';
  * @param context context to set the repl context to
  */
 export async function repl(options) {
-    const { start: startRepl } = await import('node:repl');
+    const { start: startRepl } = await dynamicImport('node:repl');
     const replServer = startRepl(options);
     if (isDefined(options?.context)) {
         for (const [key, value] of objectEntries(options.context)) {