@sprucelabs/schema 30.0.572 → 30.0.573

package/build/StaticSchemaEntityImpl.js

@@ -50,7 +50,7 @@ class StaticSchemaEntityImpl extends AbstractEntity_1.default {
         this.buildFields();
         const v = {
             ...this.values,
-            ...values,
+            ...expandValues(values),
         };
         this.values = (0, cloneDeepPreservingInstances_1.default)(v);
     }
@@ -215,3 +215,24 @@ class StaticSchemaEntityImpl extends AbstractEntity_1.default {
 }
 StaticSchemaEntityImpl.enableDuplicateCheckWhenTracking = true;
 exports.default = StaticSchemaEntityImpl;
+function expandValues(values = {}) {
+    const result = {};
+    for (const key in values) {
+        const value = values[key];
+        const keys = key.split('.');
+        let current = result;
+        for (let i = 0; i < keys.length; i++) {
+            const k = keys[i];
+            if (i === keys.length - 1) {
+                current[k] = value;
+            }
+            else {
+                if (!(k in current) || typeof current[k] !== 'object') {
+                    current[k] = {};
+                }
+                current = current[k];
+            }
+        }
+    }
+    return result;
+}

package/build/esm/StaticSchemaEntityImpl.js

@@ -12,7 +12,7 @@ class StaticSchemaEntityImpl extends AbstractEntity {
         this.buildFields();
         const v = {
             ...this.values,
-            ...values,
+            ...expandValues(values),
         };
         this.values = cloneDeepPreservingInstances(v);
     }
@@ -179,3 +179,24 @@ class StaticSchemaEntityImpl extends AbstractEntity {
 }
 StaticSchemaEntityImpl.enableDuplicateCheckWhenTracking = true;
 export default StaticSchemaEntityImpl;
+function expandValues(values = {}) {
+    const result = {};
+    for (const key in values) {
+        const value = values[key];
+        const keys = key.split('.');
+        let current = result;
+        for (let i = 0; i < keys.length; i++) {
+            const k = keys[i];
+            if (i === keys.length - 1) {
+                current[k] = value;
+            }
+            else {
+                if (!(k in current) || typeof current[k] !== 'object') {
+                    current[k] = {};
+                }
+                current = current[k];
+            }
+        }
+    }
+    return result;
+}

package/build/esm/schemas.static.types.d.ts

@@ -117,6 +117,7 @@ export interface SchemaNormalizeOptions<S extends Schema, CreateEntityInstances
         [K in SchemaFieldNames<S>]?: S['fields'][K] extends FieldDefinition ? Partial<FieldDefinitionMap[S['fields'][K]['type']]['options']> : never;
     };
     shouldIncludeNullAndUndefinedFields?: ShouldIncludeNullAndUndefinedFields;
+    shouldRetainDotSyntaxKeys?: boolean;
 }
 export interface DynamicSchemaNormalizeOptions<CreateEntityInstances extends boolean> extends SchemaNormalizeFieldValueOptions<CreateEntityInstances> {
 }

package/build/esm/types/utilities.types.d.ts

@@ -4,3 +4,45 @@ export type IsArray<T, IsArray> = IsArray extends true ? Unpack<T>[] : Unpack<T>
 export type IsArrayNoUnpack<T, IsArray> = IsArray extends true ? T[] : T;
 export type IsRequired<T, IsRequired> = IsRequired extends true ? T : T | undefined | null;
 export type AreAnyFieldsRequired<S extends Schema | undefined> = S extends Schema ? SchemaRequiredFieldNames<S> extends [] ? false : true : false;
+export type ValuesWithPaths<Values, Keys extends Paths<Values> = Paths<Values>> = {
+    [K in RequiredKeys<Values, Keys>]: TypeAtPath<Values, K>;
+} & {
+    [K in OptionalKeys<Values, Keys>]?: TypeAtPath<Values, K>;
+};
+type IsOptional<T, K extends keyof T> = T extends any ? {} extends Pick<T, K> ? true : false : never;
+type IsPathOptional<T, P extends string> = T extends any ? P extends `${infer K}.${infer Rest}` ? K extends keyof T ? IsOptional<T, K> extends true ? true : IsPathOptional<T[K], Rest> : true : P extends keyof T ? IsOptional<T, P> : true : true;
+type RequiredKeys<Values, Keys extends Paths<Values>> = {
+    [K in Keys]: IsPathOptional<Values, K> extends true ? never : K;
+}[Keys];
+type OptionalKeys<Values, Keys extends Paths<Values>> = Exclude<Keys, RequiredKeys<Values, Keys>>;
+type Paths<T, D extends number = 3> = [D] extends [never] ? never : T extends object ? {
+    [K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K], Prev[D]>> : never;
+}[keyof T] : '';
+type TypeAtPath<T, P extends string> = T extends any ? T extends null | undefined ? undefined : P extends `${infer K}.${infer Rest}` ? K extends keyof T ? TypeAtPath<T[K], Rest> : any : P extends keyof T ? T[P] : any : never;
+type Join<K, P> = K extends string | number ? P extends string | number ? `${K}${'' extends P ? '' : '.'}${P}` : never : never;
+type Prev = [
+    never,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    ...0[]
+];
+export {};

package/build/esm/utilities/normalizePartialSchemaValues.js

@@ -1,5 +1,6 @@
 import normalizeSchemaValues from './normalizeSchemaValues.js';
 export default function normalizePartialSchemaValues(schema, values, options) {
+    //@ts-ignore
     const normalized = normalizeSchemaValues(schema, values, {
         ...options,
         shouldIncludeNullAndUndefinedFields: false,

package/build/esm/utilities/normalizeSchemaValues.d.ts

@@ -1,2 +1,3 @@
 import { Schema, SchemaPartialValues, SchemaGetValuesOptions, SchemaFieldNames, SchemaPublicFieldNames, IsDynamicSchema, DynamicSchemaAllValues, SchemaValues } from '../schemas.static.types';
-export default function normalizeSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, IsDynamic extends boolean = IsDynamicSchema<S>, ShouldIncludeNullAndUndefinedFields extends boolean = true>(schema: S, values: SchemaPartialValues<S>, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields, ShouldIncludeNullAndUndefinedFields>): IsDynamic extends true ? DynamicSchemaAllValues<S, CreateEntityInstances> : IncludePrivateFields extends true ? Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, F> : Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, PF>;
+import { ValuesWithPaths } from '../types/utilities.types';
+export default function normalizeSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, IsDynamic extends boolean = IsDynamicSchema<S>, ShouldIncludeNullAndUndefinedFields extends boolean = true>(schema: S, values: ValuesWithPaths<SchemaPartialValues<S>>, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields, ShouldIncludeNullAndUndefinedFields>): IsDynamic extends true ? DynamicSchemaAllValues<S, CreateEntityInstances> : IncludePrivateFields extends true ? Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, F> : Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, PF>;

package/build/esm/utilities/normalizeSchemaValues.js

@@ -1,10 +1,19 @@
+import get from 'just-safe-get';
 import EntityFactory from '../factories/SchemaEntityFactory.js';
 export default function normalizeSchemaValues(schema, values, options) {
     const instance = EntityFactory.Entity(schema, values);
-    const { shouldCreateEntityInstances = false, ...rest } = options || {};
+    const { shouldCreateEntityInstances = false, shouldRetainDotSyntaxKeys, ...rest } = options || {};
     const normalizedOptions = {
         shouldCreateEntityInstances,
         ...rest,
     };
-    return instance.getValues(normalizedOptions);
+    let normalized = instance.getValues(normalizedOptions);
+    if (shouldRetainDotSyntaxKeys) {
+        const normalizedWithKeys = {};
+        for (const key of Object.keys(values)) {
+            normalizedWithKeys[key] = get(normalized, key);
+        }
+        normalized = normalizedWithKeys;
+    }
+    return normalized;
 }

package/build/schemas.static.types.d.ts

@@ -117,6 +117,7 @@ export interface SchemaNormalizeOptions<S extends Schema, CreateEntityInstances
         [K in SchemaFieldNames<S>]?: S['fields'][K] extends FieldDefinition ? Partial<FieldDefinitionMap[S['fields'][K]['type']]['options']> : never;
     };
     shouldIncludeNullAndUndefinedFields?: ShouldIncludeNullAndUndefinedFields;
+    shouldRetainDotSyntaxKeys?: boolean;
 }
 export interface DynamicSchemaNormalizeOptions<CreateEntityInstances extends boolean> extends SchemaNormalizeFieldValueOptions<CreateEntityInstances> {
 }

package/build/types/utilities.types.d.ts

@@ -4,3 +4,45 @@ export type IsArray<T, IsArray> = IsArray extends true ? Unpack<T>[] : Unpack<T>
 export type IsArrayNoUnpack<T, IsArray> = IsArray extends true ? T[] : T;
 export type IsRequired<T, IsRequired> = IsRequired extends true ? T : T | undefined | null;
 export type AreAnyFieldsRequired<S extends Schema | undefined> = S extends Schema ? SchemaRequiredFieldNames<S> extends [] ? false : true : false;
+export type ValuesWithPaths<Values, Keys extends Paths<Values> = Paths<Values>> = {
+    [K in RequiredKeys<Values, Keys>]: TypeAtPath<Values, K>;
+} & {
+    [K in OptionalKeys<Values, Keys>]?: TypeAtPath<Values, K>;
+};
+type IsOptional<T, K extends keyof T> = T extends any ? {} extends Pick<T, K> ? true : false : never;
+type IsPathOptional<T, P extends string> = T extends any ? P extends `${infer K}.${infer Rest}` ? K extends keyof T ? IsOptional<T, K> extends true ? true : IsPathOptional<T[K], Rest> : true : P extends keyof T ? IsOptional<T, P> : true : true;
+type RequiredKeys<Values, Keys extends Paths<Values>> = {
+    [K in Keys]: IsPathOptional<Values, K> extends true ? never : K;
+}[Keys];
+type OptionalKeys<Values, Keys extends Paths<Values>> = Exclude<Keys, RequiredKeys<Values, Keys>>;
+type Paths<T, D extends number = 3> = [D] extends [never] ? never : T extends object ? {
+    [K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K], Prev[D]>> : never;
+}[keyof T] : '';
+type TypeAtPath<T, P extends string> = T extends any ? T extends null | undefined ? undefined : P extends `${infer K}.${infer Rest}` ? K extends keyof T ? TypeAtPath<T[K], Rest> : any : P extends keyof T ? T[P] : any : never;
+type Join<K, P> = K extends string | number ? P extends string | number ? `${K}${'' extends P ? '' : '.'}${P}` : never : never;
+type Prev = [
+    never,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14,
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    ...0[]
+];
+export {};

package/build/utilities/normalizePartialSchemaValues.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = normalizePartialSchemaValues;
 const normalizeSchemaValues_1 = __importDefault(require("./normalizeSchemaValues"));
 function normalizePartialSchemaValues(schema, values, options) {
+    //@ts-ignore
     const normalized = (0, normalizeSchemaValues_1.default)(schema, values, {
         ...options,
         shouldIncludeNullAndUndefinedFields: false,

package/build/utilities/normalizeSchemaValues.d.ts

@@ -1,2 +1,3 @@
 import { Schema, SchemaPartialValues, SchemaGetValuesOptions, SchemaFieldNames, SchemaPublicFieldNames, IsDynamicSchema, DynamicSchemaAllValues, SchemaValues } from '../schemas.static.types';
-export default function normalizeSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, IsDynamic extends boolean = IsDynamicSchema<S>, ShouldIncludeNullAndUndefinedFields extends boolean = true>(schema: S, values: SchemaPartialValues<S>, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields, ShouldIncludeNullAndUndefinedFields>): IsDynamic extends true ? DynamicSchemaAllValues<S, CreateEntityInstances> : IncludePrivateFields extends true ? Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, F> : Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, PF>;
+import { ValuesWithPaths } from '../types/utilities.types';
+export default function normalizeSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, IsDynamic extends boolean = IsDynamicSchema<S>, ShouldIncludeNullAndUndefinedFields extends boolean = true>(schema: S, values: ValuesWithPaths<SchemaPartialValues<S>>, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields, ShouldIncludeNullAndUndefinedFields>): IsDynamic extends true ? DynamicSchemaAllValues<S, CreateEntityInstances> : IncludePrivateFields extends true ? Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, F> : Pick<SchemaValues<S, CreateEntityInstances, true, ShouldIncludeNullAndUndefinedFields>, PF>;

package/build/utilities/normalizeSchemaValues.js

@@ -4,13 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = normalizeSchemaValues;
+const just_safe_get_1 = __importDefault(require("just-safe-get"));
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
 function normalizeSchemaValues(schema, values, options) {
     const instance = SchemaEntityFactory_1.default.Entity(schema, values);
-    const { shouldCreateEntityInstances = false, ...rest } = options || {};
+    const { shouldCreateEntityInstances = false, shouldRetainDotSyntaxKeys, ...rest } = options || {};
     const normalizedOptions = {
         shouldCreateEntityInstances,
         ...rest,
     };
-    return instance.getValues(normalizedOptions);
+    let normalized = instance.getValues(normalizedOptions);
+    if (shouldRetainDotSyntaxKeys) {
+        const normalizedWithKeys = {};
+        for (const key of Object.keys(values)) {
+            normalizedWithKeys[key] = (0, just_safe_get_1.default)(normalized, key);
+        }
+        normalized = normalizedWithKeys;
+    }
+    return normalized;
 }

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "30.0.572",
+  "version": "30.0.573",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",