@sprucelabs/schema 28.3.18 → 28.4.0

package/build/StaticSchemaEntityImplementation.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AbstractEntity_1 = __importDefault(require("./AbstractEntity"));
 const SpruceError_1 = __importDefault(require("./errors/SpruceError"));
 const FieldFactory_1 = __importDefault(require("./factories/FieldFactory"));
+const cloneDeepPreservingInstances_1 = __importDefault(require("./utilities/cloneDeepPreservingInstances"));
 const normalizeFieldValue_1 = __importStar(require("./utilities/normalizeFieldValue"));
 /** Universal schema class  */
 class StaticSchemaEntityImplementation extends AbstractEntity_1.default {
@@ -38,7 +39,8 @@ class StaticSchemaEntityImplementation extends AbstractEntity_1.default {
         this.schema = schema;
         this.fields = {};
         this.buildFields();
-        this.values = Object.assign(Object.assign({}, this.values), values);
+        const v = Object.assign(Object.assign({}, this.values), values);
+        this.values = (0, cloneDeepPreservingInstances_1.default)(v);
     }
     buildFields() {
         const fieldDefinitions = this.schema.fields;

package/build/esm/StaticSchemaEntityImplementation.js

@@ -1,6 +1,7 @@
 import AbstractEntity from './AbstractEntity.js';
 import SpruceError from './errors/SpruceError.js';
 import FieldFactory from './factories/FieldFactory.js';
+import cloneDeepPreservingInstances from './utilities/cloneDeepPreservingInstances.js';
 import normalizeFieldValue, { normalizeValueToArray, } from './utilities/normalizeFieldValue.js';
 /** Universal schema class  */
 export default class StaticSchemaEntityImplementation extends AbstractEntity {
@@ -10,7 +11,8 @@ export default class StaticSchemaEntityImplementation extends AbstractEntity {
         this.schema = schema;
         this.fields = {};
         this.buildFields();
-        this.values = Object.assign(Object.assign({}, this.values), values);
+        const v = Object.assign(Object.assign({}, this.values), values);
+        this.values = cloneDeepPreservingInstances(v);
     }
     buildFields() {
         const fieldDefinitions = this.schema.fields;

package/build/esm/index.d.ts

@@ -4,6 +4,8 @@ import { FieldRegistration } from './utilities/registerFieldType';
 export default StaticSchemaEntityImplementation;
 export { default as validationErrorAssert } from './tests/validationErrorAssert.utility';
 export { default as selectAssert } from './tests/selectAssert.utility';
+export { default as cloneDeep } from './utilities/cloneDeep';
+export { default as cloneDeepPreservingInstances } from './utilities/cloneDeepPreservingInstances';
 export { default as selectAssertUtil } from './tests/selectAssert.deprecated';
 export * from './schemas.static.types';
 export * from './fields';

package/build/esm/index.js

@@ -19,6 +19,8 @@ import StaticSchemaEntityImplementation from './StaticSchemaEntityImplementation
 export default StaticSchemaEntityImplementation;
 export { default as validationErrorAssert } from './tests/validationErrorAssert.utility.js';
 export { default as selectAssert } from './tests/selectAssert.utility.js';
+export { default as cloneDeep } from './utilities/cloneDeep.js';
+export { default as cloneDeepPreservingInstances } from './utilities/cloneDeepPreservingInstances.js';
 export { default as selectAssertUtil } from './tests/selectAssert.deprecated.js';
 export * from './schemas.static.types.js';
 export * from './fields/index.js';

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

@@ -0,0 +1,3 @@
+export default function cloneDeep<T>(obj: T, transformer?: Transformer): T;
+declare type Transformer = (value: any, key: string) => any | void;
+export {};

package/build/esm/utilities/cloneDeep.js

@@ -0,0 +1,46 @@
+export default function cloneDeep(obj, transformer) {
+    var _a;
+    const o = obj;
+    let result = o;
+    let type = {}.toString.call(o).slice(8, -1);
+    if (type == 'Set') {
+        return new Set([...o].map((value) => cloneDeep(value, transformer)));
+    }
+    if (type == 'Map') {
+        const items = [];
+        [...o.entries()].forEach((kv) => {
+            if ((transformer === null || transformer === void 0 ? void 0 : transformer(kv[1], kv[0])) !== false) {
+                items.push([cloneDeep(kv[0]), cloneDeep(kv[1])]);
+            }
+        });
+        return new Map(items);
+    }
+    if (type == 'Date') {
+        return new Date(o.getTime());
+    }
+    if (type == 'RegExp') {
+        return RegExp(o.source, getRegExpFlags(o));
+    }
+    if (type == 'Array' || type == 'Object') {
+        result = Array.isArray(o) ? [] : {};
+        for (let key in o) {
+            result[key] = (_a = transformer === null || transformer === void 0 ? void 0 : transformer(o[key], key)) !== null && _a !== void 0 ? _a : cloneDeep(o[key], transformer);
+        }
+    }
+    // primitives and non-supported objects (e.g. functions) land here
+    return result;
+}
+function getRegExpFlags(regExp) {
+    if (typeof regExp.source.flags == 'string') {
+        return regExp.source.flags;
+    }
+    else {
+        let flags = [];
+        regExp.global && flags.push('g');
+        regExp.ignoreCase && flags.push('i');
+        regExp.multiline && flags.push('m');
+        regExp.sticky && flags.push('y');
+        regExp.unicode && flags.push('u');
+        return flags.join('');
+    }
+}

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

@@ -0,0 +1 @@
+export default function cloneDeepPreservingInstances<T>(v: T): T;

package/build/esm/utilities/cloneDeepPreservingInstances.js

@@ -0,0 +1,10 @@
+import cloneDeep from './cloneDeep.js';
+export default function cloneDeepPreservingInstances(v) {
+    return cloneDeep(v, (value) => {
+        var _a, _b;
+        const name = (_b = (_a = value === null || value === void 0 ? void 0 : value.__proto__) === null || _a === void 0 ? void 0 : _a.constructor) === null || _b === void 0 ? void 0 : _b.name;
+        if (name && name !== 'Object') {
+            return value;
+        }
+    });
+}

package/build/esm/utilities/validateSchemaValues.js

@@ -9,6 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import set from 'just-safe-set';
 import { validateSchema } from '../index.js';
 import EntityFactory from '../factories/SchemaEntityFactory.js';
 export default function validateSchemaValues(schema, values, options
@@ -16,6 +17,11 @@ export default function validateSchemaValues(schema, values, options
 ) {
     const opts = __rest(options !== null && options !== void 0 ? options : {}, []);
     validateSchema(schema);
-    const instance = EntityFactory.Entity(schema, values);
+    const mapped = Object.keys(values).reduce((mapped, key) => {
+        //@ts-ignore
+        set(mapped, key, values[key]);
+        return mapped;
+    }, {});
+    const instance = EntityFactory.Entity(schema, mapped);
     instance.validate(opts);
 }

package/build/index.d.ts

@@ -4,6 +4,8 @@ import { FieldRegistration } from './utilities/registerFieldType';
 export default StaticSchemaEntityImplementation;
 export { default as validationErrorAssert } from './tests/validationErrorAssert.utility';
 export { default as selectAssert } from './tests/selectAssert.utility';
+export { default as cloneDeep } from './utilities/cloneDeep';
+export { default as cloneDeepPreservingInstances } from './utilities/cloneDeepPreservingInstances';
 export { default as selectAssertUtil } from './tests/selectAssert.deprecated';
 export * from './schemas.static.types';
 export * from './fields';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapFieldErrorsToParameterErrors = exports.assertOptions = exports.fieldRegistrations = exports.SchemaRegistry = exports.SchemaEntityFactory = exports.FieldFactory = exports.normalizeSchemaToIdWithVersion = exports.isIdWithVersion = exports.pickFields = exports.getFields = exports.formatPhoneNumber = exports.areSchemasTheSame = exports.isSchemaValid = exports.validateSchema = exports.dropPrivateFields = exports.dropFields = exports.makeFieldsOptional = exports.areSchemaValuesValid = exports.normalizeSchemaValues = exports.validateSchemaValues = exports.defaultSchemaValues = exports.registerFieldType = exports.buildSchema = exports.buildErrorSchema = exports.SchemaError = exports.selectAssertUtil = exports.selectAssert = exports.validationErrorAssert = void 0;
+exports.mapFieldErrorsToParameterErrors = exports.assertOptions = exports.fieldRegistrations = exports.SchemaRegistry = exports.SchemaEntityFactory = exports.FieldFactory = exports.normalizeSchemaToIdWithVersion = exports.isIdWithVersion = exports.pickFields = exports.getFields = exports.formatPhoneNumber = exports.areSchemasTheSame = exports.isSchemaValid = exports.validateSchema = exports.dropPrivateFields = exports.dropFields = exports.makeFieldsOptional = exports.areSchemaValuesValid = exports.normalizeSchemaValues = exports.validateSchemaValues = exports.defaultSchemaValues = exports.registerFieldType = exports.buildSchema = exports.buildErrorSchema = exports.SchemaError = exports.selectAssertUtil = exports.cloneDeepPreservingInstances = exports.cloneDeep = exports.selectAssert = exports.validationErrorAssert = void 0;
 __exportStar(require("./StaticSchemaEntityImplementation"), exports);
 const addressField_addon_1 = __importDefault(require("./addons/addressField.addon"));
 const booleanField_addon_1 = __importDefault(require("./addons/booleanField.addon"));
@@ -41,6 +41,10 @@ var validationErrorAssert_utility_1 = require("./tests/validationErrorAssert.uti
 Object.defineProperty(exports, "validationErrorAssert", { enumerable: true, get: function () { return __importDefault(validationErrorAssert_utility_1).default; } });
 var selectAssert_utility_1 = require("./tests/selectAssert.utility");
 Object.defineProperty(exports, "selectAssert", { enumerable: true, get: function () { return __importDefault(selectAssert_utility_1).default; } });
+var cloneDeep_1 = require("./utilities/cloneDeep");
+Object.defineProperty(exports, "cloneDeep", { enumerable: true, get: function () { return __importDefault(cloneDeep_1).default; } });
+var cloneDeepPreservingInstances_1 = require("./utilities/cloneDeepPreservingInstances");
+Object.defineProperty(exports, "cloneDeepPreservingInstances", { enumerable: true, get: function () { return __importDefault(cloneDeepPreservingInstances_1).default; } });
 var selectAssert_deprecated_1 = require("./tests/selectAssert.deprecated");
 Object.defineProperty(exports, "selectAssertUtil", { enumerable: true, get: function () { return __importDefault(selectAssert_deprecated_1).default; } });
 __exportStar(require("./schemas.static.types"), exports);

package/build/utilities/cloneDeep.d.ts

@@ -0,0 +1,3 @@
+export default function cloneDeep<T>(obj: T, transformer?: Transformer): T;
+declare type Transformer = (value: any, key: string) => any | void;
+export {};

package/build/utilities/cloneDeep.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function cloneDeep(obj, transformer) {
+    var _a;
+    const o = obj;
+    let result = o;
+    let type = {}.toString.call(o).slice(8, -1);
+    if (type == 'Set') {
+        return new Set([...o].map((value) => cloneDeep(value, transformer)));
+    }
+    if (type == 'Map') {
+        const items = [];
+        [...o.entries()].forEach((kv) => {
+            if ((transformer === null || transformer === void 0 ? void 0 : transformer(kv[1], kv[0])) !== false) {
+                items.push([cloneDeep(kv[0]), cloneDeep(kv[1])]);
+            }
+        });
+        return new Map(items);
+    }
+    if (type == 'Date') {
+        return new Date(o.getTime());
+    }
+    if (type == 'RegExp') {
+        return RegExp(o.source, getRegExpFlags(o));
+    }
+    if (type == 'Array' || type == 'Object') {
+        result = Array.isArray(o) ? [] : {};
+        for (let key in o) {
+            result[key] = (_a = transformer === null || transformer === void 0 ? void 0 : transformer(o[key], key)) !== null && _a !== void 0 ? _a : cloneDeep(o[key], transformer);
+        }
+    }
+    // primitives and non-supported objects (e.g. functions) land here
+    return result;
+}
+exports.default = cloneDeep;
+function getRegExpFlags(regExp) {
+    if (typeof regExp.source.flags == 'string') {
+        return regExp.source.flags;
+    }
+    else {
+        let flags = [];
+        regExp.global && flags.push('g');
+        regExp.ignoreCase && flags.push('i');
+        regExp.multiline && flags.push('m');
+        regExp.sticky && flags.push('y');
+        regExp.unicode && flags.push('u');
+        return flags.join('');
+    }
+}

package/build/utilities/cloneDeepPreservingInstances.d.ts

@@ -0,0 +1 @@
+export default function cloneDeepPreservingInstances<T>(v: T): T;

package/build/utilities/cloneDeepPreservingInstances.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cloneDeep_1 = __importDefault(require("./cloneDeep"));
+function cloneDeepPreservingInstances(v) {
+    return (0, cloneDeep_1.default)(v, (value) => {
+        var _a, _b;
+        const name = (_b = (_a = value === null || value === void 0 ? void 0 : value.__proto__) === null || _a === void 0 ? void 0 : _a.constructor) === null || _b === void 0 ? void 0 : _b.name;
+        if (name && name !== 'Object') {
+            return value;
+        }
+    });
+}
+exports.default = cloneDeepPreservingInstances;

package/build/utilities/validateSchemaValues.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const just_safe_set_1 = __importDefault(require("just-safe-set"));
 const __1 = require("..");
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
 function validateSchemaValues(schema, values, options
@@ -21,7 +22,12 @@ function validateSchemaValues(schema, values, options
 ) {
     const opts = __rest(options !== null && options !== void 0 ? options : {}, []);
     (0, __1.validateSchema)(schema);
-    const instance = SchemaEntityFactory_1.default.Entity(schema, values);
+    const mapped = Object.keys(values).reduce((mapped, key) => {
+        //@ts-ignore
+        (0, just_safe_set_1.default)(mapped, key, values[key]);
+        return mapped;
+    }, {});
+    const instance = SchemaEntityFactory_1.default.Entity(schema, mapped);
     instance.validate(opts);
 }
 exports.default = validateSchemaValues;

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "28.3.18",
+  "version": "28.4.0",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",
@@ -70,7 +70,7 @@
     "@sprucelabs/test": "^7.7.339",
     "email-validator": "^2.0.4",
     "just-safe-get": "^4.0.1",
-    "lodash": "^4.17.21"
+    "just-safe-set": "^4.0.2"
   },
   "devDependencies": {
     "@sprucelabs/esm-postbuild": "^1.0.424",
@@ -78,8 +78,7 @@
     "@sprucelabs/jest-sheets-reporter": "^1.3.29",
     "@sprucelabs/resolve-path-aliases": "^1.1.14",
     "@sprucelabs/semantic-release": "^4.0.8",
-    "@sprucelabs/test-utils": "^3.1.39",
-    "@types/lodash": "^4.14.182",
+    "@sprucelabs/test-utils": "^3.1.41",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^7.3.0",
     "eslint": "^8.20.0",