@vuu-ui/vuu-utils 2.1.0-alpha.8 → 2.1.0

package/esm/packages/vuu-utils/src/data-editing/DataEditingProvider.js

@@ -8,15 +8,18 @@ const DataEditingProvider = ({
 }) => {
   return /* @__PURE__ */ jsx(DataEditingContext.Provider, { value: editTracker, children });
 };
-const useEditTracker = () => {
+function useEditTracker(throwIfUnavailable = false) {
   const editTracker = useContext(DataEditingContext);
   if (editTracker === void 0) {
-    console.warn(
-      "[useEditTracker] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider"
-    );
+    if (throwIfUnavailable) {
+      throw Error(
+        "[useEditTracker] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider"
+      );
+    }
+  } else {
+    return editTracker;
   }
-  return editTracker;
-};
+}
 
 export { DataEditingProvider, useEditTracker };
 //# sourceMappingURL=DataEditingProvider.js.map

package/esm/packages/vuu-utils/src/data-editing/DataEditingProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataEditingProvider.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/DataEditingProvider.tsx"],"sourcesContent":["import { createContext, ReactNode, useContext } from \"react\";\nimport { EditTracker } from \"./EditTracker\";\n\nconst DataEditingContext = createContext<EditTracker | undefined>(undefined);\n\nexport const DataEditingProvider = ({\n  children,\n  editTracker,\n}: {\n  children: ReactNode;\n  editTracker: EditTracker;\n}) => {\n  return (\n    <DataEditingContext.Provider value={editTracker}>\n      {children}\n    </DataEditingContext.Provider>\n  );\n};\n\nexport const useEditTracker = () => {\n  const editTracker = useContext(DataEditingContext);\n  if (editTracker === undefined) {\n    console.warn(\n      \"[useEditTracker] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider\",\n    );\n  }\n  return editTracker;\n};\n"],"names":[],"mappings":";;;AAGA,MAAM,kBAAA,GAAqB,cAAuC,KAAS,CAAA,CAAA;AAEpE,MAAM,sBAAsB,CAAC;AAAA,EAClC,QAAA;AAAA,EACA;AACF,CAGM,KAAA;AACJ,EAAA,2BACG,kBAAmB,CAAA,QAAA,EAAnB,EAA4B,KAAA,EAAO,aACjC,QACH,EAAA,CAAA;AAEJ;AAEO,MAAM,iBAAiB,MAAM;AAClC,EAAM,MAAA,WAAA,GAAc,WAAW,kBAAkB,CAAA;AACjD,EAAA,IAAI,gBAAgB,KAAW,CAAA,EAAA;AAC7B,IAAQ,OAAA,CAAA,IAAA;AAAA,MACN;AAAA,KACF;AAAA;AAEF,EAAO,OAAA,WAAA;AACT;;;;"}
+{"version":3,"file":"DataEditingProvider.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/DataEditingProvider.tsx"],"sourcesContent":["import { createContext, ReactNode, useContext } from \"react\";\nimport { EditTracker } from \"./EditTracker\";\n\nconst DataEditingContext = createContext<EditTracker | undefined>(undefined);\n\nexport const DataEditingProvider = ({\n  children,\n  editTracker,\n}: {\n  children: ReactNode;\n  editTracker: EditTracker;\n}) => {\n  return (\n    <DataEditingContext.Provider value={editTracker}>\n      {children}\n    </DataEditingContext.Provider>\n  );\n};\n\nexport function useEditTracker(\n  throwIfUnavailable?: false,\n): EditTracker | undefined;\nexport function useEditTracker(throwIfUnavailable: true): EditTracker;\nexport function useEditTracker(throwIfUnavailable = false) {\n  const editTracker = useContext(DataEditingContext);\n  if (editTracker === undefined) {\n    if (throwIfUnavailable) {\n      throw Error(\n        \"[useEditTracker] no DataEditingContext in scope. You need to enclose editable component(s) with DataEditingProvider\",\n      );\n    }\n  } else {\n    return editTracker;\n  }\n}\n"],"names":[],"mappings":";;;AAGA,MAAM,kBAAA,GAAqB,cAAuC,KAAS,CAAA,CAAA;AAEpE,MAAM,sBAAsB,CAAC;AAAA,EAClC,QAAA;AAAA,EACA;AACF,CAGM,KAAA;AACJ,EAAA,2BACG,kBAAmB,CAAA,QAAA,EAAnB,EAA4B,KAAA,EAAO,aACjC,QACH,EAAA,CAAA;AAEJ;AAMgB,SAAA,cAAA,CAAe,qBAAqB,KAAO,EAAA;AACzD,EAAM,MAAA,WAAA,GAAc,WAAW,kBAAkB,CAAA;AACjD,EAAA,IAAI,gBAAgB,KAAW,CAAA,EAAA;AAC7B,IAAA,IAAI,kBAAoB,EAAA;AACtB,MAAM,MAAA,KAAA;AAAA,QACJ;AAAA,OACF;AAAA;AACF,GACK,MAAA;AACL,IAAO,OAAA,WAAA;AAAA;AAEX;;;;"}

package/esm/packages/vuu-utils/src/data-editing/EditButtons.js

@@ -1,6 +1,6 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { Button } from '@salt-ds/core';
 import { useState, useMemo } from 'react';
-import { Button } from '../../../../node_modules/@salt-ds/core/dist-es/button/Button.js';
 
 const EditButtons = ({
   editTracker,

package/esm/packages/vuu-utils/src/data-editing/EditTracker.js

@@ -141,7 +141,10 @@ class EditTracker extends EventEmitter {
         return rpcResponse;
       }
     } else {
-      throw Error(`[EditTracker] commit, key ${key} not found `);
+      return {
+        errorMessage: "CHANGE_REVERTED",
+        type: "ERROR_RESULT"
+      };
     }
   }
 }

package/esm/packages/vuu-utils/src/data-editing/EditTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"EditTracker.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/EditTracker.tsx"],"sourcesContent":["import { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport type { VuuRowDataItemType, VuuTable } from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { isRpcSuccess } from \"../protocol-message-utils\";\n\nexport type EditState = \"clean\" | \"dirty\";\n\ntype CellEdit = {\n  originalValue: VuuRowDataItemType;\n  editedValue: VuuRowDataItemType;\n};\n\ntype RowEditDetails = {\n  /**\n   * Column name => cell edit details\n   */\n  cellEdits: Map<string, CellEdit>;\n};\n\ntype EditTrackerEvents = {\n  editState: (editState: EditState) => void;\n};\n\nexport class EditTracker extends EventEmitter<EditTrackerEvents> {\n  #active = false;\n  /**\n   *  Row key => row edits\n   */\n  #rowEdits = new Map<string, RowEditDetails>();\n  #editCount = 0;\n  #dataSource?: DataSource;\n  #inEditMode = false;\n\n  get active() {\n    return this.#active;\n  }\n  set active(isActive: boolean) {\n    this.#active = isActive;\n  }\n  get editCount() {\n    return this.#editCount;\n  }\n\n  set editCount(val: number) {\n    if (val !== this.#editCount) {\n      const oldCount = this.#editCount;\n      this.#editCount = val;\n      if (val === 0) {\n        this.emit(\"editState\", \"clean\");\n      } else if (oldCount === 0) {\n        this.emit(\"editState\", \"dirty\");\n      }\n    }\n  }\n\n  set dataSource(ds: DataSource) {\n    this.#dataSource = ds;\n  }\n\n  clear() {\n    this.#rowEdits.clear();\n    this.#editCount = 0;\n  }\n\n  async enterEditMode() {\n    this.#inEditMode = true;\n\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"ENTER_EDIT_MODE\",\n      params: {},\n    });\n\n    if (isRpcSuccess(rpcResponse)) {\n      const { table: sessionTable } = rpcResponse.data as { table: VuuTable };\n      return sessionTable;\n    } else {\n      console.log(\"fail\");\n    }\n  }\n\n  get inEditMode() {\n    return this.#inEditMode;\n  }\n\n  get editState(): EditState {\n    return this.editCount === 0 ? \"clean\" : \"dirty\";\n  }\n\n  async cancelChanges() {\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"EXIT_EDIT_MODE\",\n      params: {},\n    });\n    this.clear();\n    return rpcResponse;\n  }\n\n  async saveChanges() {\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"EXIT_EDIT_MODE\",\n      params: { save: true },\n    });\n    this.clear();\n    return rpcResponse;\n  }\n\n  // TODO how do we deal with the '_edited' pattern\n  edit(\n    key: string,\n    columnName: string,\n    originalValue: VuuRowDataItemType,\n    newValue: VuuRowDataItemType,\n  ) {\n    const rowEditDetails = this.#rowEdits.get(key);\n    if (rowEditDetails) {\n      const { cellEdits } = rowEditDetails;\n      const cellEdit = cellEdits.get(columnName);\n      if (cellEdit) {\n        if (newValue === cellEdit.originalValue) {\n          if (cellEdits.size === 1) {\n            this.#rowEdits.delete(key);\n          } else {\n            // re-editing a cell had removed the edit\n            cellEdits.delete(columnName);\n          }\n          this.editCount = this.#editCount - 1;\n        } else {\n          cellEdit.editedValue = newValue;\n        }\n      } else {\n        // row has already been edited, but this column has not\n        cellEdits.set(columnName, {\n          originalValue,\n          editedValue: newValue,\n        });\n        this.editCount = this.#editCount + 1;\n      }\n    } else {\n      this.#rowEdits.set(key, {\n        cellEdits: new Map([\n          [columnName, { originalValue, editedValue: newValue }],\n        ]),\n      });\n      this.editCount = this.#editCount + 1;\n    }\n  }\n\n  //TODO alow a shortcut commit that allows a value, bypassing need\n  // for edit. Thids caters for boolean values, dropdown list etc\n  // that have no intermediate edit phase\n  async commit(key: string, columnName: string) {\n    const rowEditDetails = this.#rowEdits.get(key);\n    if (rowEditDetails) {\n      const { cellEdits } = rowEditDetails;\n      const cellEditValues = cellEdits.get(columnName);\n      if (cellEditValues) {\n        const { editedValue } = cellEditValues;\n        const rpcResponse = await this.#dataSource?.rpcRequest?.({\n          type: \"RPC_REQUEST\",\n          rpcName: \"editCell\",\n          params: {\n            column: columnName,\n            data: editedValue,\n            key,\n          },\n        });\n\n        return rpcResponse;\n      }\n    } else {\n      throw Error(`[EditTracker] commit, key ${key} not found `);\n    }\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"EditTracker.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/EditTracker.tsx"],"sourcesContent":["import { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport type {\n  RpcResultError,\n  VuuRowDataItemType,\n  VuuTable,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { isRpcSuccess } from \"../protocol-message-utils\";\n\nexport type EditState = \"clean\" | \"dirty\";\n\ntype CellEdit = {\n  originalValue: VuuRowDataItemType;\n  editedValue: VuuRowDataItemType;\n};\n\ntype RowEditDetails = {\n  /**\n   * Column name => cell edit details\n   */\n  cellEdits: Map<string, CellEdit>;\n};\n\ntype EditTrackerEvents = {\n  editState: (editState: EditState) => void;\n};\n\nexport class EditTracker extends EventEmitter<EditTrackerEvents> {\n  #active = false;\n  /**\n   *  Row key => row edits\n   */\n  #rowEdits = new Map<string, RowEditDetails>();\n  #editCount = 0;\n  #dataSource?: DataSource;\n  #inEditMode = false;\n\n  get active() {\n    return this.#active;\n  }\n  set active(isActive: boolean) {\n    this.#active = isActive;\n  }\n  get editCount() {\n    return this.#editCount;\n  }\n\n  set editCount(val: number) {\n    if (val !== this.#editCount) {\n      const oldCount = this.#editCount;\n      this.#editCount = val;\n      if (val === 0) {\n        this.emit(\"editState\", \"clean\");\n      } else if (oldCount === 0) {\n        this.emit(\"editState\", \"dirty\");\n      }\n    }\n  }\n\n  set dataSource(ds: DataSource) {\n    this.#dataSource = ds;\n  }\n\n  clear() {\n    this.#rowEdits.clear();\n    this.#editCount = 0;\n  }\n\n  async enterEditMode() {\n    this.#inEditMode = true;\n\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"ENTER_EDIT_MODE\",\n      params: {},\n    });\n\n    if (isRpcSuccess(rpcResponse)) {\n      const { table: sessionTable } = rpcResponse.data as { table: VuuTable };\n      return sessionTable;\n    } else {\n      console.log(\"fail\");\n    }\n  }\n\n  get inEditMode() {\n    return this.#inEditMode;\n  }\n\n  get editState(): EditState {\n    return this.editCount === 0 ? \"clean\" : \"dirty\";\n  }\n\n  async cancelChanges() {\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"EXIT_EDIT_MODE\",\n      params: {},\n    });\n    this.clear();\n    return rpcResponse;\n  }\n\n  async saveChanges() {\n    const rpcResponse = await this.#dataSource?.rpcRequest?.({\n      type: \"RPC_REQUEST\",\n      rpcName: \"EXIT_EDIT_MODE\",\n      params: { save: true },\n    });\n    this.clear();\n    return rpcResponse;\n  }\n\n  // TODO how do we deal with the '_edited' pattern\n  edit(\n    key: string,\n    columnName: string,\n    originalValue: VuuRowDataItemType,\n    newValue: VuuRowDataItemType,\n  ) {\n    const rowEditDetails = this.#rowEdits.get(key);\n    if (rowEditDetails) {\n      const { cellEdits } = rowEditDetails;\n      const cellEdit = cellEdits.get(columnName);\n      if (cellEdit) {\n        if (newValue === cellEdit.originalValue) {\n          if (cellEdits.size === 1) {\n            this.#rowEdits.delete(key);\n          } else {\n            // re-editing a cell had removed the edit\n            cellEdits.delete(columnName);\n          }\n          this.editCount = this.#editCount - 1;\n        } else {\n          cellEdit.editedValue = newValue;\n        }\n      } else {\n        // row has already been edited, but this column has not\n        cellEdits.set(columnName, {\n          originalValue,\n          editedValue: newValue,\n        });\n        this.editCount = this.#editCount + 1;\n      }\n    } else {\n      this.#rowEdits.set(key, {\n        cellEdits: new Map([\n          [columnName, { originalValue, editedValue: newValue }],\n        ]),\n      });\n      this.editCount = this.#editCount + 1;\n    }\n  }\n\n  //TODO alow a shortcut commit that allows a value, bypassing need\n  // for edit. Thids caters for boolean values, dropdown list etc\n  // that have no intermediate edit phase\n  async commit(key: string, columnName: string) {\n    const rowEditDetails = this.#rowEdits.get(key);\n    if (rowEditDetails) {\n      const { cellEdits } = rowEditDetails;\n      const cellEditValues = cellEdits.get(columnName);\n      if (cellEditValues) {\n        const { editedValue } = cellEditValues;\n        const rpcResponse = await this.#dataSource?.rpcRequest?.({\n          type: \"RPC_REQUEST\",\n          rpcName: \"editCell\",\n          params: {\n            column: columnName,\n            data: editedValue,\n            key,\n          },\n        });\n\n        return rpcResponse;\n      }\n    } else {\n      return {\n        errorMessage: \"CHANGE_REVERTED\",\n        type: \"ERROR_RESULT\",\n      } as RpcResultError;\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

package/esm/packages/vuu-utils/src/data-editing/useEditableTable.js

@@ -1,10 +1,12 @@
-import { useState, useMemo, useCallback } from 'react';
+import { useState, useCallback, useMemo } from 'react';
 import { EditTracker } from './EditTracker.js';
 import { useData } from '../context-definitions/DataProvider.js';
 import { isRpcSuccess } from '../protocol-message-utils.js';
+import { useLayoutEffectSkipFirst } from '../useLayoutEffectSkipFirst.js';
 
 const useEditableTable = ({
   columns,
+  dataSource: dataSourceProp,
   isEditMode,
   onCancel,
   onSave,
@@ -12,9 +14,18 @@ const useEditableTable = ({
 }) => {
   const { VuuDataSource } = useData();
   const [sessionDataSource, setSessionDataSource] = useState(void 0);
+  const clearSessionDataSource = useCallback(() => {
+    setSessionDataSource((dataSource2) => {
+      dataSource2?.unsubscribe();
+      return void 0;
+    });
+  }, []);
+  useLayoutEffectSkipFirst(() => {
+    console.warn(`[useEditableTable] columns and or table changed`);
+  }, [columns, table]);
   const dataSource = useMemo(() => {
-    return new VuuDataSource({ columns, table });
-  }, [VuuDataSource, columns, table]);
+    return dataSourceProp ?? new VuuDataSource({ columns, table });
+  }, [VuuDataSource, columns, dataSourceProp, table]);
   const editTracker = useMemo(() => new EditTracker(), []);
   useMemo(() => {
     if (dataSource) {
@@ -24,17 +35,17 @@ const useEditableTable = ({
   const handleCancel = useCallback(() => {
     editTracker.cancelChanges();
     onCancel();
-    setSessionDataSource(void 0);
+    clearSessionDataSource();
     dataSource.resume?.();
-  }, [dataSource, editTracker, onCancel]);
+  }, [clearSessionDataSource, dataSource, editTracker, onCancel]);
   const handleSave = useCallback(async () => {
+    dataSource.resume?.();
     const response = await editTracker.saveChanges();
     if (isRpcSuccess(response)) {
       onSave();
-      setSessionDataSource(void 0);
-      dataSource.resume?.();
+      clearSessionDataSource();
     }
-  }, [dataSource, editTracker, onSave]);
+  }, [clearSessionDataSource, dataSource, editTracker, onSave]);
   useMemo(async () => {
     if (isEditMode) {
       const sessionTable = await editTracker.enterEditMode();
@@ -51,6 +62,7 @@ const useEditableTable = ({
     }
   }, [VuuDataSource, dataSource, editTracker, isEditMode]);
   return {
+    // DO we need to reset the dataSource or could useDataSOurce detect the sessiondataSOurce from the editSession ?
     dataSource: sessionDataSource ?? dataSource,
     editTracker,
     onCancel: handleCancel,

package/esm/packages/vuu-utils/src/data-editing/useEditableTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEditableTable.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/useEditableTable.ts"],"sourcesContent":["import { VuuTable } from \"@vuu-ui/vuu-protocol-types\";\nimport { useCallback, useMemo, useState } from \"react\";\nimport { EditTracker } from \"./EditTracker\";\nimport { useData } from \"../context-definitions/DataProvider\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport { isRpcSuccess } from \"../protocol-message-utils\";\n\nexport type EditMode = \"edit\" | \"view\";\n\nexport interface EditableTableHookProps {\n  /**\n   * columns to be included in subscription. If not provided,\n   * default will be '*'\n   */\n  columns?: string[];\n  isEditMode: boolean;\n  onCancel: () => void;\n  onSave: () => void;\n  table: VuuTable;\n}\n\nexport const useEditableTable = ({\n  columns,\n  isEditMode,\n  onCancel,\n  onSave,\n  table,\n}: EditableTableHookProps) => {\n  const { VuuDataSource } = useData();\n  const [sessionDataSource, setSessionDataSource] = useState<\n    DataSource | undefined\n  >(undefined);\n\n  const dataSource = useMemo(() => {\n    return new VuuDataSource({ columns, table });\n  }, [VuuDataSource, columns, table]);\n\n  const editTracker = useMemo(() => new EditTracker(), []);\n\n  useMemo(() => {\n    if (dataSource) {\n      editTracker.dataSource = dataSource;\n    }\n  }, [dataSource, editTracker]);\n\n  const handleCancel = useCallback(() => {\n    // editTracker.dataSource = dataSource;\n    editTracker.cancelChanges();\n    onCancel();\n    setSessionDataSource(undefined);\n    dataSource.resume?.();\n  }, [dataSource, editTracker, onCancel]);\n\n  const handleSave = useCallback(async () => {\n    // editTracker.dataSource = dataSource;\n    const response = await editTracker.saveChanges();\n    if (isRpcSuccess(response)) {\n      onSave();\n      setSessionDataSource(undefined);\n      dataSource.resume?.();\n    }\n  }, [dataSource, editTracker, onSave]);\n\n  useMemo(async () => {\n    if (isEditMode) {\n      const sessionTable = await editTracker.enterEditMode();\n      if (sessionTable && dataSource.tableSchema) {\n        dataSource.suspend?.(false);\n        const sessionDataSource = new VuuDataSource({\n          columns: dataSource.columns,\n          table: sessionTable,\n          viewport: sessionTable.table,\n        });\n        setSessionDataSource(sessionDataSource);\n        editTracker.dataSource = sessionDataSource;\n      }\n    }\n  }, [VuuDataSource, dataSource, editTracker, isEditMode]);\n\n  return {\n    dataSource: sessionDataSource ?? dataSource,\n    editTracker,\n    onCancel: handleCancel,\n    onSave: handleSave,\n  };\n};\n"],"names":["sessionDataSource"],"mappings":";;;;;AAqBO,MAAM,mBAAmB,CAAC;AAAA,EAC/B,OAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA;AACF,CAA8B,KAAA;AAC5B,EAAM,MAAA,EAAE,aAAc,EAAA,GAAI,OAAQ,EAAA;AAClC,EAAA,MAAM,CAAC,iBAAA,EAAmB,oBAAoB,CAAA,GAAI,SAEhD,KAAS,CAAA,CAAA;AAEX,EAAM,MAAA,UAAA,GAAa,QAAQ,MAAM;AAC/B,IAAA,OAAO,IAAI,aAAA,CAAc,EAAE,OAAA,EAAS,OAAO,CAAA;AAAA,GAC1C,EAAA,CAAC,aAAe,EAAA,OAAA,EAAS,KAAK,CAAC,CAAA;AAElC,EAAA,MAAM,cAAc,OAAQ,CAAA,MAAM,IAAI,WAAY,EAAA,EAAG,EAAE,CAAA;AAEvD,EAAA,OAAA,CAAQ,MAAM;AACZ,IAAA,IAAI,UAAY,EAAA;AACd,MAAA,WAAA,CAAY,UAAa,GAAA,UAAA;AAAA;AAC3B,GACC,EAAA,CAAC,UAAY,EAAA,WAAW,CAAC,CAAA;AAE5B,EAAM,MAAA,YAAA,GAAe,YAAY,MAAM;AAErC,IAAA,WAAA,CAAY,aAAc,EAAA;AAC1B,IAAS,QAAA,EAAA;AACT,IAAA,oBAAA,CAAqB,KAAS,CAAA,CAAA;AAC9B,IAAA,UAAA,CAAW,MAAS,IAAA;AAAA,GACnB,EAAA,CAAC,UAAY,EAAA,WAAA,EAAa,QAAQ,CAAC,CAAA;AAEtC,EAAM,MAAA,UAAA,GAAa,YAAY,YAAY;AAEzC,IAAM,MAAA,QAAA,GAAW,MAAM,WAAA,CAAY,WAAY,EAAA;AAC/C,IAAI,IAAA,YAAA,CAAa,QAAQ,CAAG,EAAA;AAC1B,MAAO,MAAA,EAAA;AACP,MAAA,oBAAA,CAAqB,KAAS,CAAA,CAAA;AAC9B,MAAA,UAAA,CAAW,MAAS,IAAA;AAAA;AACtB,GACC,EAAA,CAAC,UAAY,EAAA,WAAA,EAAa,MAAM,CAAC,CAAA;AAEpC,EAAA,OAAA,CAAQ,YAAY;AAClB,IAAA,IAAI,UAAY,EAAA;AACd,MAAM,MAAA,YAAA,GAAe,MAAM,WAAA,CAAY,aAAc,EAAA;AACrD,MAAI,IAAA,YAAA,IAAgB,WAAW,WAAa,EAAA;AAC1C,QAAA,UAAA,CAAW,UAAU,KAAK,CAAA;AAC1B,QAAMA,MAAAA,kBAAAA,GAAoB,IAAI,aAAc,CAAA;AAAA,UAC1C,SAAS,UAAW,CAAA,OAAA;AAAA,UACpB,KAAO,EAAA,YAAA;AAAA,UACP,UAAU,YAAa,CAAA;AAAA,SACxB,CAAA;AACD,QAAA,oBAAA,CAAqBA,kBAAiB,CAAA;AACtC,QAAA,WAAA,CAAY,UAAaA,GAAAA,kBAAAA;AAAA;AAC3B;AACF,KACC,CAAC,aAAA,EAAe,UAAY,EAAA,WAAA,EAAa,UAAU,CAAC,CAAA;AAEvD,EAAO,OAAA;AAAA,IACL,YAAY,iBAAqB,IAAA,UAAA;AAAA,IACjC,WAAA;AAAA,IACA,QAAU,EAAA,YAAA;AAAA,IACV,MAAQ,EAAA;AAAA,GACV;AACF;;;;"}
+{"version":3,"file":"useEditableTable.js","sources":["../../../../../../../packages/vuu-utils/src/data-editing/useEditableTable.ts"],"sourcesContent":["import { VuuTable } from \"@vuu-ui/vuu-protocol-types\";\nimport { useCallback, useMemo, useState } from \"react\";\nimport { EditTracker } from \"./EditTracker\";\nimport { useData } from \"../context-definitions/DataProvider\";\nimport { DataSource } from \"@vuu-ui/vuu-data-types\";\nimport { isRpcSuccess } from \"../protocol-message-utils\";\nimport { useLayoutEffectSkipFirst } from \"../useLayoutEffectSkipFirst\";\n\nexport type EditMode = \"edit\" | \"view\";\n\nexport interface EditableTableHookProps {\n  /**\n   * columns to be included in subscription. If not provided,\n   * default will be '*'. Ignored if dataSource prop present.\n   */\n  columns?: string[];\n  dataSource?: DataSource;\n  isEditMode: boolean;\n  onCancel: () => void;\n  onSave: () => void;\n  /**\n   * If dataSource not provided, new DataSource\n   * will be created using table and columns\n   */\n  table: VuuTable;\n}\n\nexport const useEditableTable = ({\n  columns,\n  dataSource: dataSourceProp,\n  isEditMode,\n  onCancel,\n  onSave,\n  table,\n}: EditableTableHookProps) => {\n  const { VuuDataSource } = useData();\n  const [sessionDataSource, setSessionDataSource] = useState<\n    DataSource | undefined\n  >(undefined);\n\n  const clearSessionDataSource = useCallback(() => {\n    setSessionDataSource((dataSource) => {\n      dataSource?.unsubscribe();\n      return undefined;\n    });\n  }, []);\n\n  useLayoutEffectSkipFirst(() => {\n    console.warn(`[useEditableTable] columns and or table changed`);\n  }, [columns, table]);\n\n  const dataSource = useMemo(() => {\n    return dataSourceProp ?? new VuuDataSource({ columns, table });\n  }, [VuuDataSource, columns, dataSourceProp, table]);\n\n  const editTracker = useMemo(() => new EditTracker(), []);\n\n  useMemo(() => {\n    if (dataSource) {\n      editTracker.dataSource = dataSource;\n    }\n  }, [dataSource, editTracker]);\n\n  const handleCancel = useCallback(() => {\n    // editTracker.dataSource = dataSource;\n    editTracker.cancelChanges();\n    onCancel();\n    clearSessionDataSource();\n    dataSource.resume?.();\n  }, [clearSessionDataSource, dataSource, editTracker, onCancel]);\n\n  const handleSave = useCallback(async () => {\n    dataSource.resume?.();\n    const response = await editTracker.saveChanges();\n    if (isRpcSuccess(response)) {\n      onSave();\n      clearSessionDataSource();\n    }\n  }, [clearSessionDataSource, dataSource, editTracker, onSave]);\n\n  useMemo(async () => {\n    if (isEditMode) {\n      const sessionTable = await editTracker.enterEditMode();\n      if (sessionTable && dataSource.tableSchema) {\n        dataSource.suspend?.(false);\n        const sessionDataSource = new VuuDataSource({\n          columns: dataSource.columns,\n          table: sessionTable,\n          viewport: sessionTable.table,\n        });\n        setSessionDataSource(sessionDataSource);\n        editTracker.dataSource = sessionDataSource;\n      }\n    }\n  }, [VuuDataSource, dataSource, editTracker, isEditMode]);\n\n  return {\n    // DO we need to reset the dataSource or could useDataSOurce detect the sessiondataSOurce from the editSession ?\n    dataSource: sessionDataSource ?? dataSource,\n    editTracker,\n    onCancel: handleCancel,\n    onSave: handleSave,\n  };\n};\n"],"names":["dataSource","sessionDataSource"],"mappings":";;;;;;AA2BO,MAAM,mBAAmB,CAAC;AAAA,EAC/B,OAAA;AAAA,EACA,UAAY,EAAA,cAAA;AAAA,EACZ,UAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA;AACF,CAA8B,KAAA;AAC5B,EAAM,MAAA,EAAE,aAAc,EAAA,GAAI,OAAQ,EAAA;AAClC,EAAA,MAAM,CAAC,iBAAA,EAAmB,oBAAoB,CAAA,GAAI,SAEhD,KAAS,CAAA,CAAA;AAEX,EAAM,MAAA,sBAAA,GAAyB,YAAY,MAAM;AAC/C,IAAA,oBAAA,CAAqB,CAACA,WAAe,KAAA;AACnC,MAAAA,aAAY,WAAY,EAAA;AACxB,MAAO,OAAA,KAAA,CAAA;AAAA,KACR,CAAA;AAAA,GACH,EAAG,EAAE,CAAA;AAEL,EAAA,wBAAA,CAAyB,MAAM;AAC7B,IAAA,OAAA,CAAQ,KAAK,CAAiD,+CAAA,CAAA,CAAA;AAAA,GAC7D,EAAA,CAAC,OAAS,EAAA,KAAK,CAAC,CAAA;AAEnB,EAAM,MAAA,UAAA,GAAa,QAAQ,MAAM;AAC/B,IAAA,OAAO,kBAAkB,IAAI,aAAA,CAAc,EAAE,OAAA,EAAS,OAAO,CAAA;AAAA,KAC5D,CAAC,aAAA,EAAe,OAAS,EAAA,cAAA,EAAgB,KAAK,CAAC,CAAA;AAElD,EAAA,MAAM,cAAc,OAAQ,CAAA,MAAM,IAAI,WAAY,EAAA,EAAG,EAAE,CAAA;AAEvD,EAAA,OAAA,CAAQ,MAAM;AACZ,IAAA,IAAI,UAAY,EAAA;AACd,MAAA,WAAA,CAAY,UAAa,GAAA,UAAA;AAAA;AAC3B,GACC,EAAA,CAAC,UAAY,EAAA,WAAW,CAAC,CAAA;AAE5B,EAAM,MAAA,YAAA,GAAe,YAAY,MAAM;AAErC,IAAA,WAAA,CAAY,aAAc,EAAA;AAC1B,IAAS,QAAA,EAAA;AACT,IAAuB,sBAAA,EAAA;AACvB,IAAA,UAAA,CAAW,MAAS,IAAA;AAAA,KACnB,CAAC,sBAAA,EAAwB,UAAY,EAAA,WAAA,EAAa,QAAQ,CAAC,CAAA;AAE9D,EAAM,MAAA,UAAA,GAAa,YAAY,YAAY;AACzC,IAAA,UAAA,CAAW,MAAS,IAAA;AACpB,IAAM,MAAA,QAAA,GAAW,MAAM,WAAA,CAAY,WAAY,EAAA;AAC/C,IAAI,IAAA,YAAA,CAAa,QAAQ,CAAG,EAAA;AAC1B,MAAO,MAAA,EAAA;AACP,MAAuB,sBAAA,EAAA;AAAA;AACzB,KACC,CAAC,sBAAA,EAAwB,UAAY,EAAA,WAAA,EAAa,MAAM,CAAC,CAAA;AAE5D,EAAA,OAAA,CAAQ,YAAY;AAClB,IAAA,IAAI,UAAY,EAAA;AACd,MAAM,MAAA,YAAA,GAAe,MAAM,WAAA,CAAY,aAAc,EAAA;AACrD,MAAI,IAAA,YAAA,IAAgB,WAAW,WAAa,EAAA;AAC1C,QAAA,UAAA,CAAW,UAAU,KAAK,CAAA;AAC1B,QAAMC,MAAAA,kBAAAA,GAAoB,IAAI,aAAc,CAAA;AAAA,UAC1C,SAAS,UAAW,CAAA,OAAA;AAAA,UACpB,KAAO,EAAA,YAAA;AAAA,UACP,UAAU,YAAa,CAAA;AAAA,SACxB,CAAA;AACD,QAAA,oBAAA,CAAqBA,kBAAiB,CAAA;AACtC,QAAA,WAAA,CAAY,UAAaA,GAAAA,kBAAAA;AAAA;AAC3B;AACF,KACC,CAAC,aAAA,EAAe,UAAY,EAAA,WAAA,EAAa,UAAU,CAAC,CAAA;AAEvD,EAAO,OAAA;AAAA;AAAA,IAEL,YAAY,iBAAqB,IAAA,UAAA;AAAA,IACjC,WAAA;AAAA,IACA,QAAU,EAAA,YAAA;AAAA,IACV,MAAQ,EAAA;AAAA,GACV;AACF;;;;"}

package/esm/packages/vuu-utils/src/data-utils.js

@@ -63,6 +63,20 @@ function asInteger(index, defaultValue) {
     throw Error(`parseIndex invalid value ${index}`);
   }
 }
+const dataDescriptorTypeToVuuRowDataItemType = ({
+  serverDataType = "string"
+}) => {
+  switch (serverDataType) {
+    case "double":
+    case "int":
+    case "long":
+      return "number";
+    case "boolean":
+      return "boolean";
+    default:
+      return "string";
+  }
+};
 
-export { DOWN1, DOWN2, UP1, UP2, asInteger, getMovingValueDirection, isValidNumber, numericTypeOfStringValue, shallowEquals, stringIsValidDecimal, stringIsValidInt, stringIsValidNumber };
+export { DOWN1, DOWN2, UP1, UP2, asInteger, dataDescriptorTypeToVuuRowDataItemType, getMovingValueDirection, isValidNumber, numericTypeOfStringValue, shallowEquals, stringIsValidDecimal, stringIsValidInt, stringIsValidNumber };
 //# sourceMappingURL=data-utils.js.map

package/esm/packages/vuu-utils/src/data-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-utils.js","sources":["../../../../../../packages/vuu-utils/src/data-utils.ts"],"sourcesContent":["export type valueChangeDirection = \"up1\" | \"up2\" | \"down1\" | \"down2\" | \"\";\n\nexport const UP1 = \"up1\";\nexport const UP2 = \"up2\";\nexport const DOWN1 = \"down1\";\nexport const DOWN2 = \"down2\";\n\nconst decimalPattern = /^-?[0-9]*\\.[0-9]+$/;\n\nexport const stringIsValidInt = (val: string) =>\n  parseInt(val, 10).toString() === val;\n\nexport const stringIsValidDecimal = (val: string) =>\n  stringIsValidInt(val) || decimalPattern.test(val);\n\nexport const stringIsValidNumber = (val: string) =>\n  stringIsValidInt(val) || stringIsValidDecimal(val);\n\nexport const numericTypeOfStringValue = (val: string) =>\n  stringIsValidInt(val) ? \"int\" : stringIsValidDecimal(val) ? \"double\" : \"NaN\";\n\nexport const isValidNumber = (n: unknown): n is number =>\n  typeof n === \"number\" && isFinite(n);\n\nconst EMPTY = {};\nexport const shallowEquals = (\n  o1: { [key: string]: unknown } = EMPTY,\n  o2: { [key: string]: unknown } = EMPTY,\n) => {\n  const props1 = Object.keys(o1);\n  const props2 = Object.keys(o2);\n  return (\n    props1.length === props2.length &&\n    props1.every((key) => o1[key] === o2[key])\n  );\n};\n\nexport function getMovingValueDirection(\n  newValue?: number,\n  direction?: valueChangeDirection,\n  prevValue?: number,\n  /** the number of decimal places to take into account when highlighting a change  */\n  decimalPlaces?: number,\n): valueChangeDirection {\n  if (newValue === undefined) {\n    return \"\";\n  }\n  if (\n    !isFinite(newValue) ||\n    prevValue === undefined ||\n    direction === undefined\n  ) {\n    return \"\";\n  } else {\n    let diff = newValue - prevValue;\n    if (diff) {\n      // make sure there is still a diff when reduced to number of decimals to be displayed\n      if (typeof decimalPlaces === \"number\") {\n        diff =\n          +newValue.toFixed(decimalPlaces) - +prevValue.toFixed(decimalPlaces);\n      }\n    }\n\n    if (diff) {\n      if (direction === \"\") {\n        if (diff < 0) {\n          return DOWN1;\n        } else {\n          return UP1;\n        }\n      } else if (diff > 0) {\n        if (direction === DOWN1 || direction === DOWN2 || direction === UP2) {\n          return UP1;\n        } else {\n          return UP2;\n        }\n      } else if (\n        direction === UP1 ||\n        direction === UP2 ||\n        direction === DOWN2\n      ) {\n        return DOWN1;\n      } else {\n        return DOWN2;\n      }\n    } else {\n      return \"\";\n    }\n  }\n}\n\nexport function asInteger(\n  index: number | string | undefined,\n  defaultValue?: number,\n) {\n  if (typeof index === \"number\") {\n    return index;\n  } else {\n    const numIdx = parseInt(index ?? \"\");\n    if (!isNaN(numIdx)) {\n      return numIdx;\n    } else if (typeof defaultValue === \"number\") {\n      return defaultValue;\n    }\n    throw Error(`parseIndex invalid value ${index}`);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-utils.js","sources":["../../../../../../packages/vuu-utils/src/data-utils.ts"],"sourcesContent":["import { DataValueDescriptor } from \"@vuu-ui/vuu-data-types\";\n\nexport type valueChangeDirection = \"up1\" | \"up2\" | \"down1\" | \"down2\" | \"\";\n\nexport const UP1 = \"up1\";\nexport const UP2 = \"up2\";\nexport const DOWN1 = \"down1\";\nexport const DOWN2 = \"down2\";\n\nconst decimalPattern = /^-?[0-9]*\\.[0-9]+$/;\n\nexport const stringIsValidInt = (val: string) =>\n  parseInt(val, 10).toString() === val;\n\nexport const stringIsValidDecimal = (val: string) =>\n  stringIsValidInt(val) || decimalPattern.test(val);\n\nexport const stringIsValidNumber = (val: string) =>\n  stringIsValidInt(val) || stringIsValidDecimal(val);\n\nexport const numericTypeOfStringValue = (val: string) =>\n  stringIsValidInt(val) ? \"int\" : stringIsValidDecimal(val) ? \"double\" : \"NaN\";\n\nexport const isValidNumber = (n: unknown): n is number =>\n  typeof n === \"number\" && isFinite(n);\n\nconst EMPTY = {};\nexport const shallowEquals = (\n  o1: { [key: string]: unknown } = EMPTY,\n  o2: { [key: string]: unknown } = EMPTY,\n) => {\n  const props1 = Object.keys(o1);\n  const props2 = Object.keys(o2);\n  return (\n    props1.length === props2.length &&\n    props1.every((key) => o1[key] === o2[key])\n  );\n};\n\nexport function getMovingValueDirection(\n  newValue?: number,\n  direction?: valueChangeDirection,\n  prevValue?: number,\n  /** the number of decimal places to take into account when highlighting a change  */\n  decimalPlaces?: number,\n): valueChangeDirection {\n  if (newValue === undefined) {\n    return \"\";\n  }\n  if (\n    !isFinite(newValue) ||\n    prevValue === undefined ||\n    direction === undefined\n  ) {\n    return \"\";\n  } else {\n    let diff = newValue - prevValue;\n    if (diff) {\n      // make sure there is still a diff when reduced to number of decimals to be displayed\n      if (typeof decimalPlaces === \"number\") {\n        diff =\n          +newValue.toFixed(decimalPlaces) - +prevValue.toFixed(decimalPlaces);\n      }\n    }\n\n    if (diff) {\n      if (direction === \"\") {\n        if (diff < 0) {\n          return DOWN1;\n        } else {\n          return UP1;\n        }\n      } else if (diff > 0) {\n        if (direction === DOWN1 || direction === DOWN2 || direction === UP2) {\n          return UP1;\n        } else {\n          return UP2;\n        }\n      } else if (\n        direction === UP1 ||\n        direction === UP2 ||\n        direction === DOWN2\n      ) {\n        return DOWN1;\n      } else {\n        return DOWN2;\n      }\n    } else {\n      return \"\";\n    }\n  }\n}\n\nexport function asInteger(\n  index: number | string | undefined,\n  defaultValue?: number,\n) {\n  if (typeof index === \"number\") {\n    return index;\n  } else {\n    const numIdx = parseInt(index ?? \"\");\n    if (!isNaN(numIdx)) {\n      return numIdx;\n    } else if (typeof defaultValue === \"number\") {\n      return defaultValue;\n    }\n    throw Error(`parseIndex invalid value ${index}`);\n  }\n}\n\nexport const dataDescriptorTypeToVuuRowDataItemType = ({\n  serverDataType = \"string\",\n}: DataValueDescriptor): \"string\" | \"number\" | \"boolean\" => {\n  switch (serverDataType) {\n    case \"double\":\n    case \"int\":\n    case \"long\":\n      return \"number\";\n    case \"boolean\":\n      return \"boolean\";\n    default:\n      return \"string\";\n  }\n};\n"],"names":[],"mappings":"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"}

package/esm/packages/vuu-utils/src/datasource/BaseDataSource.js

@@ -67,6 +67,7 @@ class BaseDataSource extends EventEmitter {
     filterSpec,
     viewport = this.viewport || (this.viewport = uuid())
   }, callback) {
+    console.log(`[BaseDataSource] subscribe to ${this.viewport}`);
     this._clientCallback = callback;
     this.viewport = viewport;
     if (aggregations || baseFilterSpec || columns || filterSpec || groupBy || sort) {

package/esm/packages/vuu-utils/src/datasource/BaseDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDataSource.js","sources":["../../../../../../../packages/vuu-utils/src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribeProps,\n  DataSourceSuspenseProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  stripVisualLink,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\nimport { Range } from \"../range-utils\";\nimport { filterAsQuery } from \"../filters\";\nimport { Filter } from \"@vuu-ui/vuu-filter-types\";\n\nexport type ConfigWithVisualLink = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport const defaultSuspenseProps: DataSourceSuspenseProps = {\n  escalateToDisable: true,\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: DataSourceSubscribeCallback | undefined;\n  protected _configWithVisualLink: ConfigWithVisualLink = vanillaConfig;\n  protected _impendingConfigWithVisualLink: ConfigWithVisualLink | undefined =\n    undefined;\n  protected _range = Range(0, 0);\n  protected _size = 0;\n  protected _title: string | undefined;\n  protected _defaultSuspenseProps: DataSourceSuspenseProps;\n\n  #freezeTimestamp: number | undefined = undefined;\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    suspenseProps = defaultSuspenseProps,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._configWithVisualLink = {\n      ...this._configWithVisualLink,\n      aggregations: aggregations || this._configWithVisualLink.aggregations,\n      baseFilterSpec:\n        baseFilterSpec || this._configWithVisualLink.baseFilterSpec,\n      columns: columns || this._configWithVisualLink.columns,\n      filterSpec: filterSpec || this._configWithVisualLink.filterSpec,\n      groupBy: groupBy || this._configWithVisualLink.groupBy,\n      sort: sort || this._configWithVisualLink.sort,\n    };\n    this._defaultSuspenseProps = suspenseProps;\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: DataSourceSubscribeProps,\n    callback: DataSourceSubscribeCallback,\n  ) {\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._configWithVisualLink = {\n        ...this._configWithVisualLink,\n        aggregations: aggregations || this._configWithVisualLink.aggregations,\n        baseFilterSpec:\n          baseFilterSpec || this._configWithVisualLink.baseFilterSpec,\n        columns: columns || this._configWithVisualLink.columns,\n        filterSpec: filterSpec || this._configWithVisualLink.filterSpec,\n        groupBy: groupBy || this._configWithVisualLink.groupBy,\n        sort: sort || this._configWithVisualLink.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n      this.emit(\"range\", range);\n    }\n  }\n\n  get aggregations() {\n    return this._configWithVisualLink.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._configWithVisualLink,\n      aggregations,\n    };\n    this.emit(\"config\", this._configWithVisualLink, this.range);\n  }\n\n  get baseFilter() {\n    return this._configWithVisualLink.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._configWithVisualLink,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._configWithVisualLink.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._configWithVisualLink,\n      columns,\n    };\n  }\n\n  get filter() {\n    return this._configWithVisualLink.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._configWithVisualLink,\n      filterSpec: filter,\n    };\n  }\n\n  setFilter(filter: Filter) {\n    const dataSourceFilter: DataSourceFilter = {\n      filter: filterAsQuery(filter),\n      filterStruct: filter,\n    };\n    this.filter = dataSourceFilter;\n  }\n\n  clearFilter() {\n    this.filter = { filter: \"\" };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfigWithVisualLink !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfigWithVisualLink) {\n      this._configWithVisualLink = this._impendingConfigWithVisualLink;\n      this._impendingConfigWithVisualLink = undefined;\n      this.emit(\"config\", this._configWithVisualLink, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return stripVisualLink(\n      this._impendingConfigWithVisualLink ?? this._configWithVisualLink,\n    );\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      requestAnimationFrame(() => {\n        this.emit(\n          \"config\",\n          this._configWithVisualLink,\n          this.range,\n          confirmed,\n          configChanges,\n        );\n      });\n    }\n  }\n\n  get impendingConfig() {\n    return this._impendingConfigWithVisualLink;\n  }\n  /**\n   * This can be set by subclass in cases where we want to await ACK of async request\n   * before we go ahead and apply change to config.\n   * It is set in place of 'config' itself and it is then the responsibility of the client\n   * to call 'confirmConfigChange' once confirmation of the change is received.\n   * Client can check 'isAwaitingConfirmationOfConfigChange' to see if a change is pending\n   * confirmation.\n   */\n  set impendingConfig(config: undefined | WithBaseFilter<WithFullConfig>) {\n    if (config) {\n      this.awaitingConfirmationOfConfigChanges = true;\n      const configChanges = this.applyConfig(config);\n      if (configChanges) {\n        this.emit(\"config\", this.config, this.range, false, configChanges);\n      }\n    } else {\n      throw Error(\n        `[BaseDataSource] ''unsetting impendingConfig is not currently supported`,\n      );\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: Range) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n      this.rangeRequest(range.withBuffer);\n      requestAnimationFrame(() => {\n        this.emit(\"range\", range);\n      });\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._configWithVisualLink.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._configWithVisualLink,\n      sort,\n    };\n    this.emit(\"config\", this._configWithVisualLink, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  private applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._configWithVisualLink,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfigWithVisualLink = {\n              ...this._configWithVisualLink,\n              ...config,\n            };\n          } else {\n            this._impendingConfigWithVisualLink = undefined;\n            this._configWithVisualLink = {\n              ...this._configWithVisualLink,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfigWithVisualLink = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfigWithVisualLink = undefined;\n            this._configWithVisualLink = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  freeze() {\n    if (!this.isFrozen) {\n      this.#freezeTimestamp = new Date().getTime();\n      this.emit(\"freeze\", true, this.#freezeTimestamp);\n    } else {\n      throw Error(\n        \"[BaseDataSource] cannot freeze, dataSource is already frozen\",\n      );\n    }\n  }\n  unfreeze() {\n    if (this.isFrozen) {\n      const freezeTimestamp = this.#freezeTimestamp as number;\n      this.#freezeTimestamp = undefined;\n      this.emit(\"freeze\", false, freezeTimestamp);\n    } else {\n      throw Error(\n        \"[BaseDataSource] cannot freeze, dataSource is already frozen\",\n      );\n    }\n  }\n  get freezeTimestamp() {\n    return this.#freezeTimestamp;\n  }\n\n  get isFrozen() {\n    return typeof this.#freezeTimestamp === \"number\";\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseDataSource.js","sources":["../../../../../../../packages/vuu-utils/src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribeProps,\n  DataSourceSuspenseProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  stripVisualLink,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\nimport { Range } from \"../range-utils\";\nimport { filterAsQuery } from \"../filters\";\nimport { Filter } from \"@vuu-ui/vuu-filter-types\";\n\nexport type ConfigWithVisualLink = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport const defaultSuspenseProps: DataSourceSuspenseProps = {\n  escalateToDisable: true,\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: DataSourceSubscribeCallback | undefined;\n  protected _configWithVisualLink: ConfigWithVisualLink = vanillaConfig;\n  protected _impendingConfigWithVisualLink: ConfigWithVisualLink | undefined =\n    undefined;\n  protected _range = Range(0, 0);\n  protected _size = 0;\n  protected _title: string | undefined;\n  protected _defaultSuspenseProps: DataSourceSuspenseProps;\n\n  #freezeTimestamp: number | undefined = undefined;\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    suspenseProps = defaultSuspenseProps,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._configWithVisualLink = {\n      ...this._configWithVisualLink,\n      aggregations: aggregations || this._configWithVisualLink.aggregations,\n      baseFilterSpec:\n        baseFilterSpec || this._configWithVisualLink.baseFilterSpec,\n      columns: columns || this._configWithVisualLink.columns,\n      filterSpec: filterSpec || this._configWithVisualLink.filterSpec,\n      groupBy: groupBy || this._configWithVisualLink.groupBy,\n      sort: sort || this._configWithVisualLink.sort,\n    };\n    this._defaultSuspenseProps = suspenseProps;\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: DataSourceSubscribeProps,\n    callback: DataSourceSubscribeCallback,\n  ) {\n    console.log(`[BaseDataSource] subscribe to ${this.viewport}`);\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._configWithVisualLink = {\n        ...this._configWithVisualLink,\n        aggregations: aggregations || this._configWithVisualLink.aggregations,\n        baseFilterSpec:\n          baseFilterSpec || this._configWithVisualLink.baseFilterSpec,\n        columns: columns || this._configWithVisualLink.columns,\n        filterSpec: filterSpec || this._configWithVisualLink.filterSpec,\n        groupBy: groupBy || this._configWithVisualLink.groupBy,\n        sort: sort || this._configWithVisualLink.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n      this.emit(\"range\", range);\n    }\n  }\n\n  get aggregations() {\n    return this._configWithVisualLink.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._configWithVisualLink,\n      aggregations,\n    };\n    this.emit(\"config\", this._configWithVisualLink, this.range);\n  }\n\n  get baseFilter() {\n    return this._configWithVisualLink.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._configWithVisualLink,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._configWithVisualLink.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._configWithVisualLink,\n      columns,\n    };\n  }\n\n  get filter() {\n    return this._configWithVisualLink.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._configWithVisualLink,\n      filterSpec: filter,\n    };\n  }\n\n  setFilter(filter: Filter) {\n    const dataSourceFilter: DataSourceFilter = {\n      filter: filterAsQuery(filter),\n      filterStruct: filter,\n    };\n    this.filter = dataSourceFilter;\n  }\n\n  clearFilter() {\n    this.filter = { filter: \"\" };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfigWithVisualLink !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfigWithVisualLink) {\n      this._configWithVisualLink = this._impendingConfigWithVisualLink;\n      this._impendingConfigWithVisualLink = undefined;\n      this.emit(\"config\", this._configWithVisualLink, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return stripVisualLink(\n      this._impendingConfigWithVisualLink ?? this._configWithVisualLink,\n    );\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      requestAnimationFrame(() => {\n        this.emit(\n          \"config\",\n          this._configWithVisualLink,\n          this.range,\n          confirmed,\n          configChanges,\n        );\n      });\n    }\n  }\n\n  get impendingConfig() {\n    return this._impendingConfigWithVisualLink;\n  }\n  /**\n   * This can be set by subclass in cases where we want to await ACK of async request\n   * before we go ahead and apply change to config.\n   * It is set in place of 'config' itself and it is then the responsibility of the client\n   * to call 'confirmConfigChange' once confirmation of the change is received.\n   * Client can check 'isAwaitingConfirmationOfConfigChange' to see if a change is pending\n   * confirmation.\n   */\n  set impendingConfig(config: undefined | WithBaseFilter<WithFullConfig>) {\n    if (config) {\n      this.awaitingConfirmationOfConfigChanges = true;\n      const configChanges = this.applyConfig(config);\n      if (configChanges) {\n        this.emit(\"config\", this.config, this.range, false, configChanges);\n      }\n    } else {\n      throw Error(\n        `[BaseDataSource] ''unsetting impendingConfig is not currently supported`,\n      );\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: Range) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n      this.rangeRequest(range.withBuffer);\n      requestAnimationFrame(() => {\n        this.emit(\"range\", range);\n      });\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._configWithVisualLink.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._configWithVisualLink,\n      sort,\n    };\n    this.emit(\"config\", this._configWithVisualLink, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  private applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._configWithVisualLink,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfigWithVisualLink = {\n              ...this._configWithVisualLink,\n              ...config,\n            };\n          } else {\n            this._impendingConfigWithVisualLink = undefined;\n            this._configWithVisualLink = {\n              ...this._configWithVisualLink,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfigWithVisualLink = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfigWithVisualLink = undefined;\n            this._configWithVisualLink = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  freeze() {\n    if (!this.isFrozen) {\n      this.#freezeTimestamp = new Date().getTime();\n      this.emit(\"freeze\", true, this.#freezeTimestamp);\n    } else {\n      throw Error(\n        \"[BaseDataSource] cannot freeze, dataSource is already frozen\",\n      );\n    }\n  }\n  unfreeze() {\n    if (this.isFrozen) {\n      const freezeTimestamp = this.#freezeTimestamp as number;\n      this.#freezeTimestamp = undefined;\n      this.emit(\"freeze\", false, freezeTimestamp);\n    } else {\n      throw Error(\n        \"[BaseDataSource] cannot freeze, dataSource is already frozen\",\n      );\n    }\n  }\n  get freezeTimestamp() {\n    return this.#freezeTimestamp;\n  }\n\n  get isFrozen() {\n    return typeof this.#freezeTimestamp === \"number\";\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":[],"mappings":"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"}

package/esm/packages/vuu-utils/src/feature-utils.js

@@ -1,6 +1,6 @@
 import { partition } from './array-utils.js';
 import { wordify } from './text-utils.js';
-import React__default from 'react';
+import React from 'react';
 import { getLayoutComponent } from './component-registry.js';
 
 const env = process.env.NODE_ENV;
@@ -13,7 +13,7 @@ function featureFromJson({ type }) {
       `layoutUtils unable to create feature component from JSON, unknown type ${type}`
     );
   }
-  return React__default.createElement(componentType);
+  return React.createElement(componentType);
 }
 const isCustomFeature = (feature) => feature.leftNavLocation === "vuu-features";
 const isWildcardSchema = (vuuTables) => vuuTables === "*";

package/esm/packages/vuu-utils/src/feature-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-utils.js","sources":["../../../../../../packages/vuu-utils/src/feature-utils.ts"],"sourcesContent":["import type { TableSchema } from \"@vuu-ui/vuu-data-types\";\nimport type { VuuTable } from \"@vuu-ui/vuu-protocol-types\";\nimport { ListOption } from \"@vuu-ui/vuu-table-types\";\nimport { partition } from \"./array-utils\";\nimport { wordify } from \"./text-utils\";\nimport React, { ReactElement } from \"react\";\nimport { getLayoutComponent } from \"./component-registry\";\n\nexport type PathMap = {\n  [key: string]: Pick<DynamicFeatureDescriptor, \"css\" | \"url\">;\n};\nexport type Environment = \"development\" | \"production\";\nexport const env = process.env.NODE_ENV as Environment;\n\nexport type LookupTableProvider = (table: VuuTable) => ListOption[];\n\nexport interface ViewConfig {\n  allowRename?: boolean;\n  closeable?: boolean;\n  header?: boolean;\n}\n\nexport interface DynamicFeatureProps<P extends object | undefined = object> {\n  /**\n    props that will be passed to the lazily loaded component.\n   */\n  ComponentProps?: P;\n  ViewProps?: ViewConfig;\n  css?: string;\n  height?: number;\n  title?: string;\n  /** \n   The url of javascript bundle to lazily load. Bundle must provide a default export\n   and that export must be a React component.\n   */\n  url: string;\n  width?: number;\n}\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  const vuuConfig: Promise<VuuConfig>;\n}\n\nexport interface DynamicFeatureDescriptor {\n  /**\n   * url for css file for feature\n   */\n  css?: string;\n  featureProps?: {\n    vuuTables?: \"*\" | VuuTable[];\n  };\n  leftNavLocation: \"vuu-features\" | \"vuu-tables\";\n  name: string;\n  title: string;\n  /**\n   * url for javascript bundle to load feature\n   */\n  url: string;\n  viewProps?: ViewConfig;\n}\n\nexport interface StaticFeatureDescriptor {\n  group?: string;\n  label: string;\n  type: string;\n}\n\nconst isStaticFeature = (\n  feature: unknown,\n): feature is StaticFeatureDescriptor =>\n  feature !== null && typeof feature === \"object\" && \"type\" in feature;\n\nexport const isStaticFeatures = (\n  features: unknown,\n): features is StaticFeatureDescriptor[] =>\n  Array.isArray(features) && features.every(isStaticFeature);\n\nexport interface FilterTableFeatureProps {\n  tableSchema: TableSchema;\n}\n\nexport type DynamicFeatures = {\n  [key: string]: DynamicFeatureDescriptor;\n};\n\nexport function featureFromJson({ type }: { type: string }): ReactElement {\n  const componentType = type.match(/^[a-z]/) ? type : getLayoutComponent(type);\n  if (componentType === undefined) {\n    throw Error(\n      `layoutUtils unable to create feature component from JSON, unknown type ${type}`,\n    );\n  }\n  return React.createElement(componentType);\n}\n\nexport interface VuuConfig {\n  features: DynamicFeatures;\n  authUrl?: string;\n  websocketUrl: string;\n  ssl: boolean;\n}\n\n/**\n * We currently categorize 'features' simply by the leftNavLocation\n * @param feature\n * @returns\n */\nexport const isCustomFeature = (feature: DynamicFeatureDescriptor) =>\n  feature.leftNavLocation === \"vuu-features\";\n\nexport const isWildcardSchema = (\n  vuuTables?: \"*\" | VuuTable[],\n): vuuTables is \"*\" => vuuTables === \"*\";\nexport const isVuuTables = (\n  vuuTables?: \"*\" | VuuTable[],\n): vuuTables is VuuTable[] => Array.isArray(vuuTables);\n\nexport interface FeaturePropsWithFilterTableFeature\n  extends Omit<DynamicFeatureProps, \"ComponentProps\"> {\n  ComponentProps: FilterTableFeatureProps;\n}\n\nexport const hasFilterTableFeatureProps = (\n  props: DynamicFeatureProps,\n): props is FeaturePropsWithFilterTableFeature =>\n  typeof props.ComponentProps === \"object\" &&\n  props.ComponentProps !== null &&\n  \"tableSchema\" in props.ComponentProps;\n\nexport const isSameTable = (t1: VuuTable, t2: VuuTable) => {\n  t1.module === t2.module && t1.table == t2.table;\n};\n\n// Sort TableScheas by module\nexport const byModule = (schema1: TableSchema, schema2: TableSchema) => {\n  const m1 = schema1.table.module.toLowerCase();\n  const m2 = schema2.table.module.toLowerCase();\n  if (m1 < m2) {\n    return -1;\n  } else if (m1 > m2) {\n    return 1;\n  } else if (schema1.table.table < schema2.table.table) {\n    return -1;\n  } else if (schema1.table.table > schema2.table.table) {\n    return 1;\n  } else {\n    return 0;\n  }\n};\n\nexport type GetFeaturePaths = (params: {\n  env: Environment;\n  fileName: string;\n  withCss?: boolean;\n}) => DynamicFeatureProps;\n\nexport const getFilterTableFeatures = (\n  schemas: TableSchema[],\n  getFeaturePath: GetFeaturePaths,\n) =>\n  schemas\n    .sort(byModule)\n    .map<DynamicFeatureProps<FilterTableFeatureProps>>((schema) => ({\n      ...getFeaturePath({ env, fileName: \"FilterTable\" }),\n      ComponentProps: {\n        tableSchema: schema,\n      },\n      ViewProps: {\n        allowRename: true,\n      },\n      title: `${schema.table.module} ${schema.table.table}`,\n    }));\n\nexport type Component = {\n  componentName: string;\n  component: unknown;\n};\n\nexport const assertComponentRegistered = (\n  componentName: string,\n  component: unknown,\n) => {\n  if (typeof component !== \"function\") {\n    console.warn(\n      `${componentName} module not loaded, will be unabale to deserialize from layout JSON`,\n    );\n  }\n};\n\nexport const assertComponentsRegistered = (componentList: Component[]) => {\n  for (const { componentName, component } of componentList) {\n    assertComponentRegistered(componentName, component);\n  }\n};\n/**\n *  Process the DynamicFeature descriptors. Identify\n * the vuu tables required and inject the appropriate TableSchemas\n *\n * @param dynamicFeatures\n * @param tableSchemas\n * @returns\n */\nexport const getCustomAndTableFeatures = (\n  dynamicFeatures: DynamicFeatureDescriptor[],\n  tableSchemas: TableSchema[],\n): {\n  dynamicFeatures: DynamicFeatureProps[];\n  tableFeatures: DynamicFeatureProps<FilterTableFeatureProps>[];\n} => {\n  // Split features into simple tables and 'custom' features\n  const [customFeatureConfig, tableFeaturesConfig] = partition(\n    dynamicFeatures,\n    isCustomFeature,\n  );\n\n  const customFeatures: DynamicFeatureProps[] = [];\n  const tableFeatures: DynamicFeatureProps<FilterTableFeatureProps>[] = [];\n\n  for (const {\n    featureProps = {},\n    viewProps,\n    ...feature\n  } of tableFeaturesConfig) {\n    const { vuuTables } = featureProps;\n    // Currently FilterTable is the only 'tableFeature' and it uses the wildcard\n    if (isWildcardSchema(vuuTables)) {\n      if (tableSchemas) {\n        for (const tableSchema of tableSchemas) {\n          tableFeatures.push({\n            ...feature,\n            ComponentProps: {\n              tableSchema,\n            },\n            title: `${tableSchema.table.module} ${wordify(\n              tableSchema.table.table,\n            )}`,\n            ViewProps: {\n              ...viewProps,\n              allowRename: true,\n            },\n          });\n        }\n      }\n    }\n  }\n\n  for (const {\n    featureProps = {},\n    viewProps,\n    ...feature\n  } of customFeatureConfig) {\n    const { vuuTables } = featureProps;\n    if (isVuuTables(vuuTables)) {\n      if (tableSchemas) {\n        customFeatures.push({\n          ...feature,\n          ComponentProps: vuuTables.reduce<Record<string, TableSchema>>(\n            (map, vuuTable) => {\n              map[`${vuuTable.table}Schema`] = tableSchemas.find(\n                (tableSchema) => isSameTable(vuuTable, tableSchema.table),\n              ) as TableSchema;\n              return map;\n            },\n            {},\n          ),\n          ViewProps: viewProps,\n        });\n      }\n    } else {\n      customFeatures.push(feature);\n    }\n  }\n  return { dynamicFeatures: customFeatures, tableFeatures: tableFeatures };\n};\n"],"names":["React"],"mappings":"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"}
+{"version":3,"file":"feature-utils.js","sources":["../../../../../../packages/vuu-utils/src/feature-utils.ts"],"sourcesContent":["import type { TableSchema } from \"@vuu-ui/vuu-data-types\";\nimport type { VuuTable } from \"@vuu-ui/vuu-protocol-types\";\nimport { ListOption } from \"@vuu-ui/vuu-table-types\";\nimport { partition } from \"./array-utils\";\nimport { wordify } from \"./text-utils\";\nimport React, { ReactElement } from \"react\";\nimport { getLayoutComponent } from \"./component-registry\";\n\nexport type PathMap = {\n  [key: string]: Pick<DynamicFeatureDescriptor, \"css\" | \"url\">;\n};\nexport type Environment = \"development\" | \"production\";\nexport const env = process.env.NODE_ENV as Environment;\n\nexport type LookupTableProvider = (table: VuuTable) => ListOption[];\n\nexport interface ViewConfig {\n  allowRename?: boolean;\n  closeable?: boolean;\n  header?: boolean;\n}\n\nexport interface DynamicFeatureProps<P extends object | undefined = object> {\n  /**\n    props that will be passed to the lazily loaded component.\n   */\n  ComponentProps?: P;\n  ViewProps?: ViewConfig;\n  css?: string;\n  height?: number;\n  title?: string;\n  /** \n   The url of javascript bundle to lazily load. Bundle must provide a default export\n   and that export must be a React component.\n   */\n  url: string;\n  width?: number;\n}\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  const vuuConfig: Promise<VuuConfig>;\n}\n\nexport interface DynamicFeatureDescriptor {\n  /**\n   * url for css file for feature\n   */\n  css?: string;\n  featureProps?: {\n    vuuTables?: \"*\" | VuuTable[];\n  };\n  leftNavLocation: \"vuu-features\" | \"vuu-tables\";\n  name: string;\n  title: string;\n  /**\n   * url for javascript bundle to load feature\n   */\n  url: string;\n  viewProps?: ViewConfig;\n}\n\nexport interface StaticFeatureDescriptor {\n  group?: string;\n  label: string;\n  type: string;\n}\n\nconst isStaticFeature = (\n  feature: unknown,\n): feature is StaticFeatureDescriptor =>\n  feature !== null && typeof feature === \"object\" && \"type\" in feature;\n\nexport const isStaticFeatures = (\n  features: unknown,\n): features is StaticFeatureDescriptor[] =>\n  Array.isArray(features) && features.every(isStaticFeature);\n\nexport interface FilterTableFeatureProps {\n  tableSchema: TableSchema;\n}\n\nexport type DynamicFeatures = {\n  [key: string]: DynamicFeatureDescriptor;\n};\n\nexport function featureFromJson({ type }: { type: string }): ReactElement {\n  const componentType = type.match(/^[a-z]/) ? type : getLayoutComponent(type);\n  if (componentType === undefined) {\n    throw Error(\n      `layoutUtils unable to create feature component from JSON, unknown type ${type}`,\n    );\n  }\n  return React.createElement(componentType);\n}\n\nexport interface VuuConfig {\n  features: DynamicFeatures;\n  authUrl?: string;\n  websocketUrl: string;\n  ssl: boolean;\n}\n\n/**\n * We currently categorize 'features' simply by the leftNavLocation\n * @param feature\n * @returns\n */\nexport const isCustomFeature = (feature: DynamicFeatureDescriptor) =>\n  feature.leftNavLocation === \"vuu-features\";\n\nexport const isWildcardSchema = (\n  vuuTables?: \"*\" | VuuTable[],\n): vuuTables is \"*\" => vuuTables === \"*\";\nexport const isVuuTables = (\n  vuuTables?: \"*\" | VuuTable[],\n): vuuTables is VuuTable[] => Array.isArray(vuuTables);\n\nexport interface FeaturePropsWithFilterTableFeature\n  extends Omit<DynamicFeatureProps, \"ComponentProps\"> {\n  ComponentProps: FilterTableFeatureProps;\n}\n\nexport const hasFilterTableFeatureProps = (\n  props: DynamicFeatureProps,\n): props is FeaturePropsWithFilterTableFeature =>\n  typeof props.ComponentProps === \"object\" &&\n  props.ComponentProps !== null &&\n  \"tableSchema\" in props.ComponentProps;\n\nexport const isSameTable = (t1: VuuTable, t2: VuuTable) => {\n  t1.module === t2.module && t1.table == t2.table;\n};\n\n// Sort TableScheas by module\nexport const byModule = (schema1: TableSchema, schema2: TableSchema) => {\n  const m1 = schema1.table.module.toLowerCase();\n  const m2 = schema2.table.module.toLowerCase();\n  if (m1 < m2) {\n    return -1;\n  } else if (m1 > m2) {\n    return 1;\n  } else if (schema1.table.table < schema2.table.table) {\n    return -1;\n  } else if (schema1.table.table > schema2.table.table) {\n    return 1;\n  } else {\n    return 0;\n  }\n};\n\nexport type GetFeaturePaths = (params: {\n  env: Environment;\n  fileName: string;\n  withCss?: boolean;\n}) => DynamicFeatureProps;\n\nexport const getFilterTableFeatures = (\n  schemas: TableSchema[],\n  getFeaturePath: GetFeaturePaths,\n) =>\n  schemas\n    .sort(byModule)\n    .map<DynamicFeatureProps<FilterTableFeatureProps>>((schema) => ({\n      ...getFeaturePath({ env, fileName: \"FilterTable\" }),\n      ComponentProps: {\n        tableSchema: schema,\n      },\n      ViewProps: {\n        allowRename: true,\n      },\n      title: `${schema.table.module} ${schema.table.table}`,\n    }));\n\nexport type Component = {\n  componentName: string;\n  component: unknown;\n};\n\nexport const assertComponentRegistered = (\n  componentName: string,\n  component: unknown,\n) => {\n  if (typeof component !== \"function\") {\n    console.warn(\n      `${componentName} module not loaded, will be unabale to deserialize from layout JSON`,\n    );\n  }\n};\n\nexport const assertComponentsRegistered = (componentList: Component[]) => {\n  for (const { componentName, component } of componentList) {\n    assertComponentRegistered(componentName, component);\n  }\n};\n/**\n *  Process the DynamicFeature descriptors. Identify\n * the vuu tables required and inject the appropriate TableSchemas\n *\n * @param dynamicFeatures\n * @param tableSchemas\n * @returns\n */\nexport const getCustomAndTableFeatures = (\n  dynamicFeatures: DynamicFeatureDescriptor[],\n  tableSchemas: TableSchema[],\n): {\n  dynamicFeatures: DynamicFeatureProps[];\n  tableFeatures: DynamicFeatureProps<FilterTableFeatureProps>[];\n} => {\n  // Split features into simple tables and 'custom' features\n  const [customFeatureConfig, tableFeaturesConfig] = partition(\n    dynamicFeatures,\n    isCustomFeature,\n  );\n\n  const customFeatures: DynamicFeatureProps[] = [];\n  const tableFeatures: DynamicFeatureProps<FilterTableFeatureProps>[] = [];\n\n  for (const {\n    featureProps = {},\n    viewProps,\n    ...feature\n  } of tableFeaturesConfig) {\n    const { vuuTables } = featureProps;\n    // Currently FilterTable is the only 'tableFeature' and it uses the wildcard\n    if (isWildcardSchema(vuuTables)) {\n      if (tableSchemas) {\n        for (const tableSchema of tableSchemas) {\n          tableFeatures.push({\n            ...feature,\n            ComponentProps: {\n              tableSchema,\n            },\n            title: `${tableSchema.table.module} ${wordify(\n              tableSchema.table.table,\n            )}`,\n            ViewProps: {\n              ...viewProps,\n              allowRename: true,\n            },\n          });\n        }\n      }\n    }\n  }\n\n  for (const {\n    featureProps = {},\n    viewProps,\n    ...feature\n  } of customFeatureConfig) {\n    const { vuuTables } = featureProps;\n    if (isVuuTables(vuuTables)) {\n      if (tableSchemas) {\n        customFeatures.push({\n          ...feature,\n          ComponentProps: vuuTables.reduce<Record<string, TableSchema>>(\n            (map, vuuTable) => {\n              map[`${vuuTable.table}Schema`] = tableSchemas.find(\n                (tableSchema) => isSameTable(vuuTable, tableSchema.table),\n              ) as TableSchema;\n              return map;\n            },\n            {},\n          ),\n          ViewProps: viewProps,\n        });\n      }\n    } else {\n      customFeatures.push(feature);\n    }\n  }\n  return { dynamicFeatures: customFeatures, tableFeatures: tableFeatures };\n};\n"],"names":[],"mappings":"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"}

package/esm/packages/vuu-utils/src/index.js

@@ -14,7 +14,7 @@ export { EditButtons } from './data-editing/EditButtons.js';
 export { DataEditingProvider, useEditTracker } from './data-editing/DataEditingProvider.js';
 export { EditTracker } from './data-editing/EditTracker.js';
 export { useEditableTable } from './data-editing/useEditableTable.js';
-export { DOWN1, DOWN2, UP1, UP2, asInteger, getMovingValueDirection, isValidNumber, numericTypeOfStringValue, shallowEquals, stringIsValidDecimal, stringIsValidInt, stringIsValidNumber } from './data-utils.js';
+export { DOWN1, DOWN2, UP1, UP2, asInteger, dataDescriptorTypeToVuuRowDataItemType, getMovingValueDirection, isValidNumber, numericTypeOfStringValue, shallowEquals, stringIsValidDecimal, stringIsValidInt, stringIsValidNumber } from './data-utils.js';
 export { BaseDataSource, defaultSuspenseProps } from './datasource/BaseDataSource.js';
 export { isViewportMenusAction, isVisualLinkCreatedAction, isVisualLinkRemovedAction, isVisualLinksAction, isVuuFeatureAction } from './datasource/datasource-action-utils.js';
 export { combineFilters } from './datasource/datasource-filter-utils.js';

package/package.json

@@ -1,17 +1,20 @@
 {
-  "version": "2.1.0-alpha.8",
+  "version": "2.1.0",
   "author": "heswell",
   "license": "Apache-2.0",
   "types": "types/index.d.ts",
+  "dependencies": {
+    "@salt-ds/core": "1.54.1"
+  },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "2.1.0-alpha.8",
-    "@vuu-ui/vuu-table-types": "2.1.0-alpha.8",
-    "@vuu-ui/vuu-filter-types": "2.1.0-alpha.8",
-    "@vuu-ui/vuu-protocol-types": "2.1.0-alpha.8"
+    "@vuu-ui/vuu-data-types": "2.1.0",
+    "@vuu-ui/vuu-table-types": "2.1.0",
+    "@vuu-ui/vuu-filter-types": "2.1.0",
+    "@vuu-ui/vuu-protocol-types": "2.1.0"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "2.1.0-alpha.8",
+    "@vuu-ui/vuu-filter-parser": "2.1.0",
     "clsx": "^2.0.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3"

package/types/context-definitions/DataContext.d.ts

@@ -15,4 +15,7 @@ export interface DataContextProps {
      */
     tableSchemas?: Record<string, TableSchema>;
 }
+export declare class NullDataSourceConstructor {
+    constructor(_: DataSourceConstructorProps);
+}
 export declare const DataContext: import("react").Context<DataContextProps>;

package/types/data-editing/DataEditingProvider.d.ts

@@ -4,4 +4,5 @@ export declare const DataEditingProvider: ({ children, editTracker, }: {
     children: ReactNode;
     editTracker: EditTracker;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const useEditTracker: () => EditTracker | undefined;
+export declare function useEditTracker(throwIfUnavailable?: false): EditTracker | undefined;
+export declare function useEditTracker(throwIfUnavailable: true): EditTracker;

package/types/data-editing/EditTracker.d.ts

@@ -1,5 +1,5 @@
 import { DataSource } from "@vuu-ui/vuu-data-types";
-import type { VuuRowDataItemType, VuuTable } from "@vuu-ui/vuu-protocol-types";
+import type { RpcResultError, VuuRowDataItemType, VuuTable } from "@vuu-ui/vuu-protocol-types";
 import { EventEmitter } from "../event-emitter";
 export type EditState = "clean" | "dirty";
 type EditTrackerEvents = {
@@ -16,9 +16,9 @@ export declare class EditTracker extends EventEmitter<EditTrackerEvents> {
     enterEditMode(): Promise<VuuTable | undefined>;
     get inEditMode(): boolean;
     get editState(): EditState;
-    cancelChanges(): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | import("@vuu-ui/vuu-protocol-types").RpcResultError | undefined>;
-    saveChanges(): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | import("@vuu-ui/vuu-protocol-types").RpcResultError | undefined>;
+    cancelChanges(): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | RpcResultError | undefined>;
+    saveChanges(): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | RpcResultError | undefined>;
     edit(key: string, columnName: string, originalValue: VuuRowDataItemType, newValue: VuuRowDataItemType): void;
-    commit(key: string, columnName: string): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | import("@vuu-ui/vuu-protocol-types").RpcResultError | undefined>;
+    commit(key: string, columnName: string): Promise<import("@vuu-ui/vuu-protocol-types").RpcResultSuccess | RpcResultError | undefined>;
 }
 export {};

package/types/data-editing/useEditableTable.d.ts

@@ -5,15 +5,20 @@ export type EditMode = "edit" | "view";
 export interface EditableTableHookProps {
     /**
      * columns to be included in subscription. If not provided,
-     * default will be '*'
+     * default will be '*'. Ignored if dataSource prop present.
      */
     columns?: string[];
+    dataSource?: DataSource;
     isEditMode: boolean;
     onCancel: () => void;
     onSave: () => void;
+    /**
+     * If dataSource not provided, new DataSource
+     * will be created using table and columns
+     */
     table: VuuTable;
 }
-export declare const useEditableTable: ({ columns, isEditMode, onCancel, onSave, table, }: EditableTableHookProps) => {
+export declare const useEditableTable: ({ columns, dataSource: dataSourceProp, isEditMode, onCancel, onSave, table, }: EditableTableHookProps) => {
     dataSource: DataSource;
     editTracker: EditTracker;
     onCancel: () => void;

package/types/data-utils.d.ts

@@ -1,3 +1,4 @@
+import { DataValueDescriptor } from "@vuu-ui/vuu-data-types";
 export type valueChangeDirection = "up1" | "up2" | "down1" | "down2" | "";
 export declare const UP1 = "up1";
 export declare const UP2 = "up2";
@@ -17,3 +18,4 @@ export declare function getMovingValueDirection(newValue?: number, direction?: v
 /** the number of decimal places to take into account when highlighting a change  */
 decimalPlaces?: number): valueChangeDirection;
 export declare function asInteger(index: number | string | undefined, defaultValue?: number): number;
+export declare const dataDescriptorTypeToVuuRowDataItemType: ({ serverDataType, }: DataValueDescriptor) => "string" | "number" | "boolean";

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

@@ -58,7 +58,9 @@ export declare const stripFilterFromColumns: (columns: RuntimeColumnDescriptor[]
     maxWidth?: number;
     minWidth?: number;
     pin?: import("@vuu-ui/vuu-table-types").PinLocation | false;
+    selected?: boolean;
     source?: "client" | "server";
+    status?: import("@salt-ds/core").ValidationStatus;
     editable?: boolean;
     editableBulk?: import("@vuu-ui/vuu-data-types").BulkEdit;
     name: string;