@firecms/schema_inference 3.0.0-canary.231 → 3.0.0-canary.233

package/src/collection_builder.ts

@@ -1,12 +1,3 @@
-import {
-    DataType,
-    EnumValues,
-    mergeDeep,
-    Properties, PropertiesOrBuilders,
-    Property,
-    resolveEnumValues,
-    StringProperty
-} from "@firecms/core";
 import {
     InferencePropertyBuilderProps,
     TypesCount,
@@ -17,7 +8,8 @@ import {
 import { buildStringProperty } from "./builders/string_property_builder";
 import { buildValidation } from "./builders/validation_builder";
 import { buildReferenceProperty } from "./builders/reference_property_builder";
-import { extractEnumFromValues } from "./util";
+import { extractEnumFromValues, mergeDeep, resolveEnumValues } from "./util";
+import { DataType, EnumValues, Properties, PropertiesOrBuilders, Property, StringProperty } from "./cms_types";
 
 export type InferenceTypeBuilder = (value: any) => DataType;
 
@@ -377,7 +369,7 @@ function getMostProbableTypeInArray(
     array: any[],
     getType: InferenceTypeBuilder
 ): DataType {
-    let typesCount: TypesCount = {};
+    const typesCount: TypesCount = {};
     array.forEach((value) => {
         increaseTypeCount(getType(value), typesCount, value, getType);
     });
@@ -398,7 +390,7 @@ function checkTypesCountHighVariability(typesCount: TypesCount) {
 
 function formatString(input: string): string {
     const normalized = input
-        .replace(/[_\-]+/g, " ")
+        .replace(/[_-]+/g, " ")
         .replace(/([a-z])([A-Z])/g, "$1 $2")
         .toLowerCase();
 

package/src/test_schemas/test_schema.ts

@@ -1,5 +1,4 @@
 import { buildEntityPropertiesFromData } from "../collection_builder";
-import { DataType } from "@firecms/core";
 
 // import usage from "./usage.json" assert {
 //         type: "json",
@@ -10,6 +9,7 @@ import usage from "./pop_products.json" assert {
         integrity: "sha384-ABC123"
         };
 import * as util from "util";
+import { DataType } from "../cms_types";
 
 buildEntityPropertiesFromData(usage, getType)
     .then((res) => console.log(util.inspect(res, { showHidden: false, depth: null, colors: true })));

package/src/types.ts

@@ -1,4 +1,4 @@
-import { DataType } from "@firecms/core";
+import { DataType } from "./cms_types";
 
 export type TypesCount = {
     number?: number,

package/src/util.ts

@@ -1,4 +1,4 @@
-import { unslugify } from "@firecms/core";
+import { EnumValueConfig, EnumValues } from "./cms_types";
 
 export function extractEnumFromValues(values: unknown[]) {
     if (!Array.isArray(values)) {
@@ -14,3 +14,63 @@ export function extractEnumFromValues(values: unknown[]) {
     enumValues.sort((a, b) => a.label.localeCompare(b.label));
     return enumValues;
 }
+
+export function unslugify(slug?: string): string {
+    if (!slug) return "";
+    if (slug.includes("-") || slug.includes("_") || !slug.includes(" ")) {
+        const result = slug.replace(/[-_]/g, " ");
+        return result.replace(/\w\S*/g, function (txt) {
+            return txt.charAt(0).toUpperCase() + txt.substr(1);
+        }).trim();
+    } else {
+        return slug.trim();
+    }
+}
+
+export function resolveEnumValues(input: EnumValues): EnumValueConfig[] | undefined {
+    if (typeof input === "object") {
+        return Object.entries(input).map(([id, value]) =>
+            (typeof value === "string"
+                ? {
+                    id,
+                    label: value
+                }
+                : value));
+    } else if (Array.isArray(input)) {
+        return input as EnumValueConfig[];
+    } else {
+        return undefined;
+    }
+}
+
+export function mergeDeep<T extends Record<any, any>, U extends Record<any, any>>(target: T, source: U, ignoreUndefined: boolean = false): T & U {
+    const targetIsObject = isObject(target);
+    const output = targetIsObject ? { ...target } : target;
+    if (targetIsObject && isObject(source)) {
+        Object.keys(source).forEach(key => {
+            const sourceElement = source[key];
+            // Skip undefined values when ignoreUndefined is true
+            if (ignoreUndefined && sourceElement === undefined) {
+                return;
+            }
+            if (sourceElement instanceof Date) {
+                // Assign a new Date instance with the same time value
+                Object.assign(output, { [key]: new Date(sourceElement.getTime()) });
+            } else if (isObject(sourceElement)) {
+                if (!(key in target))
+                    Object.assign(output, { [key]: sourceElement });
+                else
+                    (output as any)[key] = mergeDeep((target as any)[key], sourceElement);
+            } else {
+                Object.assign(output, { [key]: sourceElement });
+            }
+        });
+    }
+    return output as T;
+}
+
+export function isObject(item: any) {
+    return item && typeof item === "object" && !Array.isArray(item);
+}
+
+