@sprucelabs/schema 28.6.48 → 28.7.0

package/build/StaticSchemaEntityImplementation.js

@@ -158,9 +158,12 @@ class StaticSchemaEntityImplementation extends AbstractEntity_1.default {
     }
     getValues(options) {
         const values = {};
-        const { fields = Object.keys(this.fields), shouldIncludePrivateFields: includePrivateFields = true, } = options || {};
+        const { fields = Object.keys(this.fields), shouldIncludePrivateFields: includePrivateFields = true, shouldOnlyIncludeFieldsWithValues, } = options || {};
         this.getNamedFields().forEach((namedField) => {
             const { name, field } = namedField;
+            if (shouldOnlyIncludeFieldsWithValues && !(name in this.values)) {
+                return;
+            }
             if (fields.indexOf(name) > -1 &&
                 (includePrivateFields || !field.isPrivate)) {
                 const value = this.get(name, options);

package/build/esm/StaticSchemaEntityImplementation.js

@@ -130,9 +130,12 @@ class StaticSchemaEntityImplementation extends AbstractEntity {
     }
     getValues(options) {
         const values = {};
-        const { fields = Object.keys(this.fields), shouldIncludePrivateFields: includePrivateFields = true, } = options || {};
+        const { fields = Object.keys(this.fields), shouldIncludePrivateFields: includePrivateFields = true, shouldOnlyIncludeFieldsWithValues, } = options || {};
         this.getNamedFields().forEach((namedField) => {
             const { name, field } = namedField;
+            if (shouldOnlyIncludeFieldsWithValues && !(name in this.values)) {
+                return;
+            }
             if (fields.indexOf(name) > -1 &&
                 (includePrivateFields || !field.isPrivate)) {
                 const value = this.get(name, options);

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

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

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

@@ -0,0 +1,2 @@
+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>>;

package/build/esm/utilities/normalizePartialSchemaValues.js

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

package/build/esm/utilities/normalizeSchemaValues.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import EntityFactory from '../factories/SchemaEntityFactory.js';
 export default function normalizeSchemaValues(schema, values, options) {
     const instance = EntityFactory.Entity(schema, values);
-    const _a = options || {}, { shouldCreateEntityInstances: createEntityInstances = false } = _a, rest = __rest(_a, ["shouldCreateEntityInstances"]);
-    const normalizedOptions = Object.assign({ shouldCreateEntityInstances: createEntityInstances }, rest);
+    const _a = options || {}, { shouldCreateEntityInstances = false } = _a, rest = __rest(_a, ["shouldCreateEntityInstances"]);
+    const normalizedOptions = Object.assign({ shouldCreateEntityInstances }, rest);
     return instance.getValues(normalizedOptions);
 }

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

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

package/build/utilities/normalizePartialSchemaValues.d.ts

@@ -0,0 +1,2 @@
+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>>;

package/build/utilities/normalizePartialSchemaValues.js

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

package/build/utilities/normalizeSchemaValues.js

@@ -17,8 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const SchemaEntityFactory_1 = __importDefault(require("../factories/SchemaEntityFactory"));
 function normalizeSchemaValues(schema, values, options) {
     const instance = SchemaEntityFactory_1.default.Entity(schema, values);
-    const _a = options || {}, { shouldCreateEntityInstances: createEntityInstances = false } = _a, rest = __rest(_a, ["shouldCreateEntityInstances"]);
-    const normalizedOptions = Object.assign({ shouldCreateEntityInstances: createEntityInstances }, rest);
+    const _a = options || {}, { shouldCreateEntityInstances = false } = _a, rest = __rest(_a, ["shouldCreateEntityInstances"]);
+    const normalizedOptions = Object.assign({ shouldCreateEntityInstances }, rest);
     return instance.getValues(normalizedOptions);
 }
 exports.default = normalizeSchemaValues;

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "28.6.48",
+  "version": "28.7.0",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",
@@ -67,7 +67,7 @@
   },
   "dependencies": {
     "@sprucelabs/error": "^5.1.11",
-    "@sprucelabs/test-utils": "^3.4.74",
+    "@sprucelabs/test-utils": "^3.4.75",
     "email-validator": "^2.0.4",
     "just-safe-get": "^4.2.0",
     "just-safe-set": "^4.2.1"