@kanaries/graphic-walker 0.3.14 → 0.3.15

package/src/utils/dataPrep.ts

@@ -1,11 +1,12 @@
 import { IMutField, IRow } from "../interfaces";
+import { isPlainObject } from "./is-plain-object";
 
-function updateRowKeys(data: IRow[], keyEncodeList: {from: string; to: string}[]): IRow[] {
+function updateRowKeys(data: IRow[], keyEncodeList: { from: string[]; to: string }[]): IRow[] {
     return data.map((row) => {
         const newRow: IRow = {};
         for (let k in keyEncodeList) {
             const { from, to } = keyEncodeList[k];
-            newRow[to] = row[from];
+            newRow[to] = getValueByKeyPath(row, from);
         }
         return newRow;
     });
@@ -13,9 +14,9 @@ function updateRowKeys(data: IRow[], keyEncodeList: {from: string; to: string}[]
 
 /**
  * parse column id(key) to a safe string
- * @param metas 
+ * @param metas
  */
-function parseColumnMetas (metas: IMutField[]) {
+function parseColumnMetas(metas: IMutField[]) {
     return metas.map((meta, i) => {
         const safeKey = `gwc_${i}`;
         return {
@@ -26,42 +27,34 @@ function parseColumnMetas (metas: IMutField[]) {
     });
 }
 
-export function guardDataKeys (data: IRow[], metas: IMutField[]): {
+export function guardDataKeys(
+    data: IRow[],
+    metas: IMutField[]
+): {
     safeData: IRow[];
     safeMetas: IMutField[];
 } {
-    const safeMetas = parseColumnMetas(metas)
+    const safeMetas = parseColumnMetas(metas);
     const keyEncodeList = safeMetas.map((f, i) => ({
-        from: metas[i].fid,
-        to: f.fid
+        from: metas[i].path ?? [metas[i].fid],
+        to: f.fid,
     }));
     const safeData = updateRowKeys(data, keyEncodeList);
     return {
         safeData,
-        safeMetas
-    }
+        safeMetas,
+    };
 }
-
-const SPLITOR = '__'
-export function flatNestKeys (object: any): string[] {
-    const keys = Object.keys(object);
-    let flatColKeys: string[] = [];
-    for (let key of keys) {
-        if (typeof object[key] === 'object') {
-            const subKeys = flatNestKeys(object[key]);
-            flatColKeys = flatColKeys.concat(subKeys.map(k => `${key}${SPLITOR}${k}`));
-        } else {
-            flatColKeys.push(key)
-        }
-    }
-    return flatColKeys;
+export function flatKeys(obj: Object, prefixKeys: string[] = []): string[][] {
+    return Object.keys(obj).flatMap((k) =>
+        isPlainObject(obj[k]) ? flatKeys(obj[k], prefixKeys.concat(k)) : [prefixKeys.concat(k)]
+    );
 }
 
-export function getValueByKeyPath (object: any, keyPath: string): any {
-    const keys = keyPath.split(SPLITOR);
+export function getValueByKeyPath(object: any, keyPath: string[]): any {
     let value = object;
-    for (let key of keys) {
+    for (let key of keyPath) {
         value = value[key];
     }
     return value;
-}
+}

package/src/utils/is-plain-object.ts

@@ -0,0 +1,33 @@
+/*!
+ * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+function isObject(o: any) {
+    return Object.prototype.toString.call(o) === '[object Object]';
+}
+
+function isPlainObject(o: any) {
+    var ctor, prot;
+
+    if (isObject(o) === false) return false;
+
+    // If has modified constructor
+    ctor = o.constructor;
+    if (ctor === undefined) return true;
+
+    // If has modified prototype
+    prot = ctor.prototype;
+    if (isObject(prot) === false) return false;
+
+    // If constructor does not have an Object-specific method
+    if (prot.hasOwnProperty('isPrototypeOf') === false) {
+        return false;
+    }
+
+    // Most likely a plain Object
+    return true;
+}
+
+export { isPlainObject };

package/src/utils/save.ts

@@ -1,4 +1,4 @@
-import { IDataSet, IDataSource, IVisSpec } from "../interfaces";
+import { IDataSet, IDataSource, IVisSpec, IVisSpecForExport } from "../interfaces";
 import { VisSpecWithHistory } from "../models/visSpecHistory";
 
 export function dumpsGWPureSpec(list: VisSpecWithHistory[]): IVisSpec[] {
@@ -12,7 +12,7 @@ export function parseGWPureSpec(list: IVisSpec[]): VisSpecWithHistory[] {
 export interface IStoInfo {
     datasets: IDataSet[];
     specList: {
-        [K in keyof IVisSpec]: K extends "config" ? Partial<IVisSpec[K]> : IVisSpec[K];
+        [K in keyof IVisSpecForExport]: K extends "config" ? Partial<IVisSpecForExport[K]> : IVisSpecForExport[K];
     }[];
     dataSources: IDataSource[];
 }

package/src/visualSettings/index.tsx

@@ -491,6 +491,7 @@ const VisualSettings: React.FC<IVisualSettings> = ({
                     commonStore.setShowCodeExportPanel(true);
                 },
             },
+            ...(extra.length === 0 ? [] : ['-', ...extra]),
             '-',
             {
                 key: 'kanaries',
@@ -513,10 +514,6 @@ const VisualSettings: React.FC<IVisualSettings> = ({
 
         const items = builtInItems.filter((item) => typeof item === 'string' || !exclude.includes(item.key));
 
-        if (extra.length > 0) {
-            items.push('-', ...extra);
-        }
-
         return items;
     }, [
         vizStore,