@nolwenture/formik-jsonschema-form 0.9.2 → 0.9.3

package/dist/utils/__tests/createInitialValues.test.js

@@ -74,5 +74,40 @@ describe("Create Initial Values", () => {
             },
         };
         expect(result).toEqual(expected);
+        // Just to test types
+        const typeTest = {
+            // @ts-expect-error
+            // Should only accept empty string
+            stringIncorrect: "something",
+            stringCorrect: "",
+            // @ts-expect-error
+            // Should only accept 0
+            numberIncorrect: 123,
+            // @ts-expect-error
+            numberIncorrect2: -123,
+            numberCorrect: 0,
+            // @ts-expect-error
+            // Should only accept empty array
+            arrayIncorrect: [""],
+            // @ts-expect-error
+            arrayIncorrect2: [1],
+            arrayCorrect: [],
+            // @ts-expect-error
+            // Should only accept boolean false
+            booleanIncorrect: true,
+            booleanCorrect: false,
+            object: {
+                string: "",
+                number: 0,
+                array: [],
+                boolean: false,
+                nested: {
+                    string: "",
+                    number: 0,
+                    array: [],
+                    boolean: false,
+                },
+            },
+        };
     }));
 });

package/dist/utils/createInitialValues.d.ts

@@ -1,4 +1,7 @@
 import { JSONSchema7 } from "json-schema";
-type ReturnType = 0 | "" | 1 | boolean | Array<any> | object;
-export declare function createInitialValues(schema: JSONSchema7): ReturnType;
+type PropertyValue = 0 | "" | false | never[] | InitialValuesType;
+export interface InitialValuesType {
+    [key: string]: PropertyValue;
+}
+export declare function createInitialValues(schema: JSONSchema7, definitions?: JSONSchema7): InitialValuesType;
 export {};

package/dist/utils/createInitialValues.js

@@ -1,33 +1,34 @@
 import { solveReferences } from "./solveReferences";
-let schemaDefinitions = {};
-export function createInitialValues(schema) {
-    if (!schema) {
+export function createInitialValues(schema, definitions = {}) {
+    var _a;
+    if (!schema || !schema.properties) {
         return {};
     }
-    if (schema.definitions) {
-        schemaDefinitions = schema.definitions;
-    }
-    if (schema.properties) {
-        return Object.keys(schema === null || schema === void 0 ? void 0 : schema.properties).reduce((acc, key) => {
-            var _a;
-            const value = (_a = schema === null || schema === void 0 ? void 0 : schema.properties) === null || _a === void 0 ? void 0 : _a[key];
-            const solvedValue = solveReferences(value, schemaDefinitions);
-            return Object.assign(Object.assign({}, acc), { [key]: createInitialValues(solvedValue) });
-        }, {});
-    }
-    const type = schema.type;
-    switch (type) {
-        case "array":
-            return [];
-        case "boolean":
-            return false;
-        case "null":
-            return "";
-        case "number":
-            return 0;
-        case "string":
-            return "";
-        default:
-            throw new Error("Unsupported schema type");
+    const schemaDefinitions = Object.assign(Object.assign({}, definitions), ((_a = schema.definitions) !== null && _a !== void 0 ? _a : {}));
+    function getValue(schema) {
+        if (schema.properties) {
+            return createInitialValues(schema, schemaDefinitions);
+        }
+        const type = schema.type;
+        switch (type) {
+            case "array":
+                return [];
+            case "boolean":
+                return false;
+            case "null":
+                return "";
+            case "number":
+                return 0;
+            case "string":
+                return "";
+            default:
+                throw new Error("Unsupported schema type");
+        }
     }
+    return Object.keys(schema === null || schema === void 0 ? void 0 : schema.properties).reduce((acc, key) => {
+        var _a;
+        const value = (_a = schema === null || schema === void 0 ? void 0 : schema.properties) === null || _a === void 0 ? void 0 : _a[key];
+        const solvedValue = solveReferences(value, schemaDefinitions);
+        return Object.assign(Object.assign({}, acc), { [key]: getValue(solvedValue) });
+    }, {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nolwenture/formik-jsonschema-form",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Formik form generation from json schema",
   "author": "Antti Vikman <antti.vikman@nolwenture.com>",
   "contributors": [