@sprucelabs/schema 29.2.0 → 29.2.2

package/build/errors/SpruceError.js

@@ -56,6 +56,9 @@ class SpruceError extends error_1.default {
                 message = `${map[options.code]}:\n\n${this.renderParametersWithFriendlyMessages(options.parameters, options.friendlyMessages)}`;
                 break;
             }
+            case 'FIELDS_NOT_MAPPED':
+                message = `The following fields were not mapped because they don't exist in your map: ${options.fields.join(', ')}`;
+                break;
             default:
                 message = this.message;
         }

package/build/errors/options.types.d.ts

@@ -1,6 +1,6 @@
 import AbstractSpruceError, { ErrorOptions as ISpruceErrorOptions } from '@sprucelabs/error';
 import { FieldType } from '../fields/field.static.types';
-export type SchemaErrorOptions = DuplicateSchemaErrorOptions | SchemaErrorOptionsNotFound | TransformationFailedErrorOptions | InvalidSchemaDefinitionErrorOptions | NotImplementedErrorOptions | InvalidFieldRegistrationErrorOptions | VersionRequiredErrorOptions | MissingParametersOptions | InvalidParametersOptions | UnexpectedParametersOptions | ValidationFailedErrorOptions | InvalidSchemaReferenceErrorOptions;
+export type SchemaErrorOptions = DuplicateSchemaErrorOptions | SchemaErrorOptionsNotFound | TransformationFailedErrorOptions | InvalidSchemaDefinitionErrorOptions | NotImplementedErrorOptions | InvalidFieldRegistrationErrorOptions | VersionRequiredErrorOptions | MissingParametersOptions | InvalidParametersOptions | UnexpectedParametersOptions | ValidationFailedErrorOptions | InvalidSchemaReferenceErrorOptions | FieldsNotMappedErrorOptions;
 export type FieldErrorCode = 'MISSING_PARAMETER' | 'INVALID_PARAMETER' | 'UNEXPECTED_PARAMETER';
 export interface FieldError {
     code: FieldErrorCode;
@@ -41,6 +41,10 @@ export interface NotImplementedErrorOptions extends ISpruceErrorOptions {
     code: 'NOT_IMPLEMENTED';
     instructions: string;
 }
+export interface FieldsNotMappedErrorOptions extends ISpruceErrorOptions {
+    code: 'FIELDS_NOT_MAPPED';
+    fields: string[];
+}
 export interface InvalidFieldRegistrationErrorOptions extends ISpruceErrorOptions {
     code: 'INVALID_FIELD_REGISTRATION';
     package: string;

package/build/esm/errors/SpruceError.js

@@ -51,6 +51,9 @@ export default class SpruceError extends AbstractSpruceError {
                 message = `${map[options.code]}:\n\n${this.renderParametersWithFriendlyMessages(options.parameters, options.friendlyMessages)}`;
                 break;
             }
+            case 'FIELDS_NOT_MAPPED':
+                message = `The following fields were not mapped because they don't exist in your map: ${options.fields.join(', ')}`;
+                break;
             default:
                 message = this.message;
         }

package/build/esm/errors/options.types.d.ts

@@ -1,6 +1,6 @@
 import AbstractSpruceError, { ErrorOptions as ISpruceErrorOptions } from '@sprucelabs/error';
 import { FieldType } from '../fields/field.static.types';
-export type SchemaErrorOptions = DuplicateSchemaErrorOptions | SchemaErrorOptionsNotFound | TransformationFailedErrorOptions | InvalidSchemaDefinitionErrorOptions | NotImplementedErrorOptions | InvalidFieldRegistrationErrorOptions | VersionRequiredErrorOptions | MissingParametersOptions | InvalidParametersOptions | UnexpectedParametersOptions | ValidationFailedErrorOptions | InvalidSchemaReferenceErrorOptions;
+export type SchemaErrorOptions = DuplicateSchemaErrorOptions | SchemaErrorOptionsNotFound | TransformationFailedErrorOptions | InvalidSchemaDefinitionErrorOptions | NotImplementedErrorOptions | InvalidFieldRegistrationErrorOptions | VersionRequiredErrorOptions | MissingParametersOptions | InvalidParametersOptions | UnexpectedParametersOptions | ValidationFailedErrorOptions | InvalidSchemaReferenceErrorOptions | FieldsNotMappedErrorOptions;
 export type FieldErrorCode = 'MISSING_PARAMETER' | 'INVALID_PARAMETER' | 'UNEXPECTED_PARAMETER';
 export interface FieldError {
     code: FieldErrorCode;
@@ -41,6 +41,10 @@ export interface NotImplementedErrorOptions extends ISpruceErrorOptions {
     code: 'NOT_IMPLEMENTED';
     instructions: string;
 }
+export interface FieldsNotMappedErrorOptions extends ISpruceErrorOptions {
+    code: 'FIELDS_NOT_MAPPED';
+    fields: string[];
+}
 export interface InvalidFieldRegistrationErrorOptions extends ISpruceErrorOptions {
     code: 'INVALID_FIELD_REGISTRATION';
     package: string;

package/build/esm/fields/DateField.js

@@ -33,13 +33,17 @@ export function validateDateValue(options) {
     if (typeof value === 'number' || value instanceof Date) {
         return [];
     }
-    else {
-        return [
-            {
-                name,
-                code: 'INVALID_PARAMETER',
-                friendlyMessage: `This doesn't look like a date to me!`,
-            },
-        ];
+    else if (typeof value === 'string') {
+        const date = new Date(value);
+        if (date.toString() !== 'Invalid Date') {
+            return [];
+        }
     }
+    return [
+        {
+            name,
+            code: 'INVALID_PARAMETER',
+            friendlyMessage: `This doesn't look like a date to me!`,
+        },
+    ];
 }

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

@@ -4,5 +4,8 @@ export default class KeyMapper {
     mapTo(values: Record<string, any>): any;
     mapFrom(values: Record<string, any>): any;
     mapFieldNameTo(name: string): any;
-    mapFieldNameFrom(name: string): string | null;
+    private throwFieldsNotMapped;
+    mapFieldNameFrom(name: string): string;
+    private _mapTo;
+    private _mapFrom;
 }

package/build/esm/utilities/KeyMapper.js

@@ -1,16 +1,26 @@
+import SpruceError from '../errors/SpruceError.js';
 export default class KeyMapper {
     constructor(map) {
         this.map = map;
     }
     mapTo(values) {
-        return keyMapper.mapTo(values, this.map);
+        return this._mapTo(values, this.map);
     }
     mapFrom(values) {
-        return keyMapper.mapFrom(values, this.map);
+        return this._mapFrom(values, this.map);
     }
     mapFieldNameTo(name) {
+        if (!this.map[name]) {
+            this.throwFieldsNotMapped([name]);
+        }
         return this.map[name];
     }
+    throwFieldsNotMapped(fields) {
+        throw new SpruceError({
+            code: 'FIELDS_NOT_MAPPED',
+            fields,
+        });
+    }
     mapFieldNameFrom(name) {
         for (const key in this.map) {
             // eslint-disable-next-line no-prototype-builtins
@@ -20,29 +30,40 @@ export default class KeyMapper {
                 }
             }
         }
-        return null;
+        this.throwFieldsNotMapped([name]);
+        return 'never hit';
     }
-}
-const keyMapper = {
-    mapTo(values, map) {
+    _mapTo(values, map) {
+        const foundFields = [];
         let target = {};
         for (const key in map) {
             // eslint-disable-next-line no-prototype-builtins
             if (values.hasOwnProperty(key)) {
                 target[map[key]] = values[key];
+                foundFields.push(key);
             }
         }
+        const missingFields = Object.keys(values).filter((key) => !foundFields.includes(key));
+        if (missingFields.length > 0) {
+            this.throwFieldsNotMapped(missingFields);
+        }
         return target;
-    },
-    mapFrom(values, map) {
+    }
+    _mapFrom(values, map) {
+        const foundFields = [];
         let target = {};
         for (const targetKey in map) {
             const sourceKey = map[targetKey];
             // eslint-disable-next-line no-prototype-builtins
             if (values.hasOwnProperty(sourceKey)) {
                 target[targetKey] = values[sourceKey];
+                foundFields.push(sourceKey);
             }
         }
+        const missingFields = Object.keys(values).filter((key) => !foundFields.includes(key));
+        if (missingFields.length > 0) {
+            this.throwFieldsNotMapped(missingFields);
+        }
         return target;
-    },
-};
+    }
+}

package/build/fields/DateField.js

@@ -40,14 +40,18 @@ function validateDateValue(options) {
     if (typeof value === 'number' || value instanceof Date) {
         return [];
     }
-    else {
-        return [
-            {
-                name,
-                code: 'INVALID_PARAMETER',
-                friendlyMessage: `This doesn't look like a date to me!`,
-            },
-        ];
+    else if (typeof value === 'string') {
+        const date = new Date(value);
+        if (date.toString() !== 'Invalid Date') {
+            return [];
+        }
     }
+    return [
+        {
+            name,
+            code: 'INVALID_PARAMETER',
+            friendlyMessage: `This doesn't look like a date to me!`,
+        },
+    ];
 }
 exports.validateDateValue = validateDateValue;

package/build/utilities/KeyMapper.d.ts

@@ -4,5 +4,8 @@ export default class KeyMapper {
     mapTo(values: Record<string, any>): any;
     mapFrom(values: Record<string, any>): any;
     mapFieldNameTo(name: string): any;
-    mapFieldNameFrom(name: string): string | null;
+    private throwFieldsNotMapped;
+    mapFieldNameFrom(name: string): string;
+    private _mapTo;
+    private _mapFrom;
 }

package/build/utilities/KeyMapper.js

@@ -1,18 +1,31 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 class KeyMapper {
     constructor(map) {
         this.map = map;
     }
     mapTo(values) {
-        return keyMapper.mapTo(values, this.map);
+        return this._mapTo(values, this.map);
     }
     mapFrom(values) {
-        return keyMapper.mapFrom(values, this.map);
+        return this._mapFrom(values, this.map);
     }
     mapFieldNameTo(name) {
+        if (!this.map[name]) {
+            this.throwFieldsNotMapped([name]);
+        }
         return this.map[name];
     }
+    throwFieldsNotMapped(fields) {
+        throw new SpruceError_1.default({
+            code: 'FIELDS_NOT_MAPPED',
+            fields,
+        });
+    }
     mapFieldNameFrom(name) {
         for (const key in this.map) {
             // eslint-disable-next-line no-prototype-builtins
@@ -22,30 +35,41 @@ class KeyMapper {
                 }
             }
         }
-        return null;
+        this.throwFieldsNotMapped([name]);
+        return 'never hit';
     }
-}
-exports.default = KeyMapper;
-const keyMapper = {
-    mapTo(values, map) {
+    _mapTo(values, map) {
+        const foundFields = [];
         let target = {};
         for (const key in map) {
             // eslint-disable-next-line no-prototype-builtins
             if (values.hasOwnProperty(key)) {
                 target[map[key]] = values[key];
+                foundFields.push(key);
             }
         }
+        const missingFields = Object.keys(values).filter((key) => !foundFields.includes(key));
+        if (missingFields.length > 0) {
+            this.throwFieldsNotMapped(missingFields);
+        }
         return target;
-    },
-    mapFrom(values, map) {
+    }
+    _mapFrom(values, map) {
+        const foundFields = [];
         let target = {};
         for (const targetKey in map) {
             const sourceKey = map[targetKey];
             // eslint-disable-next-line no-prototype-builtins
             if (values.hasOwnProperty(sourceKey)) {
                 target[targetKey] = values[sourceKey];
+                foundFields.push(sourceKey);
             }
         }
+        const missingFields = Object.keys(values).filter((key) => !foundFields.includes(key));
+        if (missingFields.length > 0) {
+            this.throwFieldsNotMapped(missingFields);
+        }
         return target;
-    },
-};
+    }
+}
+exports.default = KeyMapper;

package/package.json

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