@vuu-ui/vuu-utils 0.9.1 → 0.9.2

package/cjs/datasource/BaseDataSource.js

@@ -24,9 +24,11 @@ class BaseDataSource extends eventEmitter.EventEmitter {
     __publicField(this, "viewport");
     __publicField(this, "_clientCallback");
     __publicField(this, "_config", datasourceUtils.vanillaConfig);
+    __publicField(this, "_impendingConfig");
     __publicField(this, "_range", { from: 0, to: 0 });
     __publicField(this, "_size", 0);
     __publicField(this, "_title");
+    __publicField(this, "awaitingConfirmationOfConfigChanges", false);
     this._config = {
       ...this._config,
       aggregations: aggregations || this._config.aggregations,
@@ -74,7 +76,7 @@ class BaseDataSource extends eventEmitter.EventEmitter {
       ...this._config,
       aggregations
     };
-    this.emit("config", this._config);
+    this.emit("config", this._config, this.range);
   }
   get baseFilter() {
     return this._config.baseFilterSpec;
@@ -93,7 +95,7 @@ class BaseDataSource extends eventEmitter.EventEmitter {
       ...this._config,
       columns
     };
-    this.emit("config", this._config);
+    this.emit("config", this._config, this.range);
   }
   get filter() {
     return this._config.filterSpec;
@@ -104,13 +106,36 @@ class BaseDataSource extends eventEmitter.EventEmitter {
       filterSpec: filter
     };
   }
+  get isAwaitingConfirmationOfConfigChange() {
+    return this._impendingConfig !== void 0;
+  }
+  confirmConfigChange() {
+    if (this._impendingConfig) {
+      this._config = this._impendingConfig;
+      this._impendingConfig = void 0;
+      this.emit("config", this._config, this.range, true);
+    } else {
+      throw Error(
+        `BaseDataSOurce, unexpected call to confirmConfigChange, no changes pending`
+      );
+    }
+  }
   get config() {
-    return this._config;
+    return this._impendingConfig ?? this._config;
   }
   set config(config) {
+    const confirmed = this.awaitingConfirmationOfConfigChanges ? true : void 0;
+    this.awaitingConfirmationOfConfigChanges = false;
+    const configChanges = this.applyConfig(config);
+    if (configChanges) {
+      this.emit("config", this.config, this.range, confirmed, configChanges);
+    }
+  }
+  set impendingConfig(config) {
+    this.awaitingConfirmationOfConfigChanges = true;
     const configChanges = this.applyConfig(config);
     if (configChanges) {
-      this.emit("config", this._config, void 0, configChanges);
+      this.emit("config", this.config, this.range, false, configChanges);
     }
   }
   get range() {
@@ -133,7 +158,7 @@ class BaseDataSource extends eventEmitter.EventEmitter {
       ...this._config,
       sort
     };
-    this.emit("config", this._config);
+    this.emit("config", this._config, this.range);
   }
   get title() {
     return this._title ?? "";
@@ -158,12 +183,25 @@ class BaseDataSource extends eventEmitter.EventEmitter {
           }
         } : config;
         if (preserveExistingConfigAttributes) {
-          this._config = {
-            ...this._config,
-            ...config
-          };
+          if (this.awaitingConfirmationOfConfigChanges) {
+            this._impendingConfig = {
+              ...this._config,
+              ...config
+            };
+          } else {
+            this._impendingConfig = void 0;
+            this._config = {
+              ...this._config,
+              ...config
+            };
+          }
         } else {
-          this._config = datasourceUtils.withConfigDefaults(newConfig);
+          if (this.awaitingConfirmationOfConfigChanges) {
+            this._impendingConfig = datasourceUtils.withConfigDefaults(newConfig);
+          } else {
+            this._impendingConfig = void 0;
+            this._config = datasourceUtils.withConfigDefaults(newConfig);
+          }
         }
         return otherChanges;
       }

package/cjs/datasource/BaseDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  SubscribeCallback,\n  SubscribeProps,\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  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\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: SubscribeCallback | undefined;\n  protected _config: WithBaseFilter<WithFullConfig> & {\n    visualLink?: LinkDescriptorWithLabel;\n  } = vanillaConfig;\n  protected _range: VuuRange = { from: 0, to: 0 };\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\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    }: SubscribeProps,\n    callback: SubscribeCallback,\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._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.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    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get config() {\n    return this._config;\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this._config, undefined, configChanges);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: VuuRange) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.rangeRequest(range);\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config);\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  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\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          this._config = {\n            ...this._config,\n            ...config,\n          };\n        } else {\n          this._config = withConfigDefaults(newConfig);\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":["EventEmitter","vanillaConfig","uuid","isConfigChanged","parseFilter","withConfigDefaults"],"mappings":"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"}
+{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  SubscribeCallback,\n  SubscribeProps,\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  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\n\nexport type RuntimeConfig = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\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: SubscribeCallback | undefined;\n  protected _config: RuntimeConfig = vanillaConfig;\n  protected _impendingConfig: RuntimeConfig | undefined = undefined;\n  protected _range: VuuRange = { from: 0, to: 0 };\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\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    }: SubscribeProps,\n    callback: SubscribeCallback,\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._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.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    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfig !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfig) {\n      this._config = this._impendingConfig;\n      this._impendingConfig = undefined;\n      this.emit(\"config\", this._config, 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 this._impendingConfig ?? this._config;\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      this.emit(\"config\", this.config, this.range, confirmed, configChanges);\n    }\n  }\n\n  set impendingConfig(config: WithBaseFilter<WithFullConfig>) {\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  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: VuuRange) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.rangeRequest(range);\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config, 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  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\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._impendingConfig = {\n              ...this._config,\n              ...config,\n            };\n          } else {\n            this._impendingConfig = undefined;\n            this._config = {\n              ...this._config,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfig = undefined;\n            this._config = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":["EventEmitter","vanillaConfig","uuid","isConfigChanged","parseFilter","withConfigDefaults"],"mappings":"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"}

package/cjs/form-utils.js

@@ -12,25 +12,27 @@ const getFieldName = (target) => {
     throw Error("named form field not found");
   }
 };
-function getTypedValue(value, type, throwIfUndefined = false) {
+function getTypedValue(value, type, throwIfInvalid = false) {
   switch (type) {
     case "int":
     case "long": {
-      const typedValue = parseInt(value, 10);
-      if (dataUtils.isValidNumber(typedValue)) {
-        return typedValue;
-      } else if (throwIfUndefined) {
-        throw Error("SessionEditingForm getTypedValue");
+      if (dataUtils.stringIsValidInt(value)) {
+        return parseInt(value, 10);
+      } else if (throwIfInvalid) {
+        throw Error(`value ${value} is not a valid ${type}`);
       } else {
         return void 0;
       }
     }
-    case "double": {
-      const typedValue = parseFloat(value);
-      if (dataUtils.isValidNumber(typedValue)) {
-        return typedValue;
+    case "double":
+    case "number": {
+      if (dataUtils.stringIsValidDecimal(value)) {
+        return parseFloat(value);
+      } else if (throwIfInvalid) {
+        throw Error(`value ${value} is not a valid ${type}`);
+      } else {
+        return void 0;
       }
-      return void 0;
     }
     case "boolean":
       return value === "true" ? true : false;

package/cjs/form-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-utils.js","sources":["../src/form-utils.ts"],"sourcesContent":["import {\n  VuuColumnDataType,\n  VuuRowDataItemType,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { KeyboardEvent, SyntheticEvent } from \"react\";\nimport { queryClosest } from \"./html-utils\";\nimport { isValidNumber } from \"./data-utils\";\n\n/**\n * Use with the following convention:\n *\n * <FormField data-field=\"my-field-name\">\n */\nexport const getFieldName = (target: EventTarget | HTMLElement): string => {\n  const saltFormField = queryClosest(target, \"[data-field]\") as HTMLElement;\n  const fieldName = saltFormField?.dataset.field;\n  if (fieldName) {\n    return fieldName;\n  } else {\n    throw Error(\"named form field not found\");\n  }\n};\n\nexport type InputSource = \"typeahead-suggestion\" | \"text-input\";\n\nexport type CommitHandler<\n  E extends HTMLElement = HTMLInputElement,\n  T extends VuuRowDataItemType | undefined = string,\n> = (\n  evt: SyntheticEvent<E> | KeyboardEvent<E>,\n  value: T,\n  source?: InputSource,\n) => void;\n\n/**\n * Convert a string value to the type appropriate for the associated\n * column or form field. Can be used when processing a string value\n * from an input used for user editing.\n *\n * @param value\n * @param type\n * @param throwIfUndefined\n */\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType,\n  throwIfUndefined?: false,\n): VuuRowDataItemType | undefined;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType,\n  throwIfUndefined: true,\n): VuuRowDataItemType;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType,\n  throwIfUndefined = false,\n): VuuRowDataItemType | undefined {\n  switch (type) {\n    case \"int\":\n    case \"long\": {\n      const typedValue = parseInt(value, 10);\n      if (isValidNumber(typedValue)) {\n        return typedValue;\n      } else if (throwIfUndefined) {\n        throw Error(\"SessionEditingForm getTypedValue\");\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"double\": {\n      const typedValue = parseFloat(value);\n      if (isValidNumber(typedValue)) {\n        return typedValue;\n      }\n      return undefined;\n    }\n\n    case \"boolean\":\n      return value === \"true\" ? true : false;\n    default:\n      return value;\n  }\n}\n"],"names":["queryClosest","isValidNumber"],"mappings":";;;;;AAaa,MAAA,YAAA,GAAe,CAAC,MAA8C,KAAA;AACzE,EAAM,MAAA,aAAA,GAAgBA,sBAAa,CAAA,MAAA,EAAQ,cAAc,CAAA,CAAA;AACzD,EAAM,MAAA,SAAA,GAAY,eAAe,OAAQ,CAAA,KAAA,CAAA;AACzC,EAAA,IAAI,SAAW,EAAA;AACb,IAAO,OAAA,SAAA,CAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,4BAA4B,CAAA,CAAA;AAAA,GAC1C;AACF,EAAA;AAgCO,SAAS,aACd,CAAA,KAAA,EACA,IACA,EAAA,gBAAA,GAAmB,KACa,EAAA;AAChC,EAAA,QAAQ,IAAM;AAAA,IACZ,KAAK,KAAA,CAAA;AAAA,IACL,KAAK,MAAQ,EAAA;AACX,MAAM,MAAA,UAAA,GAAa,QAAS,CAAA,KAAA,EAAO,EAAE,CAAA,CAAA;AACrC,MAAI,IAAAC,uBAAA,CAAc,UAAU,CAAG,EAAA;AAC7B,QAAO,OAAA,UAAA,CAAA;AAAA,iBACE,gBAAkB,EAAA;AAC3B,QAAA,MAAM,MAAM,kCAAkC,CAAA,CAAA;AAAA,OACzC,MAAA;AACL,QAAO,OAAA,KAAA,CAAA,CAAA;AAAA,OACT;AAAA,KACF;AAAA,IAEA,KAAK,QAAU,EAAA;AACb,MAAM,MAAA,UAAA,GAAa,WAAW,KAAK,CAAA,CAAA;AACnC,MAAI,IAAAA,uBAAA,CAAc,UAAU,CAAG,EAAA;AAC7B,QAAO,OAAA,UAAA,CAAA;AAAA,OACT;AACA,MAAO,OAAA,KAAA,CAAA,CAAA;AAAA,KACT;AAAA,IAEA,KAAK,SAAA;AACH,MAAO,OAAA,KAAA,KAAU,SAAS,IAAO,GAAA,KAAA,CAAA;AAAA,IACnC;AACE,MAAO,OAAA,KAAA,CAAA;AAAA,GACX;AACF;;;;;"}
+{"version":3,"file":"form-utils.js","sources":["../src/form-utils.ts"],"sourcesContent":["import {\n  VuuColumnDataType,\n  VuuRowDataItemType,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { KeyboardEvent, SyntheticEvent } from \"react\";\nimport { queryClosest } from \"./html-utils\";\nimport { stringIsValidDecimal, stringIsValidInt } from \"./data-utils\";\n\n/**\n * Use with the following convention:\n *\n * <FormField data-field=\"my-field-name\">\n */\nexport const getFieldName = (target: EventTarget | HTMLElement): string => {\n  const saltFormField = queryClosest(target, \"[data-field]\") as HTMLElement;\n  const fieldName = saltFormField?.dataset.field;\n  if (fieldName) {\n    return fieldName;\n  } else {\n    throw Error(\"named form field not found\");\n  }\n};\n\nexport type InputSource = \"typeahead-suggestion\" | \"text-input\";\n\nexport type CommitHandler<\n  E extends HTMLElement = HTMLInputElement,\n  T extends VuuRowDataItemType | undefined = string,\n> = (\n  evt: SyntheticEvent<E> | KeyboardEvent<E>,\n  value: T,\n  source?: InputSource,\n) => void;\n\n/**\n * Convert a string value to the type appropriate for the associated\n * column or form field. Can be used when processing a string value\n * from an input used for user editing.\n *\n * @param value\n * @param type\n * @param throwIfInvalid\n */\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | \"number\",\n  throwIfInvalid?: false,\n): VuuRowDataItemType | undefined;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | \"number\",\n  throwIfInvalid: true,\n): VuuRowDataItemType;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | \"number\",\n  throwIfInvalid = false,\n): VuuRowDataItemType | undefined {\n  switch (type) {\n    case \"int\":\n    case \"long\": {\n      if (stringIsValidInt(value)) {\n        return parseInt(value, 10);\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"double\":\n    case \"number\": {\n      if (stringIsValidDecimal(value)) {\n        return parseFloat(value);\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"boolean\":\n      return value === \"true\" ? true : false;\n    default:\n      return value;\n  }\n}\n"],"names":["queryClosest","stringIsValidInt","stringIsValidDecimal"],"mappings":";;;;;AAaa,MAAA,YAAA,GAAe,CAAC,MAA8C,KAAA;AACzE,EAAM,MAAA,aAAA,GAAgBA,sBAAa,CAAA,MAAA,EAAQ,cAAc,CAAA,CAAA;AACzD,EAAM,MAAA,SAAA,GAAY,eAAe,OAAQ,CAAA,KAAA,CAAA;AACzC,EAAA,IAAI,SAAW,EAAA;AACb,IAAO,OAAA,SAAA,CAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,4BAA4B,CAAA,CAAA;AAAA,GAC1C;AACF,EAAA;AAgCO,SAAS,aACd,CAAA,KAAA,EACA,IACA,EAAA,cAAA,GAAiB,KACe,EAAA;AAChC,EAAA,QAAQ,IAAM;AAAA,IACZ,KAAK,KAAA,CAAA;AAAA,IACL,KAAK,MAAQ,EAAA;AACX,MAAI,IAAAC,0BAAA,CAAiB,KAAK,CAAG,EAAA;AAC3B,QAAO,OAAA,QAAA,CAAS,OAAO,EAAE,CAAA,CAAA;AAAA,iBAChB,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA,CAAA;AAAA,OACT;AAAA,KACF;AAAA,IAEA,KAAK,QAAA,CAAA;AAAA,IACL,KAAK,QAAU,EAAA;AACb,MAAI,IAAAC,8BAAA,CAAqB,KAAK,CAAG,EAAA;AAC/B,QAAA,OAAO,WAAW,KAAK,CAAA,CAAA;AAAA,iBACd,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA,CAAA;AAAA,OACT;AAAA,KACF;AAAA,IAEA,KAAK,SAAA;AACH,MAAO,OAAA,KAAA,KAAU,SAAS,IAAO,GAAA,KAAA,CAAA;AAAA,IACnC;AACE,MAAO,OAAA,KAAA,CAAA;AAAA,GACX;AACF;;;;;"}

package/cjs/index.js

@@ -82,6 +82,7 @@ exports.applyRuntimeColumnWidthsToConfig = columnUtils.applyRuntimeColumnWidthsT
 exports.applySortToColumns = columnUtils.applySortToColumns;
 exports.applyWidthToColumns = columnUtils.applyWidthToColumns;
 exports.buildColumnMap = columnUtils.buildColumnMap;
+exports.checkConfirmationPending = columnUtils.checkConfirmationPending;
 exports.dataAndColumnUnchanged = columnUtils.dataAndColumnUnchanged;
 exports.dataColumnAndKeyUnchanged = columnUtils.dataColumnAndKeyUnchanged;
 exports.existingSort = columnUtils.existingSort;
@@ -102,6 +103,7 @@ exports.getRowRecord = columnUtils.getRowRecord;
 exports.getRuntimeColumnWidth = columnUtils.getRuntimeColumnWidth;
 exports.getTableHeadings = columnUtils.getTableHeadings;
 exports.getTypeFormattingFromColumn = columnUtils.getTypeFormattingFromColumn;
+exports.hasCustomRenderer = columnUtils.hasCustomRenderer;
 exports.hasHeadings = columnUtils.hasHeadings;
 exports.hasValidationRules = columnUtils.hasValidationRules;
 exports.isCalculatedColumn = columnUtils.isCalculatedColumn;
@@ -171,7 +173,11 @@ exports.UP1 = dataUtils.UP1;
 exports.UP2 = dataUtils.UP2;
 exports.getMovingValueDirection = dataUtils.getMovingValueDirection;
 exports.isValidNumber = dataUtils.isValidNumber;
+exports.numericTypeOfStringValue = dataUtils.numericTypeOfStringValue;
 exports.shallowEquals = dataUtils.shallowEquals;
+exports.stringIsValidDecimal = dataUtils.stringIsValidDecimal;
+exports.stringIsValidInt = dataUtils.stringIsValidInt;
+exports.stringIsValidNumber = dataUtils.stringIsValidNumber;
 exports.BaseDataSource = BaseDataSource.BaseDataSource;
 exports.isViewportMenusAction = datasourceActionUtils.isViewportMenusAction;
 exports.isVisualLinkCreatedAction = datasourceActionUtils.isVisualLinkCreatedAction;
@@ -358,6 +364,7 @@ exports.ThemeContext = ThemeProvider.ThemeContext;
 exports.ThemeProvider = ThemeProvider.ThemeProvider;
 exports.useThemeAttributes = ThemeProvider.useThemeAttributes;
 exports.isNotNullOrUndefined = tsUtils.isNotNullOrUndefined;
+exports.isObject = tsUtils.isObject;
 exports.getUrlParameter = urlUtils.getUrlParameter;
 exports.hasUrlParameter = urlUtils.hasUrlParameter;
 exports.useId = useId.useId;
@@ -368,6 +375,7 @@ exports.useShellContext = ShellContext.useShellContext;
 exports.DataSourceContext = DataSourceContext.DataSourceContext;
 exports.DataSourceProvider = DataSourceProvider.DataSourceProvider;
 exports.useDataSource = DataSourceProvider.useDataSource;
+exports.useDataSourceExtensions = DataSourceProvider.useDataSourceExtensions;
 exports.WorkspaceContext = WorkspaceContext.WorkspaceContext;
 exports.usePlaceholderJSON = WorkspaceContext.usePlaceholderJSON;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/cjs/ts-utils.js

@@ -3,6 +3,8 @@
 function isNotNullOrUndefined(value) {
   return value !== void 0 && value !== null;
 }
+const isObject = (o) => typeof o === "object" && o !== null;
 
 exports.isNotNullOrUndefined = isNotNullOrUndefined;
+exports.isObject = isObject;
 //# sourceMappingURL=ts-utils.js.map

package/cjs/ts-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-utils.js","sources":["../src/ts-utils.ts"],"sourcesContent":["export function isNotNullOrUndefined<T>(\n  value: T | undefined | null\n): value is NonNullable<T> {\n  return value !== undefined && value !== null;\n}\n"],"names":[],"mappings":";;AAAO,SAAS,qBACd,KACyB,EAAA;AACzB,EAAO,OAAA,KAAA,KAAU,UAAa,KAAU,KAAA,IAAA,CAAA;AAC1C;;;;"}
+{"version":3,"file":"ts-utils.js","sources":["../src/ts-utils.ts"],"sourcesContent":["export function isNotNullOrUndefined<T>(\n  value: T | undefined | null,\n): value is NonNullable<T> {\n  return value !== undefined && value !== null;\n}\n\nexport const isObject = (o: unknown): o is object =>\n  typeof o === \"object\" && o !== null;\n"],"names":[],"mappings":";;AAAO,SAAS,qBACd,KACyB,EAAA;AACzB,EAAO,OAAA,KAAA,KAAU,UAAa,KAAU,KAAA,IAAA,CAAA;AAC1C,CAAA;AAEO,MAAM,WAAW,CAAC,CAAA,KACvB,OAAO,CAAA,KAAM,YAAY,CAAM,KAAA;;;;;"}

package/esm/column-utils.js

@@ -91,6 +91,7 @@ const toColumnDescriptor = (name) => ({
 const isTypeDescriptor = (type) => typeof type !== "undefined" && typeof type !== "string";
 const EMPTY_COLUMN_MAP = {};
 const isColumnTypeRenderer = (renderer) => typeof renderer?.name !== "undefined";
+const hasCustomRenderer = (type) => isTypeDescriptor(type) && isColumnTypeRenderer(type.renderer);
 const isLookupRenderer = (renderer) => typeof renderer?.name !== "undefined" && "lookup" in renderer;
 const isValueListRenderer = (renderer) => typeof renderer?.name !== "undefined" && Array.isArray(renderer.values);
 const hasValidationRules = (type) => isTypeDescriptor(type) && Array.isArray(type.rules) && type.rules.length > 0;
@@ -198,19 +199,38 @@ function extractGroupColumn(columns, groupBy, confirmed = true) {
       };
     });
     const groupCol = {
+      ariaColIndex: 1,
       columns: groupCols,
       heading: ["group-col"],
-      index: 1,
       isGroup: true,
       groupConfirmed: confirmed,
       name: "group-col",
       width: groupCols.map((c) => c.width).reduce((a, b) => a + b) + 100
     };
-    return [groupCol, rest.map((col, i) => ({ ...col, index: i + 2 }))];
+    const withAdjustedAriaIndex = [];
+    let colIndex = 2;
+    for (const column of rest) {
+      withAdjustedAriaIndex.push({
+        ...column,
+        ariaColIndex: column.hidden ? -1 : colIndex
+      });
+      if (!column.hidden) {
+        colIndex += 1;
+      }
+    }
+    return [groupCol, withAdjustedAriaIndex];
   }
   return [null, flattenColumnGroup(columns)];
 }
 const isGroupColumn = (column) => column.isGroup === true;
+const checkConfirmationPending = (previousConfig) => {
+  if (previousConfig) {
+    const [column] = previousConfig.columns;
+    if (isGroupColumn(column)) {
+      return column.groupConfirmed;
+    }
+  }
+};
 const isJsonAttribute = (value) => typeof value === "string" && (value.endsWith("{") || value.endsWith("["));
 const isJsonGroup = (column, row, columnMap) => column.type?.name === "json" && isJsonAttribute(row[columnMap[column.name]]);
 const isJsonColumn = (column) => column.type?.name === "json";
@@ -774,5 +794,5 @@ const dataColumnAndKeyUnchanged = (p, p1) => p.column === p1.column && p.row[KEY
 const toColumnName = (column) => column.name;
 const isStringColumn = (column) => column.serverDataType === "string";
 
-export { AggregationType, addColumnToSubscribedColumns, applyDefaultColumnConfig, applyGroupByToColumns, applyRuntimeColumnWidthsToConfig, applySortToColumns, applyWidthToColumns, buildColumnMap, dataAndColumnUnchanged, dataColumnAndKeyUnchanged, existingSort, extractGroupColumn, findColumn, flattenColumnGroup, fromServerDataType, getCalculatedColumnDetails, getColumnLabel, getColumnName, getColumnStyle, getColumnsInViewport, getDefaultAlignment, getDefaultColumnType, getGroupIcon, getGroupValue, getRowRecord, getRuntimeColumnWidth, getTableHeadings, getTypeFormattingFromColumn, hasHeadings, hasValidationRules, isCalculatedColumn, isColumnTypeRenderer, isDataLoading, isDateTimeDataValue, isGroupColumn, isJsonAttribute, isJsonColumn, isJsonGroup, isLookupRenderer, isMappedValueTypeRenderer, isNotHidden, isNumericColumn, isPinned, isResizing, isStringColumn, isTextColumn, isTypeDescriptor, isValidColumnAlignment, isValidPinLocation, isValueListRenderer, isVuuColumnDataType, mapSortCriteria, measurePinnedColumns, metadataKeys, moveColumnTo, projectUpdates, removeSort, replaceColumn, setAggregations, setCalculatedColumnExpression, setCalculatedColumnName, setCalculatedColumnType, sortPinnedColumns, subscribedOnly, toColumnDescriptor, toColumnName, toDataSourceColumns, updateColumn, updateColumnFormatting, updateColumnRenderProps, updateColumnType, visibleColumnAtIndex };
+export { AggregationType, addColumnToSubscribedColumns, applyDefaultColumnConfig, applyGroupByToColumns, applyRuntimeColumnWidthsToConfig, applySortToColumns, applyWidthToColumns, buildColumnMap, checkConfirmationPending, dataAndColumnUnchanged, dataColumnAndKeyUnchanged, existingSort, extractGroupColumn, findColumn, flattenColumnGroup, fromServerDataType, getCalculatedColumnDetails, getColumnLabel, getColumnName, getColumnStyle, getColumnsInViewport, getDefaultAlignment, getDefaultColumnType, getGroupIcon, getGroupValue, getRowRecord, getRuntimeColumnWidth, getTableHeadings, getTypeFormattingFromColumn, hasCustomRenderer, hasHeadings, hasValidationRules, isCalculatedColumn, isColumnTypeRenderer, isDataLoading, isDateTimeDataValue, isGroupColumn, isJsonAttribute, isJsonColumn, isJsonGroup, isLookupRenderer, isMappedValueTypeRenderer, isNotHidden, isNumericColumn, isPinned, isResizing, isStringColumn, isTextColumn, isTypeDescriptor, isValidColumnAlignment, isValidPinLocation, isValueListRenderer, isVuuColumnDataType, mapSortCriteria, measurePinnedColumns, metadataKeys, moveColumnTo, projectUpdates, removeSort, replaceColumn, setAggregations, setCalculatedColumnExpression, setCalculatedColumnName, setCalculatedColumnType, sortPinnedColumns, subscribedOnly, toColumnDescriptor, toColumnName, toDataSourceColumns, updateColumn, updateColumnFormatting, updateColumnRenderProps, updateColumnType, visibleColumnAtIndex };
 //# sourceMappingURL=column-utils.js.map