functional-models 3.10.0 → 3.11.0

package/properties.d.ts

@@ -1,5 +1,5 @@
 import { ZodType } from 'zod';
-import { ModelReferenceType, ModelInstance, ModelType, PropertyInstance, DataValue, PropertyConfig, ValueGetter, MaybeFunction, Arrayable, PropertyValidator, ModelReferencePropertyInstance, DataDescription, JsonAble, CalculateDenormalization, PropertyType, DateValueType, PrimitiveValueType, CanBeNullableType } from './types';
+import { ModelReferenceType, ModelInstance, ModelType, PropertyInstance, DataValue, PropertyConfig, ValueGetter, MaybeFunction, Arrayable, PropertyValidator, ModelReferencePropertyInstance, DataDescription, JsonAble, CalculateDenormalization, PropertyType, DateValueType, PrimitiveValueType, CanBeNullableType } from './types.js';
 /**
  * The base function that creates a fully loaded instance of a property. All standard issue properties use this function.
  * @param propertyType - The property's value type.
@@ -38,7 +38,7 @@ type DatePropertyConfig<T extends Arrayable<DataValue>> = {
  */
 export declare const DateProperty: <T extends CanBeNullableType<DateValueType> = DateValueType>(config?: DatePropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -63,7 +63,7 @@ export declare const DateProperty: <T extends CanBeNullableType<DateValueType> =
  */
 export declare const DatetimeProperty: <T extends CanBeNullableType<DateValueType> = DateValueType>(config?: DatePropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -88,7 +88,7 @@ export declare const DatetimeProperty: <T extends CanBeNullableType<DateValueTyp
  */
 export declare const ArrayProperty: <T extends CanBeNullableType<DataValue> = DataValue>(config?: {}, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => readonly T[] | undefined;
     getConstantValue: () => readonly T[] | undefined;
     getPropertyType: () => PropertyType | string;
@@ -114,7 +114,7 @@ export declare const ArrayProperty: <T extends CanBeNullableType<DataValue> = Da
  */
 export declare const SingleTypeArrayProperty: <TValue extends Omit<PrimitiveValueType, "object">>(valueType: TValue, config?: {}, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => readonly TValue[] | undefined;
     getConstantValue: () => readonly TValue[] | undefined;
     getPropertyType: () => PropertyType | string;
@@ -139,7 +139,7 @@ export declare const SingleTypeArrayProperty: <TValue extends Omit<PrimitiveValu
  */
 export declare const ObjectProperty: <TObject extends CanBeNullableType<Readonly<Record<string, JsonAble>>> = Readonly<Record<string, JsonAble>>>(config?: {}, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TObject | undefined;
     getConstantValue: () => TObject | undefined;
     getPropertyType: () => PropertyType | string;
@@ -164,7 +164,7 @@ export declare const ObjectProperty: <TObject extends CanBeNullableType<Readonly
  */
 export declare const TextProperty: <T extends CanBeNullableType<string> = string>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -189,7 +189,7 @@ export declare const TextProperty: <T extends CanBeNullableType<string> = string
  */
 export declare const BigTextProperty: <T extends CanBeNullableType<string> = string>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -214,7 +214,7 @@ export declare const BigTextProperty: <T extends CanBeNullableType<string> = str
  */
 export declare const IntegerProperty: <T extends CanBeNullableType<number> = number>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -240,7 +240,7 @@ export declare const IntegerProperty: <T extends CanBeNullableType<number> = num
  */
 export declare const YearProperty: <T extends CanBeNullableType<number> = number>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -265,7 +265,7 @@ export declare const YearProperty: <T extends CanBeNullableType<number> = number
  */
 export declare const NumberProperty: <T extends CanBeNullableType<number> = number>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -292,7 +292,7 @@ export declare const NumberProperty: <T extends CanBeNullableType<number> = numb
  */
 export declare const ConstantValueProperty: <TDataValue extends CanBeNullableType<Arrayable<DataValue>> = Arrayable<DataValue>>(valueType: PropertyType | string, value: TDataValue, config?: PropertyConfig<TDataValue>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TDataValue | undefined;
     getConstantValue: () => TDataValue | undefined;
     getPropertyType: () => PropertyType | string;
@@ -317,7 +317,7 @@ export declare const ConstantValueProperty: <TDataValue extends CanBeNullableTyp
  */
 export declare const EmailProperty: <T extends CanBeNullableType<string> = string>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -342,7 +342,7 @@ export declare const EmailProperty: <T extends CanBeNullableType<string> = strin
  */
 export declare const BooleanProperty: <T extends CanBeNullableType<boolean> = boolean>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -368,7 +368,7 @@ export declare const BooleanProperty: <T extends CanBeNullableType<boolean> = bo
  */
 export declare const PrimaryKeyUuidProperty: <T extends CanBeNullableType<string> = string>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -395,7 +395,7 @@ export declare const PrimaryKeyUuidProperty: <T extends CanBeNullableType<string
  */
 export declare const UuidProperty: <T extends CanBeNullableType<string> = string>(config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;
@@ -454,7 +454,7 @@ export declare const AdvancedModelReferenceProperty: <T extends DataDescription,
  */
 export declare const DenormalizedProperty: <TValue extends CanBeNullableType<DataValue>, T extends DataDescription>(propertyType: string, calculate: CalculateDenormalization<TValue, T>, config?: PropertyConfig<TValue>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TValue | undefined;
     getConstantValue: () => TValue | undefined;
     getPropertyType: () => PropertyType | string;
@@ -482,7 +482,7 @@ export declare const DenormalizedProperty: <TValue extends CanBeNullableType<Dat
  */
 export declare const DenormalizedTextProperty: <T extends DataDescription, TData extends CanBeNullableType<string> = string>(calculate: CalculateDenormalization<TData, T>, config?: PropertyConfig<TData>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TData | undefined;
     getConstantValue: () => TData | undefined;
     getPropertyType: () => PropertyType | string;
@@ -510,7 +510,7 @@ export declare const DenormalizedTextProperty: <T extends DataDescription, TData
  */
 export declare const DenormalizedNumberProperty: <T extends DataDescription, TData extends CanBeNullableType<number> = number>(calculate: CalculateDenormalization<TData, T>, config?: PropertyConfig<TData>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TData | undefined;
     getConstantValue: () => TData | undefined;
     getPropertyType: () => PropertyType | string;
@@ -538,7 +538,7 @@ export declare const DenormalizedNumberProperty: <T extends DataDescription, TDa
  */
 export declare const DenormalizedIntegerProperty: <T extends DataDescription, TData extends CanBeNullableType<number> = number>(calculate: CalculateDenormalization<TData, T>, config?: PropertyConfig<TData>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => TData | undefined;
     getConstantValue: () => TData | undefined;
     getPropertyType: () => PropertyType | string;
@@ -574,7 +574,7 @@ export declare const DenormalizedIntegerProperty: <T extends DataDescription, TD
  */
 export declare const NaturalIdProperty: <T extends CanBeNullableType<string> = string>(propertyKeys: readonly string[], joiner: string, config?: PropertyConfig<T>, additionalMetadata?: {}) => Readonly<{
     getConfig: () => object;
-    getChoices: () => readonly import("./types").ChoiceTypes[];
+    getChoices: () => readonly import("./types.js").ChoiceTypes[];
     getDefaultValue: () => T | undefined;
     getConstantValue: () => T | undefined;
     getPropertyType: () => PropertyType | string;

package/properties.js

@@ -1,4 +1,3 @@
-"use strict";
 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) {
@@ -8,18 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NaturalIdProperty = exports.DenormalizedIntegerProperty = exports.DenormalizedNumberProperty = exports.DenormalizedTextProperty = exports.DenormalizedProperty = exports.AdvancedModelReferenceProperty = exports.ModelReferenceProperty = exports.UuidProperty = exports.PrimaryKeyUuidProperty = exports.BooleanProperty = exports.EmailProperty = exports.ConstantValueProperty = exports.NumberProperty = exports.YearProperty = exports.IntegerProperty = exports.BigTextProperty = exports.TextProperty = exports.ObjectProperty = exports.SingleTypeArrayProperty = exports.ArrayProperty = exports.DatetimeProperty = exports.DateProperty = exports.Property = void 0;
-const merge_1 = __importDefault(require("lodash/merge"));
-const get_1 = __importDefault(require("lodash/get"));
-const uuid_1 = require("uuid");
-const validation_1 = require("./validation");
-const utils_1 = require("./utils");
-const types_1 = require("./types");
-const lib_1 = require("./lib");
+import merge from 'lodash/merge.js';
+import get from 'lodash/get.js';
+import { v4 as uuidv4 } from 'uuid';
+import { arrayType, createPropertyValidator, isType, isValidUuid, maxNumber, meetsRegex, minNumber, optionalValidator, referenceTypeMatch, } from './validation.js';
+import { createHeadAndTail, memoizeAsync, memoizeSync } from './utils.js';
+import { PropertyType, } from './types.js';
+import { getValueForModelInstance, getValueForReferencedModel, isReferencedProperty, getCommonTextValidators, getCommonNumberValidators, mergeValidators, isModelInstance, createZodForProperty, } from './lib.js';
 const MAX_YEAR = 3000;
 const EMAIL_REGEX = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/u;
 /**
@@ -32,7 +26,7 @@ const EMAIL_REGEX = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-
  * @typeParam TModelExtensions - Any additional model extensions
  * @typeParam TModelInstanceExtensions - Any additional model instance extensions
  */
-const Property = (propertyType, config = {}, additionalMetadata = {}) => {
+export const Property = (propertyType, config = {}, additionalMetadata = {}) => {
     if (!propertyType && !(config === null || config === void 0 ? void 0 : config.typeOverride)) {
         throw new Error(`Property type must be provided.`);
     }
@@ -62,11 +56,11 @@ const Property = (propertyType, config = {}, additionalMetadata = {}) => {
         const method = lazyLoadMethod
             ? lazyLoadMethod
             : config.lazyLoadMethodAtomic
-                ? (0, utils_1.memoizeAsync)(config.lazyLoadMethodAtomic)
+                ? memoizeAsync(config.lazyLoadMethodAtomic)
                 : typeof instanceValue === 'function'
                     ? instanceValue
                     : () => instanceValue;
-        const valueGetter = (0, utils_1.memoizeSync)(() => {
+        const valueGetter = memoizeSync(() => {
             // @ts-ignore
             const result = method(instanceValue, modelData, 
             // @ts-ignore
@@ -76,7 +70,7 @@ const Property = (propertyType, config = {}, additionalMetadata = {}) => {
         return valueGetter;
     };
     const getValidator = (valueGetter) => {
-        const validator = (0, validation_1.createPropertyValidator)(valueGetter, config);
+        const validator = createPropertyValidator(valueGetter, config);
         const _propertyValidatorWrapper = (model, instanceData, propertyConfiguration) => __awaiter(void 0, void 0, void 0, function* () {
             return validator(model, instanceData, propertyConfiguration);
         });
@@ -89,7 +83,7 @@ const Property = (propertyType, config = {}, additionalMetadata = {}) => {
         if (provided) {
             return provided;
         }
-        return (0, lib_1.createZodForProperty)(propertyType, config)();
+        return createZodForProperty(propertyType, config)();
     };
     const propertyInstance = Object.assign(Object.assign({}, additionalMetadata), { getConfig: () => config || {}, getChoices,
         getDefaultValue,
@@ -98,7 +92,6 @@ const Property = (propertyType, config = {}, additionalMetadata = {}) => {
         getValidator });
     return propertyInstance;
 };
-exports.Property = Property;
 /**
  * Determines if the value is a Date object.
  * @param value Any value
@@ -115,7 +108,7 @@ const isDate = (value) => {
  * @param config - A configuration that enables overriding of date formatting
  * @param additionalMetadata
  */
-const DateProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Date, (0, merge_1.default)({
+export const DateProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Date, merge({
     lazyLoadMethod: (value) => {
         if (isDate(value)) {
             if (config.formatFunction) {
@@ -133,13 +126,12 @@ const DateProperty = (config = {}, additionalMetadata = {}) => (0, exports.Prope
         return value;
     },
 }, config), additionalMetadata);
-exports.DateProperty = DateProperty;
 /**
  * A property for Date AND Times. Supports both strings and Date Objects.
  * @param config - A configuration that enables overriding of date and time formatting
  * @param additionalMetadata
  */
-const DatetimeProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Datetime, (0, merge_1.default)({
+export const DatetimeProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Datetime, merge({
     lazyLoadMethod: (value) => {
         if (isDate(value)) {
             if (config.formatFunction) {
@@ -157,85 +149,76 @@ const DatetimeProperty = (config = {}, additionalMetadata = {}) => (0, exports.P
         return value;
     },
 }, config), additionalMetadata);
-exports.DatetimeProperty = DatetimeProperty;
 /**
  * A property that has an array of sub values.
  * @param config
  * @param additionalMetadata
  */
-const ArrayProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Array, Object.assign(Object.assign({ defaultValue: [] }, config), { isArray: true }), additionalMetadata);
-exports.ArrayProperty = ArrayProperty;
+export const ArrayProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Array, Object.assign(Object.assign({ defaultValue: [] }, config), { isArray: true }), additionalMetadata);
 /**
  * A property that is an array, but only of a single value type. This is an {@link ArrayProperty} but with a validator for the type.
  * @param valueType - The type. (Only supports primitive data types, no objects)
  * @param config
  * @param additionalMetadata
  */
-const SingleTypeArrayProperty = (valueType, config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Array, Object.assign(Object.assign({ defaultValue: [] }, config), { isArray: true, validators: (0, lib_1.mergeValidators)(config, 
+export const SingleTypeArrayProperty = (valueType, config = {}, additionalMetadata = {}) => Property(PropertyType.Array, Object.assign(Object.assign({ defaultValue: [] }, config), { isArray: true, validators: mergeValidators(config, 
     // @ts-ignore
-    (0, validation_1.arrayType)(valueType)) }), additionalMetadata);
-exports.SingleTypeArrayProperty = SingleTypeArrayProperty;
+    arrayType(valueType)) }), additionalMetadata);
 /**
  * A property that has simple objects. These must be JSON compliant. These are validated.
  * @param config
  * @param additionalMetadata
  */
-const ObjectProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Object, (0, merge_1.default)(config, {
-    validators: (0, lib_1.mergeValidators)(config, (0, validation_1.isType)('object')),
+export const ObjectProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Object, merge(config, {
+    validators: mergeValidators(config, isType('object')),
 }), additionalMetadata);
-exports.ObjectProperty = ObjectProperty;
 /**
  * A simple text property. If it's possible to put ALOT of text in this field consider using the {@link BigTextProperty}
  * @param config - Additional Configurations
  * @param additionalMetadata - Additional Metadata
  */
-const TextProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Text, (0, merge_1.default)(config, {
+export const TextProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Text, merge(config, {
     isString: true,
     // @ts-ignore
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonTextValidators)(config)),
+    validators: mergeValidators(config, ...getCommonTextValidators(config)),
 }), additionalMetadata);
-exports.TextProperty = TextProperty;
 /**
  * A property for large blocks of strings.
  * @param config - Additional configurations
  * @param additionalMetadata - Additional metadata
  */
-const BigTextProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.BigText, (0, merge_1.default)(config, {
+export const BigTextProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.BigText, merge(config, {
     isString: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonTextValidators)(config)),
+    validators: mergeValidators(config, ...getCommonTextValidators(config)),
 }), additionalMetadata);
-exports.BigTextProperty = BigTextProperty;
 /**
  * A property that houses integers. No floats allowed.
  * @param config
  * @param additionalMetadata
  */
-const IntegerProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Integer, (0, merge_1.default)(config, {
+export const IntegerProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Integer, merge(config, {
     isInteger: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonNumberValidators)(config)),
+    validators: mergeValidators(config, ...getCommonNumberValidators(config)),
 }), additionalMetadata);
-exports.IntegerProperty = IntegerProperty;
 /**
  * An integer property that represents a year. NOTE: This is exclusively focused on a year in a modern context.
  * Validates from 0 to 3000
  * @param config
  * @param additionalMetadata
  */
-const YearProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Integer, (0, merge_1.default)(config, {
+export const YearProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Integer, merge(config, {
     isInteger: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonNumberValidators)(config), (0, validation_1.minNumber)(0), (0, validation_1.maxNumber)(MAX_YEAR)),
+    validators: mergeValidators(config, ...getCommonNumberValidators(config), minNumber(0), maxNumber(MAX_YEAR)),
 }), additionalMetadata);
-exports.YearProperty = YearProperty;
 /**
  * A property for numbers. This could be integers or float values.
  * @param config
  * @param additionalMetadata
  */
-const NumberProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Number, (0, merge_1.default)(config, {
+export const NumberProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Number, merge(config, {
     isNumber: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonNumberValidators)(config)),
+    validators: mergeValidators(config, ...getCommonNumberValidators(config)),
 }), additionalMetadata);
-exports.NumberProperty = NumberProperty;
 /**
  * A property that has a fixed value that can never be changed. Can be useful for things like embedding the name of a model into JSONified objects.
  * @param valueType - The value type for this property.
@@ -243,47 +226,43 @@ exports.NumberProperty = NumberProperty;
  * @param config
  * @param additionalMetadata
  */
-const ConstantValueProperty = (valueType, value, config = {}, additionalMetadata = {}) => (0, exports.Property)(valueType, (0, merge_1.default)(config, {
+export const ConstantValueProperty = (valueType, value, config = {}, additionalMetadata = {}) => Property(valueType, merge(config, {
     value,
 }), additionalMetadata);
-exports.ConstantValueProperty = ConstantValueProperty;
 /**
  * A property that encapsulates email addresses. Provides validation for making sure an email is valid.
  * @param config
  * @param additionalMetadata
  */
-const EmailProperty = (config = {}, additionalMetadata = {}) => (0, exports.TextProperty)((0, merge_1.default)(config, {
-    type: types_1.PropertyType.Email,
-    validators: (0, lib_1.mergeValidators)(config, (0, validation_1.meetsRegex)(EMAIL_REGEX)),
+export const EmailProperty = (config = {}, additionalMetadata = {}) => TextProperty(merge(config, {
+    type: PropertyType.Email,
+    validators: mergeValidators(config, meetsRegex(EMAIL_REGEX)),
 }), additionalMetadata);
-exports.EmailProperty = EmailProperty;
 /**
  * A property that has a true or false value.
  * @param config
  * @param additionalMetadata
  */
-const BooleanProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Boolean, (0, merge_1.default)(config, {
+export const BooleanProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.Boolean, merge(config, {
     isBoolean: true,
 }), additionalMetadata);
-exports.BooleanProperty = BooleanProperty;
 /**
  * A property that is used for Primary Keys. If no value is provided a UUID is automatically created.
  * This property has required on it.
  * @param config - Additional configurations. NOTE: required is ALWAYS true.
  * @param additionalMetadata - Any additional metadata.
  */
-const PrimaryKeyUuidProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.UniqueId, (0, merge_1.default)(config, {
+export const PrimaryKeyUuidProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.UniqueId, merge(config, {
     required: true,
     isString: true,
-    validators: (0, lib_1.mergeValidators)(config, validation_1.isValidUuid),
+    validators: mergeValidators(config, isValidUuid),
     lazyLoadMethod: (value) => {
         if (!value) {
-            return (0, uuid_1.v4)();
+            return uuidv4();
         }
         return value;
     },
 }), additionalMetadata);
-exports.PrimaryKeyUuidProperty = PrimaryKeyUuidProperty;
 /**
  * A property that has a uuid.
  * This property has required on it.
@@ -291,19 +270,18 @@ exports.PrimaryKeyUuidProperty = PrimaryKeyUuidProperty;
  * @param config - Additional configurations.
  * @param additionalMetadata - Any additional metadata.
  */
-const UuidProperty = (config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.UniqueId, (0, merge_1.default)(config, {
+export const UuidProperty = (config = {}, additionalMetadata = {}) => Property(PropertyType.UniqueId, merge(config, {
     isString: true,
-    validators: (0, lib_1.mergeValidators)(config, config.required ? validation_1.isValidUuid : (0, validation_1.optionalValidator)(validation_1.isValidUuid)),
+    validators: mergeValidators(config, config.required ? isValidUuid : optionalValidator(isValidUuid)),
     lazyLoadMethod: (value) => {
         if (!value) {
             if (config.autoNow) {
-                return (0, uuid_1.v4)();
+                return uuidv4();
             }
         }
         return value;
     },
 }), additionalMetadata);
-exports.UuidProperty = UuidProperty;
 /**
  * A property that has a reference to another model instance. A "Foreign Key" if you will.
  * For full functionality a {@link ModelInstanceFetcher} must be provided in the config.
@@ -321,8 +299,7 @@ exports.UuidProperty = UuidProperty;
  * @param config
  * @param additionalMetadata
  */
-const ModelReferenceProperty = (model, config = {}, additionalMetadata = {}) => (0, exports.AdvancedModelReferenceProperty)(model, config, additionalMetadata);
-exports.ModelReferenceProperty = ModelReferenceProperty;
+export const ModelReferenceProperty = (model, config = {}, additionalMetadata = {}) => AdvancedModelReferenceProperty(model, config, additionalMetadata);
 /**
  * The full implementation of a ModelReference, useful for typing certain extended functionalities.
  * For a full description see {@link ModelReferenceProperty}
@@ -330,7 +307,7 @@ exports.ModelReferenceProperty = ModelReferenceProperty;
  * @param config
  * @param additionalMetadata
  */
-const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata = {}) => {
+export const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata = {}) => {
     if (!model) {
         throw new Error('Must include the referenced model');
     }
@@ -341,8 +318,8 @@ const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata =
         return model;
     };
     // @ts-ignore
-    const validator = (0, validation_1.referenceTypeMatch)(model);
-    const validators = (0, lib_1.mergeValidators)(config, validator);
+    const validator = referenceTypeMatch(model);
+    const validators = mergeValidators(config, validator);
     const _getId = (instanceValues) => () => {
         if (!instanceValues) {
             return undefined;
@@ -362,17 +339,17 @@ const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata =
         return instanceValues[primaryKey];
     };
     const lazyLoadMethodAtomic = (instanceValues) => __awaiter(void 0, void 0, void 0, function* () {
-        const valueIsModelInstance = (0, lib_1.isModelInstance)(instanceValues);
+        const valueIsModelInstance = isModelInstance(instanceValues);
         const _getInstanceReturn = (objToUse) => {
             // We need to determine if the object we just got is an actual model instance to determine if we need to make one.
-            const objIsModelInstance = (0, lib_1.isModelInstance)(objToUse);
+            const objIsModelInstance = isModelInstance(objToUse);
             const instance = objIsModelInstance
                 ? objToUse
                 : // @ts-ignore
                     _getModel().create(objToUse);
             // We are replacing the toObj function, because the reference type in the end should be the primary key when serialized.
-            return (0, merge_1.default)({}, instance, {
-                toObj: (0, utils_1.memoizeAsync)(_getId(instanceValues)),
+            return merge({}, instance, {
+                toObj: memoizeAsync(_getId(instanceValues)),
             });
         };
         // @ts-ignore
@@ -382,7 +359,7 @@ const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata =
         // TypedJson?
         const theModel = _getModel();
         const primaryKey = theModel.getModelDefinition().primaryKeyName;
-        if ((0, get_1.default)(instanceValues, primaryKey)) {
+        if (get(instanceValues, primaryKey)) {
             return _getInstanceReturn(instanceValues);
         }
         if (config === null || config === void 0 ? void 0 : config.fetcher) {
@@ -396,7 +373,7 @@ const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata =
         }
         return _getId(instanceValues)();
     });
-    const p = (0, merge_1.default)((0, exports.Property)(types_1.PropertyType.ModelReference, (0, merge_1.default)({}, config, {
+    const p = merge(Property(PropertyType.ModelReference, merge({}, config, {
         validators,
         lazyLoadMethodAtomic,
     }), additionalMetadata), {
@@ -405,7 +382,6 @@ const AdvancedModelReferenceProperty = (model, config = {}, additionalMetadata =
     });
     return p;
 };
-exports.AdvancedModelReferenceProperty = AdvancedModelReferenceProperty;
 /**
  * A property for Denormalizing. This represents a complex value that has been simplified for ease of use.
  * One common use is for creating "Display Values" in a GUI. This process can be extremely expensive, such as having to
@@ -419,8 +395,8 @@ exports.AdvancedModelReferenceProperty = AdvancedModelReferenceProperty;
  * @param config - A Config
  * @param additionalMetadata _ Any additional metadata.
  */
-const DenormalizedProperty = (propertyType, calculate, config = {}, additionalMetadata = {}) => {
-    const property = (0, exports.Property)(propertyType, (0, merge_1.default)(config, {
+export const DenormalizedProperty = (propertyType, calculate, config = {}, additionalMetadata = {}) => {
+    const property = Property(propertyType, merge(config, {
         isDenormalized: true,
         lazyLoadMethodAtomic: (value, modelData, modelInstance) => __awaiter(void 0, void 0, void 0, function* () {
             if (value !== undefined) {
@@ -429,44 +405,40 @@ const DenormalizedProperty = (propertyType, calculate, config = {}, additionalMe
             return calculate(modelData, modelInstance);
         }),
     }), additionalMetadata);
-    return (0, merge_1.default)(property, {
+    return merge(property, {
         calculate,
     });
 };
-exports.DenormalizedProperty = DenormalizedProperty;
 /**
  * A Denormalized Property that is for text.
  * @param calculate - A function that can get a string
  * @param config - Any configs
  * @param additionalMetadata - Optional Metadata
  */
-const DenormalizedTextProperty = (calculate, config = {}, additionalMetadata = {}) => (0, exports.DenormalizedProperty)(types_1.PropertyType.Text, calculate, (0, merge_1.default)(config, {
+export const DenormalizedTextProperty = (calculate, config = {}, additionalMetadata = {}) => DenormalizedProperty(PropertyType.Text, calculate, merge(config, {
     isString: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonTextValidators)(config)),
+    validators: mergeValidators(config, ...getCommonTextValidators(config)),
 }), additionalMetadata);
-exports.DenormalizedTextProperty = DenormalizedTextProperty;
 /**
  * A Denormalized Property that is for numbers.
  * @param calculate - A function that can get a string
  * @param config - Any configs
  * @param additionalMetadata - Optional Metadata
  */
-const DenormalizedNumberProperty = (calculate, config = {}, additionalMetadata = {}) => (0, exports.DenormalizedProperty)(types_1.PropertyType.Number, calculate, (0, merge_1.default)(config, {
+export const DenormalizedNumberProperty = (calculate, config = {}, additionalMetadata = {}) => DenormalizedProperty(PropertyType.Number, calculate, merge(config, {
     isNumber: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonNumberValidators)(config)),
+    validators: mergeValidators(config, ...getCommonNumberValidators(config)),
 }), additionalMetadata);
-exports.DenormalizedNumberProperty = DenormalizedNumberProperty;
 /**
  * A Denormalized Property that is for integers.
  * @param calculate - A function that can get a string
  * @param config - Any configs
  * @param additionalMetadata - Optional Metadata
  */
-const DenormalizedIntegerProperty = (calculate, config = {}, additionalMetadata = {}) => (0, exports.DenormalizedProperty)(types_1.PropertyType.Integer, calculate, (0, merge_1.default)(config, {
+export const DenormalizedIntegerProperty = (calculate, config = {}, additionalMetadata = {}) => DenormalizedProperty(PropertyType.Integer, calculate, merge(config, {
     isInteger: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonNumberValidators)(config)),
+    validators: mergeValidators(config, ...getCommonNumberValidators(config)),
 }), additionalMetadata);
-exports.DenormalizedIntegerProperty = DenormalizedIntegerProperty;
 /**
  * An id that is naturally formed by other properties within a model.
  * Instead of having a "globally unique" id the model is unique because the composition of values of properties.
@@ -481,16 +453,16 @@ exports.DenormalizedIntegerProperty = DenormalizedIntegerProperty;
  * @param config
  * @param additionalMetadata
  */
-const NaturalIdProperty = (propertyKeys, joiner, config = {}, additionalMetadata = {}) => (0, exports.Property)(types_1.PropertyType.Text, (0, merge_1.default)(config, {
+export const NaturalIdProperty = (propertyKeys, joiner, config = {}, additionalMetadata = {}) => Property(PropertyType.Text, merge(config, {
     isString: true,
-    validators: (0, lib_1.mergeValidators)(config, ...(0, lib_1.getCommonTextValidators)(config)),
+    validators: mergeValidators(config, ...getCommonTextValidators(config)),
     lazyLoadMethodAtomic: (value, model, modelInstance) => __awaiter(void 0, void 0, void 0, function* () {
         const data = yield propertyKeys.reduce((accP, key) => __awaiter(void 0, void 0, void 0, function* () {
             const acc = yield accP;
-            const [head] = (0, utils_1.createHeadAndTail)(key.split('.'), '.');
-            const value = yield ((0, lib_1.isReferencedProperty)(modelInstance, head)
-                ? (0, lib_1.getValueForReferencedModel)(modelInstance, key)
-                : (0, lib_1.getValueForModelInstance)(modelInstance, key));
+            const [head] = createHeadAndTail(key.split('.'), '.');
+            const value = yield (isReferencedProperty(modelInstance, head)
+                ? getValueForReferencedModel(modelInstance, key)
+                : getValueForModelInstance(modelInstance, key));
             return acc.concat(value);
         }), Promise.resolve([]));
         // If any of these values are not set, we do not want to have a value at all.
@@ -500,5 +472,4 @@ const NaturalIdProperty = (propertyKeys, joiner, config = {}, additionalMetadata
         return data.join(joiner);
     }),
 }), additionalMetadata);
-exports.NaturalIdProperty = NaturalIdProperty;
 //# sourceMappingURL=properties.js.map