@sprucelabs/schema 30.0.109 → 30.0.110

package/build/esm/AbstractSchemaTest.js

@@ -1,23 +1,9 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import AbstractSpruceTest from '@sprucelabs/test-utils';
 import { SchemaRegistry } from './index.js';
 export default class AbstractSchemaTest extends AbstractSpruceTest {
-    static beforeEach() {
-        const _super = Object.create(null, {
-            beforeEach: { get: () => super.beforeEach }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.beforeEach.call(this);
-            this.registry = SchemaRegistry.getInstance();
-            this.registry.forgetAllSchemas();
-        });
+    static async beforeEach() {
+        await super.beforeEach();
+        this.registry = SchemaRegistry.getInstance();
+        this.registry.forgetAllSchemas();
     }
 }

package/build/esm/DynamicSchemaEntityImplementation.js

@@ -46,7 +46,7 @@ export default class DynamicSchemaEntityImplementation extends AbstractEntity {
             this.validate(options);
             return true;
         }
-        catch (_a) {
+        catch {
             return false;
         }
     }
@@ -65,7 +65,7 @@ export default class DynamicSchemaEntityImplementation extends AbstractEntity {
         return values;
     }
     setValues(values) {
-        this.values = Object.assign(Object.assign({}, this.values), values);
+        this.values = { ...this.values, ...values };
         return this;
     }
     getNamedFields(options = {}) {

package/build/esm/StaticSchemaEntityImpl.js

@@ -10,7 +10,10 @@ class StaticSchemaEntityImpl extends AbstractEntity {
         this.schema = schema;
         this.fields = {};
         this.buildFields();
-        const v = Object.assign(Object.assign({}, this.values), values);
+        const v = {
+            ...this.values,
+            ...values,
+        };
         this.values = cloneDeepPreservingInstances(v);
     }
     buildFields() {
@@ -30,7 +33,10 @@ class StaticSchemaEntityImpl extends AbstractEntity {
     normalizeValue(forField, value, options) {
         var _a, _b;
         const field = this.fields[forField];
-        const overrideOptions = Object.assign(Object.assign({}, (options !== null && options !== void 0 ? options : {})), ((_b = (_a = options === null || options === void 0 ? void 0 : options.byField) === null || _a === void 0 ? void 0 : _a[forField]) !== null && _b !== void 0 ? _b : {}));
+        const overrideOptions = {
+            ...(options !== null && options !== void 0 ? options : {}),
+            ...((_b = (_a = options === null || options === void 0 ? void 0 : options.byField) === null || _a === void 0 ? void 0 : _a[forField]) !== null && _b !== void 0 ? _b : {}),
+        };
         return normalizeFieldValue(this.schemaId, this.name, {}, field, value, overrideOptions);
     }
     get(fieldName, options = {}) {
@@ -49,7 +55,7 @@ class StaticSchemaEntityImpl extends AbstractEntity {
             this.validate(options);
             return true;
         }
-        catch (_a) {
+        catch {
             return false;
         }
     }

package/build/esm/fields/SchemaField.js

@@ -317,7 +317,11 @@ class SchemaField extends AbstractField {
         if (createEntityInstances) {
             return instance;
         }
-        const getValueOptions = Object.assign(Object.assign({ validate: false }, options), { fields: undefined });
+        const getValueOptions = {
+            validate: false,
+            ...options,
+            fields: undefined,
+        };
         if (isUnion) {
             return {
                 schemaId: instance.schemaId,

package/build/esm/tests/AbstractDateFieldTest.js

@@ -1,25 +1,11 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { assert } from '@sprucelabs/test-utils';
 import { validationErrorAssert } from '../index.js';
 import AbstractSchemaTest from '../AbstractSchemaTest.js';
 import SchemaEntityFactory from '../factories/SchemaEntityFactory.js';
 export default class AbstractDateFieldTest extends AbstractSchemaTest {
-    static beforeEach() {
-        const _super = Object.create(null, {
-            beforeEach: { get: () => super.beforeEach }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.beforeEach.call(this);
-            this.entity = SchemaEntityFactory.Entity(this.schema);
-        });
+    static async beforeEach() {
+        await super.beforeEach();
+        this.entity = SchemaEntityFactory.Entity(this.schema);
     }
     static canSetDateAsDateObject() {
         //@ts-ignore

package/build/esm/utilities/defaultSchemaValues.js

@@ -2,5 +2,8 @@ import StaticSchemaEntityImpl from '../StaticSchemaEntityImpl.js';
 export default function defaultSchemaValues(definition, options = {}) {
     const instance = new StaticSchemaEntityImpl(definition);
     // @ts-ignore
-    return instance.getDefaultValues(Object.assign({ shouldCreateEntityInstances: false }, options));
+    return instance.getDefaultValues({
+        shouldCreateEntityInstances: false,
+        ...options,
+    });
 }

package/build/esm/utilities/dropFields.js

@@ -2,7 +2,9 @@ export default function dropFields(fields, dropFields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
         if (!dropFields || dropFields.indexOf(name) === -1) {
-            optionalFields[name] = Object.assign({}, fields[name]);
+            optionalFields[name] = {
+                ...fields[name],
+            };
         }
     });
     return optionalFields;

package/build/esm/utilities/dropPrivateFields.js

@@ -2,7 +2,9 @@ export default function dropPrivateFields(fields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
         if (!fields[name].isPrivate) {
-            optionalFields[name] = Object.assign({}, fields[name]);
+            optionalFields[name] = {
+                ...fields[name],
+            };
         }
     });
     return optionalFields;

package/build/esm/utilities/isSchemaValid.js

@@ -4,7 +4,7 @@ export default function isSchemaValid(definition) {
         validateSchema(definition);
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
 }

package/build/esm/utilities/makeFieldsOptional.js

@@ -1,7 +1,10 @@
 export default function makeFieldsOptional(fields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
-        optionalFields[name] = Object.assign(Object.assign({}, fields[name]), { isRequired: false });
+        optionalFields[name] = {
+            ...fields[name],
+            isRequired: false,
+        };
     });
     return optionalFields;
 }

package/build/esm/utilities/mapFieldErrorsToParameterErrors.js

@@ -40,13 +40,22 @@ function pullParamaterIssues(errors, prefix = '') {
             unexpectedParamaters.push(...u);
         }
         else if (fieldError.code === 'MISSING_PARAMETER') {
-            missingParameters.push(Object.assign(Object.assign({}, fieldError), { name: fieldName }));
+            missingParameters.push({
+                ...fieldError,
+                name: fieldName,
+            });
         }
         else if (fieldError.code === 'INVALID_PARAMETER') {
-            invalidParameters.push(Object.assign(Object.assign({}, fieldError), { name: fieldName }));
+            invalidParameters.push({
+                ...fieldError,
+                name: fieldName,
+            });
         }
         else if (fieldError.code === 'UNEXPECTED_PARAMETER') {
-            unexpectedParamaters.push(Object.assign(Object.assign({}, fieldError), { name: fieldName }));
+            unexpectedParamaters.push({
+                ...fieldError,
+                name: fieldName,
+            });
         }
     });
     return { missingParameters, invalidParameters, unexpectedParamaters };

package/build/esm/utilities/normalizeFieldValue.js

@@ -1,14 +1,3 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import SpruceError from '../errors/SpruceError.js';
 export default function normalizeFieldValue(schemaId, schemaName, schemasById, field, value, options) {
     var _a;
@@ -20,8 +9,12 @@ export default function normalizeFieldValue(schemaId, schemaName, schemasById, f
             friendlyMessages: [`I was expecting an array for ${field.name}.`],
         });
     }
-    const _b = options !== null && options !== void 0 ? options : {}, { shouldValidate: validate = true, shouldCreateEntityInstances: createEntityInstances = true } = _b, extraOptions = __rest(_b, ["shouldValidate", "shouldCreateEntityInstances"]);
-    const baseOptions = Object.assign(Object.assign({ schemasById }, ((_a = field.definition.options) !== null && _a !== void 0 ? _a : {})), extraOptions);
+    const { shouldValidate: validate = true, shouldCreateEntityInstances: createEntityInstances = true, ...extraOptions } = options !== null && options !== void 0 ? options : {};
+    const baseOptions = {
+        schemasById,
+        ...((_a = field.definition.options) !== null && _a !== void 0 ? _a : {}),
+        ...extraOptions,
+    };
     if (value === null || typeof value === 'undefined') {
         if (field && (!validate || !field.isRequired)) {
             return value;
@@ -39,7 +32,9 @@ export default function normalizeFieldValue(schemaId, schemaName, schemasById, f
         localValue.forEach((value) => {
             errors = [
                 ...errors,
-                ...field.validate(value, Object.assign({}, baseOptions)),
+                ...field.validate(value, {
+                    ...baseOptions,
+                }),
             ];
         });
     }
@@ -54,7 +49,10 @@ export default function normalizeFieldValue(schemaId, schemaName, schemasById, f
     if (localValue.length > 0) {
         localValue = localValue.map((value) => typeof value === 'undefined'
             ? undefined
-            : field.toValueType(value, Object.assign({ createEntityInstances }, baseOptions)));
+            : field.toValueType(value, {
+                createEntityInstances,
+                ...baseOptions,
+            }));
     }
     return (field.isArray ? localValue : localValue[0]);
 }

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

@@ -1,2 +1,4 @@
 import { Schema, SchemaPartialValues, SchemaGetValuesOptions, SchemaFieldNames, SchemaPublicFieldNames, SchemaValues } from '../schemas.static.types';
-export default function normalizePartialSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, Values extends SchemaPartialValues<S, CreateEntityInstances> = SchemaPartialValues<S, CreateEntityInstances>, Fields extends keyof Values = keyof Values>(schema: S, values: Values, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields>): Required<Pick<SchemaValues<S, CreateEntityInstances>, Fields>>;
+export default function normalizePartialSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, Values extends SchemaPartialValues<S, CreateEntityInstances> = SchemaPartialValues<S, CreateEntityInstances>, Fields extends keyof Values = keyof Values>(schema: S, values: Values, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields>): Required<Pick<SchemaValues<S, CreateEntityInstances>, 
+/** @ts-ignore */
+Fields>>;

package/build/esm/utilities/normalizePartialSchemaValues.js

@@ -1,5 +1,8 @@
 import normalizeSchemaValues from './normalizeSchemaValues.js';
 export default function normalizePartialSchemaValues(schema, values, options) {
-    const normalized = normalizeSchemaValues(schema, values, Object.assign(Object.assign({}, options), { shouldIncludeNullAndUndefinedFields: false }));
+    const normalized = normalizeSchemaValues(schema, values, {
+        ...options,
+        shouldIncludeNullAndUndefinedFields: false,
+    });
     return normalized;
 }

package/build/esm/utilities/normalizeSchemaValues.js

@@ -1,18 +1,10 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import EntityFactory from '../factories/SchemaEntityFactory.js';
 export default function normalizeSchemaValues(schema, values, options) {
     const instance = EntityFactory.Entity(schema, values);
-    const _a = options || {}, { shouldCreateEntityInstances = false } = _a, rest = __rest(_a, ["shouldCreateEntityInstances"]);
-    const normalizedOptions = Object.assign({ shouldCreateEntityInstances }, rest);
+    const { shouldCreateEntityInstances = false, ...rest } = options || {};
+    const normalizedOptions = {
+        shouldCreateEntityInstances,
+        ...rest,
+    };
     return instance.getValues(normalizedOptions);
 }

package/build/esm/utilities/registerFieldType.js

@@ -24,15 +24,26 @@ export function validateFieldRegistration(registration) {
         });
     }
     if (errors.length > 0) {
-        throw new SpruceError(Object.assign({ code: 'INVALID_FIELD_REGISTRATION' }, builtRegistration));
+        throw new SpruceError({
+            code: 'INVALID_FIELD_REGISTRATION',
+            ...builtRegistration,
+        });
     }
 }
 /** Register a new type of field */
 export default function registerFieldType(options) {
-    const registration = Object.assign({ package: options.package, className: options.class.name, type: options.type, importAs: options.importAs, 
+    const registration = {
+        package: options.package,
+        className: options.class.name,
+        type: options.type,
+        importAs: options.importAs,
+        // TODO change this up when typescript supports typing static methods on a class
+        // @ts-ignore
+        description: options.class.description,
         // TODO change this up when typescript supports typing static methods on a class
         // @ts-ignore
-        description: options.class.description }, options.class.generateTypeDetails());
+        ...options.class.generateTypeDetails(),
+    };
     validateFieldRegistration(registration);
     return registration;
 }

package/build/esm/utilities/validateSchemaValues.js

@@ -1,19 +1,8 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    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) {
-    const opts = __rest(options !== null && options !== void 0 ? options : {}, []);
+    const { ...opts } = options !== null && options !== void 0 ? options : {};
     validateSchema(schema);
     const mapped = Object.keys(values).reduce((mapped, key) => {
         //@ts-ignore

package/build/fields/DateField.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateDateValue = void 0;
+exports.validateDateValue = validateDateValue;
 const getStartOfDay_1 = __importDefault(require("../utilities/getStartOfDay"));
 const isUndefinedOrNull_1 = __importDefault(require("../utilities/isUndefinedOrNull"));
 const AbstractField_1 = __importDefault(require("./AbstractField"));
@@ -52,4 +52,3 @@ function validateDateValue(options) {
         },
     ];
 }
-exports.validateDateValue = validateDateValue;

package/build/fields/DurationField.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDuration = exports.reduceDurationToMs = void 0;
+exports.reduceDurationToMs = reduceDurationToMs;
+exports.buildDuration = buildDuration;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const AbstractField_1 = __importDefault(require("./AbstractField"));
 function reduceDurationToMs(duration) {
@@ -15,7 +16,6 @@ function reduceDurationToMs(duration) {
     ms += d.hours * 60 * 60 * 1000;
     return ms;
 }
-exports.reduceDurationToMs = reduceDurationToMs;
 function buildDuration(value) {
     let totalMs = 0;
     if (typeof value === 'string') {
@@ -47,7 +47,6 @@ function buildDuration(value) {
     const hours = (totalMs - minutes) / 60;
     return { hours, minutes, seconds, ms };
 }
-exports.buildDuration = buildDuration;
 class DurationField extends AbstractField_1.default {
     static generateTemplateDetails(options) {
         return {

package/build/utilities/areSchemaValuesValid.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = areSchemaValuesValid;
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
 function areSchemaValuesValid(definition, values, options) {
     const instance = SchemaEntityFactory_1.default.Entity(definition, values);
     return instance.isValid(options);
 }
-exports.default = areSchemaValuesValid;

package/build/utilities/areSchemasTheSame.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = areSchemasTheSame;
 function areSchemasTheSame(left, right) {
     var _a, _b;
     if (left.id !== right.id) {
@@ -13,4 +14,3 @@ function areSchemasTheSame(left, right) {
     // TODO let fields compare their definitions
     return true;
 }
-exports.default = areSchemasTheSame;

package/build/utilities/assertOptions.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = assertOptions;
 const just_safe_get_1 = __importDefault(require("just-safe-get"));
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function assertOptions(options, toCheck, friendlyMessage) {
@@ -23,4 +24,3 @@ function assertOptions(options, toCheck, friendlyMessage) {
     }
     return options;
 }
-exports.default = assertOptions;

package/build/utilities/buildErrorSchema.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = buildErrorSchema;
 /** Build error schema */
 function buildErrorSchema(schema) {
     return schema;
 }
-exports.default = buildErrorSchema;

package/build/utilities/buildSchema.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = buildSchema;
 const SchemaRegistry_1 = __importDefault(require("../singletons/SchemaRegistry"));
 function buildSchema(schema) {
     SchemaRegistry_1.default.getInstance().trackSchema(schema);
     return schema;
 }
-exports.default = buildSchema;

package/build/utilities/cloneDeep.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = cloneDeep;
 function cloneDeep(obj, transformer) {
     var _a;
     const o = obj;
@@ -33,7 +34,6 @@ function cloneDeep(obj, 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;

package/build/utilities/cloneDeepPreservingInstances.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = cloneDeepPreservingInstances;
 const cloneDeep_1 = __importDefault(require("./cloneDeep"));
 function cloneDeepPreservingInstances(v) {
     return (0, cloneDeep_1.default)(v, (value) => {
@@ -13,4 +14,3 @@ function cloneDeepPreservingInstances(v) {
         }
     });
 }
-exports.default = cloneDeepPreservingInstances;

package/build/utilities/defaultSchemaValues.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = defaultSchemaValues;
 const StaticSchemaEntityImpl_1 = __importDefault(require("../StaticSchemaEntityImpl"));
 function defaultSchemaValues(definition, options = {}) {
     const instance = new StaticSchemaEntityImpl_1.default(definition);
@@ -12,4 +13,3 @@ function defaultSchemaValues(definition, options = {}) {
         ...options,
     });
 }
-exports.default = defaultSchemaValues;

package/build/utilities/dropFields.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = dropFields;
 function dropFields(fields, dropFields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
@@ -11,4 +12,3 @@ function dropFields(fields, dropFields) {
     });
     return optionalFields;
 }
-exports.default = dropFields;

package/build/utilities/dropPrivateFields.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = dropPrivateFields;
 function dropPrivateFields(fields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
@@ -11,4 +12,3 @@ function dropPrivateFields(fields) {
     });
     return optionalFields;
 }
-exports.default = dropPrivateFields;

package/build/utilities/formatPhoneNumber.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDummyNumber = exports.isValidNumber = void 0;
+exports.isValidNumber = isValidNumber;
+exports.default = formatPhoneNumber;
+exports.isDummyNumber = isDummyNumber;
 function formatNumberWithCode(phoneNumberString, code = '1') {
     if (phoneNumberString.match(/[a-zA-Z]/g)) {
         return null;
@@ -33,7 +35,6 @@ function isValidNumber(number) {
     const formatted = (_a = formatNumberWithCode(number, code)) === null || _a === void 0 ? void 0 : _a.replace(/[^0-9]/g, '');
     return (formatted === null || formatted === void 0 ? void 0 : formatted.length) === 11 || (formatted === null || formatted === void 0 ? void 0 : formatted.length) === 12;
 }
-exports.isValidNumber = isValidNumber;
 function stripCode(number) {
     let code = `1`; // Default to North American country code
     const cleaned = number.replace(/(?!^\+)[^\d]/g, '');
@@ -67,9 +68,7 @@ function formatPhoneNumber(val, shouldFailSilently = true) {
     const cleaned = formatted.replace(/\s+$/, '');
     return cleaned;
 }
-exports.default = formatPhoneNumber;
 function isDummyNumber(phone) {
     const cleanedValue = phone.replace(/\D/g, '');
     return cleanedValue.startsWith('1555') || cleanedValue.startsWith('555');
 }
-exports.isDummyNumber = isDummyNumber;

package/build/utilities/getFields.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getFields;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function getFields(schema) {
     var _a;
@@ -15,4 +16,3 @@ function getFields(schema) {
     }
     return names;
 }
-exports.default = getFields;

package/build/utilities/getStartOfDay.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getStartOfDay;
 function getStartOfDay(timestamp) {
     if (!timestamp) {
         timestamp = new Date().getTime();
@@ -8,4 +9,3 @@ function getStartOfDay(timestamp) {
     date.setUTCHours(0, 0, 0, 0);
     return date.getTime();
 }
-exports.default = getStartOfDay;

package/build/utilities/isIdWithVersion.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = isIdWithVersion;
 function isIdWithVersion(item) {
     return (typeof item.id === 'string' &&
         typeof item.fields === 'undefined' &&
         typeof item.dynamicFieldSignature === 'undefined');
 }
-exports.default = isIdWithVersion;

package/build/utilities/isSchemaValid.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = isSchemaValid;
 const validateSchema_1 = __importDefault(require("./validateSchema"));
 function isSchemaValid(definition) {
     try {
@@ -13,4 +14,3 @@ function isSchemaValid(definition) {
         return false;
     }
 }
-exports.default = isSchemaValid;

package/build/utilities/isUndefinedOrNull.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = isUndefinedOrNull;
 function isUndefinedOrNull(value) {
     return typeof value === 'undefined' || value === null;
 }
-exports.default = isUndefinedOrNull;

package/build/utilities/makeFieldsOptional.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = makeFieldsOptional;
 function makeFieldsOptional(fields) {
     const optionalFields = {};
     Object.keys(fields).forEach((name) => {
@@ -10,4 +11,3 @@ function makeFieldsOptional(fields) {
     });
     return optionalFields;
 }
-exports.default = makeFieldsOptional;

package/build/utilities/mapFieldErrorsToParameterErrors.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = mapFieldErrorsToParameterErrors;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function mapFieldErrorsToParameterErrors(fieldErrors) {
     const { missingParameters, invalidParameters, unexpectedParamaters } = pullParamaterIssues(fieldErrors);
@@ -30,7 +31,6 @@ function mapFieldErrorsToParameterErrors(fieldErrors) {
     }
     return errors;
 }
-exports.default = mapFieldErrorsToParameterErrors;
 function pullParamaterIssues(errors, prefix = '') {
     const missingParameters = [];
     const invalidParameters = [];

package/build/utilities/normalizeFieldValue.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeValueToArray = void 0;
+exports.default = normalizeFieldValue;
+exports.normalizeValueToArray = normalizeValueToArray;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function normalizeFieldValue(schemaId, schemaName, schemasById, field, value, options) {
     var _a;
@@ -62,7 +63,6 @@ function normalizeFieldValue(schemaId, schemaName, schemasById, field, value, op
     }
     return (field.isArray ? localValue : localValue[0]);
 }
-exports.default = normalizeFieldValue;
 function normalizeValueToArray(value) {
     return value === null || typeof value === 'undefined'
         ? []
@@ -70,4 +70,3 @@ function normalizeValueToArray(value) {
             ? value
             : [value];
 }
-exports.normalizeValueToArray = normalizeValueToArray;

package/build/utilities/normalizePartialSchemaValues.d.ts

@@ -1,2 +1,4 @@
 import { Schema, SchemaPartialValues, SchemaGetValuesOptions, SchemaFieldNames, SchemaPublicFieldNames, SchemaValues } from '../schemas.static.types';
-export default function normalizePartialSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, Values extends SchemaPartialValues<S, CreateEntityInstances> = SchemaPartialValues<S, CreateEntityInstances>, Fields extends keyof Values = keyof Values>(schema: S, values: Values, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields>): Required<Pick<SchemaValues<S, CreateEntityInstances>, Fields>>;
+export default function normalizePartialSchemaValues<S extends Schema, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, Values extends SchemaPartialValues<S, CreateEntityInstances> = SchemaPartialValues<S, CreateEntityInstances>, Fields extends keyof Values = keyof Values>(schema: S, values: Values, options?: SchemaGetValuesOptions<S, F, PF, CreateEntityInstances, IncludePrivateFields>): Required<Pick<SchemaValues<S, CreateEntityInstances>, 
+/** @ts-ignore */
+Fields>>;

package/build/utilities/normalizePartialSchemaValues.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = normalizePartialSchemaValues;
 const normalizeSchemaValues_1 = __importDefault(require("./normalizeSchemaValues"));
 function normalizePartialSchemaValues(schema, values, options) {
     const normalized = (0, normalizeSchemaValues_1.default)(schema, values, {
@@ -11,4 +12,3 @@ function normalizePartialSchemaValues(schema, values, options) {
     });
     return normalized;
 }
-exports.default = normalizePartialSchemaValues;

package/build/utilities/normalizeSchemaToIdWithVersion.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = normalizeSchemaToIdWithVersion;
 const isIdWithVersion_1 = __importDefault(require("./isIdWithVersion"));
 function normalizeSchemaToIdWithVersion(schemaOrIdWithVersion) {
     if ((0, isIdWithVersion_1.default)(schemaOrIdWithVersion)) {
@@ -17,4 +18,3 @@ function normalizeSchemaToIdWithVersion(schemaOrIdWithVersion) {
     }
     return idWithVersion;
 }
-exports.default = normalizeSchemaToIdWithVersion;

package/build/utilities/normalizeSchemaValues.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = normalizeSchemaValues;
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
 function normalizeSchemaValues(schema, values, options) {
     const instance = SchemaEntityFactory_1.default.Entity(schema, values);
@@ -13,4 +14,3 @@ function normalizeSchemaValues(schema, values, options) {
     };
     return instance.getValues(normalizedOptions);
 }
-exports.default = normalizeSchemaValues;

package/build/utilities/pickFields.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = pickFields;
 function pickFields(fields, names) {
     const final = {};
     for (const name of names) {
@@ -7,4 +8,3 @@ function pickFields(fields, names) {
     }
     return final;
 }
-exports.default = pickFields;

package/build/utilities/registerFieldType.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFieldRegistration = void 0;
+exports.validateFieldRegistration = validateFieldRegistration;
+exports.default = registerFieldType;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function validateFieldRegistration(registration) {
     const errors = [];
@@ -36,7 +37,6 @@ function validateFieldRegistration(registration) {
         });
     }
 }
-exports.validateFieldRegistration = validateFieldRegistration;
 /** Register a new type of field */
 function registerFieldType(options) {
     const registration = {
@@ -54,4 +54,3 @@ function registerFieldType(options) {
     validateFieldRegistration(registration);
     return registration;
 }
-exports.default = registerFieldType;

package/build/utilities/selectChoicesToHash.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schemaChoicesToHash = exports.selectChoicesToHash = void 0;
+exports.selectChoicesToHash = selectChoicesToHash;
+exports.schemaChoicesToHash = schemaChoicesToHash;
 /** Pass the select options directly to create a value/label hash */
 function selectChoicesToHash(options) {
     const partial = {};
@@ -10,7 +11,6 @@ function selectChoicesToHash(options) {
     });
     return partial;
 }
-exports.selectChoicesToHash = selectChoicesToHash;
 /** Take a definition and a field name and returns a value/label hash */
 function schemaChoicesToHash(definition, fieldName) {
     var _a, _b, _c, _d;
@@ -19,4 +19,3 @@ function schemaChoicesToHash(definition, fieldName) {
     // @ts-ignore
     (_d = (_c = (_b = (_a = definition.fields) === null || _a === void 0 ? void 0 : _a[fieldName]) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.choices) !== null && _d !== void 0 ? _d : []);
 }
-exports.schemaChoicesToHash = schemaChoicesToHash;

package/build/utilities/validateSchema.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = validateSchema;
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 function validateSchema(schema) {
     var _a;
@@ -32,4 +33,3 @@ function validateSchema(schema) {
         });
     }
 }
-exports.default = validateSchema;

package/build/utilities/validateSchemaValues.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = validateSchemaValues;
 const just_safe_set_1 = __importDefault(require("just-safe-set"));
 const __1 = require("..");
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
@@ -17,4 +18,3 @@ function validateSchemaValues(schema, values, options) {
     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": "30.0.109",
+  "version": "30.0.110",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",
@@ -50,9 +50,6 @@
     "release": "semantic-release",
     "test": "jest",
     "update.dependencies": "yarn run clean.dependencies && yarn",
-    "upgrade.packages": "yarn-upgrade-all && rm -f yarn.lock ; yarn ; yarn fix.lint ; true",
-    "upgrade.packages.all": "yarn install && yarn upgrade.packages",
-    "upgrade.packages.test": "yarn upgrade.packages.all && yarn lint && yarn build.dev && yarn test",
     "watch.build.dev": "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
     "watch.tsc": "tsc -w",
     "post.watch.build": "yarn build.resolve-paths",
@@ -61,28 +58,28 @@
     "build.copy-files": "mkdir -p build && rsync -avzq --exclude='*.ts' ./src/ ./build/"
   },
   "dependencies": {
-    "@sprucelabs/error": "^6.0.61",
-    "@sprucelabs/test-utils": "^5.1.1",
+    "@sprucelabs/error": "^6.0.69",
+    "@sprucelabs/test-utils": "^5.1.2",
     "email-validator": "^2.0.4",
     "just-safe-get": "^4.2.0",
     "just-safe-set": "^4.2.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.47",
-    "@sprucelabs/jest-json-reporter": "^8.0.66",
-    "@sprucelabs/resolve-path-aliases": "^2.0.42",
-    "@sprucelabs/semantic-release": "^5.0.1",
-    "@sprucelabs/test": "^9.0.29",
+    "@sprucelabs/esm-postbuild": "^6.0.52",
+    "@sprucelabs/jest-json-reporter": "^8.0.72",
+    "@sprucelabs/resolve-path-aliases": "^2.0.47",
+    "@sprucelabs/semantic-release": "^5.0.2",
+    "@sprucelabs/test": "^9.0.34",
     "chokidar-cli": "^3.0.0",
     "eslint": "^9.5.0",
-    "eslint-config-spruce": "^11.2.24",
+    "eslint-config-spruce": "^11.2.26",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.3.2",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "jest": {
     "testEnvironment": "node",