@vuu-ui/vuu-utils 3.4.1 → 3.5.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. package/package.json +6 -6
  2. package/src/column-utils.js +21 -6
  3. package/src/component-registry.js +2 -1
  4. package/src/data-utils.js +1 -0
  5. package/src/datasource/BaseDataSource.js +5 -3
  6. package/src/date/EpochTimestamp.js +80 -0
  7. package/src/date/date-utils.js +50 -18
  8. package/src/date/dateTimePattern.js +33 -5
  9. package/src/date/formatter.js +54 -16
  10. package/src/date/index.js +5 -2
  11. package/src/date/temporal.js +131 -0
  12. package/src/date/time-zone.js +56 -0
  13. package/src/filters/filter-utils.js +12 -6
  14. package/src/filters/filterAsQuery.js +107 -45
  15. package/src/filters/index.js +1 -0
  16. package/src/filters/temporal-cell-filter.js +60 -0
  17. package/src/form-utils.js +38 -4
  18. package/src/formatting-utils.js +46 -25
  19. package/src/nanoid/index.js +3 -3
  20. package/types/column-utils.d.ts +41 -6
  21. package/types/datasource/BaseDataSource.d.ts +2 -2
  22. package/types/date/EpochTimestamp.d.ts +63 -0
  23. package/types/date/date-utils.d.ts +33 -7
  24. package/types/date/dateTimePattern.d.ts +20 -2
  25. package/types/date/formatter.d.ts +26 -1
  26. package/types/date/index.d.ts +6 -2
  27. package/types/date/temporal.d.ts +68 -0
  28. package/types/date/time-zone.d.ts +52 -0
  29. package/types/filters/filter-utils.d.ts +4 -0
  30. package/types/filters/filterAsQuery.d.ts +41 -0
  31. package/types/filters/index.d.ts +1 -0
  32. package/types/filters/temporal-cell-filter.d.ts +24 -0
  33. package/types/form-utils.d.ts +19 -0
  34. package/types/formatting-utils.d.ts +23 -1
  35. package/types/src/Clock.d.ts +0 -20
  36. package/types/src/PageVisibilityObserver.d.ts +0 -36
  37. package/types/src/ScaledDecimal.d.ts +0 -12
  38. package/types/src/ShellContext.d.ts +0 -11
  39. package/types/src/ThemeProvider.d.ts +0 -32
  40. package/types/src/array-utils.d.ts +0 -16
  41. package/types/src/box-utils.d.ts +0 -24
  42. package/types/src/broadcast-channel.d.ts +0 -16
  43. package/types/src/column-utils.d.ts +0 -243
  44. package/types/src/common-types.d.ts +0 -6
  45. package/types/src/component-registry.d.ts +0 -65
  46. package/types/src/context-definitions/DataContext.d.ts +0 -21
  47. package/types/src/context-definitions/DataProvider.d.ts +0 -7
  48. package/types/src/context-definitions/DataSourceProvider.d.ts +0 -12
  49. package/types/src/context-definitions/WorkspaceContext.d.ts +0 -17
  50. package/types/src/cookie-utils.d.ts +0 -9
  51. package/types/src/css-utils.d.ts +0 -1
  52. package/types/src/data-utils.d.ts +0 -33
  53. package/types/src/datasource/BaseDataSource.d.ts +0 -63
  54. package/types/src/datasource/datasource-action-utils.d.ts +0 -7
  55. package/types/src/datasource/datasource-filter-utils.d.ts +0 -2
  56. package/types/src/datasource/datasource-utils.d.ts +0 -61
  57. package/types/src/date/date-utils.d.ts +0 -39
  58. package/types/src/date/dateTimePattern.d.ts +0 -8
  59. package/types/src/date/formatter.d.ts +0 -9
  60. package/types/src/date/index.d.ts +0 -4
  61. package/types/src/date/types.d.ts +0 -29
  62. package/types/src/debug-utils.d.ts +0 -9
  63. package/types/src/edit-utils.d.ts +0 -2
  64. package/types/src/errors.d.ts +0 -2
  65. package/types/src/event-emitter.d.ts +0 -21
  66. package/types/src/feature-utils.d.ts +0 -110
  67. package/types/src/filters/filter-utils.d.ts +0 -75
  68. package/types/src/filters/filterAsQuery.d.ts +0 -8
  69. package/types/src/filters/index.d.ts +0 -2
  70. package/types/src/form-utils.d.ts +0 -37
  71. package/types/src/formatting-utils.d.ts +0 -14
  72. package/types/src/getUniqueId.d.ts +0 -1
  73. package/types/src/group-utils.d.ts +0 -10
  74. package/types/src/html-utils.d.ts +0 -21
  75. package/types/src/index.d.ts +0 -76
  76. package/types/src/input-utils.d.ts +0 -2
  77. package/types/src/invariant.d.ts +0 -1
  78. package/types/src/itemToString.d.ts +0 -2
  79. package/types/src/json-types.d.ts +0 -52
  80. package/types/src/json-utils.d.ts +0 -6
  81. package/types/src/keyboard-utils.d.ts +0 -15
  82. package/types/src/keyset.d.ts +0 -16
  83. package/types/src/layout-types.d.ts +0 -22
  84. package/types/src/list-utils.d.ts +0 -2
  85. package/types/src/local-storage-utils.d.ts +0 -4
  86. package/types/src/logging-utils.d.ts +0 -45
  87. package/types/src/module-utils.d.ts +0 -8
  88. package/types/src/nanoid/index.d.ts +0 -1
  89. package/types/src/perf-utils.d.ts +0 -5
  90. package/types/src/promise-utils.d.ts +0 -8
  91. package/types/src/protocol-message-utils.d.ts +0 -43
  92. package/types/src/range-utils.d.ts +0 -29
  93. package/types/src/react-utils.d.ts +0 -15
  94. package/types/src/round-decimal.d.ts +0 -4
  95. package/types/src/row-utils.d.ts +0 -28
  96. package/types/src/selection-utils.d.ts +0 -9
  97. package/types/src/shell-layout-types.d.ts +0 -15
  98. package/types/src/sort-utils.d.ts +0 -11
  99. package/types/src/table-schema-utils.d.ts +0 -5
  100. package/types/src/text-utils.d.ts +0 -10
  101. package/types/src/theme-utils.d.ts +0 -14
  102. package/types/src/tree-types.d.ts +0 -9
  103. package/types/src/tree-utils.d.ts +0 -9
  104. package/types/src/ts-utils.d.ts +0 -20
  105. package/types/src/typeahead-utils.d.ts +0 -1
  106. package/types/src/url-utils.d.ts +0 -3
  107. package/types/src/useId.d.ts +0 -1
  108. package/types/src/useLayoutEffectSkipFirst.d.ts +0 -2
  109. package/types/src/useResizeObserver.d.ts +0 -15
  110. package/types/src/useStateRef.d.ts +0 -2
  111. package/types/src/user-types.d.ts +0 -3
@@ -0,0 +1,56 @@
1
+ import { CalendarDate, CalendarDateTime, fromAbsolute, getLocalTimeZone, toCalendarDate, toZoned } from "@internationalized/date";
2
+ let defaultTimeZone = "local";
3
+ const setDefaultTimeZone = (timeZone)=>{
4
+ defaultTimeZone = timeZone;
5
+ };
6
+ const getDefaultTimeZone = ()=>defaultTimeZone;
7
+ const resolveTimeZone = (timeZone = defaultTimeZone)=>"local" === timeZone ? getLocalTimeZone() : timeZone;
8
+ const getDateTimeFields = (epochMillis, timeZone)=>{
9
+ const { year, month, day, hour, minute, second, millisecond } = fromAbsolute(epochMillis, resolveTimeZone(timeZone));
10
+ return {
11
+ year,
12
+ month,
13
+ day,
14
+ hour,
15
+ minute,
16
+ second,
17
+ millisecond
18
+ };
19
+ };
20
+ const fromDateTimeFields = ({ year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0 }, timeZone)=>toZoned(new CalendarDateTime(year, month, day, hour, minute, second, millisecond), resolveTimeZone(timeZone), "compatible").toDate().getTime();
21
+ const calendarDateOf = (epochMillis, timeZone)=>toCalendarDate(fromAbsolute(epochMillis, resolveTimeZone(timeZone)));
22
+ const startOfCalendarDay = (date, timeZone)=>toZoned(date, resolveTimeZone(timeZone)).toDate().getTime();
23
+ const startOfDay = (epochMillis, timeZone)=>startOfCalendarDay(calendarDateOf(epochMillis, timeZone), timeZone);
24
+ const startOfNextDay = (epochMillis, timeZone)=>startOfCalendarDay(calendarDateOf(epochMillis, timeZone).add({
25
+ days: 1
26
+ }), timeZone);
27
+ const isStartOfDay = (epochMillis, timeZone)=>startOfDay(epochMillis, timeZone) === epochMillis;
28
+ const isoDatePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
29
+ const resolveRelativeDate = (date = "today", timeZone)=>{
30
+ if (date instanceof Date) return calendarDateOf(date.getTime(), timeZone);
31
+ {
32
+ if ("today" === date) return calendarDateOf(Date.now(), timeZone);
33
+ if ("yesterday" === date) return calendarDateOf(Date.now(), timeZone).subtract({
34
+ days: 1
35
+ });
36
+ const match = isoDatePattern.exec(date);
37
+ if (match) return new CalendarDate(parseInt(match[1]), parseInt(match[2]), parseInt(match[3]));
38
+ throw Error(`[time-zone] invalid date ${date}`);
39
+ }
40
+ };
41
+ const timeOfDayToEpochMillis = (timeString, date = "today", timeZone)=>{
42
+ const { year, month, day } = resolveRelativeDate(date, timeZone);
43
+ const [hms, fraction = ""] = timeString.split(".");
44
+ const [hour, minute, second] = hms.split(":").map((v)=>parseInt(v, 10));
45
+ const millisecond = parseInt(fraction.padEnd(3, "0").slice(0, 3), 10);
46
+ return fromDateTimeFields({
47
+ year,
48
+ month,
49
+ day,
50
+ hour,
51
+ minute,
52
+ second,
53
+ millisecond
54
+ }, timeZone);
55
+ };
56
+ export { fromDateTimeFields, getDateTimeFields, getDefaultTimeZone, isStartOfDay, resolveRelativeDate, resolveTimeZone, setDefaultTimeZone, startOfDay, startOfNextDay, timeOfDayToEpochMillis };
@@ -1,4 +1,6 @@
1
1
  import { ScaledDecimal } from "../ScaledDecimal.js";
2
+ import { isTimeDataValueWithMilliseconds } from "../column-utils.js";
3
+ import { getTemporalInfo } from "../date/temporal.js";
2
4
  const singleValueFilterOps = new Set([
3
5
  "=",
4
6
  "!=",
@@ -64,6 +66,13 @@ const collectFiltersForColumn = (filter, columnName)=>{
64
66
  };
65
67
  };
66
68
  const stringifyBoolean = (value)=>"boolean" == typeof value ? "${filter.value}" : value;
69
+ const getDefaultTimeRange = (column)=>isTimeDataValueWithMilliseconds(column) ? [
70
+ "00:00:00.000",
71
+ "23:59:59.999"
72
+ ] : [
73
+ "00:00:00",
74
+ "23:59:59"
75
+ ];
67
76
  const getColumnValueFromFilter = (column, operator, filter)=>{
68
77
  if (isSingleValueFilter(filter)) {
69
78
  if (filter.column === column.name) {
@@ -72,7 +81,7 @@ const getColumnValueFromFilter = (column, operator, filter)=>{
72
81
  `${filter.value}`,
73
82
  ""
74
83
  ];
75
- else if ("<" === filter.op) return [
84
+ else if ("<" === filter.op || "<=" === filter.op) return [
76
85
  "",
77
86
  `${filter.value}`
78
87
  ];
@@ -97,10 +106,7 @@ const getColumnValueFromFilter = (column, operator, filter)=>{
97
106
  }
98
107
  }
99
108
  if (!operator.startsWith("between")) return "";
100
- if ("time" === column.type) return [
101
- "00:00:00",
102
- "23:59:59"
103
- ];
109
+ if (getTemporalInfo(column)?.kind === "time") return getDefaultTimeRange(column);
104
110
  return [
105
111
  "",
106
112
  ""
@@ -133,4 +139,4 @@ const filtersAreEqual = (f1, f2)=>{
133
139
  }
134
140
  return false;
135
141
  };
136
- export { applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, isAndFilter, isBetweenFilter, isBetweenOperator, isCompleteFilter, isExtendedFilter, isFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isScaledDecimalFilterClause, isSerializableFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns };
142
+ export { applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, getDefaultTimeRange, isAndFilter, isBetweenFilter, isBetweenOperator, isCompleteFilter, isExtendedFilter, isFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isScaledDecimalFilterClause, isSerializableFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns };
@@ -1,4 +1,6 @@
1
- import { isDateTimeDataValue } from "../column-utils.js";
1
+ import { EpochTimestamp } from "../date/EpochTimestamp.js";
2
+ import { getTemporalInfo } from "../date/temporal.js";
3
+ import { isStartOfDay, startOfDay, startOfNextDay, timeOfDayToEpochMillis } from "../date/time-zone.js";
2
4
  import { stringIsValidLong } from "../data-utils.js";
3
5
  import { isMultiClauseFilter, isMultiValueFilter, isSerializableFilter } from "./filter-utils.js";
4
6
  import { ScaledDecimal } from "../ScaledDecimal.js";
@@ -8,7 +10,9 @@ const filterValue = (value, columnType)=>{
8
10
  const isNumericType = [
9
11
  "int",
10
12
  "long",
11
- "double"
13
+ "double",
14
+ "epochtimestamp",
15
+ "epochtimestampnano"
12
16
  ].includes(columnType);
13
17
  return isNumericType ? value : `"${value}"`;
14
18
  }
@@ -24,64 +28,122 @@ const filterAsQueryCore = (f, opts)=>{
24
28
  const multiClauseFilter = f.filters.map((filter)=>filterAsQueryCore(filter, opts)).join(` ${f.op} `);
25
29
  return `(${multiClauseFilter})`;
26
30
  }
27
- if (isMultiValueFilter(f)) return `${f.column} ${f.op} [${f.values.map(quotedStrings).join(",")}]`;
28
- return singleValueFilterAsQuery(f, opts);
31
+ if (!isMultiValueFilter(f)) return singleValueFilterAsQuery(f, opts);
32
+ {
33
+ const column = opts?.columnsByName?.[f.column];
34
+ const temporalInfo = getTemporalInfo(column);
35
+ const values = f.values;
36
+ if (temporalInfo) {
37
+ const literals = values.map((v)=>EpochTimestamp.fromWire(v, temporalInfo.encoding)?.toLiteral(temporalInfo.encoding) ?? quotedStrings(v));
38
+ return `${f.column} ${f.op} [${literals.join(",")}]`;
39
+ }
40
+ return `${f.column} ${f.op} [${values.map(quotedStrings).join(",")}]`;
41
+ }
29
42
  };
30
43
  function singleValueFilterAsQuery(f, opts) {
31
44
  if (isSerializableFilter(f)) return f.asQuery();
32
45
  {
33
46
  const column = opts?.columnsByName?.[f.column];
34
- if (column && isDateTimeDataValue(column)) return dateFilterAsQuery(f, opts);
47
+ const temporalInfo = getTemporalInfo(column);
48
+ if (temporalInfo) return temporalFilterAsQuery(f, temporalInfo);
35
49
  return defaultSingleValueFilterAsQuery(f, opts);
36
50
  }
37
51
  }
38
52
  const ONE_DAY_IN_MILLIS = 86400000;
39
- function dateFilterAsQuery(f, opts) {
40
- switch(f.op){
53
+ const timeOfDayPattern = /^\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?$/;
54
+ const NANOS_PER_SECOND = 1000000000;
55
+ const NANOS_PER_MILLI = 1000000;
56
+ const resolveTemporalFilterValue = (value, { encoding, kind, timeZone }, date = "today")=>{
57
+ if ("string" == typeof value && timeOfDayPattern.test(value)) {
58
+ const [hms, fraction = ""] = value.split(".");
59
+ const millis = timeOfDayToEpochMillis(hms, date, timeZone);
60
+ const nanos = parseInt(fraction.padEnd(9, "0"), 10);
61
+ const ts = EpochTimestamp.fromMillis(millis + Math.floor(nanos / NANOS_PER_MILLI), "epochNanos" === encoding ? nanos % NANOS_PER_MILLI : 0);
62
+ const period = 10 ** (9 - Math.min(fraction.length, 9));
63
+ const unit = "epochNanos" === encoding ? 1 : NANOS_PER_MILLI;
64
+ return [
65
+ ts,
66
+ period > unit ? period : "exact"
67
+ ];
68
+ }
69
+ const ts = EpochTimestamp.fromWire(value instanceof ScaledDecimal ? value.asLong : value, encoding);
70
+ if (void 0 === ts) return [
71
+ void 0,
72
+ "exact"
73
+ ];
74
+ const isWholeDay = 0 === ts.subMilliNanos && isStartOfDay(ts.epochMillis, timeZone);
75
+ if ("date" === kind || "datetime" === kind && isWholeDay) return [
76
+ ts,
77
+ "day"
78
+ ];
79
+ if ("time" === kind && 0 === ts.subMilliNanos && ts.epochMillis % 1000 === 0) return [
80
+ ts,
81
+ NANOS_PER_SECOND
82
+ ];
83
+ return [
84
+ ts,
85
+ "exact"
86
+ ];
87
+ };
88
+ function temporalFilterAsQuery(f, temporalInfo, options) {
89
+ const { column, op } = f;
90
+ const { encoding, timeZone } = temporalInfo;
91
+ const [ts, granularity] = resolveTemporalFilterValue(f.value, temporalInfo, options?.date);
92
+ if (void 0 === ts) return `${column} ${op} ${filterValue(f.value, "long")}`;
93
+ if ("exact" === granularity) return `${column} ${op} ${ts.toLiteral(encoding)}`;
94
+ const [start, end] = "day" === granularity ? [
95
+ EpochTimestamp.fromMillis(startOfDay(ts.epochMillis, timeZone)),
96
+ EpochTimestamp.fromMillis(startOfNextDay(ts.epochMillis, timeZone))
97
+ ] : [
98
+ ts,
99
+ EpochTimestamp.fromNanos(ts.epochNanos + BigInt(granularity))
100
+ ];
101
+ const from = start.toLiteral(encoding);
102
+ const to = end.toLiteral(encoding);
103
+ switch(op){
41
104
  case "=":
42
- {
43
- const filters = [
44
- {
45
- op: ">=",
46
- column: f.column,
47
- value: f.value
48
- },
49
- {
50
- op: "<",
51
- column: f.column,
52
- value: f.value + ONE_DAY_IN_MILLIS
53
- }
54
- ];
55
- return filterAsQueryCore({
56
- op: "and",
57
- filters
58
- }, opts);
59
- }
105
+ return `(${column} >= ${from} and ${column} < ${to})`;
60
106
  case "!=":
61
- {
62
- const filters = [
63
- {
64
- op: "<",
65
- column: f.column,
66
- value: f.value
67
- },
68
- {
69
- op: ">=",
70
- column: f.column,
71
- value: f.value + ONE_DAY_IN_MILLIS
72
- }
73
- ];
74
- return filterAsQueryCore({
75
- op: "or",
76
- filters
77
- }, opts);
78
- }
107
+ return `(${column} < ${from} or ${column} >= ${to})`;
108
+ case ">":
109
+ return `${column} >= ${to}`;
110
+ case ">=":
111
+ return `${column} >= ${from}`;
112
+ case "<":
113
+ return `${column} < ${from}`;
114
+ case "<=":
115
+ return `${column} < ${to}`;
79
116
  default:
80
- return defaultSingleValueFilterAsQuery(f, opts);
117
+ return `${column} ${op} ${ts.toLiteral(encoding)}`;
81
118
  }
82
119
  }
120
+ function dateFilterAsQuery(f, opts) {
121
+ const temporalInfo = getTemporalInfo(opts?.columnsByName?.[f.column] ?? {
122
+ type: "date/time"
123
+ });
124
+ return temporalFilterAsQuery(f, temporalInfo);
125
+ }
83
126
  const defaultSingleValueFilterAsQuery = (f, opts)=>{
84
127
  const columnType = opts?.columnsByName?.[f.column]?.serverDataType;
85
128
  return `${f.column} ${f.op} ${filterValue(f.value, columnType)}`;
86
129
  };
87
- export { ONE_DAY_IN_MILLIS, dateFilterAsQuery, filterAsQuery };
130
+ const getColumnsByName = (columns)=>columns.reduce((map, column)=>{
131
+ map[column.name] = column;
132
+ return map;
133
+ }, {});
134
+ const getColumnsByNameForFilter = (tableSchema, columnsByName)=>{
135
+ if (void 0 === tableSchema) return columnsByName;
136
+ const result = {};
137
+ for (const column of tableSchema.columns)result[column.name] = {
138
+ ...column,
139
+ ...columnsByName?.[column.name]
140
+ };
141
+ if (columnsByName) for (const [name, column] of Object.entries(columnsByName))result[name] ??= column;
142
+ return result;
143
+ };
144
+ const filterRequiresResolution = (filter, columnsByName)=>{
145
+ if (isMultiClauseFilter(filter)) return filter.filters.some((f)=>filterRequiresResolution(f, columnsByName));
146
+ if (isSerializableFilter(filter)) return true;
147
+ return void 0 !== getTemporalInfo(columnsByName?.[filter.column]);
148
+ };
149
+ export { ONE_DAY_IN_MILLIS, dateFilterAsQuery, filterAsQuery, filterRequiresResolution, getColumnsByName, getColumnsByNameForFilter, temporalFilterAsQuery };
@@ -1,2 +1,3 @@
1
1
  export * from "./filter-utils.js";
2
2
  export * from "./filterAsQuery.js";
3
+ export * from "./temporal-cell-filter.js";
@@ -0,0 +1,60 @@
1
+ import { dateTimePattern, defaultPatternsByType } from "../date/dateTimePattern.js";
2
+ import { EpochTimestamp } from "../date/EpochTimestamp.js";
3
+ import { formatTimestamp } from "../date/formatter.js";
4
+ import { getTemporalInfo } from "../date/temporal.js";
5
+ import { startOfDay } from "../date/time-zone.js";
6
+ import { getFractionalSecondDigits, temporalFormatter } from "../formatting-utils.js";
7
+ const pad2 = (n)=>`${n}`.padStart(2, "0");
8
+ const getTemporalCellFilter = (column, value, dateOnly = false)=>{
9
+ const temporalInfo = getTemporalInfo(column);
10
+ if (void 0 === temporalInfo) return;
11
+ const { encoding, kind, timeZone } = temporalInfo;
12
+ const ts = EpochTimestamp.fromWire(value, encoding);
13
+ if (void 0 === ts) return;
14
+ const pattern = dateTimePattern(column.type, kind);
15
+ if ("date" === kind || dateOnly && "datetime" === kind || void 0 === pattern.time) {
16
+ const { date = defaultPatternsByType.date } = pattern;
17
+ const start = EpochTimestamp.fromMillis(startOfDay(ts.epochMillis, timeZone));
18
+ return {
19
+ label: formatTimestamp({
20
+ date
21
+ }, {
22
+ timeZone
23
+ })(ts),
24
+ op: "=",
25
+ value: `${start.toWire(encoding)}`
26
+ };
27
+ }
28
+ const digits = Math.max(0, Math.min(9, getFractionalSecondDigits(column, temporalInfo)));
29
+ const unit = "epochNanos" === encoding ? 1n : 1000000n;
30
+ const period = 10n ** BigInt(9 - digits);
31
+ const startNanos = ts.epochNanos - ts.epochNanos % period;
32
+ const start = EpochTimestamp.fromNanos(startNanos);
33
+ const label = temporalFormatter(column, temporalInfo)(start.toWire(encoding));
34
+ if ("time" === kind) {
35
+ const { hour, minute, second } = ts.getFields(timeZone);
36
+ const fraction = ts.fractionalSecond(digits);
37
+ return {
38
+ label,
39
+ op: "=",
40
+ value: `${pad2(hour)}:${pad2(minute)}:${pad2(second)}${fraction ? `.${fraction}` : ""}`
41
+ };
42
+ }
43
+ {
44
+ if (period <= unit) return {
45
+ label,
46
+ op: "=",
47
+ value: `${ts.toWire(encoding)}`
48
+ };
49
+ const end = EpochTimestamp.fromNanos(startNanos + period - unit);
50
+ return {
51
+ label,
52
+ op: "between-inclusive",
53
+ value: [
54
+ `${start.toWire(encoding)}`,
55
+ `${end.toWire(encoding)}`
56
+ ]
57
+ };
58
+ }
59
+ };
60
+ export { getTemporalCellFilter };
package/src/form-utils.js CHANGED
@@ -1,5 +1,8 @@
1
1
  import { stringIsValidDecimal, stringIsValidInt, stringIsValidLong } from "./data-utils.js";
2
- import { Time, isValidTimeString } from "./date/index.js";
2
+ import { Time, isValidTimeString, isValidTimeStringMillis, normaliseTimeString } from "./date/date-utils.js";
3
+ import { getTemporalInfo, parseTemporalInput } from "./date/temporal.js";
4
+ import { getDefaultTimeZone } from "./date/time-zone.js";
5
+ import { isTypeDescriptor } from "./column-utils.js";
3
6
  import { queryClosest } from "./html-utils.js";
4
7
  import { ScaledDecimal2, ScaledDecimal4, ScaledDecimal6, ScaledDecimal8 } from "./ScaledDecimal.js";
5
8
  class DataValidationError extends Error {
@@ -19,7 +22,9 @@ const getFieldName = (target)=>{
19
22
  };
20
23
  const isNumber = (type, value)=>"number" === type;
21
24
  const isValidRange = ([val1, val2])=>{
22
- if (isValidTimeString(val1) && isValidTimeString(val2)) return val2 > val1;
25
+ const time1 = normaliseTimeString(val1, true);
26
+ const time2 = normaliseTimeString(val2, true);
27
+ if (time1 && time2) return time2 > time1;
23
28
  return true;
24
29
  };
25
30
  function getTypedRange([value1, value2], dataType, options) {
@@ -62,8 +67,24 @@ function getTypedValue(value, type, throwIfInvalid = false, options) {
62
67
  throw new DataValidationError(`value ${value} is not a valid ${type}`, "decimal", getActualType(value));
63
68
  case "boolean":
64
69
  return "true" === value;
70
+ case "epochtimestamp":
71
+ case "epochtimestampnano":
72
+ case "date/time":
73
+ case "date":
74
+ {
75
+ const encoding = "epochtimestampnano" === type ? "epochNanos" : "epochMillis";
76
+ const timestamp = parseTemporalInput(value, {
77
+ kind: "date" === type ? "date" : "datetime",
78
+ encoding,
79
+ precision: "epochNanos" === encoding ? "ns" : "ms",
80
+ timeZone: getDefaultTimeZone()
81
+ });
82
+ if (timestamp) return timestamp.toWire(encoding);
83
+ if (!throwIfInvalid) return;
84
+ throw new DataValidationError(`value ${value} is not a valid ${type}`, "date/time", getActualType(value));
85
+ }
65
86
  case "time":
66
- if (isValidTimeString(value)) if (options?.type === "TimeString") return value;
87
+ if (isValidTimeString(value) || isValidTimeStringMillis(value)) if (options?.type === "TimeString") return value;
67
88
  else return +Time(value).asDate();
68
89
  if (value.length > 0 && Time.isDateInMillis(value)) return Number(value);
69
90
  if (!throwIfInvalid) return;
@@ -72,4 +93,17 @@ function getTypedValue(value, type, throwIfInvalid = false, options) {
72
93
  return value;
73
94
  }
74
95
  }
75
- export { DataValidationError, getFieldName, getTypedRange, getTypedValue, isNumber, isValidRange };
96
+ function getTypedTemporalValue(value, temporalInfo, throwIfInvalid = false, baseValue) {
97
+ if ("" === value) return;
98
+ const timestamp = parseTemporalInput(value, temporalInfo, baseValue);
99
+ if (timestamp) return timestamp.toWire(temporalInfo.encoding);
100
+ if (throwIfInvalid) throw new DataValidationError(`value ${value} is not a valid ${temporalInfo.kind}`, temporalInfo.kind, getActualType(value));
101
+ }
102
+ function getTypedValueForDescriptor(value, descriptor, throwIfInvalid = false) {
103
+ const temporalInfo = getTemporalInfo(descriptor);
104
+ if (temporalInfo) return getTypedTemporalValue(value, temporalInfo, throwIfInvalid);
105
+ const { serverDataType = "string", type } = descriptor;
106
+ const dataType = isTypeDescriptor(type) ? type.name : type ?? serverDataType;
107
+ return throwIfInvalid ? getTypedValue(value, dataType, true) : getTypedValue(value, dataType, false);
108
+ }
109
+ export { DataValidationError, getFieldName, getTypedRange, getTypedTemporalValue, getTypedValue, getTypedValueForDescriptor, isNumber, isValidRange };
@@ -1,31 +1,51 @@
1
- import { isDateTimeDataValue, isMappedValueTypeRenderer, isNanoTimestampColumn, isTimeDataValue, isTypeDescriptor } from "./column-utils.js";
2
- import { dateTimePattern, formatDate } from "./date/index.js";
1
+ import { isMappedValueTypeRenderer, isTypeDescriptor } from "./column-utils.js";
2
+ import { dateTimePattern, defaultPatternsByType } from "./date/dateTimePattern.js";
3
+ import { isStartOfDay } from "./date/time-zone.js";
4
+ import { EpochTimestamp } from "./date/EpochTimestamp.js";
5
+ import { formatTimestamp } from "./date/formatter.js";
6
+ import { getTemporalInfo } from "./date/temporal.js";
3
7
  import { roundDecimal, roundScaledDecimal } from "./round-decimal.js";
4
8
  import { isNumericType } from "./protocol-message-utils.js";
5
9
  const DEFAULT_NUMERIC_FORMAT = {};
6
10
  const defaultValueFormatter = (value)=>null == value ? "" : "string" == typeof value ? value : value.toString();
7
- const dateFormatter = (column)=>{
8
- if (isNanoTimestampColumn(column)) {
9
- const pattern = dateTimePattern(column.type);
10
- const formatter = formatDate(pattern);
11
- return (value)=>{
12
- if ("string" != typeof value || "" === value) return "";
13
- {
14
- const bigIntValue = BigInt(value);
15
- const dateTimeValue = Number(bigIntValue / 1000000n);
16
- const nanoSeconds = (bigIntValue % 1000000n).toString().padStart(9, "0");
17
- return `${formatter(new Date(dateTimeValue))}.${nanoSeconds}`;
18
- }
19
- };
20
- }
21
- {
22
- const pattern = dateTimePattern(column.type);
23
- const formatter = formatDate(pattern);
24
- return (value)=>{
25
- if ("number" == typeof value && 0 !== value) return formatter(new Date(value));
26
- return "";
27
- };
11
+ const getFractionalSecondDigits = (column, temporalInfo = getTemporalInfo(column))=>{
12
+ if (void 0 === temporalInfo) return 0;
13
+ const pattern = dateTimePattern(column.type, temporalInfo.kind);
14
+ const formatting = isTypeDescriptor(column.type) ? column.type.formatting : void 0;
15
+ return formatting?.fractionalSecondDigits ?? ("hh:mm:ss.ms" === pattern.time ? 3 : "ns" === temporalInfo.precision && pattern.time ? 9 : 0);
16
+ };
17
+ const temporalFormatter = (column, temporalInfo = getTemporalInfo(column))=>{
18
+ if (void 0 === temporalInfo) return defaultValueFormatter;
19
+ const { encoding, kind, timeZone } = temporalInfo;
20
+ const formatting = isTypeDescriptor(column.type) ? column.type.formatting ?? DEFAULT_NUMERIC_FORMAT : DEFAULT_NUMERIC_FORMAT;
21
+ const pattern = dateTimePattern(column.type, kind);
22
+ const fractionalSecondDigits = getFractionalSecondDigits(column, temporalInfo);
23
+ const formatter = formatTimestamp(pattern, {
24
+ fractionalSecondDigits,
25
+ locale: formatting.locale,
26
+ timeZone
27
+ });
28
+ return (value)=>{
29
+ const timestamp = EpochTimestamp.fromWire(value, encoding);
30
+ return timestamp ? formatter(timestamp) : "";
31
+ };
32
+ };
33
+ const timeOfDayPattern = /^\d{2}:\d{2}:\d{2}(\.\d{1,9})?$/;
34
+ const formatTemporalFilterValue = (value, column)=>{
35
+ const temporalInfo = getTemporalInfo(column);
36
+ if ("string" == typeof value && timeOfDayPattern.test(value)) return value;
37
+ if (void 0 === temporalInfo) return defaultValueFormatter(value);
38
+ const timestamp = EpochTimestamp.fromWire(value, temporalInfo.encoding);
39
+ if (void 0 === timestamp) return defaultValueFormatter(value);
40
+ if ("datetime" === temporalInfo.kind && 0 === timestamp.subMilliNanos && isStartOfDay(timestamp.epochMillis, temporalInfo.timeZone)) {
41
+ const { date = defaultPatternsByType.date } = dateTimePattern(column.type, "date");
42
+ return formatTimestamp({
43
+ date
44
+ }, {
45
+ timeZone: temporalInfo.timeZone
46
+ })(timestamp);
28
47
  }
48
+ return temporalFormatter(column, temporalInfo)(value);
29
49
  };
30
50
  const numericFormatter = ({ align = "right", serverDataType, type })=>{
31
51
  if (void 0 === type || "string" == typeof type) return defaultValueFormatter;
@@ -47,7 +67,8 @@ const NumericTypes = [
47
67
  ];
48
68
  const getValueFormatter = (column)=>{
49
69
  const { serverDataType = "string" } = column;
50
- if (isDateTimeDataValue(column) || isTimeDataValue(column)) return dateFormatter(column);
70
+ const temporalInfo = getTemporalInfo(column);
71
+ if (temporalInfo) return temporalFormatter(column, temporalInfo);
51
72
  const { type } = column;
52
73
  if (isTypeDescriptor(type) && isMappedValueTypeRenderer(type?.renderer)) return mapFormatter(type.renderer.map);
53
74
  if (isNumericType(serverDataType) || isTypeDescriptor(type) && NumericTypes.includes(type.name)) return numericFormatter(column);
@@ -55,4 +76,4 @@ const getValueFormatter = (column)=>{
55
76
  return defaultValueFormatter;
56
77
  };
57
78
  const lowerCase = (str)=>str.toLowerCase();
58
- export { defaultValueFormatter, getValueFormatter, lowerCase, numericFormatter };
79
+ export { defaultValueFormatter, formatTemporalFilterValue, getFractionalSecondDigits, getValueFormatter, lowerCase, numericFormatter, temporalFormatter };
@@ -1,12 +1,12 @@
1
1
  const uuid = (size = 21)=>{
2
- let id = '';
2
+ let id = "";
3
3
  const bytes = crypto.getRandomValues(new Uint8Array(size));
4
4
  while(size--){
5
5
  const byte = 63 & bytes[size];
6
6
  if (byte < 36) id += byte.toString(36);
7
7
  else if (byte < 62) id += (byte - 26).toString(36).toUpperCase();
8
- else if (byte < 63) id += '_';
9
- else id += '-';
8
+ else if (byte < 63) id += "_";
9
+ else id += "-";
10
10
  }
11
11
  return id;
12
12
  };
@@ -32,13 +32,48 @@ export type CalculatedColumn = {
32
32
  };
33
33
  export declare const isVuuColumnDataType: (value: string | undefined | null) => value is VuuColumnDataType;
34
34
  export declare const fromServerDataType: (serverDataType: VuuColumnDataType) => DataValueTypeSimple;
35
+ /**
36
+ * Returns true if serverDataType is epochtimestampnano. Note: prefer
37
+ * getTemporalInfo, which describes encoding, kind and time zone.
38
+ */
35
39
  export declare const isNanoTimestampColumn: ({ serverDataType, }: DataValueDescriptor) => boolean;
36
- export declare const isTimestampColumn: (column: ColumnDescriptor) => boolean;
37
- export declare const isNumericColumn: ({ serverDataType, type }: ColumnDescriptor) => boolean;
38
- export declare const isDateTimeDataType: (column: ColumnDescriptor) => column is DateTimeDataValueDescriptor;
39
- export declare const isTimeDataType: (column: ColumnDescriptor) => column is TimeDataValueDescriptor;
40
- export declare const isDateTimeDataValue: (column: ColumnDescriptor) => boolean;
41
- export declare const isTimeDataValue: (column?: ColumnDescriptor) => column is TimeDataValueDescriptor;
40
+ /**
41
+ * Returns true if serverDataType is epochtimestamp or epochtimestampnano.
42
+ * Note: this does not recognise legacy columns (long with a date/time type),
43
+ * use isTemporalColumn for that.
44
+ */
45
+ export declare const isTimestampColumn: (column: DataValueDescriptor) => boolean;
46
+ /**
47
+ * Returns true for any column holding a temporal value, see getTemporalInfo.
48
+ */
49
+ export declare const isTemporalColumn: (column?: DataValueDescriptor) => boolean;
50
+ /**
51
+ * Numeric columns, excluding those that hold temporal values.
52
+ */
53
+ export declare const isNumericColumn: (column: ColumnDescriptor) => boolean;
54
+ /**
55
+ * Checks the 'type' only, returns true for 'date/time' (or 'date').
56
+ * @deprecated use getTemporalInfo or isDateTimeDataValue
57
+ */
58
+ export declare const isDateTimeDataType: (column: DataValueDescriptor) => column is DateTimeDataValueDescriptor;
59
+ /**
60
+ * Checks the 'type' only, returns true for 'time'.
61
+ * @deprecated use getTemporalInfo or isTimeDataValue
62
+ */
63
+ export declare const isTimeDataType: (column: DataValueDescriptor) => column is TimeDataValueDescriptor;
64
+ /**
65
+ * Temporal value of kind 'datetime' or 'date' (i.e has a meaningful date component)
66
+ */
67
+ export declare const isDateTimeDataValue: (column?: DataValueDescriptor) => boolean;
68
+ /**
69
+ * Temporal value of kind 'time' (time of day)
70
+ */
71
+ export declare const isTimeDataValue: (column?: DataValueDescriptor) => column is TimeDataValueDescriptor;
72
+ /**
73
+ * A time column is edited/filtered with millisecond precision if its
74
+ * formatting pattern includes milliseconds.
75
+ */
76
+ export declare const isTimeDataValueWithMilliseconds: (column?: ColumnDescriptor) => column is TimeDataValueDescriptor;
42
77
  export declare const isPinned: (column: ColumnDescriptor) => boolean;
43
78
  export declare const hasHeadings: (column: ColumnDescriptor) => boolean;
44
79
  export declare const isResizing: (column: RuntimeColumnDescriptor) => boolean | undefined;
@@ -1,4 +1,4 @@
1
- import type { DataSource, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, DataSourceSubscribeCallback, DataSourceSubscribeProps, DataSourceSuspenseProps, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
1
+ import type { DataSource, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, DataSourceSubscribeCallback, DataSourceSubscribeProps, DataSourceSuspenseProps, SetFilterOptions, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
2
2
  import { LinkDescriptorWithLabel, VuuAggregation, VuuRange, VuuSort } from "@vuu-ui/vuu-protocol-types";
3
3
  import { EventEmitter } from "../event-emitter";
4
4
  import { Range } from "../range-utils";
@@ -28,7 +28,7 @@ export declare abstract class BaseDataSource extends EventEmitter<DataSourceEven
28
28
  set columns(columns: string[]);
29
29
  get filter(): DataSourceFilter;
30
30
  set filter(filter: DataSourceFilter);
31
- setFilter(filter: Filter): void;
31
+ setFilter(filter: Filter, options?: SetFilterOptions): void;
32
32
  clearFilter(): void;
33
33
  get isAwaitingConfirmationOfConfigChange(): boolean;
34
34
  protected confirmConfigChange(): void;