zcb 0.1.1 → 0.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcb",
   "description": "Build configs with type safety from zod schema.",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/zod-config-builder",

package/src/createConfigBuilder.ts

@@ -1,18 +1,16 @@
 import { type JSONSchema7 } from 'json-schema';
+import { cloneDeep, merge } from 'lodash-es';
 import { type ZodError, type z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 import { cloneNonEnumerableValues } from './transformers/cloneNonEnumerableValues.ts';
 import { NonEmumeralProperties } from './types.ts';
-import { arrayHasInvalidDefaults } from './utils/arrayHasInvalidDefaults.ts';
-import { collateObjectPropertyDefaults } from './utils/collateObjectPropertyDefaults.ts';
+import { collateDefaultValues } from './utils/collateDefaultValues.ts';
 import { isDerivedValueCallback } from './utils/isDerivedValueCallback.ts';
 import { isInvalidPropertyOverride } from './utils/isInvalidPropertyOverride.ts';
 import { RESERVED_KEYWORDS, isPropertyReservedWord } from './utils/isPropertyReservedWord.ts';
 import { isSchemaValid } from './utils/isSchemaValid.ts';
-import { isValidPropertyDefinition } from './utils/isValidPropertyDefinition.ts';
 import { isValidValue } from './utils/isValidValue.ts';
 import { jsonStringifyReplacer } from './utils/jsonStringifyReplacer.ts';
-import { recordHasInvalidDefaults } from './utils/recordHasInvalidDefaults.ts';
 import { transformConfigSync } from './utils/transformConfig.ts';
 
 export type ConfigBuilder<ZodTypes> = {
@@ -32,6 +30,10 @@ export type ConfigBuilder<ZodTypes> = {
   $values: () => ZodTypes;
 };
 
+export type CreateConfigBuilderOptions = {
+  type?: string;
+};
+
 export const createConfigBuilder = <ZodTypes>(
   zodSchema: z.ZodSchema,
   derivedValueCallbacks: Partial<
@@ -44,21 +46,44 @@ export const createConfigBuilder = <ZodTypes>(
   > = {},
   initialValues: Partial<{
     [Key in keyof ZodTypes]: ZodTypes[Key];
-  }> = {}
+  }> = {},
+  options: CreateConfigBuilderOptions = {}
 ): ConfigBuilder<ZodTypes> => {
   type Config = {
     [Key in keyof ZodTypes]: ZodTypes[Key];
   };
 
   type DerivedValueCallback<K extends keyof Config = keyof Config> = (c: Config) => Config[K];
-  let config = initialValues as Config;
 
-  Object.defineProperty(config, NonEmumeralProperties.ZCB, {
-    configurable: false,
-    enumerable: false,
-    value: true,
-  });
+  const jsonSchema = zodToJsonSchema(zodSchema) as JSONSchema7;
+
+  if (isSchemaValid(jsonSchema)) {
+    throw new Error(`The root type of a config schema must be "object", but received "${String(jsonSchema.type)}"`);
+  }
+
+  const addNonEnumeralBaseProperties = (conf: Config) => {
+    Object.defineProperty(conf, NonEmumeralProperties.ZCB, {
+      configurable: false,
+      enumerable: false,
+      value: true,
+    });
 
+    if (options.type) {
+      Object.defineProperty(conf, NonEmumeralProperties.TYPE, {
+        configurable: false,
+        enumerable: false,
+        value: options.type,
+      });
+    }
+  };
+
+  const createInitialConfig = () => {
+    const config = merge(cloneDeep(initialValues), collateDefaultValues(jsonSchema)) as Config;
+    addNonEnumeralBaseProperties(config);
+    return config;
+  };
+
+  let config = createInitialConfig();
   let callbacks: Partial<Record<keyof Config, DerivedValueCallback>> = { ...derivedValueCallbacks };
 
   const configBuilder = {
@@ -95,17 +120,10 @@ export const createConfigBuilder = <ZodTypes>(
     },
     $flush: () => {
       const values = configBuilder.$values();
-      config = {} as Config;
-
-      Object.defineProperty(config, NonEmumeralProperties.ZCB, {
-        configurable: false,
-        enumerable: false,
-        value: true,
-      });
-
+      config = createInitialConfig();
       return values;
     },
-    $fork: () => createConfigBuilder<Config>(zodSchema, derivedValueCallbacks),
+    $fork: () => createConfigBuilder<Config>(zodSchema, derivedValueCallbacks, initialValues, options),
     $toJson: () => JSON.stringify(configBuilder.$values(), jsonStringifyReplacer, 2),
     $validate: () => {
       try {
@@ -135,12 +153,6 @@ export const createConfigBuilder = <ZodTypes>(
     value: callbacks,
   });
 
-  const jsonSchema = zodToJsonSchema(zodSchema) as JSONSchema7;
-
-  if (isSchemaValid(jsonSchema)) {
-    throw new Error(`The root type of a config schema must be "object", but received "${String(jsonSchema.type)}"`);
-  }
-
   for (const propertyName in jsonSchema.properties) {
     if (isPropertyReservedWord(propertyName)) {
       throw new Error(
@@ -150,45 +162,13 @@ export const createConfigBuilder = <ZodTypes>(
       );
     }
 
-    const castProperty = propertyName as keyof Config;
-    const propertyDefinition = jsonSchema.properties[propertyName];
-
-    if (isValidPropertyDefinition(propertyDefinition)) {
-      if (propertyDefinition.default) {
-        config[castProperty] = propertyDefinition.default as Config[keyof Config];
-      }
-
-      if (propertyDefinition.type === 'array' && arrayHasInvalidDefaults(propertyDefinition)) {
-        throw new Error(
-          `When setting schema array defaults for the array assigned to "${String(
-            castProperty
-          )}", set them on the array and not the item.`
-        );
-      }
-
-      if (propertyDefinition.type === 'object') {
-        if (recordHasInvalidDefaults(propertyDefinition)) {
-          throw new Error(
-            `When setting schema property defaults for the value of the record assigned to "${String(
-              castProperty
-            )}", set them on the record and not the value.`
-          );
-        }
-
-        const propertyDefaults = collateObjectPropertyDefaults(propertyDefinition);
-
-        if (propertyDefaults) {
-          config[castProperty] = propertyDefaults as Config[keyof Config];
-        }
-      }
-    }
+    const castPropertyName = propertyName as keyof Config;
 
-    configBuilder[castProperty] = ((value: Config[keyof Config] | DerivedValueCallback, override?: boolean) => {
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      if (isInvalidPropertyOverride(config[castProperty], override)) {
+    configBuilder[castPropertyName] = ((value: Config[keyof Config] | DerivedValueCallback, override?: boolean) => {
+      if (isInvalidPropertyOverride(config[castPropertyName], override)) {
         throw new Error(
           `A value already exists for "${String(
-            castProperty
+            castPropertyName
           )}". You may be trying to add a new values before flushing the old one. If you intended to override the existing value, pass in true as the second argument.`
         );
       }
@@ -199,19 +179,19 @@ export const createConfigBuilder = <ZodTypes>(
       if (!isValidValue(value)) {
         throw new Error(
           `"${String(
-            castProperty
+            castPropertyName
           )}" value has a depth greater than ${MAX_DEPTH}. To pass in objects with a depth greater than ${MAX_DEPTH}, create a builder for that config slice.`
         );
       }
 
       if (isDerivedValueCallback<DerivedValueCallback>(value)) {
-        callbacks[castProperty] = value;
+        callbacks[castPropertyName] = value;
         propertyValue = value(config);
       } else {
         propertyValue = value;
       }
 
-      config[castProperty] = propertyValue;
+      config[castPropertyName] = propertyValue;
       return configBuilder;
     }) as ConfigBuilder<Config>[keyof Config];
   }

package/src/types.ts

@@ -19,6 +19,7 @@ export enum NonEmumeralProperties {
   CALLBACKS = '__callbacks',
   DISABLED = '__disabled',
   EXPERIMENT = '__experiment',
+  TYPE = '__type',
   ZCB = '__zcb',
 }
 

package/src/utils/collateDefaultValues.ts

@@ -0,0 +1,55 @@
+import { type JSONSchema7 } from 'json-schema';
+import { arrayHasInvalidDefaults } from './arrayHasInvalidDefaults.ts';
+import { collateObjectPropertyDefaults } from './collateObjectPropertyDefaults.ts';
+import { RESERVED_KEYWORDS, isPropertyReservedWord } from './isPropertyReservedWord.ts';
+import { isValidPropertyDefinition } from './isValidPropertyDefinition.ts';
+import { recordHasInvalidDefaults } from './recordHasInvalidDefaults.ts';
+
+export const collateDefaultValues = <Config>(jsonSchema: JSONSchema7) => {
+  const defaultValues = {} as Partial<Config>;
+
+  for (const propertyName in jsonSchema.properties) {
+    if (isPropertyReservedWord(propertyName)) {
+      throw new Error(
+        `"${propertyName}" is a reserved keyword within the config builder. Please use a different property name. The full list of reserved keywords is: ${[
+          ...RESERVED_KEYWORDS,
+        ].join(', ')}`
+      );
+    }
+
+    const castPropertyName = propertyName as keyof Config;
+    const propertyDefinition = jsonSchema.properties[propertyName];
+
+    if (isValidPropertyDefinition(propertyDefinition)) {
+      if (propertyDefinition.default) {
+        defaultValues[castPropertyName] = propertyDefinition.default as Config[keyof Config];
+      }
+
+      if (propertyDefinition.type === 'array' && arrayHasInvalidDefaults(propertyDefinition)) {
+        throw new Error(
+          `When setting schema array defaults for the array assigned to "${String(
+            castPropertyName
+          )}", set them on the array and not the item.`
+        );
+      }
+
+      if (propertyDefinition.type === 'object') {
+        if (recordHasInvalidDefaults(propertyDefinition)) {
+          throw new Error(
+            `When setting schema property defaults for the value of the record assigned to "${String(
+              castPropertyName
+            )}", set them on the record and not the value.`
+          );
+        }
+
+        const propertyDefaults = collateObjectPropertyDefaults(propertyDefinition);
+
+        if (propertyDefaults) {
+          defaultValues[castPropertyName] = propertyDefaults as Config[keyof Config];
+        }
+      }
+    }
+  }
+
+  return defaultValues;
+};