@vuu-ui/vuu-utils 0.8.99 → 0.9.1

package/esm/json-utils.js

@@ -4,21 +4,30 @@ const { COUNT } = metadataKeys;
 const isJsonData = (value) => typeof value === "object" && value !== null;
 const vuuRowDataItemTypes = ["boolean", "number", "string"];
 const isVuuRowDataItem = (value) => vuuRowDataItemTypes.includes(typeof value);
-const typeofVuuDataItem = (value) => typeof value === "boolean" ? "boolean" : typeof value === "number" ? "number" : "string";
 const getCellValue = (attribute, attributeValue) => {
-  if (isJsonData(attributeValue)) {
-    return { attribute: `${attribute}+`, attributeValue: "", type: "json" };
+  if (Array.isArray(attributeValue)) {
+    return {
+      attribute: `${attribute}[`,
+      attributeValue: "",
+      isLeaf: false
+    };
+  } else if (isJsonData(attributeValue)) {
+    return {
+      attribute: `${attribute}{`,
+      attributeValue: "",
+      isLeaf: false
+    };
   } else if (attributeValue === void 0) {
     return {
       attribute,
       attributeValue: "undefined",
-      type: "string"
+      isLeaf: true
     };
   } else if (isVuuRowDataItem(attributeValue)) {
     return {
       attribute,
       attributeValue,
-      type: typeofVuuDataItem(attributeValue)
+      isLeaf: true
     };
   } else {
     throw Error(`unsupported type ${typeof attributeValue} in JSON`);
@@ -34,11 +43,13 @@ const jsonToDataSourceRows = (json) => {
   const cols = [];
   cols.push(
     {
-      name: "col 1",
+      className: "vuuJsonCell",
+      name: "Level 1",
       type: jsonColumnType
     },
     {
-      name: "col 2",
+      className: "vuuJsonCell",
+      name: "Level 2",
       type: jsonColumnType
     }
   );
@@ -51,7 +62,8 @@ const addChildValues = (rows, json, cols, index = { value: 0 }, keyBase = "$root
   let rowCount = 0;
   if (depth === cols.length - 1) {
     cols.push({
-      name: `col ${cols.length + 1}`,
+      className: "vuuJsonCell",
+      name: `Level ${cols.length + 1}`,
       hidden: true,
       type: jsonColumnType
     });
@@ -59,8 +71,7 @@ const addChildValues = (rows, json, cols, index = { value: 0 }, keyBase = "$root
   const columnEntries = Object.entries(json);
   for (let i = 0; i < columnEntries.length; i++, index.value += 1) {
     const [key, value] = columnEntries[i];
-    const { attribute, attributeValue, type } = getCellValue(key, value);
-    const isLeaf = type !== "json";
+    const { attribute, attributeValue, isLeaf } = getCellValue(key, value);
     const blanks = Array(depth).fill("");
     const fullKey = `${keyBase}|${key}`;
     const row = [index.value, index.value, isLeaf, false, depth, 0, fullKey, 0, ...blanks, attribute, attributeValue];

package/esm/json-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-utils.js","sources":["../src/json-utils.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnDescriptor,\n  DataValueTypeDescriptor,\n} from \"@vuu-ui/vuu-table-types\";\nimport { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport { metadataKeys } from \"./column-utils\";\n\nconst { COUNT } = metadataKeys;\n\nexport type JsonData =\n  | {\n      [key: string]: unknown;\n    }\n  | JsonData[];\n\ntype Index = { value: number };\n\ntype CellValue = {\n  attribute: string;\n  attributeValue: JsonData | VuuRowDataItemType | null;\n  type: \"json\" | \"number\" | \"string\" | \"boolean\";\n};\n\nconst isJsonData = (value: unknown): value is JsonData =>\n  typeof value === \"object\" && value !== null;\n\nconst vuuRowDataItemTypes = [\"boolean\", \"number\", \"string\"];\nconst isVuuRowDataItem = (value: unknown): value is VuuRowDataItemType =>\n  vuuRowDataItemTypes.includes(typeof value);\nconst typeofVuuDataItem = (value: VuuRowDataItemType) =>\n  typeof value === \"boolean\"\n    ? \"boolean\"\n    : typeof value === \"number\"\n      ? \"number\"\n      : \"string\";\n\nconst getCellValue = (\n  attribute: string,\n  attributeValue: unknown,\n): CellValue => {\n  if (isJsonData(attributeValue)) {\n    return { attribute: `${attribute}+`, attributeValue: \"\", type: \"json\" };\n  } else if (attributeValue === undefined) {\n    return {\n      attribute,\n      attributeValue: \"undefined\",\n      type: \"string\",\n    };\n  } else if (isVuuRowDataItem(attributeValue)) {\n    return {\n      attribute,\n      attributeValue,\n      type: typeofVuuDataItem(attributeValue),\n    };\n  } else {\n    throw Error(`unsupported type ${typeof attributeValue} in JSON`);\n  }\n};\n\nconst jsonColumnType: DataValueTypeDescriptor = {\n  name: \"json\",\n  renderer: {\n    name: \"json\",\n  },\n};\n\nexport const jsonToDataSourceRows = (\n  json: JsonData,\n): [ColumnDescriptor[], DataSourceRow[]] => {\n  const cols: ColumnDescriptor[] = [];\n\n  cols.push(\n    {\n      name: \"col 1\",\n      type: jsonColumnType,\n    },\n    {\n      name: \"col 2\",\n      type: jsonColumnType,\n    },\n  );\n\n  const rows: DataSourceRow[] = [];\n\n  addChildValues(rows, json, cols);\n  return [cols, rows];\n};\n\nconst addChildValues = (\n  rows: DataSourceRow[],\n  json: JsonData,\n  cols: ColumnDescriptor[],\n  index: Index = { value: 0 },\n  keyBase = \"$root\",\n  depth = 0,\n): [number, number] => {\n  let leafCount = 0;\n  let rowCount = 0;\n  if (depth === cols.length - 1) {\n    cols.push({\n      name: `col ${cols.length + 1}`,\n      hidden: true,\n      type: jsonColumnType,\n    });\n  }\n  const columnEntries = Object.entries(json);\n  for (let i = 0; i < columnEntries.length; i++, index.value += 1) {\n    const [key, value] = columnEntries[i];\n    const { attribute, attributeValue, type } = getCellValue(key, value);\n    const isLeaf = type !== \"json\";\n    const blanks = Array(depth).fill(\"\");\n    const fullKey = `${keyBase}|${key}`;\n    // prettier-ignore\n    const row = [index.value, index.value, isLeaf,false,depth,0,fullKey,0, ...blanks, attribute, attributeValue ] as DataSourceRow\n    rows.push(row);\n    rowCount += 1;\n\n    if (isJsonData(value)) {\n      const [nestedLeafCount, nestedRowCount] = addChildValues(\n        rows,\n        value,\n        cols,\n        { value: index.value + 1 },\n        fullKey,\n        depth + 1,\n      );\n      row[COUNT] = nestedLeafCount;\n      leafCount += nestedLeafCount;\n      rowCount += nestedRowCount;\n      index.value += nestedRowCount;\n    } else {\n      leafCount += 1;\n    }\n  }\n\n  return [leafCount, rowCount];\n};\n"],"names":[],"mappings":";;AAQA,MAAM,EAAE,OAAU,GAAA,YAAA,CAAA;AAgBlB,MAAM,aAAa,CAAC,KAAA,KAClB,OAAO,KAAA,KAAU,YAAY,KAAU,KAAA,IAAA,CAAA;AAEzC,MAAM,mBAAsB,GAAA,CAAC,SAAW,EAAA,QAAA,EAAU,QAAQ,CAAA,CAAA;AAC1D,MAAM,mBAAmB,CAAC,KAAA,KACxB,mBAAoB,CAAA,QAAA,CAAS,OAAO,KAAK,CAAA,CAAA;AAC3C,MAAM,iBAAA,GAAoB,CAAC,KAAA,KACzB,OAAO,KAAA,KAAU,YACb,SACA,GAAA,OAAO,KAAU,KAAA,QAAA,GACf,QACA,GAAA,QAAA,CAAA;AAER,MAAM,YAAA,GAAe,CACnB,SAAA,EACA,cACc,KAAA;AACd,EAAI,IAAA,UAAA,CAAW,cAAc,CAAG,EAAA;AAC9B,IAAO,OAAA,EAAE,WAAW,CAAG,EAAA,SAAS,KAAK,cAAgB,EAAA,EAAA,EAAI,MAAM,MAAO,EAAA,CAAA;AAAA,GACxE,MAAA,IAAW,mBAAmB,KAAW,CAAA,EAAA;AACvC,IAAO,OAAA;AAAA,MACL,SAAA;AAAA,MACA,cAAgB,EAAA,WAAA;AAAA,MAChB,IAAM,EAAA,QAAA;AAAA,KACR,CAAA;AAAA,GACF,MAAA,IAAW,gBAAiB,CAAA,cAAc,CAAG,EAAA;AAC3C,IAAO,OAAA;AAAA,MACL,SAAA;AAAA,MACA,cAAA;AAAA,MACA,IAAA,EAAM,kBAAkB,cAAc,CAAA;AAAA,KACxC,CAAA;AAAA,GACK,MAAA;AACL,IAAA,MAAM,KAAM,CAAA,CAAA,iBAAA,EAAoB,OAAO,cAAc,CAAU,QAAA,CAAA,CAAA,CAAA;AAAA,GACjE;AACF,CAAA,CAAA;AAEA,MAAM,cAA0C,GAAA;AAAA,EAC9C,IAAM,EAAA,MAAA;AAAA,EACN,QAAU,EAAA;AAAA,IACR,IAAM,EAAA,MAAA;AAAA,GACR;AACF,CAAA,CAAA;AAEa,MAAA,oBAAA,GAAuB,CAClC,IAC0C,KAAA;AAC1C,EAAA,MAAM,OAA2B,EAAC,CAAA;AAElC,EAAK,IAAA,CAAA,IAAA;AAAA,IACH;AAAA,MACE,IAAM,EAAA,OAAA;AAAA,MACN,IAAM,EAAA,cAAA;AAAA,KACR;AAAA,IACA;AAAA,MACE,IAAM,EAAA,OAAA;AAAA,MACN,IAAM,EAAA,cAAA;AAAA,KACR;AAAA,GACF,CAAA;AAEA,EAAA,MAAM,OAAwB,EAAC,CAAA;AAE/B,EAAe,cAAA,CAAA,IAAA,EAAM,MAAM,IAAI,CAAA,CAAA;AAC/B,EAAO,OAAA,CAAC,MAAM,IAAI,CAAA,CAAA;AACpB,EAAA;AAEA,MAAM,cAAiB,GAAA,CACrB,IACA,EAAA,IAAA,EACA,IACA,EAAA,KAAA,GAAe,EAAE,KAAA,EAAO,CAAE,EAAA,EAC1B,OAAU,GAAA,OAAA,EACV,QAAQ,CACa,KAAA;AACrB,EAAA,IAAI,SAAY,GAAA,CAAA,CAAA;AAChB,EAAA,IAAI,QAAW,GAAA,CAAA,CAAA;AACf,EAAI,IAAA,KAAA,KAAU,IAAK,CAAA,MAAA,GAAS,CAAG,EAAA;AAC7B,IAAA,IAAA,CAAK,IAAK,CAAA;AAAA,MACR,IAAM,EAAA,CAAA,IAAA,EAAO,IAAK,CAAA,MAAA,GAAS,CAAC,CAAA,CAAA;AAAA,MAC5B,MAAQ,EAAA,IAAA;AAAA,MACR,IAAM,EAAA,cAAA;AAAA,KACP,CAAA,CAAA;AAAA,GACH;AACA,EAAM,MAAA,aAAA,GAAgB,MAAO,CAAA,OAAA,CAAQ,IAAI,CAAA,CAAA;AACzC,EAAS,KAAA,IAAA,CAAA,GAAI,GAAG,CAAI,GAAA,aAAA,CAAc,QAAQ,CAAK,EAAA,EAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AAC/D,IAAA,MAAM,CAAC,GAAA,EAAK,KAAK,CAAA,GAAI,cAAc,CAAC,CAAA,CAAA;AACpC,IAAA,MAAM,EAAE,SAAW,EAAA,cAAA,EAAgB,MAAS,GAAA,YAAA,CAAa,KAAK,KAAK,CAAA,CAAA;AACnE,IAAA,MAAM,SAAS,IAAS,KAAA,MAAA,CAAA;AACxB,IAAA,MAAM,MAAS,GAAA,KAAA,CAAM,KAAK,CAAA,CAAE,KAAK,EAAE,CAAA,CAAA;AACnC,IAAA,MAAM,OAAU,GAAA,CAAA,EAAG,OAAO,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA,CAAA;AAEjC,IAAA,MAAM,GAAM,GAAA,CAAC,KAAM,CAAA,KAAA,EAAO,MAAM,KAAO,EAAA,MAAA,EAAO,KAAM,EAAA,KAAA,EAAM,GAAE,OAAQ,EAAA,CAAA,EAAG,GAAG,MAAA,EAAQ,WAAW,cAAe,CAAA,CAAA;AAC5G,IAAA,IAAA,CAAK,KAAK,GAAG,CAAA,CAAA;AACb,IAAY,QAAA,IAAA,CAAA,CAAA;AAEZ,IAAI,IAAA,UAAA,CAAW,KAAK,CAAG,EAAA;AACrB,MAAM,MAAA,CAAC,eAAiB,EAAA,cAAc,CAAI,GAAA,cAAA;AAAA,QACxC,IAAA;AAAA,QACA,KAAA;AAAA,QACA,IAAA;AAAA,QACA,EAAE,KAAA,EAAO,KAAM,CAAA,KAAA,GAAQ,CAAE,EAAA;AAAA,QACzB,OAAA;AAAA,QACA,KAAQ,GAAA,CAAA;AAAA,OACV,CAAA;AACA,MAAA,GAAA,CAAI,KAAK,CAAI,GAAA,eAAA,CAAA;AACb,MAAa,SAAA,IAAA,eAAA,CAAA;AACb,MAAY,QAAA,IAAA,cAAA,CAAA;AACZ,MAAA,KAAA,CAAM,KAAS,IAAA,cAAA,CAAA;AAAA,KACV,MAAA;AACL,MAAa,SAAA,IAAA,CAAA,CAAA;AAAA,KACf;AAAA,GACF;AAEA,EAAO,OAAA,CAAC,WAAW,QAAQ,CAAA,CAAA;AAC7B,CAAA;;;;"}
+{"version":3,"file":"json-utils.js","sources":["../src/json-utils.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnDescriptor,\n  DataValueTypeDescriptor,\n} from \"@vuu-ui/vuu-table-types\";\nimport { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport { metadataKeys } from \"./column-utils\";\n\nconst { COUNT } = metadataKeys;\n\nexport type JsonData =\n  | {\n      [key: string]: unknown;\n    }\n  | JsonData[];\n\ntype Index = { value: number };\n\ntype CellValue = {\n  attribute: string;\n  attributeValue: JsonData | VuuRowDataItemType | null;\n  isLeaf: boolean;\n};\n\nconst isJsonData = (value: unknown): value is JsonData =>\n  typeof value === \"object\" && value !== null;\n\nconst vuuRowDataItemTypes = [\"boolean\", \"number\", \"string\"];\nconst isVuuRowDataItem = (value: unknown): value is VuuRowDataItemType =>\n  vuuRowDataItemTypes.includes(typeof value);\n\nconst getCellValue = (\n  attribute: string,\n  attributeValue: unknown,\n): CellValue => {\n  if (Array.isArray(attributeValue)) {\n    return {\n      attribute: `${attribute}[`,\n      attributeValue: \"\",\n      isLeaf: false,\n    };\n  } else if (isJsonData(attributeValue)) {\n    return {\n      attribute: `${attribute}{`,\n      attributeValue: \"\",\n      isLeaf: false,\n    };\n  } else if (attributeValue === undefined) {\n    return {\n      attribute,\n      attributeValue: \"undefined\",\n      isLeaf: true,\n    };\n  } else if (isVuuRowDataItem(attributeValue)) {\n    return {\n      attribute,\n      attributeValue,\n      isLeaf: true,\n    };\n  } else {\n    throw Error(`unsupported type ${typeof attributeValue} in JSON`);\n  }\n};\n\nconst jsonColumnType: DataValueTypeDescriptor = {\n  name: \"json\",\n  renderer: {\n    name: \"json\",\n  },\n};\n\nexport const jsonToDataSourceRows = (\n  json: JsonData,\n): [ColumnDescriptor[], DataSourceRow[]] => {\n  const cols: ColumnDescriptor[] = [];\n\n  cols.push(\n    {\n      className: \"vuuJsonCell\",\n      name: \"Level 1\",\n      type: jsonColumnType,\n    },\n    {\n      className: \"vuuJsonCell\",\n      name: \"Level 2\",\n      type: jsonColumnType,\n    },\n  );\n\n  const rows: DataSourceRow[] = [];\n\n  addChildValues(rows, json, cols);\n  return [cols, rows];\n};\n\nconst addChildValues = (\n  rows: DataSourceRow[],\n  json: JsonData,\n  cols: ColumnDescriptor[],\n  index: Index = { value: 0 },\n  keyBase = \"$root\",\n  depth = 0,\n): [number, number] => {\n  let leafCount = 0;\n  let rowCount = 0;\n  if (depth === cols.length - 1) {\n    cols.push({\n      className: \"vuuJsonCell\",\n      name: `Level ${cols.length + 1}`,\n      hidden: true,\n      type: jsonColumnType,\n    });\n  }\n  const columnEntries = Object.entries(json);\n  for (let i = 0; i < columnEntries.length; i++, index.value += 1) {\n    const [key, value] = columnEntries[i];\n    const { attribute, attributeValue, isLeaf } = getCellValue(key, value);\n    const blanks = Array(depth).fill(\"\");\n    const fullKey = `${keyBase}|${key}`;\n    // prettier-ignore\n    const row = [index.value, index.value, isLeaf,false,depth,0,fullKey,0, ...blanks, attribute, attributeValue ] as DataSourceRow\n    rows.push(row);\n    rowCount += 1;\n\n    if (isJsonData(value)) {\n      const [nestedLeafCount, nestedRowCount] = addChildValues(\n        rows,\n        value,\n        cols,\n        { value: index.value + 1 },\n        fullKey,\n        depth + 1,\n      );\n      row[COUNT] = nestedLeafCount;\n      leafCount += nestedLeafCount;\n      rowCount += nestedRowCount;\n      index.value += nestedRowCount;\n    } else {\n      leafCount += 1;\n    }\n  }\n\n  return [leafCount, rowCount];\n};\n"],"names":[],"mappings":"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"}

package/esm/row-utils.js

@@ -21,22 +21,6 @@ const virtualRowPositioning = (rowHeight, virtualisedExtent, pctScrollTop) => [
   },
   true
 ];
-const getRowElementAtIndex = (container, rowIndex) => {
-  if (rowIndex === -1) {
-    return null;
-  } else {
-    const activeRow = container.querySelector(
-      `[aria-rowindex="${rowIndex + 1}"]`
-    );
-    if (activeRow) {
-      return activeRow;
-    } else {
-      throw Error(
-        `getRowElementAtIndex no row found for index index ${rowIndex}`
-      );
-    }
-  }
-};
 const asDataSourceRowObject = (row, columnMap) => {
   const { [IS_LEAF]: isLeaf, [KEY]: key, [IDX]: index } = row;
   const rowObject = {
@@ -52,5 +36,5 @@ const asDataSourceRowObject = (row, columnMap) => {
   return rowObject;
 };
 
-export { actualRowPositioning, asDataSourceRowObject, getRowElementAtIndex, virtualRowPositioning };
+export { actualRowPositioning, asDataSourceRowObject, virtualRowPositioning };
 //# sourceMappingURL=row-utils.js.map

package/esm/row-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"row-utils.js","sources":["../src/row-utils.ts"],"sourcesContent":["//TODO this all probably belongs in vuu-table\nimport type {\n  DataSourceRow,\n  DataSourceRowObject,\n} from \"@vuu-ui/vuu-data-types\";\nimport type { MutableRefObject } from \"react\";\nimport { ColumnMap, metadataKeys } from \"./column-utils\";\nimport { isRowSelected } from \"./selection-utils\";\n\nconst { IS_LEAF, KEY, IDX } = metadataKeys;\n\nexport type RowOffsetFunc = (\n  row: DataSourceRow,\n  pctScrollTop?: number,\n) => number;\nexport type RowAtPositionFunc = (position: number) => number;\n\n/**\n * RowOffset function, RowAtPosition function, isVirtualScroll\n */\nexport type RowPositioning = [RowOffsetFunc, RowAtPositionFunc, boolean];\n\nexport const actualRowPositioning = (rowHeight: number): RowPositioning => [\n  (row) => row[IDX] * rowHeight,\n  (position) => Math.floor(position / rowHeight),\n  false,\n];\n\n/**\n * return functions for determining a) the pixel offset to apply to a row, given the\n * row index and b) the index of the row at a given scroll offset. This implementation\n * is used when we are forced to 'virtualise' scrolling - because the number of rows\n * is high enough that we cannot create a large enough HTML content container.\n *\n * @param rowHeight\n * @param virtualisedExtent\n * @param pctScrollTop\n * @returns\n */\nexport const virtualRowPositioning = (\n  rowHeight: number,\n  virtualisedExtent: number,\n  pctScrollTop: MutableRefObject<number>,\n): RowPositioning => [\n  (row, offset = 0) => {\n    const rowOffset = pctScrollTop.current * virtualisedExtent;\n    return (row[IDX] - offset) * rowHeight - rowOffset;\n  },\n  /*\n    Return index position of closest row \n  */\n  (position) => {\n    const rowOffset = pctScrollTop.current * virtualisedExtent;\n    return Math.round((position + rowOffset) / rowHeight);\n  },\n  true,\n];\n\nexport const getRowElementAtIndex = (\n  container: HTMLDivElement | EventTarget,\n  rowIndex: number,\n) => {\n  if (rowIndex === -1) {\n    return null;\n  } else {\n    const activeRow = (container as HTMLElement).querySelector(\n      `[aria-rowindex=\"${rowIndex + 1}\"]`,\n    ) as HTMLElement;\n\n    if (activeRow) {\n      return activeRow;\n    } else {\n      throw Error(\n        `getRowElementAtIndex no row found for index index ${rowIndex}`,\n      );\n    }\n  }\n};\n\nexport const asDataSourceRowObject = (\n  row: DataSourceRow,\n  columnMap: ColumnMap,\n): DataSourceRowObject => {\n  const { [IS_LEAF]: isLeaf, [KEY]: key, [IDX]: index } = row;\n\n  const rowObject: DataSourceRowObject = {\n    key,\n    index,\n    isGroupRow: !isLeaf,\n    isSelected: isRowSelected(row),\n    data: {},\n  };\n\n  for (const [colName, colIdx] of Object.entries(columnMap)) {\n    rowObject.data[colName] = row[colIdx];\n  }\n\n  return rowObject;\n};\n"],"names":[],"mappings":";;;AASA,MAAM,EAAE,OAAA,EAAS,GAAK,EAAA,GAAA,EAAQ,GAAA,YAAA,CAAA;AAajB,MAAA,oBAAA,GAAuB,CAAC,SAAsC,KAAA;AAAA,EACzE,CAAC,GAAA,KAAQ,GAAI,CAAA,GAAG,CAAI,GAAA,SAAA;AAAA,EACpB,CAAC,QAAA,KAAa,IAAK,CAAA,KAAA,CAAM,WAAW,SAAS,CAAA;AAAA,EAC7C,KAAA;AACF,EAAA;AAaO,MAAM,qBAAwB,GAAA,CACnC,SACA,EAAA,iBAAA,EACA,YACmB,KAAA;AAAA,EACnB,CAAC,GAAK,EAAA,MAAA,GAAS,CAAM,KAAA;AACnB,IAAM,MAAA,SAAA,GAAY,aAAa,OAAU,GAAA,iBAAA,CAAA;AACzC,IAAA,OAAA,CAAQ,GAAI,CAAA,GAAG,CAAI,GAAA,MAAA,IAAU,SAAY,GAAA,SAAA,CAAA;AAAA,GAC3C;AAAA;AAAA;AAAA;AAAA,EAIA,CAAC,QAAa,KAAA;AACZ,IAAM,MAAA,SAAA,GAAY,aAAa,OAAU,GAAA,iBAAA,CAAA;AACzC,IAAA,OAAO,IAAK,CAAA,KAAA,CAAA,CAAO,QAAW,GAAA,SAAA,IAAa,SAAS,CAAA,CAAA;AAAA,GACtD;AAAA,EACA,IAAA;AACF,EAAA;AAEa,MAAA,oBAAA,GAAuB,CAClC,SAAA,EACA,QACG,KAAA;AACH,EAAA,IAAI,aAAa,CAAI,CAAA,EAAA;AACnB,IAAO,OAAA,IAAA,CAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,YAAa,SAA0B,CAAA,aAAA;AAAA,MAC3C,CAAA,gBAAA,EAAmB,WAAW,CAAC,CAAA,EAAA,CAAA;AAAA,KACjC,CAAA;AAEA,IAAA,IAAI,SAAW,EAAA;AACb,MAAO,OAAA,SAAA,CAAA;AAAA,KACF,MAAA;AACL,MAAM,MAAA,KAAA;AAAA,QACJ,qDAAqD,QAAQ,CAAA,CAAA;AAAA,OAC/D,CAAA;AAAA,KACF;AAAA,GACF;AACF,EAAA;AAEa,MAAA,qBAAA,GAAwB,CACnC,GAAA,EACA,SACwB,KAAA;AACxB,EAAA,MAAM,EAAE,CAAC,OAAO,GAAG,MAAQ,EAAA,CAAC,GAAG,GAAG,GAAK,EAAA,CAAC,GAAG,GAAG,OAAU,GAAA,GAAA,CAAA;AAExD,EAAA,MAAM,SAAiC,GAAA;AAAA,IACrC,GAAA;AAAA,IACA,KAAA;AAAA,IACA,YAAY,CAAC,MAAA;AAAA,IACb,UAAA,EAAY,cAAc,GAAG,CAAA;AAAA,IAC7B,MAAM,EAAC;AAAA,GACT,CAAA;AAEA,EAAA,KAAA,MAAW,CAAC,OAAS,EAAA,MAAM,KAAK,MAAO,CAAA,OAAA,CAAQ,SAAS,CAAG,EAAA;AACzD,IAAA,SAAA,CAAU,IAAK,CAAA,OAAO,CAAI,GAAA,GAAA,CAAI,MAAM,CAAA,CAAA;AAAA,GACtC;AAEA,EAAO,OAAA,SAAA,CAAA;AACT;;;;"}
+{"version":3,"file":"row-utils.js","sources":["../src/row-utils.ts"],"sourcesContent":["//TODO this all probably belongs in vuu-table\nimport type {\n  DataSourceRow,\n  DataSourceRowObject,\n} from \"@vuu-ui/vuu-data-types\";\nimport type { MutableRefObject } from \"react\";\nimport { ColumnMap, metadataKeys } from \"./column-utils\";\nimport { isRowSelected } from \"./selection-utils\";\n\nconst { IS_LEAF, KEY, IDX } = metadataKeys;\n\nexport type RowOffsetFunc = (\n  row: DataSourceRow,\n  pctScrollTop?: number,\n) => number;\nexport type RowAtPositionFunc = (position: number) => number;\n\n/**\n * RowOffset function, RowAtPosition function, isVirtualScroll\n */\nexport type RowPositioning = [RowOffsetFunc, RowAtPositionFunc, boolean];\n\nexport const actualRowPositioning = (rowHeight: number): RowPositioning => [\n  (row) => row[IDX] * rowHeight,\n  (position) => Math.floor(position / rowHeight),\n  false,\n];\n\n/**\n * return functions for determining a) the pixel offset to apply to a row, given the\n * row index and b) the index of the row at a given scroll offset. This implementation\n * is used when we are forced to 'virtualise' scrolling - because the number of rows\n * is high enough that we cannot create a large enough HTML content container.\n *\n * @param rowHeight\n * @param virtualisedExtent\n * @param pctScrollTop\n * @returns\n */\nexport const virtualRowPositioning = (\n  rowHeight: number,\n  virtualisedExtent: number,\n  pctScrollTop: MutableRefObject<number>,\n): RowPositioning => [\n  (row, offset = 0) => {\n    const rowOffset = pctScrollTop.current * virtualisedExtent;\n    return (row[IDX] - offset) * rowHeight - rowOffset;\n  },\n  /*\n    Return index position of closest row \n  */\n  (position) => {\n    const rowOffset = pctScrollTop.current * virtualisedExtent;\n    return Math.round((position + rowOffset) / rowHeight);\n  },\n  true,\n];\n\nexport const asDataSourceRowObject = (\n  row: DataSourceRow,\n  columnMap: ColumnMap,\n): DataSourceRowObject => {\n  const { [IS_LEAF]: isLeaf, [KEY]: key, [IDX]: index } = row;\n\n  const rowObject: DataSourceRowObject = {\n    key,\n    index,\n    isGroupRow: !isLeaf,\n    isSelected: isRowSelected(row),\n    data: {},\n  };\n\n  for (const [colName, colIdx] of Object.entries(columnMap)) {\n    rowObject.data[colName] = row[colIdx];\n  }\n\n  return rowObject;\n};\n"],"names":[],"mappings":";;;AASA,MAAM,EAAE,OAAA,EAAS,GAAK,EAAA,GAAA,EAAQ,GAAA,YAAA,CAAA;AAajB,MAAA,oBAAA,GAAuB,CAAC,SAAsC,KAAA;AAAA,EACzE,CAAC,GAAA,KAAQ,GAAI,CAAA,GAAG,CAAI,GAAA,SAAA;AAAA,EACpB,CAAC,QAAA,KAAa,IAAK,CAAA,KAAA,CAAM,WAAW,SAAS,CAAA;AAAA,EAC7C,KAAA;AACF,EAAA;AAaO,MAAM,qBAAwB,GAAA,CACnC,SACA,EAAA,iBAAA,EACA,YACmB,KAAA;AAAA,EACnB,CAAC,GAAK,EAAA,MAAA,GAAS,CAAM,KAAA;AACnB,IAAM,MAAA,SAAA,GAAY,aAAa,OAAU,GAAA,iBAAA,CAAA;AACzC,IAAA,OAAA,CAAQ,GAAI,CAAA,GAAG,CAAI,GAAA,MAAA,IAAU,SAAY,GAAA,SAAA,CAAA;AAAA,GAC3C;AAAA;AAAA;AAAA;AAAA,EAIA,CAAC,QAAa,KAAA;AACZ,IAAM,MAAA,SAAA,GAAY,aAAa,OAAU,GAAA,iBAAA,CAAA;AACzC,IAAA,OAAO,IAAK,CAAA,KAAA,CAAA,CAAO,QAAW,GAAA,SAAA,IAAa,SAAS,CAAA,CAAA;AAAA,GACtD;AAAA,EACA,IAAA;AACF,EAAA;AAEa,MAAA,qBAAA,GAAwB,CACnC,GAAA,EACA,SACwB,KAAA;AACxB,EAAA,MAAM,EAAE,CAAC,OAAO,GAAG,MAAQ,EAAA,CAAC,GAAG,GAAG,GAAK,EAAA,CAAC,GAAG,GAAG,OAAU,GAAA,GAAA,CAAA;AAExD,EAAA,MAAM,SAAiC,GAAA;AAAA,IACrC,GAAA;AAAA,IACA,KAAA;AAAA,IACA,YAAY,CAAC,MAAA;AAAA,IACb,UAAA,EAAY,cAAc,GAAG,CAAA;AAAA,IAC7B,MAAM,EAAC;AAAA,GACT,CAAA;AAEA,EAAA,KAAA,MAAW,CAAC,OAAS,EAAA,MAAM,KAAK,MAAO,CAAA,OAAA,CAAQ,SAAS,CAAG,EAAA;AACzD,IAAA,SAAA,CAAU,IAAK,CAAA,OAAO,CAAI,GAAA,GAAA,CAAI,MAAM,CAAA,CAAA;AAAA,GACtC;AAEA,EAAO,OAAA,SAAA,CAAA;AACT;;;;"}

package/esm/tree-utils.js

@@ -0,0 +1,64 @@
+import { metadataKeys } from './column-utils.js';
+
+const { COUNT } = metadataKeys;
+const treeToDataSourceRows = (treeSourceNodes, iconProvider) => {
+  const columns = [];
+  columns.push(
+    {
+      getIcon: iconProvider?.getIcon,
+      name: "Level 1",
+      type: "string"
+    },
+    {
+      getIcon: iconProvider?.getIcon,
+      name: "Level 2",
+      type: "string"
+    }
+  );
+  const rows = [];
+  addChildValues(rows, treeSourceNodes, columns, iconProvider);
+  return [columns, rows];
+};
+const addChildValues = (rows, treeSourceNodes, cols, iconProvider, index = { value: 0 }, keyBase = "$root", depth = 1) => {
+  let leafCount = 0;
+  let rowCount = 0;
+  if (depth === cols.length - 1) {
+    cols.push({
+      getIcon: iconProvider?.getIcon,
+      name: `Level ${cols.length + 1}`,
+      type: "string"
+    });
+  }
+  for (let i = 0; i < treeSourceNodes.length; i++, index.value += 1) {
+    const { childNodes, icon, label } = treeSourceNodes[i];
+    const blanks = Array(depth - 1).fill("");
+    const fullKey = `${keyBase}|${label}`;
+    const row = [index.value, index.value, false, false, depth, 0, fullKey, 0, ...blanks, label];
+    if (icon) {
+      iconProvider?.setIcon(fullKey, icon);
+    }
+    rows.push(row);
+    rowCount += 1;
+    if (childNodes && childNodes.length > 0) {
+      const [nestedLeafCount, nestedRowCount] = addChildValues(
+        rows,
+        childNodes,
+        cols,
+        iconProvider,
+        { value: index.value + 1 },
+        fullKey,
+        depth + 1
+      );
+      row[COUNT] = nestedLeafCount;
+      leafCount += nestedLeafCount;
+      rowCount += nestedRowCount;
+      index.value += nestedRowCount;
+    } else {
+      leafCount += 1;
+    }
+  }
+  return [leafCount, rowCount];
+};
+
+export { treeToDataSourceRows };
+//# sourceMappingURL=tree-utils.js.map

package/esm/tree-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-utils.js","sources":["../src/tree-utils.ts"],"sourcesContent":["import { TreeSourceNode } from \"./tree-types\";\nimport { ColumnDescriptor } from \"@vuu-ui/vuu-table-types\";\nimport { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { metadataKeys } from \"./column-utils\";\nimport { IconProvider } from \"@vuu-ui/vuu-data-local/src/tree-data-source/IconProvider\";\n\nconst { COUNT } = metadataKeys;\n\ntype Index = { value: number };\n\nexport const treeToDataSourceRows = (\n  treeSourceNodes: TreeSourceNode[],\n  iconProvider?: IconProvider,\n): [ColumnDescriptor[], DataSourceRow[]] => {\n  const columns: ColumnDescriptor[] = [];\n\n  columns.push(\n    {\n      getIcon: iconProvider?.getIcon,\n      name: \"Level 1\",\n      type: \"string\",\n    },\n    {\n      getIcon: iconProvider?.getIcon,\n      name: \"Level 2\",\n      type: \"string\",\n    },\n  );\n\n  const rows: DataSourceRow[] = [];\n\n  addChildValues(rows, treeSourceNodes, columns, iconProvider);\n  return [columns, rows];\n};\n\nconst addChildValues = (\n  rows: DataSourceRow[],\n  treeSourceNodes: TreeSourceNode[],\n  cols: ColumnDescriptor[],\n  iconProvider: IconProvider | undefined,\n  index: Index = { value: 0 },\n  keyBase = \"$root\",\n  depth = 1,\n): [number, number] => {\n  let leafCount = 0;\n  let rowCount = 0;\n  if (depth === cols.length - 1) {\n    cols.push({\n      getIcon: iconProvider?.getIcon,\n      name: `Level ${cols.length + 1}`,\n      type: \"string\",\n    });\n  }\n  for (let i = 0; i < treeSourceNodes.length; i++, index.value += 1) {\n    const { childNodes, icon, label } = treeSourceNodes[i];\n    const blanks = Array(depth - 1).fill(\"\");\n    const fullKey = `${keyBase}|${label}`;\n    // prettier-ignore\n    const row = [index.value, index.value, false,false,depth,0,fullKey,0, ...blanks, label ] as DataSourceRow;\n    if (icon) {\n      iconProvider?.setIcon(fullKey, icon);\n    }\n    rows.push(row);\n    rowCount += 1;\n\n    if (childNodes && childNodes.length > 0) {\n      const [nestedLeafCount, nestedRowCount] = addChildValues(\n        rows,\n        childNodes,\n        cols,\n        iconProvider,\n        { value: index.value + 1 },\n        fullKey,\n        depth + 1,\n      );\n      row[COUNT] = nestedLeafCount;\n      leafCount += nestedLeafCount;\n      rowCount += nestedRowCount;\n      index.value += nestedRowCount;\n    } else {\n      leafCount += 1;\n    }\n  }\n\n  return [leafCount, rowCount];\n};\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,17 @@
 {
-  "version": "0.8.99",
+  "version": "0.9.1",
   "author": "heswell",
   "license": "Apache-2.0",
   "types": "types/index.d.ts",
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "0.8.99",
-    "@vuu-ui/vuu-table-types": "0.8.99",
-    "@vuu-ui/vuu-filter-types": "0.8.99",
-    "@vuu-ui/vuu-protocol-types": "0.8.99"
+    "@vuu-ui/vuu-data-types": "0.9.1",
+    "@vuu-ui/vuu-table-types": "0.9.1",
+    "@vuu-ui/vuu-filter-types": "0.9.1",
+    "@vuu-ui/vuu-protocol-types": "0.9.1"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "0.8.99",
+    "@vuu-ui/vuu-filter-parser": "0.9.1",
     "clsx": "^2.0.0",
     "react": ">=17.0.2",
     "react-dom": ">=17.0.2"

package/types/column-utils.d.ts

@@ -89,7 +89,8 @@ export declare const isDataLoading: (columns: RuntimeColumnDescriptor[]) => bool
 export declare const getColumnsInViewport: (columns: RuntimeColumnDescriptor[], vpStart: number, vpEnd: number) => [RuntimeColumnDescriptor[], number];
 export declare const isNotHidden: (column: RuntimeColumnDescriptor) => boolean;
 export declare const visibleColumnAtIndex: (columns: RuntimeColumnDescriptor[], index: number) => RuntimeColumnDescriptor | undefined;
-export declare const getGroupValueAndOffset: (columns: RuntimeColumnDescriptor[], row: DataSourceRow, columnMap: ColumnMap) => [unknown, number];
+export declare const getGroupIcon: (columns: RuntimeColumnDescriptor[], row: DataSourceRow) => string | undefined;
+export declare const getGroupValue: (columns: RuntimeColumnDescriptor[], row: DataSourceRow, columnMap: ColumnMap) => unknown;
 export declare const getDefaultColumnType: (serverDataType?: VuuColumnDataType) => DataValueTypeSimple;
 export declare const updateColumnFormatting: <T extends ColumnDescriptor = ColumnDescriptor>(column: T, formatting: ColumnTypeFormatting) => T;
 export declare function updateColumnType<T extends ColumnDescriptor = ColumnDescriptor>(column: T, type: DataValueTypeSimple): T;

package/types/datasource/BaseDataSource.d.ts

@@ -11,7 +11,7 @@ export declare abstract class BaseDataSource extends EventEmitter<DataSourceEven
     protected _range: VuuRange;
     protected _size: number;
     protected _title: string | undefined;
-    constructor({ aggregations, baseFilterSpec, columns, filterSpec, groupBy, sort, title, viewport, }: DataSourceConstructorProps);
+    constructor({ aggregations, baseFilterSpec, columns, filterSpec, groupBy, sort, title, viewport, }: Omit<DataSourceConstructorProps, "table">);
     subscribe({ baseFilterSpec, columns, aggregations, range, sort, groupBy, filterSpec, viewport, }: SubscribeProps, callback: SubscribeCallback): void;
     get aggregations(): VuuAggregation[];
     set aggregations(aggregations: VuuAggregation[]);
@@ -21,13 +21,15 @@ export declare abstract class BaseDataSource extends EventEmitter<DataSourceEven
     set columns(columns: string[]);
     get filter(): DataSourceFilter;
     set filter(filter: DataSourceFilter);
-    get config(): WithBaseFilter<DataSourceConfig>;
-    set config(config: WithBaseFilter<DataSourceConfig>);
+    get config(): WithBaseFilter<WithFullConfig>;
+    set config(config: WithBaseFilter<WithFullConfig>);
     get range(): VuuRange;
     set range(range: VuuRange);
     get size(): number;
     get sort(): VuuSort;
     set sort(sort: VuuSort);
+    get title(): string;
+    set title(title: string);
     applyConfig(config: WithBaseFilter<DataSourceConfig>, preserveExistingConfigAttributes?: boolean): DataSourceConfigChanges | undefined;
     abstract rangeRequest(range: VuuRange): void;
 }

package/types/filters/filter-utils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { DataSourceFilter } from "@vuu-ui/vuu-data-types";
 import { AndFilter, Filter, FilterClauseOp, FilterWithPartialClause, MultiClauseFilter, MultiValueFilterClause, OrFilter, SingleValueFilterClause } from "@vuu-ui/vuu-filter-types";
-import { RuntimeColumnDescriptor } from "@vuu-ui/vuu-table-types";
+import { ColumnDescriptor, RuntimeColumnDescriptor } from "@vuu-ui/vuu-table-types";
 import { EventEmitter } from "../event-emitter";
 import { VuuFilter } from "@vuu-ui/vuu-protocol-types";
 export declare const isValidFilterClauseOp: (op?: string) => op is FilterClauseOp;
@@ -45,6 +45,7 @@ export declare const stripFilterFromColumns: (columns: RuntimeColumnDescriptor[]
     aggregate?: import("@vuu-ui/vuu-protocol-types").VuuAggType | undefined;
     colHeaderContentRenderer?: string | undefined;
     colHeaderLabelRenderer?: string | undefined;
+    getIcon?: ((row: import("@vuu-ui/vuu-data-types").DataSourceRow) => string | undefined) | undefined;
     hidden?: boolean | undefined;
     maxWidth?: number | undefined;
     minWidth?: number | undefined;
@@ -61,5 +62,7 @@ export type FilterEvents = {
 };
 export declare class FilterAggregator extends EventEmitter<FilterEvents> {
     #private;
-    addFilter(column: string, value: string): void;
+    addFilter(column: ColumnDescriptor, value: string | number): void;
+    removeFilter(column: ColumnDescriptor): boolean;
+    get filter(): VuuFilter;
 }

package/types/form-utils.d.ts

@@ -1,4 +1,4 @@
-import { VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
+import { VuuColumnDataType, VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
 import { KeyboardEvent, SyntheticEvent } from "react";
 /**
  * Use with the following convention:
@@ -8,3 +8,14 @@ import { KeyboardEvent, SyntheticEvent } from "react";
 export declare const getFieldName: (target: EventTarget | HTMLElement) => string;
 export type InputSource = "typeahead-suggestion" | "text-input";
 export type CommitHandler<E extends HTMLElement = HTMLInputElement, T extends VuuRowDataItemType | undefined = string> = (evt: SyntheticEvent<E> | KeyboardEvent<E>, value: T, source?: InputSource) => void;
+/**
+ * Convert a string value to the type appropriate for the associated
+ * column or form field. Can be used when processing a string value
+ * from an input used for user editing.
+ *
+ * @param value
+ * @param type
+ * @param throwIfUndefined
+ */
+export declare function getTypedValue(value: string, type: VuuColumnDataType, throwIfUndefined?: false): VuuRowDataItemType | undefined;
+export declare function getTypedValue(value: string, type: VuuColumnDataType, throwIfUndefined: true): VuuRowDataItemType;

package/types/index.d.ts

@@ -49,6 +49,8 @@ export * from "./sort-utils";
 export * from "./table-schema-utils";
 export * from "./text-utils";
 export * from "./typeahead-utils";
+export * from "./tree-types";
+export * from "./tree-utils";
 export * from "./ThemeProvider";
 export * from "./ts-utils";
 export * from "./url-utils";

package/types/row-utils.d.ts

@@ -20,5 +20,4 @@ export declare const actualRowPositioning: (rowHeight: number) => RowPositioning
  * @returns
  */
 export declare const virtualRowPositioning: (rowHeight: number, virtualisedExtent: number, pctScrollTop: MutableRefObject<number>) => RowPositioning;
-export declare const getRowElementAtIndex: (container: HTMLDivElement | EventTarget, rowIndex: number) => HTMLElement | null;
 export declare const asDataSourceRowObject: (row: DataSourceRow, columnMap: ColumnMap) => DataSourceRowObject;

package/types/tree-types.d.ts

@@ -0,0 +1,17 @@
+export interface TreeSourceNode {
+    id: string;
+    icon?: string;
+    header?: boolean;
+    label: string;
+    childNodes?: TreeSourceNode[];
+}
+export interface NormalisedTreeSourceNode extends TreeSourceNode {
+    childNodes?: NormalisedTreeSourceNode[];
+    count: number;
+    expanded?: boolean;
+    index: number;
+    level: number;
+}
+export interface NonLeafNode extends NormalisedTreeSourceNode {
+    childNodes: NormalisedTreeSourceNode[];
+}

package/types/tree-utils.d.ts

@@ -0,0 +1,5 @@
+import { TreeSourceNode } from "./tree-types";
+import { ColumnDescriptor } from "@vuu-ui/vuu-table-types";
+import { DataSourceRow } from "@vuu-ui/vuu-data-types";
+import { IconProvider } from "@vuu-ui/vuu-data-local/src/tree-data-source/IconProvider";
+export declare const treeToDataSourceRows: (treeSourceNodes: TreeSourceNode[], iconProvider?: IconProvider) => [ColumnDescriptor[], DataSourceRow[]];