@duplojs/utils 1.4.56 → 1.4.57

package/dist/clean/entity.cjs

@@ -2,16 +2,15 @@
 
 var kind = require('./kind.cjs');
 var newType = require('./newType.cjs');
+var asserts = require('../common/asserts.cjs');
 var kind$1 = require('../common/kind.cjs');
 var pipe = require('../common/pipe.cjs');
-var filter = require('../array/filter.cjs');
-var isType = require('../common/isType.cjs');
 var map = require('../array/map.cjs');
-var entry = require('../object/entry.cjs');
 var toTuple = require('../array/toTuple.cjs');
 var first = require('../array/at/first.cjs');
 var innerPipe = require('../common/innerPipe.cjs');
 var when = require('../pattern/when.cjs');
+var isType = require('../common/isType.cjs');
 var exhaustive = require('../pattern/exhaustive.cjs');
 var when$1 = require('../common/when.cjs');
 var index = require('../dataParser/parsers/array/index.cjs');
@@ -24,13 +23,12 @@ var entries = require('../object/entries.cjs');
 var forward = require('../common/forward.cjs');
 var errorKindNamespace = require('../common/errorKindNamespace.cjs');
 var fromEntries = require('../object/fromEntries.cjs');
+var entry = require('../object/entry.cjs');
 var transform = require('../dataParser/parsers/transform.cjs');
 var base$1 = require('./constraint/base.cjs');
 var wrapValue = require('../common/wrapValue.cjs');
-var otherwise = require('../pattern/otherwise.cjs');
-var justReturn = require('../common/justReturn.cjs');
-var union = require('../dataParser/parsers/union.cjs');
 var minElements = require('../array/minElements.cjs');
+var union = require('../dataParser/parsers/union.cjs');
 var index$1 = require('../dataParser/parsers/object/index.cjs');
 var override = require('../common/override.cjs');
 var is = require('../either/left/is.cjs');
@@ -61,7 +59,10 @@ function createEntity(name, getPropertiesDefinition) {
         return transform.transform(simplePropertyDefinition.dataParser, (value) => base$1.constrainedTypeKind.setTo(newType.newTypeKind.setTo(wrapValue.wrapValue(value), simplePropertyDefinition.name), constraintKindValue));
     }
     function unionPropertyDefinitionToDataParser(unionPropertyDefinition) {
-        return pipe.pipe(unionPropertyDefinition, map.map(simplePropertyDefinitionToDataParser), when.when(minElements.minElements(1), union.union), otherwise.otherwise(justReturn.justReturn(null)));
+        return pipe.pipe(unionPropertyDefinition, map.map(simplePropertyDefinitionToDataParser), (options) => {
+            asserts.asserts(options, minElements.minElements(1));
+            return union.union(options);
+        });
     }
     const params = {
         union: (...type) => ({ type }),
@@ -99,7 +100,7 @@ function createEntity(name, getPropertiesDefinition) {
             }
             return dataParser;
         }, when$1.when(() => definition.nullable === true, nullable.nullable))))), exhaustive.exhaustive),
-    ])), map.map(([key, value]) => value !== null && entry.entry(key, value)), filter.filter(isType.isType("array")), fromEntries.fromEntries, index$1.object, (dataParser) => transform.transform(dataParser, (value) => entityKind.setTo(value, name)));
+    ])), fromEntries.fromEntries, index$1.object, (dataParser) => transform.transform(dataParser, (value) => entityKind.setTo(value, name)));
     function map$1(rawProperties) {
         const result = mapDataParser.parse(rawProperties);
         if (is.isLeft(result)) {

package/dist/clean/entity.d.ts

@@ -27,6 +27,12 @@ export type EntityProperties<GenericPropertiesDefinition extends EntityPropertie
     ] : readonly InferredValue[] : InferredValue) extends infer InferredValueWithArray ? IsEqual<GenericPropertiesDefinition[Prop]["nullable"], true> extends true ? InferredValueWithArray | null : InferredValueWithArray : never : never : unknown);
 }>;
 export type EntityRawProperties<GenericPropertiesDefinition extends EntityPropertiesDefinition = EntityPropertiesDefinition> = SimplifyTopLevel<{
+    readonly [Prop in keyof GenericPropertiesDefinition]: (GenericPropertiesDefinition[Prop] extends EntitySimplePropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop]>> : GenericPropertiesDefinition[Prop] extends EntityUnionPropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop][number]>> : GenericPropertiesDefinition[Prop] extends EntityAdvancedPropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop]["type"] extends EntityUnionPropertyDefinition ? GenericPropertiesDefinition[Prop]["type"][number] : GenericPropertiesDefinition[Prop]["type"] extends EntitySimplePropertyDefinition ? GenericPropertiesDefinition[Prop]["type"] : never>> extends infer InferredValue ? (IsEqual<GenericPropertiesDefinition[Prop]["inArray"], true> extends true ? readonly InferredValue[] : GenericPropertiesDefinition[Prop]["inArray"] extends object ? GenericPropertiesDefinition[Prop]["inArray"]["min"] extends number ? readonly [
+        ...DArray.CreateTuple<InferredValue, GenericPropertiesDefinition[Prop]["inArray"]["min"]>,
+        ...InferredValue[]
+    ] : readonly InferredValue[] : InferredValue) extends infer InferredValueWithArray ? IsEqual<GenericPropertiesDefinition[Prop]["nullable"], true> extends true ? InferredValueWithArray | null : InferredValueWithArray : never : never : unknown);
+}>;
+export type PropertiesToMapOfEntity<GenericPropertiesDefinition extends EntityPropertiesDefinition = EntityPropertiesDefinition> = SimplifyTopLevel<{
     readonly [Prop in keyof GenericPropertiesDefinition]: (GenericPropertiesDefinition[Prop] extends EntitySimplePropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop]>> : GenericPropertiesDefinition[Prop] extends EntityUnionPropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop][number]>> : GenericPropertiesDefinition[Prop] extends EntityAdvancedPropertyDefinition ? Unwrap<GetNewType<GenericPropertiesDefinition[Prop]["type"] extends EntityUnionPropertyDefinition ? GenericPropertiesDefinition[Prop]["type"][number] : GenericPropertiesDefinition[Prop]["type"] extends EntitySimplePropertyDefinition ? GenericPropertiesDefinition[Prop]["type"] : never>> extends infer InferredValue ? (Or<[
         IsEqual<GenericPropertiesDefinition[Prop]["inArray"], true>,
         IsExtends<GenericPropertiesDefinition[Prop]["inArray"], object>
@@ -47,11 +53,7 @@ export interface EntityHandler<GenericName extends string = string, GenericPrope
      * 
      */
     readonly propertiesDefinition: GenericPropertiesDefinition;
-    /**
-     * The DataParser derived from the properties definition. Useful to reuse validation outside entity creation.
-     * 
-     */
-    readonly mapDataParser: DDataParser.Contract<EntityProperties<GenericPropertiesDefinition>, EntityRawProperties<GenericPropertiesDefinition>>;
+    readonly mapDataParser: DDataParser.Contract<EntityProperties<GenericPropertiesDefinition>, unknown>;
     /**
      * Builds an entity from already typed properties.
      * 
@@ -70,7 +72,7 @@ export interface EntityHandler<GenericName extends string = string, GenericPrope
      */
     "new"<const GenericProperties extends EntityProperties<GenericPropertiesDefinition>>(properties: GenericProperties): Entity<GenericName> & GenericProperties;
     /**
-     * Validates raw properties and returns an Either with the typed entity.
+     * Validates permissive raw properties and returns an Either with the typed entity.
      * 
      * ```ts
      * if (User.Entity.is(result)) {
@@ -85,9 +87,9 @@ export interface EntityHandler<GenericName extends string = string, GenericPrope
      * ```
      * 
      */
-    map(rawProperties: EntityRawProperties<GenericPropertiesDefinition>): (DEither.Right<"createEntity", Entity<GenericName> & EntityProperties<GenericPropertiesDefinition>> | DEither.Left<"createEntityError", DDataParser.DataParserError>);
+    map(rawProperties: PropertiesToMapOfEntity<GenericPropertiesDefinition>): (DEither.Right<"createEntity", Entity<GenericName> & EntityProperties<GenericPropertiesDefinition>> | DEither.Left<"createEntityError", DDataParser.DataParserError>);
     /**
-     * Validates raw properties and throws on error.
+     * Validates permissive raw properties and throws on error.
      * 
      * ```ts
      * const mapped = User.Entity.mapOrThrow({
@@ -99,7 +101,7 @@ export interface EntityHandler<GenericName extends string = string, GenericPrope
      * ```
      * 
      */
-    mapOrThrow(rawProperties: EntityRawProperties<GenericPropertiesDefinition>): Entity<GenericName> & EntityProperties<GenericPropertiesDefinition>;
+    mapOrThrow(rawProperties: PropertiesToMapOfEntity<GenericPropertiesDefinition>): Entity<GenericName> & EntityProperties<GenericPropertiesDefinition>;
     /**
     * Checks if a value is an entity of this handler (type guard).
     * 
@@ -129,9 +131,9 @@ declare const CreateEntityError_base: new (params: {
     "@DuplojsUtilsError/create-entity-error"?: unknown;
 }, parentParams: readonly [message?: string | undefined, options?: ErrorOptions | undefined]) => Error & Kind<import("../common").KindDefinition<"create-entity-error", unknown>, unknown> & Kind<import("../common").KindDefinition<"@DuplojsUtilsError/create-entity-error", unknown>, unknown>;
 export declare class CreateEntityError extends CreateEntityError_base {
-    rawProperties: EntityRawProperties;
+    rawProperties: PropertiesToMapOfEntity;
     dataParserError: DDataParser.DataParserError;
-    constructor(rawProperties: EntityRawProperties, dataParserError: DDataParser.DataParserError);
+    constructor(rawProperties: PropertiesToMapOfEntity, dataParserError: DDataParser.DataParserError);
 }
 export interface PropertiesDefinitionParams {
     union<const GenericUnionPropertyDefinition extends EntityUnionPropertyDefinition>(...type: GenericUnionPropertyDefinition): {
@@ -216,7 +218,7 @@ export interface PropertiesDefinitionParams {
  * 
  * @remarks
  * - The definition callback can use helpers like `array`, `nullable`, and `union` to enrich properties.
- * - Use `map`/`mapOrThrow` to build from raw inputs; `new` expects already typed values.
+ * - Use `map`/`mapOrThrow` to build from raw inputs (with runtime constraint checks); `new` expects already typed values.
  * 
  * @see https://utils.duplojs.dev/en/v1/api/clean/entity
  * 

package/dist/clean/entity.mjs

@@ -1,15 +1,14 @@
 import { createCleanKind } from './kind.mjs';
 import { newTypeHandlerKind, newTypeKind } from './newType.mjs';
+import { asserts } from '../common/asserts.mjs';
 import { kindHeritage } from '../common/kind.mjs';
 import { pipe } from '../common/pipe.mjs';
-import { filter } from '../array/filter.mjs';
-import { isType } from '../common/isType.mjs';
 import { map } from '../array/map.mjs';
-import { entry } from '../object/entry.mjs';
 import { toTuple } from '../array/toTuple.mjs';
 import { first } from '../array/at/first.mjs';
 import { innerPipe } from '../common/innerPipe.mjs';
 import { when } from '../pattern/when.mjs';
+import { isType } from '../common/isType.mjs';
 import { exhaustive } from '../pattern/exhaustive.mjs';
 import { when as when$1 } from '../common/when.mjs';
 import { array } from '../dataParser/parsers/array/index.mjs';
@@ -22,13 +21,12 @@ import { entries } from '../object/entries.mjs';
 import { forward } from '../common/forward.mjs';
 import { createErrorKind } from '../common/errorKindNamespace.mjs';
 import { fromEntries } from '../object/fromEntries.mjs';
+import { entry } from '../object/entry.mjs';
 import { transform } from '../dataParser/parsers/transform.mjs';
 import { constrainedTypeKind } from './constraint/base.mjs';
 import { wrapValue } from '../common/wrapValue.mjs';
-import { otherwise } from '../pattern/otherwise.mjs';
-import { justReturn } from '../common/justReturn.mjs';
-import { union } from '../dataParser/parsers/union.mjs';
 import { minElements } from '../array/minElements.mjs';
+import { union } from '../dataParser/parsers/union.mjs';
 import { object } from '../dataParser/parsers/object/index.mjs';
 import { createOverride } from '../common/override.mjs';
 import { isLeft } from '../either/left/is.mjs';
@@ -59,7 +57,10 @@ function createEntity(name, getPropertiesDefinition) {
         return transform(simplePropertyDefinition.dataParser, (value) => constrainedTypeKind.setTo(newTypeKind.setTo(wrapValue(value), simplePropertyDefinition.name), constraintKindValue));
     }
     function unionPropertyDefinitionToDataParser(unionPropertyDefinition) {
-        return pipe(unionPropertyDefinition, map(simplePropertyDefinitionToDataParser), when(minElements(1), union), otherwise(justReturn(null)));
+        return pipe(unionPropertyDefinition, map(simplePropertyDefinitionToDataParser), (options) => {
+            asserts(options, minElements(1));
+            return union(options);
+        });
     }
     const params = {
         union: (...type) => ({ type }),
@@ -97,7 +98,7 @@ function createEntity(name, getPropertiesDefinition) {
             }
             return dataParser;
         }, when$1(() => definition.nullable === true, nullable))))), exhaustive),
-    ])), map(([key, value]) => value !== null && entry(key, value)), filter(isType("array")), fromEntries, object, (dataParser) => transform(dataParser, (value) => entityKind.setTo(value, name)));
+    ])), fromEntries, object, (dataParser) => transform(dataParser, (value) => entityKind.setTo(value, name)));
     function map$1(rawProperties) {
         const result = mapDataParser.parse(rawProperties);
         if (isLeft(result)) {

package/dist/dataParser/base.d.ts

@@ -256,5 +256,5 @@ export declare namespace dataParserInit {
 }
 export type Output<GenericDataParser extends DataParser> = GetKindValue<typeof dataParserKind, GenericDataParser>["output"];
 export type Input<GenericDataParser extends DataParser> = GetKindValue<typeof dataParserKind, GenericDataParser>["input"];
-export type Contract<GenericOutput extends unknown, GenericInput extends unknown = GenericOutput> = DataParser<DataParserDefinition<never>, GenericOutput, GenericInput>;
+export type Contract<GenericOutput extends unknown, GenericInput extends unknown = GenericOutput> = DataParser<DataParserDefinition, GenericOutput, GenericInput>;
 export {};

package/dist/dataParser/baseExtended.d.ts

@@ -415,5 +415,5 @@ export declare function dataParserExtendedInit<GenericDataParser extends DataPar
 export declare namespace dataParserExtendedInit {
     var overrideHandler: OverrideHandler<DataParserExtended<DataParserDefinition<import("./base").DataParserChecker<import("./base").DataParserCheckerDefinition, unknown>>, unknown, unknown>>;
 }
-export type ContractExtended<GenericOutput extends unknown, GenericInput extends unknown = GenericOutput> = DataParserExtended<DataParserDefinition<never>, GenericOutput, GenericInput>;
+export type ContractExtended<GenericOutput extends unknown, GenericInput extends unknown = GenericOutput> = DataParserExtended<DataParserDefinition, GenericOutput, GenericInput>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duplojs/utils",
-  "version": "1.4.56",
+  "version": "1.4.57",
   "author": {
     "name": "mathcovax",
     "url": "https://github.com/mathcovax"