@deephaven/jsapi-utils 0.72.1-beta.4 → 0.72.1-core-plugins.9

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.
@@ -61,9 +61,13 @@ export declare class DateUtils {
61
61
  * Anything that is not captured in the string will be undefined.
62
62
  *
63
63
  * @param dateTimeString The date time string to parse
64
+ * @param allowOverflow If true, will allow overflow characters after the date
65
+ * string
64
66
  * @returns Containing the date time components
65
67
  */
66
- static parseDateTimeString(dateTimeString: string): DateParts<string>;
68
+ static parseDateTimeString(dateTimeString: string, allowOverflow?: boolean): DateParts<string> & {
69
+ overflow?: string;
70
+ };
67
71
  /**
68
72
  * Parses the date range provided from a string of text.
69
73
  * @param text The string to parse the date from. Can be a keyword like "today", or in the format "2018-08-04"
@@ -77,6 +81,12 @@ export declare class DateUtils {
77
81
  * @param dateWrapper The DateWrapper object, or time in millis
78
82
  */
79
83
  static getJsDate(dateWrapper: DhType.DateWrapper | number): Date;
84
+ /**
85
+ * Trim overflow (usually timezone) from a date time string.
86
+ * @param dateTimeString The date time string to trim
87
+ * @returns The date time string without overflow
88
+ */
89
+ static trimDateTimeStringTimeZone(dateTimeString: string): string;
80
90
  }
81
91
  export default DateUtils;
82
92
  //# sourceMappingURL=DateUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DateUtils.d.ts","sourceRoot":"","sources":["../src/DateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE3D,UAAU,SAAS,CAAC,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,CAAC,CAAC;CACV;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,gBAAgB,SAAmC;IAE1D,MAAM,CAAC,MAAM,WAaX;IAEF;;;;;;;;;;OAUG;IACH,MAAM,CAAC,eAAe,CACpB,EAAE,EAAE,OAAO,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAI,EACT,GAAG,SAAI,EACP,IAAI,SAAI,EACR,MAAM,SAAI,EACV,MAAM,SAAI,EACV,EAAE,SAAI,GACL,MAAM,CAAC,WAAW;IAoBrB;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAQ/C;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAChB,EAAE,EAAE,OAAO,MAAM,EACjB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,EACzB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,WAAW,GAAG,IAAI;IA6C5B;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAqB9C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI;IAwB3B;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAkCrE;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CACnB,EAAE,EAAE,OAAO,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;IAuGjE;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,GAAG,MAAM,GAAG,IAAI;CAMjE;AAED,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"DateUtils.d.ts","sourceRoot":"","sources":["../src/DateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAK3D,UAAU,SAAS,CAAC,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,CAAC,CAAC;CACV;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,gBAAgB,SAAmC;IAE1D,MAAM,CAAC,MAAM,WAaX;IAEF;;;;;;;;;;OAUG;IACH,MAAM,CAAC,eAAe,CACpB,EAAE,EAAE,OAAO,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAI,EACT,GAAG,SAAI,EACP,IAAI,SAAI,EACR,MAAM,SAAI,EACV,MAAM,SAAI,EACV,EAAE,SAAI,GACL,MAAM,CAAC,WAAW;IAoBrB;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAQ/C;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAChB,EAAE,EAAE,OAAO,MAAM,EACjB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,EACzB,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,WAAW,GAAG,IAAI;IA6C5B;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAqB9C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI;IAwB3B;;;;;;;;OAQG;IACH,MAAM,CAAC,mBAAmB,CACxB,cAAc,EAAE,MAAM,EACtB,aAAa,UAAQ,GACpB,SAAS,CAAC,MAAM,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;IAmC5C;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CACnB,EAAE,EAAE,OAAO,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;IAuGjE;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,GAAG,MAAM,GAAG,IAAI;IAOhE;;;;OAIG;IACH,MAAM,CAAC,0BAA0B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;CAoBlE;AAED,eAAe,SAAS,CAAC"}
package/dist/DateUtils.js CHANGED
@@ -1,6 +1,9 @@
1
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
2
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
1
3
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
2
4
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
3
5
  function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
6
+ var DATE_TIME_REGEX = /\s*(\d{4})([-./](\d{1,2}|[a-z]+))?([-./](\d{1,2}))?([tT\s](\d{2})([:](\d{2}))?([:](\d{2}))?([.](\d{1,9}))?)?(.*)/;
4
7
  export class DateUtils {
5
8
  /**
6
9
  *
@@ -159,19 +162,21 @@ export class DateUtils {
159
162
  * Anything that is not captured in the string will be undefined.
160
163
  *
161
164
  * @param dateTimeString The date time string to parse
165
+ * @param allowOverflow If true, will allow overflow characters after the date
166
+ * string
162
167
  * @returns Containing the date time components
163
168
  */
164
169
  static parseDateTimeString(dateTimeString) {
165
- var regex = /\s*(\d{4})([-./]([\da-z]+))?([-./](\d{1,2}))?([tT\s](\d{2})([:](\d{2}))?([:](\d{2}))?([.](\d{1,9}))?)?(.*)/;
166
- var result = regex.exec(dateTimeString);
170
+ var allowOverflow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
171
+ var result = DATE_TIME_REGEX.exec(dateTimeString);
167
172
  if (result == null) {
168
173
  throw new Error("Unexpected date string: ".concat(dateTimeString));
169
174
  }
170
175
  var [, year,, month,, date,, hours,, minutes,, seconds,, nanos, overflow] = result;
171
- if (overflow != null && overflow.length > 0) {
176
+ if (!allowOverflow && overflow != null && overflow.length > 0) {
172
177
  throw new Error("Unexpected characters after date string '".concat(dateTimeString, "': ").concat(overflow));
173
178
  }
174
- return {
179
+ var dateParts = {
175
180
  year,
176
181
  month,
177
182
  date,
@@ -180,6 +185,9 @@ export class DateUtils {
180
185
  seconds,
181
186
  nanos
182
187
  };
188
+ return allowOverflow ? _objectSpread(_objectSpread({}, dateParts), {}, {
189
+ overflow
190
+ }) : dateParts;
183
191
  }
184
192
 
185
193
  /**
@@ -239,6 +247,27 @@ export class DateUtils {
239
247
  }
240
248
  return dateWrapper.asDate();
241
249
  }
250
+
251
+ /**
252
+ * Trim overflow (usually timezone) from a date time string.
253
+ * @param dateTimeString The date time string to trim
254
+ * @returns The date time string without overflow
255
+ */
256
+ static trimDateTimeStringTimeZone(dateTimeString) {
257
+ var {
258
+ overflow = ''
259
+ } = DateUtils.parseDateTimeString(dateTimeString, true);
260
+ if (overflow === '') {
261
+ return dateTimeString;
262
+ }
263
+
264
+ // Expecting timezone overflow to be a single space followed by some
265
+ // combination of letters
266
+ if (!/^\s[A-Za-z]+/.test(overflow)) {
267
+ throw new Error("Unexpected timezone format in overflow: '".concat(dateTimeString, "'"));
268
+ }
269
+ return dateTimeString.slice(0, -overflow.length);
270
+ }
242
271
  }
243
272
  _defineProperty(DateUtils, "FULL_DATE_FORMAT", 'yyyy-MM-dd HH:mm:ss.SSSSSSSSS');
244
273
  _defineProperty(DateUtils, "months", ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december']);
@@ -1 +1 @@
1
- {"version":3,"file":"DateUtils.js","names":["DateUtils","makeDateWrapper","dh","timeZone","year","month","arguments","length","undefined","day","hour","minute","second","ns","Error","yearString","concat","padStart","monthString","dayString","hourString","minuteString","secondString","nanoString","dateString","i18n","DateTimeFormat","parse","FULL_DATE_FORMAT","TimeZone","getTimeZone","getNextNanos","sigNanos","parseInt","zeros","repeat","nextNanoString","getNextDate","components","values","date","hours","minutes","seconds","nanos","jsDate","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","parseMonth","Number","isNaN","NaN","cleanMonthString","trim","toLowerCase","i","months","startsWith","parseDateValues","padEnd","parseDateTimeString","dateTimeString","regex","result","exec","overflow","parseDateRange","text","cleanText","now","startDate","tomorrow","endDate","yesterday","DateWrapper","ofJsDate","getJsDate","dateWrapper","asDate","_defineProperty"],"sources":["../src/DateUtils.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\n\ninterface DateParts<T> {\n year: T;\n month: T;\n date: T;\n hours: T;\n minutes: T;\n seconds: T;\n nanos: T;\n}\n\nexport class DateUtils {\n static FULL_DATE_FORMAT = 'yyyy-MM-dd HH:mm:ss.SSSSSSSSS';\n\n static months = [\n 'january',\n 'february',\n 'march',\n 'april',\n 'may',\n 'june',\n 'july',\n 'august',\n 'september',\n 'october',\n 'november',\n 'december',\n ];\n\n /**\n *\n * @param timeZone The time zone to parse this time in. E.g. America/New_York\n * @param year The year for the date\n * @param month The month, starting at 0\n * @param day The day, starting at 1\n * @param hour The hours\n * @param minute The minutes\n * @param second The seconds\n * @param ns The nanoseconds\n */\n static makeDateWrapper(\n dh: typeof DhType,\n timeZone: string,\n year: number,\n month = 0,\n day = 1,\n hour = 0,\n minute = 0,\n second = 0,\n ns = 0\n ): DhType.DateWrapper {\n if (!timeZone) {\n throw new Error('No timezone provided');\n }\n const yearString = `${year}`.padStart(4, '0');\n const monthString = `${month + 1}`.padStart(2, '0');\n const dayString = `${day}`.padStart(2, '0');\n const hourString = `${hour}`.padStart(2, '0');\n const minuteString = `${minute}`.padStart(2, '0');\n const secondString = `${second}`.padStart(2, '0');\n const nanoString = `${ns}`.padStart(9, '0');\n\n const dateString = `${yearString}-${monthString}-${dayString} ${hourString}:${minuteString}:${secondString}.${nanoString}`;\n return dh.i18n.DateTimeFormat.parse(\n DateUtils.FULL_DATE_FORMAT,\n dateString,\n dh.i18n.TimeZone.getTimeZone(timeZone)\n );\n }\n\n /**\n * Takes the string the user entered and returns the next nanos value\n * @param nanoString The nano string to get the next one of\n * @returns The value of the next nanos\n */\n static getNextNanos(nanoString: string): number {\n const sigNanos = parseInt(nanoString, 10);\n // Get the zeroes needed for padding before adding one so we handle overflow properly.\n const zeros = '0'.repeat(9 - nanoString.length);\n const nextNanoString = `${sigNanos + 1}${zeros}`;\n return parseInt(nextNanoString, 10);\n }\n\n /**\n * @param components The string components that were parsed from the original string\n * @param values The values that were parsed from the components\n * @param timeZone The time zone to parse the date in. E.g. America/New_York\n * @returns Returns the DateWrapper for the next date, or null if a full date was passed in\n */\n static getNextDate(\n dh: typeof DhType,\n components: DateParts<string>,\n values: DateParts<number>,\n timeZone: string\n ): DhType.DateWrapper | null {\n let { year, month, date, hours, minutes, seconds, nanos } = values;\n\n if (components.nanos != null) {\n if (components.nanos.length === 9) {\n // They want an exact match\n return null;\n }\n nanos = DateUtils.getNextNanos(components.nanos);\n if (nanos > 999999999) {\n // There's an overflow, add it to the seconds manually\n seconds += 1;\n nanos = 0;\n }\n } else if (components.seconds != null) {\n seconds += 1;\n } else if (components.minutes != null) {\n minutes += 1;\n } else if (components.hours != null) {\n hours += 1;\n } else if (components.date != null) {\n date += 1;\n } else if (components.month != null) {\n month += 1;\n } else {\n year += 1;\n }\n\n // Use the JS date to handle overflow rather than doing our own logic\n // Because handling leap years and stuff is a pain\n // Still need to add nanos after, and the overflow from that is already added to seconds above\n const jsDate = new Date(year, month, date, hours, minutes, seconds);\n return DateUtils.makeDateWrapper(\n dh,\n timeZone,\n jsDate.getFullYear(),\n jsDate.getMonth(),\n jsDate.getDate(),\n jsDate.getHours(),\n jsDate.getMinutes(),\n jsDate.getSeconds(),\n nanos\n );\n }\n\n /**\n * Get the JS month value for the provided string.\n * Matches digits or a month name (eg. '1', '01', 'jan', 'january' should all work)\n * @param monthString The string to parse to a JS month value\n * @returns number The JS month value, which starts at 0 for january, or NaN if nothing could be parsed\n */\n static parseMonth(monthString: string): number {\n const month = parseInt(monthString, 10);\n if (!Number.isNaN(month)) {\n if (month >= 1 && month <= 12) {\n return month - 1;\n }\n return NaN;\n }\n\n const cleanMonthString = monthString.trim().toLowerCase();\n if (cleanMonthString.length >= 3) {\n for (let i = 0; i < DateUtils.months.length; i += 1) {\n if (DateUtils.months[i].startsWith(cleanMonthString)) {\n return i;\n }\n }\n }\n\n return NaN;\n }\n\n /**\n * Parse a date object out of the provided string segments.\n * Also using `parseMonth` to get month names like Aug/August rather than\n * simply doing `parseInt`.\n * @param yearString The year part of the string\n * @param monthString The month part of the string\n * @param dayString The day part of the string\n * @param hourString The hour part of the string\n * @param minuteString The minute part of the string\n * @param secondString The second part of the string\n * @param nanoString The milli part of the string\n */\n static parseDateValues(\n yearString: string,\n monthString: string,\n dayString: string,\n hourString: string,\n minuteString: string,\n secondString: string,\n nanoString: string\n ): DateParts<number> | null {\n const year = parseInt(yearString, 10);\n const month = monthString != null ? this.parseMonth(monthString) : 0;\n const date = dayString != null ? parseInt(dayString, 10) : 1;\n const hours = hourString != null ? parseInt(hourString, 10) : 0;\n const minutes = minuteString != null ? parseInt(minuteString, 10) : 0;\n const seconds = secondString != null ? parseInt(secondString, 10) : 0;\n const nanos =\n nanoString != null ? parseInt(nanoString.padEnd(9, '0'), 10) : 0;\n if (\n Number.isNaN(year) ||\n Number.isNaN(month) ||\n Number.isNaN(date) ||\n Number.isNaN(hours) ||\n Number.isNaN(minutes) ||\n Number.isNaN(seconds) ||\n Number.isNaN(nanos)\n ) {\n return null;\n }\n\n return { year, month, date, hours, minutes, seconds, nanos };\n }\n\n /**\n * Parse out a date time string into it's string components.\n * Anything that is not captured in the string will be undefined.\n *\n * @param dateTimeString The date time string to parse\n * @returns Containing the date time components\n */\n static parseDateTimeString(dateTimeString: string): DateParts<string> {\n const regex =\n /\\s*(\\d{4})([-./]([\\da-z]+))?([-./](\\d{1,2}))?([tT\\s](\\d{2})([:](\\d{2}))?([:](\\d{2}))?([.](\\d{1,9}))?)?(.*)/;\n const result = regex.exec(dateTimeString);\n if (result == null) {\n throw new Error(`Unexpected date string: ${dateTimeString}`);\n }\n\n const [\n ,\n year,\n ,\n month,\n ,\n date,\n ,\n hours,\n ,\n minutes,\n ,\n seconds,\n ,\n nanos,\n overflow,\n ] = result;\n if (overflow != null && overflow.length > 0) {\n throw new Error(\n `Unexpected characters after date string '${dateTimeString}': ${overflow}`\n );\n }\n\n return { year, month, date, hours, minutes, seconds, nanos };\n }\n\n /**\n * Parses the date range provided from a string of text.\n * @param text The string to parse the date from. Can be a keyword like \"today\", or in the format \"2018-08-04\"\n * @param timeZone The time zone to parse this range in. E.g. America/New_York\n * @returns A tuple with the start and end value/null for that date range, or both null\n */\n static parseDateRange(\n dh: typeof DhType,\n text: string,\n timeZone: string\n ): [DhType.DateWrapper, DhType.DateWrapper | null] | [null, null] {\n const cleanText = text.trim().toLowerCase();\n if (cleanText.length === 0) {\n throw new Error('Cannot parse date range from empty string');\n }\n\n if (cleanText === 'null') {\n return [null, null];\n }\n\n if (cleanText === 'today') {\n const now = new Date(Date.now());\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n now.getFullYear(),\n now.getMonth(),\n now.getDate()\n );\n const tomorrow = new Date(\n now.getFullYear(),\n now.getMonth(),\n now.getDate() + 1\n );\n const endDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n tomorrow.getFullYear(),\n tomorrow.getMonth(),\n tomorrow.getDate()\n );\n return [startDate, endDate];\n }\n\n if (cleanText === 'yesterday') {\n const now = new Date(Date.now());\n const yesterday = new Date(\n now.getFullYear(),\n now.getMonth(),\n now.getDate() - 1\n );\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n yesterday.getFullYear(),\n yesterday.getMonth(),\n yesterday.getDate()\n );\n const endDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n now.getFullYear(),\n now.getMonth(),\n now.getDate()\n );\n return [startDate, endDate];\n }\n\n if (cleanText === 'now') {\n const now = new Date(Date.now());\n const date = dh.DateWrapper.ofJsDate(now);\n return [date, null];\n }\n\n const components = DateUtils.parseDateTimeString(cleanText);\n if (\n components.year == null &&\n components.month == null &&\n components.date == null\n ) {\n throw new Error(`Unable to extract year, month, or day ${cleanText}`);\n }\n\n const values = DateUtils.parseDateValues(\n components.year,\n components.month,\n components.date,\n components.hours,\n components.minutes,\n components.seconds,\n components.nanos\n );\n\n if (values == null) {\n throw new Error(`Unable to extract date values from ${components}`);\n }\n\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n values.year,\n values.month,\n values.date,\n values.hours,\n values.minutes,\n values.seconds,\n values.nanos\n );\n\n const endDate = DateUtils.getNextDate(dh, components, values, timeZone);\n return [startDate, endDate];\n }\n\n /**\n * Gets the Js Date object from the provided DateWrapper.\n * In unit test, DateWrapper is just a number provided in millis, so handles that case.\n * @param dateWrapper The DateWrapper object, or time in millis\n */\n static getJsDate(dateWrapper: DhType.DateWrapper | number): Date {\n if (typeof dateWrapper === 'number') {\n return new Date(dateWrapper);\n }\n return dateWrapper.asDate();\n }\n}\n\nexport default DateUtils;\n"],"mappings":"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"}
1
+ {"version":3,"file":"DateUtils.js","names":["DATE_TIME_REGEX","DateUtils","makeDateWrapper","dh","timeZone","year","month","arguments","length","undefined","day","hour","minute","second","ns","Error","yearString","concat","padStart","monthString","dayString","hourString","minuteString","secondString","nanoString","dateString","i18n","DateTimeFormat","parse","FULL_DATE_FORMAT","TimeZone","getTimeZone","getNextNanos","sigNanos","parseInt","zeros","repeat","nextNanoString","getNextDate","components","values","date","hours","minutes","seconds","nanos","jsDate","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","parseMonth","Number","isNaN","NaN","cleanMonthString","trim","toLowerCase","i","months","startsWith","parseDateValues","padEnd","parseDateTimeString","dateTimeString","allowOverflow","result","exec","overflow","dateParts","_objectSpread","parseDateRange","text","cleanText","now","startDate","tomorrow","endDate","yesterday","DateWrapper","ofJsDate","getJsDate","dateWrapper","asDate","trimDateTimeStringTimeZone","test","slice","_defineProperty"],"sources":["../src/DateUtils.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\n\nconst DATE_TIME_REGEX =\n /\\s*(\\d{4})([-./](\\d{1,2}|[a-z]+))?([-./](\\d{1,2}))?([tT\\s](\\d{2})([:](\\d{2}))?([:](\\d{2}))?([.](\\d{1,9}))?)?(.*)/;\n\ninterface DateParts<T> {\n year: T;\n month: T;\n date: T;\n hours: T;\n minutes: T;\n seconds: T;\n nanos: T;\n}\n\nexport class DateUtils {\n static FULL_DATE_FORMAT = 'yyyy-MM-dd HH:mm:ss.SSSSSSSSS';\n\n static months = [\n 'january',\n 'february',\n 'march',\n 'april',\n 'may',\n 'june',\n 'july',\n 'august',\n 'september',\n 'october',\n 'november',\n 'december',\n ];\n\n /**\n *\n * @param timeZone The time zone to parse this time in. E.g. America/New_York\n * @param year The year for the date\n * @param month The month, starting at 0\n * @param day The day, starting at 1\n * @param hour The hours\n * @param minute The minutes\n * @param second The seconds\n * @param ns The nanoseconds\n */\n static makeDateWrapper(\n dh: typeof DhType,\n timeZone: string,\n year: number,\n month = 0,\n day = 1,\n hour = 0,\n minute = 0,\n second = 0,\n ns = 0\n ): DhType.DateWrapper {\n if (!timeZone) {\n throw new Error('No timezone provided');\n }\n const yearString = `${year}`.padStart(4, '0');\n const monthString = `${month + 1}`.padStart(2, '0');\n const dayString = `${day}`.padStart(2, '0');\n const hourString = `${hour}`.padStart(2, '0');\n const minuteString = `${minute}`.padStart(2, '0');\n const secondString = `${second}`.padStart(2, '0');\n const nanoString = `${ns}`.padStart(9, '0');\n\n const dateString = `${yearString}-${monthString}-${dayString} ${hourString}:${minuteString}:${secondString}.${nanoString}`;\n return dh.i18n.DateTimeFormat.parse(\n DateUtils.FULL_DATE_FORMAT,\n dateString,\n dh.i18n.TimeZone.getTimeZone(timeZone)\n );\n }\n\n /**\n * Takes the string the user entered and returns the next nanos value\n * @param nanoString The nano string to get the next one of\n * @returns The value of the next nanos\n */\n static getNextNanos(nanoString: string): number {\n const sigNanos = parseInt(nanoString, 10);\n // Get the zeroes needed for padding before adding one so we handle overflow properly.\n const zeros = '0'.repeat(9 - nanoString.length);\n const nextNanoString = `${sigNanos + 1}${zeros}`;\n return parseInt(nextNanoString, 10);\n }\n\n /**\n * @param components The string components that were parsed from the original string\n * @param values The values that were parsed from the components\n * @param timeZone The time zone to parse the date in. E.g. America/New_York\n * @returns Returns the DateWrapper for the next date, or null if a full date was passed in\n */\n static getNextDate(\n dh: typeof DhType,\n components: DateParts<string>,\n values: DateParts<number>,\n timeZone: string\n ): DhType.DateWrapper | null {\n let { year, month, date, hours, minutes, seconds, nanos } = values;\n\n if (components.nanos != null) {\n if (components.nanos.length === 9) {\n // They want an exact match\n return null;\n }\n nanos = DateUtils.getNextNanos(components.nanos);\n if (nanos > 999999999) {\n // There's an overflow, add it to the seconds manually\n seconds += 1;\n nanos = 0;\n }\n } else if (components.seconds != null) {\n seconds += 1;\n } else if (components.minutes != null) {\n minutes += 1;\n } else if (components.hours != null) {\n hours += 1;\n } else if (components.date != null) {\n date += 1;\n } else if (components.month != null) {\n month += 1;\n } else {\n year += 1;\n }\n\n // Use the JS date to handle overflow rather than doing our own logic\n // Because handling leap years and stuff is a pain\n // Still need to add nanos after, and the overflow from that is already added to seconds above\n const jsDate = new Date(year, month, date, hours, minutes, seconds);\n return DateUtils.makeDateWrapper(\n dh,\n timeZone,\n jsDate.getFullYear(),\n jsDate.getMonth(),\n jsDate.getDate(),\n jsDate.getHours(),\n jsDate.getMinutes(),\n jsDate.getSeconds(),\n nanos\n );\n }\n\n /**\n * Get the JS month value for the provided string.\n * Matches digits or a month name (eg. '1', '01', 'jan', 'january' should all work)\n * @param monthString The string to parse to a JS month value\n * @returns number The JS month value, which starts at 0 for january, or NaN if nothing could be parsed\n */\n static parseMonth(monthString: string): number {\n const month = parseInt(monthString, 10);\n if (!Number.isNaN(month)) {\n if (month >= 1 && month <= 12) {\n return month - 1;\n }\n return NaN;\n }\n\n const cleanMonthString = monthString.trim().toLowerCase();\n if (cleanMonthString.length >= 3) {\n for (let i = 0; i < DateUtils.months.length; i += 1) {\n if (DateUtils.months[i].startsWith(cleanMonthString)) {\n return i;\n }\n }\n }\n\n return NaN;\n }\n\n /**\n * Parse a date object out of the provided string segments.\n * Also using `parseMonth` to get month names like Aug/August rather than\n * simply doing `parseInt`.\n * @param yearString The year part of the string\n * @param monthString The month part of the string\n * @param dayString The day part of the string\n * @param hourString The hour part of the string\n * @param minuteString The minute part of the string\n * @param secondString The second part of the string\n * @param nanoString The milli part of the string\n */\n static parseDateValues(\n yearString: string,\n monthString: string,\n dayString: string,\n hourString: string,\n minuteString: string,\n secondString: string,\n nanoString: string\n ): DateParts<number> | null {\n const year = parseInt(yearString, 10);\n const month = monthString != null ? this.parseMonth(monthString) : 0;\n const date = dayString != null ? parseInt(dayString, 10) : 1;\n const hours = hourString != null ? parseInt(hourString, 10) : 0;\n const minutes = minuteString != null ? parseInt(minuteString, 10) : 0;\n const seconds = secondString != null ? parseInt(secondString, 10) : 0;\n const nanos =\n nanoString != null ? parseInt(nanoString.padEnd(9, '0'), 10) : 0;\n if (\n Number.isNaN(year) ||\n Number.isNaN(month) ||\n Number.isNaN(date) ||\n Number.isNaN(hours) ||\n Number.isNaN(minutes) ||\n Number.isNaN(seconds) ||\n Number.isNaN(nanos)\n ) {\n return null;\n }\n\n return { year, month, date, hours, minutes, seconds, nanos };\n }\n\n /**\n * Parse out a date time string into it's string components.\n * Anything that is not captured in the string will be undefined.\n *\n * @param dateTimeString The date time string to parse\n * @param allowOverflow If true, will allow overflow characters after the date\n * string\n * @returns Containing the date time components\n */\n static parseDateTimeString(\n dateTimeString: string,\n allowOverflow = false\n ): DateParts<string> & { overflow?: string } {\n const result = DATE_TIME_REGEX.exec(dateTimeString);\n if (result == null) {\n throw new Error(`Unexpected date string: ${dateTimeString}`);\n }\n\n const [\n ,\n year,\n ,\n month,\n ,\n date,\n ,\n hours,\n ,\n minutes,\n ,\n seconds,\n ,\n nanos,\n overflow,\n ] = result;\n\n if (!allowOverflow && overflow != null && overflow.length > 0) {\n throw new Error(\n `Unexpected characters after date string '${dateTimeString}': ${overflow}`\n );\n }\n\n const dateParts = { year, month, date, hours, minutes, seconds, nanos };\n\n return allowOverflow ? { ...dateParts, overflow } : dateParts;\n }\n\n /**\n * Parses the date range provided from a string of text.\n * @param text The string to parse the date from. Can be a keyword like \"today\", or in the format \"2018-08-04\"\n * @param timeZone The time zone to parse this range in. E.g. America/New_York\n * @returns A tuple with the start and end value/null for that date range, or both null\n */\n static parseDateRange(\n dh: typeof DhType,\n text: string,\n timeZone: string\n ): [DhType.DateWrapper, DhType.DateWrapper | null] | [null, null] {\n const cleanText = text.trim().toLowerCase();\n if (cleanText.length === 0) {\n throw new Error('Cannot parse date range from empty string');\n }\n\n if (cleanText === 'null') {\n return [null, null];\n }\n\n if (cleanText === 'today') {\n const now = new Date(Date.now());\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n now.getFullYear(),\n now.getMonth(),\n now.getDate()\n );\n const tomorrow = new Date(\n now.getFullYear(),\n now.getMonth(),\n now.getDate() + 1\n );\n const endDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n tomorrow.getFullYear(),\n tomorrow.getMonth(),\n tomorrow.getDate()\n );\n return [startDate, endDate];\n }\n\n if (cleanText === 'yesterday') {\n const now = new Date(Date.now());\n const yesterday = new Date(\n now.getFullYear(),\n now.getMonth(),\n now.getDate() - 1\n );\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n yesterday.getFullYear(),\n yesterday.getMonth(),\n yesterday.getDate()\n );\n const endDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n now.getFullYear(),\n now.getMonth(),\n now.getDate()\n );\n return [startDate, endDate];\n }\n\n if (cleanText === 'now') {\n const now = new Date(Date.now());\n const date = dh.DateWrapper.ofJsDate(now);\n return [date, null];\n }\n\n const components = DateUtils.parseDateTimeString(cleanText);\n if (\n components.year == null &&\n components.month == null &&\n components.date == null\n ) {\n throw new Error(`Unable to extract year, month, or day ${cleanText}`);\n }\n\n const values = DateUtils.parseDateValues(\n components.year,\n components.month,\n components.date,\n components.hours,\n components.minutes,\n components.seconds,\n components.nanos\n );\n\n if (values == null) {\n throw new Error(`Unable to extract date values from ${components}`);\n }\n\n const startDate = DateUtils.makeDateWrapper(\n dh,\n timeZone,\n values.year,\n values.month,\n values.date,\n values.hours,\n values.minutes,\n values.seconds,\n values.nanos\n );\n\n const endDate = DateUtils.getNextDate(dh, components, values, timeZone);\n return [startDate, endDate];\n }\n\n /**\n * Gets the Js Date object from the provided DateWrapper.\n * In unit test, DateWrapper is just a number provided in millis, so handles that case.\n * @param dateWrapper The DateWrapper object, or time in millis\n */\n static getJsDate(dateWrapper: DhType.DateWrapper | number): Date {\n if (typeof dateWrapper === 'number') {\n return new Date(dateWrapper);\n }\n return dateWrapper.asDate();\n }\n\n /**\n * Trim overflow (usually timezone) from a date time string.\n * @param dateTimeString The date time string to trim\n * @returns The date time string without overflow\n */\n static trimDateTimeStringTimeZone(dateTimeString: string): string {\n const { overflow = '' } = DateUtils.parseDateTimeString(\n dateTimeString,\n true\n );\n\n if (overflow === '') {\n return dateTimeString;\n }\n\n // Expecting timezone overflow to be a single space followed by some\n // combination of letters\n if (!/^\\s[A-Za-z]+/.test(overflow)) {\n throw new Error(\n `Unexpected timezone format in overflow: '${dateTimeString}'`\n );\n }\n\n return dateTimeString.slice(0, -overflow.length);\n }\n}\n\nexport default DateUtils;\n"],"mappings":"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"}
@@ -18,8 +18,9 @@ export declare function createComboboxFilterArgs(value: string, allValue: string
18
18
  * @param tableUtils TableUtils instance to create filter from
19
19
  * @param columnNames Names of the columns to filter
20
20
  * @param searchText Text to search (will be trimmed of leading / trailing whitespace)
21
+ * @param timeZone Timezone to use for date parsing
21
22
  */
22
- export declare function createSearchTextFilter(tableUtils: TableUtils, columnNames: string | string[], searchText: string): FilterConditionFactory;
23
+ export declare function createSearchTextFilter(tableUtils: TableUtils, columnNames: string | string[], searchText: string, timeZone: string): FilterConditionFactory;
23
24
  /**
24
25
  * Create a filter condition factory function.
25
26
  * @param columnNames Column names that filter conditions will target
@@ -1 +1 @@
1
- {"version":3,"file":"FilterUtils.d.ts","sourceRoot":"","sources":["../src/FilterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,WAAW,sBAAsB;IACrC,CACE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,GAChD,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf;IACD,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf,CAIA;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,UAAU,EAAE,MAAM,GACjB,sBAAsB,CA2BxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,qBAAqB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,eAAe,EAChE,iBAAiB,GAAE,KAAK,GAAG,IAAW,GACrC,sBAAsB,CAkBxB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,KAAK,EAAE,MAAM,EACb,QAAQ,EACJ,UAAU,GACV,oBAAoB,GACpB,IAAI,GACJ,cAAc,GACd,OAAO,GACP,iBAAiB,GACpB,sBAAsB,CAUxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAC/C,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,OAAO,EAC5B,eAAe,EAAE,OAAO,GACvB,sBAAsB,CAwBxB;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,UAAU,YAM9D,GAAG,MAAM,KAChB,GAAG,eAAe,CAOtB;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,OAAO,YAQH,GAAG,MAAM,KAChB,GAAG,eAAe,CAYtB"}
1
+ {"version":3,"file":"FilterUtils.d.ts","sourceRoot":"","sources":["../src/FilterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,WAAW,sBAAsB;IACrC,CACE,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,GAChD,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf;IACD,QAAQ,EAAE,IAAI,GAAG,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf,CAIA;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,sBAAsB,CAsBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,qBAAqB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,eAAe,EAChE,iBAAiB,GAAE,KAAK,GAAG,IAAW,GACrC,sBAAsB,CAkBxB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,EAC9B,KAAK,EAAE,MAAM,EACb,QAAQ,EACJ,UAAU,GACV,oBAAoB,GACpB,IAAI,GACJ,cAAc,GACd,OAAO,GACP,iBAAiB,GACpB,sBAAsB,CAUxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAC/C,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,OAAO,EAC5B,eAAe,EAAE,OAAO,GACvB,sBAAsB,CAwBxB;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,UAAU,YAM9D,GAAG,MAAM,KAChB,GAAG,eAAe,CAOtB;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,OAAO,YAQH,GAAG,MAAM,KAChB,GAAG,eAAe,CAYtB"}
@@ -19,8 +19,9 @@ export function createComboboxFilterArgs(value, allValue) {
19
19
  * @param tableUtils TableUtils instance to create filter from
20
20
  * @param columnNames Names of the columns to filter
21
21
  * @param searchText Text to search (will be trimmed of leading / trailing whitespace)
22
+ * @param timeZone Timezone to use for date parsing
22
23
  */
23
- export function createSearchTextFilter(tableUtils, columnNames, searchText) {
24
+ export function createSearchTextFilter(tableUtils, columnNames, searchText, timeZone) {
24
25
  /**
25
26
  * Creates a filter condition that matches based on search text.
26
27
  * @param maybeTable Table to filter
@@ -30,7 +31,7 @@ export function createSearchTextFilter(tableUtils, columnNames, searchText) {
30
31
  if (searchTextTrimmed === '') {
31
32
  return null;
32
33
  }
33
- var factory = createFilterConditionFactory(columnNames, col => col.filter().containsIgnoreCase(tableUtils.makeFilterValue(col.type, searchTextTrimmed)), 'or');
34
+ var factory = createFilterConditionFactory(columnNames, col => tableUtils.makeSearchTextFilter(col, searchTextTrimmed, timeZone), 'or');
34
35
  return factory(maybeTable);
35
36
  };
36
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FilterUtils.js","names":["createComboboxFilterArgs","value","allValue","operator","createSearchTextFilter","tableUtils","columnNames","searchText","searchTextFilter","maybeTable","searchTextTrimmed","trim","factory","createFilterConditionFactory","col","filter","containsIgnoreCase","makeFilterValue","type","createColumnCondition","conditionOperator","arguments","length","undefined","filterConditionFactory","maybeColumns","findColumns","filterConditions","map","reduce","current","next","createValueFilter","createSelectedValuesFilter","columnName","selection","emptySelectionEqAll","invertSelection","selectedValuesFilter","maybeColumn","findColumn","isAllSelected","size","makeSelectValueFilter","keys","createNotNullOrEmptyFilterCondition","notNullOrEmptyFilterCondition","column","isNull","not","and","notEq","createShowOnlyEmptyFilterCondition","isOn","showOnlyEmptyFilterCondition","emptyStringValue","eqEmptyStringCondition","eq","or"],"sources":["../src/FilterUtils.ts"],"sourcesContent":["import type { dh } from '@deephaven/jsapi-types';\nimport type { SelectionT } from '@deephaven/utils';\nimport TableUtils from './TableUtils';\n\nexport interface FilterConditionFactory {\n (\n table: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null;\n}\n\n/**\n * Create args for a filter derived from a combobox selection.\n * @param value\n */\nexport function createComboboxFilterArgs(\n value: string,\n allValue: string\n): {\n operator: 'eq' | 'notEq';\n value: string;\n} {\n return value === allValue\n ? { operator: 'notEq', value: '' } // this is synonymous with \"no filter\"\n : { operator: 'eq', value };\n}\n\n/**\n * Create a filter condition factory for a `contains` filter that matches the\n * given search text.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnNames Names of the columns to filter\n * @param searchText Text to search (will be trimmed of leading / trailing whitespace)\n */\nexport function createSearchTextFilter(\n tableUtils: TableUtils,\n columnNames: string | string[],\n searchText: string\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches based on search text.\n * @param maybeTable Table to filter\n */\n return function searchTextFilter(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const searchTextTrimmed = searchText.trim();\n\n if (searchTextTrimmed === '') {\n return null;\n }\n\n const factory = createFilterConditionFactory(\n columnNames,\n col =>\n col\n .filter()\n .containsIgnoreCase(\n tableUtils.makeFilterValue(col.type, searchTextTrimmed)\n ),\n 'or'\n );\n\n return factory(maybeTable);\n };\n}\n\n/**\n * Create a filter condition factory function.\n * @param columnNames Column names that filter conditions will target\n * @param createColumnCondition Function that can create a `FilterCondition` from\n * a given column. This will be run across all columns corresponding to the given\n * list of column names.\n * @param conditionOperator Operator that will be used to combine multiple\n * `FilterConditions` if multiple column names are given.\n */\nexport function createFilterConditionFactory(\n columnNames: string | string[],\n createColumnCondition: (column: dh.Column) => dh.FilterCondition,\n conditionOperator: 'and' | 'or' = 'or'\n): FilterConditionFactory {\n return function filterConditionFactory(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const maybeColumns = maybeTable?.findColumns(\n typeof columnNames === 'string' ? [columnNames] : columnNames\n );\n\n if (maybeColumns == null || maybeColumns.length === 0) {\n return null;\n }\n\n const filterConditions = maybeColumns.map(createColumnCondition);\n\n return filterConditions.reduce((current, next) =>\n current[conditionOperator](next)\n );\n };\n}\n\n/**\n * Create a filter condition factory for a filter operator that matches the\n * given value.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnNames Column names to compare value to\n * @param value Value to match\n * @param operator Operator to use for matching\n */\nexport function createValueFilter(\n tableUtils: TableUtils,\n columnNames: string | string[],\n value: string,\n operator:\n | 'contains'\n | 'containsIgnoreCase'\n | 'eq'\n | 'eqIgnoreCase'\n | 'notEq'\n | 'notEqIgnoreCase'\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches based on matching a given value.\n * @param maybeTable Table to filter\n */\n return createFilterConditionFactory(\n columnNames,\n col => col.filter()[operator](tableUtils.makeFilterValue(col.type, value)),\n 'or'\n );\n}\n\n/**\n * Create a filter condition factory for a filter that matches a given Selection.\n * If column is not found or selection parameter is 'all', the factory will return\n * null to indicate the results will be unfiltered.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnName The column name to filter\n * @param selection 'all' or an array of values to filter by\n * @param emptySelectionEqAll If true, empty selection means select\n * all. If false, it means select none.\n * @param invertSelection Invert the selection (eg. All items are selected,\n * then you deselect items)\n */\nexport function createSelectedValuesFilter<TValue>(\n tableUtils: TableUtils,\n columnName: string,\n selection: SelectionT<TValue>,\n emptySelectionEqAll: boolean,\n invertSelection: boolean\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches rows for selected values. Returns\n * null to indicate no filtering.\n * @param maybeTable the table to filter\n */\n return function selectedValuesFilter(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const maybeColumn = maybeTable?.findColumn(columnName);\n\n const isAllSelected =\n selection === 'all' || (emptySelectionEqAll && selection.size === 0);\n\n if (maybeColumn == null || isAllSelected) {\n return null;\n }\n\n return tableUtils.makeSelectValueFilter(\n maybeColumn,\n [...selection.keys()],\n invertSelection\n );\n };\n}\n\n/**\n * Creates a `notNullOrEmptyFilterCondition` function.\n * @param tableUtils TableUtils instance to use for making filters.\n */\nexport function createNotNullOrEmptyFilterCondition(tableUtils: TableUtils) {\n /**\n * Returns a filter condition that matches values in a given column that are\n * not null or empty string.\n */\n return function notNullOrEmptyFilterCondition(\n column: dh.Column\n ): dh.FilterCondition {\n return column\n .filter()\n .isNull()\n .not()\n .and(column.filter().notEq(tableUtils.makeFilterValue(column.type, '')));\n };\n}\n\n/**\n * Creates a `showOnlyEmptyFilterCondition` function that can be toggled on or\n * off.\n * @param tableUtils TableUtils instance to use for making filters.\n * @param isOn Flag to indicate if the filter should be on or off.\n */\nexport function createShowOnlyEmptyFilterCondition(\n tableUtils: TableUtils,\n isOn: boolean\n) {\n /**\n * Returns a filter condition that matches values in a given column. If the\n * `isOn` param is true, this will filter to only null or empty string values.\n * If `isOn` is false, it will return a filter that matches all values.\n */\n return function showOnlyEmptyFilterCondition(\n column: dh.Column\n ): dh.FilterCondition {\n const filter = column.filter();\n const emptyStringValue = tableUtils.makeFilterValue(column.type, '');\n const eqEmptyStringCondition = filter.eq(emptyStringValue);\n\n if (isOn) {\n return filter.isNull().or(eqEmptyStringCondition);\n }\n\n // If filter is off, return a condition that will always be true\n return eqEmptyStringCondition.or(filter.notEq(emptyStringValue));\n };\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"FilterUtils.js","names":["createComboboxFilterArgs","value","allValue","operator","createSearchTextFilter","tableUtils","columnNames","searchText","timeZone","searchTextFilter","maybeTable","searchTextTrimmed","trim","factory","createFilterConditionFactory","col","makeSearchTextFilter","createColumnCondition","conditionOperator","arguments","length","undefined","filterConditionFactory","maybeColumns","findColumns","filterConditions","map","reduce","current","next","createValueFilter","filter","makeFilterValue","type","createSelectedValuesFilter","columnName","selection","emptySelectionEqAll","invertSelection","selectedValuesFilter","maybeColumn","findColumn","isAllSelected","size","makeSelectValueFilter","keys","createNotNullOrEmptyFilterCondition","notNullOrEmptyFilterCondition","column","isNull","not","and","notEq","createShowOnlyEmptyFilterCondition","isOn","showOnlyEmptyFilterCondition","emptyStringValue","eqEmptyStringCondition","eq","or"],"sources":["../src/FilterUtils.ts"],"sourcesContent":["import type { dh } from '@deephaven/jsapi-types';\nimport type { SelectionT } from '@deephaven/utils';\nimport TableUtils from './TableUtils';\n\nexport interface FilterConditionFactory {\n (\n table: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null;\n}\n\n/**\n * Create args for a filter derived from a combobox selection.\n * @param value\n */\nexport function createComboboxFilterArgs(\n value: string,\n allValue: string\n): {\n operator: 'eq' | 'notEq';\n value: string;\n} {\n return value === allValue\n ? { operator: 'notEq', value: '' } // this is synonymous with \"no filter\"\n : { operator: 'eq', value };\n}\n\n/**\n * Create a filter condition factory for a `contains` filter that matches the\n * given search text.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnNames Names of the columns to filter\n * @param searchText Text to search (will be trimmed of leading / trailing whitespace)\n * @param timeZone Timezone to use for date parsing\n */\nexport function createSearchTextFilter(\n tableUtils: TableUtils,\n columnNames: string | string[],\n searchText: string,\n timeZone: string\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches based on search text.\n * @param maybeTable Table to filter\n */\n return function searchTextFilter(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const searchTextTrimmed = searchText.trim();\n\n if (searchTextTrimmed === '') {\n return null;\n }\n\n const factory = createFilterConditionFactory(\n columnNames,\n col => tableUtils.makeSearchTextFilter(col, searchTextTrimmed, timeZone),\n 'or'\n );\n\n return factory(maybeTable);\n };\n}\n\n/**\n * Create a filter condition factory function.\n * @param columnNames Column names that filter conditions will target\n * @param createColumnCondition Function that can create a `FilterCondition` from\n * a given column. This will be run across all columns corresponding to the given\n * list of column names.\n * @param conditionOperator Operator that will be used to combine multiple\n * `FilterConditions` if multiple column names are given.\n */\nexport function createFilterConditionFactory(\n columnNames: string | string[],\n createColumnCondition: (column: dh.Column) => dh.FilterCondition,\n conditionOperator: 'and' | 'or' = 'or'\n): FilterConditionFactory {\n return function filterConditionFactory(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const maybeColumns = maybeTable?.findColumns(\n typeof columnNames === 'string' ? [columnNames] : columnNames\n );\n\n if (maybeColumns == null || maybeColumns.length === 0) {\n return null;\n }\n\n const filterConditions = maybeColumns.map(createColumnCondition);\n\n return filterConditions.reduce((current, next) =>\n current[conditionOperator](next)\n );\n };\n}\n\n/**\n * Create a filter condition factory for a filter operator that matches the\n * given value.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnNames Column names to compare value to\n * @param value Value to match\n * @param operator Operator to use for matching\n */\nexport function createValueFilter(\n tableUtils: TableUtils,\n columnNames: string | string[],\n value: string,\n operator:\n | 'contains'\n | 'containsIgnoreCase'\n | 'eq'\n | 'eqIgnoreCase'\n | 'notEq'\n | 'notEqIgnoreCase'\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches based on matching a given value.\n * @param maybeTable Table to filter\n */\n return createFilterConditionFactory(\n columnNames,\n col => col.filter()[operator](tableUtils.makeFilterValue(col.type, value)),\n 'or'\n );\n}\n\n/**\n * Create a filter condition factory for a filter that matches a given Selection.\n * If column is not found or selection parameter is 'all', the factory will return\n * null to indicate the results will be unfiltered.\n * @param tableUtils TableUtils instance to create filter from\n * @param columnName The column name to filter\n * @param selection 'all' or an array of values to filter by\n * @param emptySelectionEqAll If true, empty selection means select\n * all. If false, it means select none.\n * @param invertSelection Invert the selection (eg. All items are selected,\n * then you deselect items)\n */\nexport function createSelectedValuesFilter<TValue>(\n tableUtils: TableUtils,\n columnName: string,\n selection: SelectionT<TValue>,\n emptySelectionEqAll: boolean,\n invertSelection: boolean\n): FilterConditionFactory {\n /**\n * Creates a filter condition that matches rows for selected values. Returns\n * null to indicate no filtering.\n * @param maybeTable the table to filter\n */\n return function selectedValuesFilter(\n maybeTable: dh.Table | dh.TreeTable | null | undefined\n ): dh.FilterCondition | null {\n const maybeColumn = maybeTable?.findColumn(columnName);\n\n const isAllSelected =\n selection === 'all' || (emptySelectionEqAll && selection.size === 0);\n\n if (maybeColumn == null || isAllSelected) {\n return null;\n }\n\n return tableUtils.makeSelectValueFilter(\n maybeColumn,\n [...selection.keys()],\n invertSelection\n );\n };\n}\n\n/**\n * Creates a `notNullOrEmptyFilterCondition` function.\n * @param tableUtils TableUtils instance to use for making filters.\n */\nexport function createNotNullOrEmptyFilterCondition(tableUtils: TableUtils) {\n /**\n * Returns a filter condition that matches values in a given column that are\n * not null or empty string.\n */\n return function notNullOrEmptyFilterCondition(\n column: dh.Column\n ): dh.FilterCondition {\n return column\n .filter()\n .isNull()\n .not()\n .and(column.filter().notEq(tableUtils.makeFilterValue(column.type, '')));\n };\n}\n\n/**\n * Creates a `showOnlyEmptyFilterCondition` function that can be toggled on or\n * off.\n * @param tableUtils TableUtils instance to use for making filters.\n * @param isOn Flag to indicate if the filter should be on or off.\n */\nexport function createShowOnlyEmptyFilterCondition(\n tableUtils: TableUtils,\n isOn: boolean\n) {\n /**\n * Returns a filter condition that matches values in a given column. If the\n * `isOn` param is true, this will filter to only null or empty string values.\n * If `isOn` is false, it will return a filter that matches all values.\n */\n return function showOnlyEmptyFilterCondition(\n column: dh.Column\n ): dh.FilterCondition {\n const filter = column.filter();\n const emptyStringValue = tableUtils.makeFilterValue(column.type, '');\n const eqEmptyStringCondition = filter.eq(emptyStringValue);\n\n if (isOn) {\n return filter.isNull().or(eqEmptyStringCondition);\n }\n\n // If filter is off, return a condition that will always be true\n return eqEmptyStringCondition.or(filter.notEq(emptyStringValue));\n };\n}\n"],"mappings":"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"}
@@ -31,7 +31,7 @@ export declare class Formatter {
31
31
  */
32
32
  constructor(dh: typeof DhType, columnFormattingRules?: FormattingRule[], dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[1], decimalFormatOptions?: ConstructorParameters<typeof DecimalColumnFormatter>[1], integerFormatOptions?: ConstructorParameters<typeof IntegerColumnFormatter>[1], truncateNumbersWithPound?: boolean, showEmptyStrings?: boolean, showNullStrings?: boolean);
33
33
  defaultColumnFormatter: TableColumnFormatter;
34
- typeFormatterMap: Map<DataType, TableColumnFormatter>;
34
+ typeFormatterMap: ReadonlyMap<DataType, TableColumnFormatter>;
35
35
  columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;
36
36
  truncateNumbersWithPound: boolean;
37
37
  showEmptyStrings: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAGL,uBAAuB,EACvB,sBAAsB,EAEtB,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,qBAAa,SAAS;IACpB;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CACxB,qBAAqB,EAAE,cAAc,EAAE,GACtC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAmBpD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAC7B,UAAU,EAAE,QAAQ,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,GACxB,cAAc;IAQjB;;;;;;;OAOG;gBAED,EAAE,EAAE,OAAO,MAAM,EACjB,qBAAqB,GAAE,cAAc,EAAO,EAC5C,eAAe,CAAC,EAAE,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAC1E,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,wBAAwB,UAAQ,EAChC,gBAAgB,UAAO,EACvB,eAAe,UAAO;IAoCxB,sBAAsB,EAAE,oBAAoB,CAAC;IAE7C,gBAAgB,EAAE,GAAG,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAEtD,eAAe,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE/D,wBAAwB,EAAE,OAAO,CAAC;IAElC,gBAAgB,EAAE,OAAO,CAAC;IAE1B,eAAe,EAAE,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,UAAQ,GACxB,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS;IAY7C;;;;;OAKG;IACH,eAAe,CACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,iBAAiB,GAAG,IAAI;IAK3B,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAUhE;;;;;;OAMG;IACH,kBAAkB,CAChB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,SAAK,EACf,cAAc,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAC1C,MAAM;IAYT;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAGL,uBAAuB,EACvB,sBAAsB,EAEtB,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,qBAAa,SAAS;IACpB;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CACxB,qBAAqB,EAAE,cAAc,EAAE,GACtC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAmBpD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAC7B,UAAU,EAAE,QAAQ,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,GACxB,cAAc;IAQjB;;;;;;;OAOG;gBAED,EAAE,EAAE,OAAO,MAAM,EACjB,qBAAqB,GAAE,cAAc,EAAO,EAC5C,eAAe,CAAC,EAAE,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAC1E,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,wBAAwB,UAAQ,EAChC,gBAAgB,UAAO,EACvB,eAAe,UAAO;IAoCxB,sBAAsB,EAAE,oBAAoB,CAAC;IAE7C,gBAAgB,EAAE,WAAW,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAE9D,eAAe,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE/D,wBAAwB,EAAE,OAAO,CAAC;IAElC,gBAAgB,EAAE,OAAO,CAAC;IAE1B,eAAe,EAAE,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,UAAQ,GACxB,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS;IAY7C;;;;;OAKG;IACH,eAAe,CACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,iBAAiB,GAAG,IAAI;IAK3B,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAUhE;;;;;;OAMG;IACH,kBAAkB,CAChB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,SAAK,EACf,cAAc,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAC1C,MAAM;IAYT;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,eAAe,SAAS,CAAC"}
package/dist/Formatter.js CHANGED
@@ -1,6 +1,7 @@
1
1
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
2
2
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
3
3
  function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
4
+ import { assertInstanceOf } from '@deephaven/utils';
4
5
  import TableUtils from "./TableUtils.js";
5
6
  import { BooleanColumnFormatter, CharColumnFormatter, DateTimeColumnFormatter, DecimalColumnFormatter, DefaultColumnFormatter, IntegerColumnFormatter, StringColumnFormatter } from "./formatters/index.js";
6
7
  export class Formatter {
@@ -141,9 +142,9 @@ export class Formatter {
141
142
  * @returns The time zone name E.g. America/New_York
142
143
  */
143
144
  get timeZone() {
144
- var _formatter$dhTimeZone;
145
145
  var formatter = this.typeFormatterMap.get(TableUtils.dataType.DATETIME);
146
- return formatter === null || formatter === void 0 ? void 0 : (_formatter$dhTimeZone = formatter.dhTimeZone) === null || _formatter$dhTimeZone === void 0 ? void 0 : _formatter$dhTimeZone.id;
146
+ assertInstanceOf(formatter, DateTimeColumnFormatter);
147
+ return formatter.dhTimeZone.id;
147
148
  }
148
149
  }
149
150
  export default Formatter;
@@ -1 +1 @@
1
- {"version":3,"file":"Formatter.js","names":["TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","StringColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dh","arguments","length","undefined","dateTimeOptions","decimalFormatOptions","integerFormatOptions","truncateNumbersWithPound","showEmptyStrings","showNullStrings","_defineProperty","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","STRING","columnFormatMap","getColumnFormatMapForType","createIfNecessary","getColumnFormat","_columnFormatMap$get","getColumnTypeFormatter","columnTypeFormatter","_this$typeFormatterMa","getFormattedString","value","formatOverride","formatter","timeZone","_formatter$dhTimeZone","dhTimeZone","id"],"sources":["../src/Formatter.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\nimport TableUtils, { DataType } from './TableUtils';\nimport {\n BooleanColumnFormatter,\n CharColumnFormatter,\n DateTimeColumnFormatter,\n DecimalColumnFormatter,\n DefaultColumnFormatter,\n IntegerColumnFormatter,\n StringColumnFormatter,\n TableColumnFormat,\n TableColumnFormatter,\n} from './formatters';\n\nexport type ColumnName = string;\n\nexport interface FormattingRule {\n columnType: string;\n columnName: ColumnName;\n format: TableColumnFormat;\n}\n\nexport class Formatter {\n /**\n * Converts FormattingRule[] to Map\n * @param columnFormattingRules Array or column formatting rules\n * @returns Map of columnName-to-format Maps indexed by normalized dataType\n */\n static makeColumnFormatMap(\n columnFormattingRules: FormattingRule[]\n ): Map<DataType, Map<ColumnName, TableColumnFormat>> {\n if (columnFormattingRules == null) {\n return new Map();\n }\n return columnFormattingRules.reduce((map, next) => {\n const dataType = TableUtils.getNormalizedType(next.columnType);\n if (dataType === null) {\n return map;\n }\n\n if (!map.has(dataType)) {\n map.set(dataType, new Map());\n }\n const formatMap = map.get(dataType);\n formatMap?.set(next.columnName, next.format);\n return map;\n }, new Map<DataType, Map<ColumnName, TableColumnFormat>>());\n }\n\n /**\n * Creates a column formatting rule\n * @param columnType Normalized data type\n * @param columnName Column name\n * @param format Format object\n */\n static makeColumnFormattingRule(\n columnType: DataType,\n columnName: ColumnName,\n format: TableColumnFormat\n ): FormattingRule {\n return {\n columnType,\n columnName,\n format,\n };\n }\n\n /**\n * @param dh JSAPI instance\n * @param columnFormattingRules Optional array of column formatting rules\n * @param dateTimeOptions Optional object with DateTime configuration\n * @param decimalFormatOptions Optional object with Decimal configuration\n * @param integerFormatOptions Optional object with Integer configuration\n * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end\n */\n constructor(\n dh: typeof DhType,\n columnFormattingRules: FormattingRule[] = [],\n dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[1],\n decimalFormatOptions?: ConstructorParameters<\n typeof DecimalColumnFormatter\n >[1],\n integerFormatOptions?: ConstructorParameters<\n typeof IntegerColumnFormatter\n >[1],\n truncateNumbersWithPound = false,\n showEmptyStrings = true,\n showNullStrings = true\n ) {\n // Formatting order:\n // - columnFormatMap[type][name]\n // - typeFormatterMap[type]\n // - defaultColumnFormatter\n\n this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n // Default formatters by data type\n this.typeFormatterMap = new Map<DataType, TableColumnFormatter>([\n [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n [\n TableUtils.dataType.DATETIME,\n new DateTimeColumnFormatter(dh, dateTimeOptions),\n ],\n [\n TableUtils.dataType.DECIMAL,\n new DecimalColumnFormatter(dh, decimalFormatOptions),\n ],\n [\n TableUtils.dataType.INT,\n new IntegerColumnFormatter(dh, integerFormatOptions),\n ],\n [TableUtils.dataType.STRING, new StringColumnFormatter()],\n ]);\n\n // Formats indexed by data type and column name\n this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n this.truncateNumbersWithPound = truncateNumbersWithPound;\n\n this.showEmptyStrings = showEmptyStrings;\n this.showNullStrings = showNullStrings;\n }\n\n defaultColumnFormatter: TableColumnFormatter;\n\n typeFormatterMap: Map<DataType, TableColumnFormatter>;\n\n columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;\n\n truncateNumbersWithPound: boolean;\n\n showEmptyStrings: boolean;\n\n showNullStrings: boolean;\n\n /**\n * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n * @param columnType column type\n * @param createIfNecessary create new entry if true\n * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n */\n getColumnFormatMapForType(\n columnType: string,\n createIfNecessary = false\n ): Map<string, TableColumnFormat> | undefined {\n const dataType = TableUtils.getNormalizedType(columnType);\n if (dataType === null) {\n return undefined;\n }\n\n if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n this.columnFormatMap.set(dataType, new Map());\n }\n return this.columnFormatMap.get(dataType);\n }\n\n /**\n * Gets a column format object for a given column type and name\n * @param columnType column type\n * @param columnName column name\n * @returns format object or null for Default\n */\n getColumnFormat(\n columnType: string,\n columnName: ColumnName\n ): TableColumnFormat | null {\n const columnFormatMap = this.getColumnFormatMapForType(columnType);\n return columnFormatMap?.get(columnName) ?? null;\n }\n\n getColumnTypeFormatter(columnType: string): TableColumnFormatter {\n const dataType = TableUtils.getNormalizedType(columnType);\n let columnTypeFormatter = this.defaultColumnFormatter;\n if (dataType) {\n columnTypeFormatter =\n this.typeFormatterMap.get(dataType) ?? columnTypeFormatter;\n }\n return columnTypeFormatter;\n }\n\n /**\n * Gets formatted string for a given value, column type and name\n * @param value Value to format\n * @param columnType Column type used to determine the formatting settings\n * @param columnName Column name used to determine the formatting settings\n * @param formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n */\n getFormattedString(\n value: unknown,\n columnType: string,\n columnName = '',\n formatOverride?: Partial<TableColumnFormat>\n ): string {\n if (value == null) {\n return '';\n }\n\n const formatter = this.getColumnTypeFormatter(columnType);\n const format =\n formatOverride || this.getColumnFormat(columnType, columnName);\n\n return formatter.format(value, format ?? undefined);\n }\n\n /**\n * Gets the timeZone name\n * @returns The time zone name E.g. America/New_York\n */\n get timeZone(): string {\n const formatter = this.typeFormatterMap.get(\n TableUtils.dataType.DATETIME\n ) as DateTimeColumnFormatter;\n return formatter?.dhTimeZone?.id;\n }\n}\n\nexport default Formatter;\n"],"mappings":"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"}
1
+ {"version":3,"file":"Formatter.js","names":["assertInstanceOf","TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","StringColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dh","arguments","length","undefined","dateTimeOptions","decimalFormatOptions","integerFormatOptions","truncateNumbersWithPound","showEmptyStrings","showNullStrings","_defineProperty","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","STRING","columnFormatMap","getColumnFormatMapForType","createIfNecessary","getColumnFormat","_columnFormatMap$get","getColumnTypeFormatter","columnTypeFormatter","_this$typeFormatterMa","getFormattedString","value","formatOverride","formatter","timeZone","dhTimeZone","id"],"sources":["../src/Formatter.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\nimport { assertInstanceOf } from '@deephaven/utils';\nimport TableUtils, { DataType } from './TableUtils';\nimport {\n BooleanColumnFormatter,\n CharColumnFormatter,\n DateTimeColumnFormatter,\n DecimalColumnFormatter,\n DefaultColumnFormatter,\n IntegerColumnFormatter,\n StringColumnFormatter,\n TableColumnFormat,\n TableColumnFormatter,\n} from './formatters';\n\nexport type ColumnName = string;\n\nexport interface FormattingRule {\n columnType: string;\n columnName: ColumnName;\n format: TableColumnFormat;\n}\n\nexport class Formatter {\n /**\n * Converts FormattingRule[] to Map\n * @param columnFormattingRules Array or column formatting rules\n * @returns Map of columnName-to-format Maps indexed by normalized dataType\n */\n static makeColumnFormatMap(\n columnFormattingRules: FormattingRule[]\n ): Map<DataType, Map<ColumnName, TableColumnFormat>> {\n if (columnFormattingRules == null) {\n return new Map();\n }\n return columnFormattingRules.reduce((map, next) => {\n const dataType = TableUtils.getNormalizedType(next.columnType);\n if (dataType === null) {\n return map;\n }\n\n if (!map.has(dataType)) {\n map.set(dataType, new Map());\n }\n const formatMap = map.get(dataType);\n formatMap?.set(next.columnName, next.format);\n return map;\n }, new Map<DataType, Map<ColumnName, TableColumnFormat>>());\n }\n\n /**\n * Creates a column formatting rule\n * @param columnType Normalized data type\n * @param columnName Column name\n * @param format Format object\n */\n static makeColumnFormattingRule(\n columnType: DataType,\n columnName: ColumnName,\n format: TableColumnFormat\n ): FormattingRule {\n return {\n columnType,\n columnName,\n format,\n };\n }\n\n /**\n * @param dh JSAPI instance\n * @param columnFormattingRules Optional array of column formatting rules\n * @param dateTimeOptions Optional object with DateTime configuration\n * @param decimalFormatOptions Optional object with Decimal configuration\n * @param integerFormatOptions Optional object with Integer configuration\n * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end\n */\n constructor(\n dh: typeof DhType,\n columnFormattingRules: FormattingRule[] = [],\n dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[1],\n decimalFormatOptions?: ConstructorParameters<\n typeof DecimalColumnFormatter\n >[1],\n integerFormatOptions?: ConstructorParameters<\n typeof IntegerColumnFormatter\n >[1],\n truncateNumbersWithPound = false,\n showEmptyStrings = true,\n showNullStrings = true\n ) {\n // Formatting order:\n // - columnFormatMap[type][name]\n // - typeFormatterMap[type]\n // - defaultColumnFormatter\n\n this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n // Default formatters by data type\n this.typeFormatterMap = new Map<DataType, TableColumnFormatter>([\n [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n [\n TableUtils.dataType.DATETIME,\n new DateTimeColumnFormatter(dh, dateTimeOptions),\n ],\n [\n TableUtils.dataType.DECIMAL,\n new DecimalColumnFormatter(dh, decimalFormatOptions),\n ],\n [\n TableUtils.dataType.INT,\n new IntegerColumnFormatter(dh, integerFormatOptions),\n ],\n [TableUtils.dataType.STRING, new StringColumnFormatter()],\n ]);\n\n // Formats indexed by data type and column name\n this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n this.truncateNumbersWithPound = truncateNumbersWithPound;\n\n this.showEmptyStrings = showEmptyStrings;\n this.showNullStrings = showNullStrings;\n }\n\n defaultColumnFormatter: TableColumnFormatter;\n\n typeFormatterMap: ReadonlyMap<DataType, TableColumnFormatter>;\n\n columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;\n\n truncateNumbersWithPound: boolean;\n\n showEmptyStrings: boolean;\n\n showNullStrings: boolean;\n\n /**\n * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n * @param columnType column type\n * @param createIfNecessary create new entry if true\n * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n */\n getColumnFormatMapForType(\n columnType: string,\n createIfNecessary = false\n ): Map<string, TableColumnFormat> | undefined {\n const dataType = TableUtils.getNormalizedType(columnType);\n if (dataType === null) {\n return undefined;\n }\n\n if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n this.columnFormatMap.set(dataType, new Map());\n }\n return this.columnFormatMap.get(dataType);\n }\n\n /**\n * Gets a column format object for a given column type and name\n * @param columnType column type\n * @param columnName column name\n * @returns format object or null for Default\n */\n getColumnFormat(\n columnType: string,\n columnName: ColumnName\n ): TableColumnFormat | null {\n const columnFormatMap = this.getColumnFormatMapForType(columnType);\n return columnFormatMap?.get(columnName) ?? null;\n }\n\n getColumnTypeFormatter(columnType: string): TableColumnFormatter {\n const dataType = TableUtils.getNormalizedType(columnType);\n let columnTypeFormatter = this.defaultColumnFormatter;\n if (dataType) {\n columnTypeFormatter =\n this.typeFormatterMap.get(dataType) ?? columnTypeFormatter;\n }\n return columnTypeFormatter;\n }\n\n /**\n * Gets formatted string for a given value, column type and name\n * @param value Value to format\n * @param columnType Column type used to determine the formatting settings\n * @param columnName Column name used to determine the formatting settings\n * @param formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n */\n getFormattedString(\n value: unknown,\n columnType: string,\n columnName = '',\n formatOverride?: Partial<TableColumnFormat>\n ): string {\n if (value == null) {\n return '';\n }\n\n const formatter = this.getColumnTypeFormatter(columnType);\n const format =\n formatOverride || this.getColumnFormat(columnType, columnName);\n\n return formatter.format(value, format ?? undefined);\n }\n\n /**\n * Gets the timeZone name\n * @returns The time zone name E.g. America/New_York\n */\n get timeZone(): string {\n const formatter = this.typeFormatterMap.get(TableUtils.dataType.DATETIME);\n\n assertInstanceOf(formatter, DateTimeColumnFormatter);\n\n return formatter.dhTimeZone.id;\n }\n}\n\nexport default Formatter;\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"MessageUtils.d.ts","sourceRoot":"","sources":["../src/MessageUtils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,qBAAqB,8CACW,CAAC;AAE9C,eAAO,MAAM,uBAAuB,gDACW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AAEtE;;GAEG;AACH,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AAExE,MAAM,WAAW,OAAO,CAAC,CAAC,GAAG,OAAO;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC1D,OAAO,EAAE,OAAO,uBAAuB,CAAC;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC3D,OAAO,EAAE,OAAO,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,OAAO;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,OAAO,CAOtD;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,GACX,GAAG,IAAI,qBAAqB,CAE9B;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,OAAO,GACX,GAAG,IAAI,sBAAsB,CAE/B;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,QAAQ,CAGxD;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,OAAO,EAAE,MAAM,EACf,EAAE,SAAY,EACd,OAAO,CAAC,EAAE,CAAC,GACV,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAE1E;AAED,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAQ/C;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,OAAO,SAAQ,GACd,OAAO,CAAC,OAAO,CAAC,CA8BlB"}
1
+ {"version":3,"file":"MessageUtils.d.ts","sourceRoot":"","sources":["../src/MessageUtils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,qBAAqB,8CACW,CAAC;AAE9C,eAAO,MAAM,uBAAuB,gDACW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AAEtE;;GAEG;AACH,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AAExE,MAAM,WAAW,OAAO,CAAC,CAAC,GAAG,OAAO;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC1D,OAAO,EAAE,OAAO,uBAAuB,CAAC;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC3D,OAAO,EAAE,OAAO,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,OAAO;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,OAAO,CAOtD;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,GACX,GAAG,IAAI,qBAAqB,CAE9B;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,OAAO,GACX,GAAG,IAAI,sBAAsB,CAE/B;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,QAAQ,CAGxD;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,OAAO,EAAE,MAAM,EACf,EAAE,SAAW,EACb,OAAO,CAAC,EAAE,CAAC,GACV,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAE1E;AAED,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAQ/C;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,OAAO,SAAQ,GACd,OAAO,CAAC,OAAO,CAAC,CA8BlB"}
@@ -1,6 +1,6 @@
1
1
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
2
2
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
3
- import shortid from 'shortid';
3
+ import { nanoid } from 'nanoid';
4
4
  import Log from '@deephaven/log';
5
5
  import { TimeoutError } from '@deephaven/utils';
6
6
  var log = Log.module('MessageUtils');
@@ -44,7 +44,7 @@ export function isResponse(obj) {
44
44
  * @returns Message
45
45
  */
46
46
  export function makeMessage(message) {
47
- var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : shortid();
47
+ var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : nanoid();
48
48
  var payload = arguments.length > 2 ? arguments[2] : undefined;
49
49
  return {
50
50
  message,
@@ -93,7 +93,7 @@ function _requestParentResponse() {
93
93
  }
94
94
  return new Promise((resolve, reject) => {
95
95
  var timeoutId;
96
- var id = shortid();
96
+ var id = nanoid();
97
97
  var listener = event => {
98
98
  var {
99
99
  data
@@ -1 +1 @@
1
- {"version":3,"file":"MessageUtils.js","names":["shortid","Log","TimeoutError","log","module","LOGIN_OPTIONS_REQUEST","SESSION_DETAILS_REQUEST","BROADCAST_CHANNEL_NAME","BROADCAST_LOGIN_MESSAGE","BROADCAST_LOGOUT_MESSAGE","isMessage","obj","message","id","isBroadcastLoginMessage","isBroadcastLogoutMessage","isResponse","response","makeMessage","arguments","length","undefined","payload","makeResponse","messageId","getWindowParent","window","opener","parent","requestParentResponse","_x","_requestParentResponse","apply","_asyncToGenerator","request","timeout","Error","Promise","resolve","reject","timeoutId","listener","event","data","debug","clearTimeout","removeEventListener","addEventListener","setTimeout","postMessage"],"sources":["../src/MessageUtils.ts"],"sourcesContent":["import shortid from 'shortid';\nimport Log from '@deephaven/log';\nimport { TimeoutError } from '@deephaven/utils';\n\nconst log = Log.module('MessageUtils');\n\nexport const LOGIN_OPTIONS_REQUEST =\n 'io.deephaven.message.LoginOptions.request';\n\nexport const SESSION_DETAILS_REQUEST =\n 'io.deephaven.message.SessionDetails.request';\n\n/**\n * Use a BroadcastChannel for sending messages between tabs, such as when the user logs out.\n */\nexport const BROADCAST_CHANNEL_NAME = 'io.deephaven.broadcast';\n\n/**\n * Event emitted when the user has logged in successfully\n */\nexport const BROADCAST_LOGIN_MESSAGE = 'io.deephaven.broadcast.Login';\n\n/**\n * Event emitted when the user has logged out\n */\nexport const BROADCAST_LOGOUT_MESSAGE = 'io.deephaven.broadcast.Logout';\n\nexport interface Message<T = unknown> {\n id: string;\n message: string;\n payload?: T;\n}\n\nexport interface BroadcastLoginMessage extends Message<void> {\n message: typeof BROADCAST_LOGIN_MESSAGE;\n}\n\nexport interface BroadcastLogoutMessage extends Message<void> {\n message: typeof BROADCAST_LOGOUT_MESSAGE;\n}\n\nexport interface Response<T = unknown> {\n id: string;\n payload: T;\n}\n\nexport function isMessage(obj: unknown): obj is Message {\n const message = obj as Message;\n return (\n message != null &&\n typeof message.id === 'string' &&\n typeof message.message === 'string'\n );\n}\n\nexport function isBroadcastLoginMessage(\n obj: unknown\n): obj is BroadcastLoginMessage {\n return isMessage(obj) && obj.message === BROADCAST_LOGIN_MESSAGE;\n}\n\nexport function isBroadcastLogoutMessage(\n obj: unknown\n): obj is BroadcastLogoutMessage {\n return isMessage(obj) && obj.message === BROADCAST_LOGOUT_MESSAGE;\n}\n\nexport function isResponse(obj: unknown): obj is Response {\n const response = obj as Response;\n return response != null && typeof response.id === 'string';\n}\n\n/**\n * Make message object with optional payload\n * @param message Message string\n * @param id Unique message id\n * @param payload Payload to send\n * @returns Message\n */\nexport function makeMessage<T>(\n message: string,\n id = shortid(),\n payload?: T\n): Message<T> {\n return { message, id, payload };\n}\n\n/**\n * Make response object for given message id\n * @param messageId Id of the request message to respond to\n * @param payload Payload to respond with\n * @returns Response\n */\nexport function makeResponse<T>(messageId: string, payload: T): Response<T> {\n return { id: messageId, payload };\n}\n\nexport function getWindowParent(): Window | null {\n if (window.opener != null) {\n return window.opener;\n }\n if (window.parent != null && window.parent !== window) {\n return window.parent;\n }\n return null;\n}\n\n/**\n * Request data from the parent window and wait for response\n * @param request Request message to send to the parent window\n * @param timeout Timeout in ms\n * @returns Payload of the given type, or undefined\n */\nexport async function requestParentResponse(\n request: string,\n timeout = 30000\n): Promise<unknown> {\n const parent = getWindowParent();\n if (parent == null) {\n throw new Error('window parent is null, unable to send request.');\n }\n return new Promise((resolve, reject) => {\n let timeoutId: number;\n const id = shortid();\n const listener = (event: MessageEvent): void => {\n const { data } = event;\n if (!isResponse(data)) {\n log.debug('Ignoring non-deephaven response', data);\n return;\n }\n log.debug('Received message', data);\n if (data?.id !== id) {\n log.debug(\"Ignore message, id doesn't match\", data);\n return;\n }\n window.clearTimeout(timeoutId);\n window.removeEventListener('message', listener);\n resolve(data.payload);\n };\n window.addEventListener('message', listener);\n timeoutId = window.setTimeout(() => {\n window.removeEventListener('message', listener);\n reject(new TimeoutError('Request timed out'));\n }, timeout);\n parent.postMessage(makeMessage(request, id), '*');\n });\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"MessageUtils.js","names":["nanoid","Log","TimeoutError","log","module","LOGIN_OPTIONS_REQUEST","SESSION_DETAILS_REQUEST","BROADCAST_CHANNEL_NAME","BROADCAST_LOGIN_MESSAGE","BROADCAST_LOGOUT_MESSAGE","isMessage","obj","message","id","isBroadcastLoginMessage","isBroadcastLogoutMessage","isResponse","response","makeMessage","arguments","length","undefined","payload","makeResponse","messageId","getWindowParent","window","opener","parent","requestParentResponse","_x","_requestParentResponse","apply","_asyncToGenerator","request","timeout","Error","Promise","resolve","reject","timeoutId","listener","event","data","debug","clearTimeout","removeEventListener","addEventListener","setTimeout","postMessage"],"sources":["../src/MessageUtils.ts"],"sourcesContent":["import { nanoid } from 'nanoid';\nimport Log from '@deephaven/log';\nimport { TimeoutError } from '@deephaven/utils';\n\nconst log = Log.module('MessageUtils');\n\nexport const LOGIN_OPTIONS_REQUEST =\n 'io.deephaven.message.LoginOptions.request';\n\nexport const SESSION_DETAILS_REQUEST =\n 'io.deephaven.message.SessionDetails.request';\n\n/**\n * Use a BroadcastChannel for sending messages between tabs, such as when the user logs out.\n */\nexport const BROADCAST_CHANNEL_NAME = 'io.deephaven.broadcast';\n\n/**\n * Event emitted when the user has logged in successfully\n */\nexport const BROADCAST_LOGIN_MESSAGE = 'io.deephaven.broadcast.Login';\n\n/**\n * Event emitted when the user has logged out\n */\nexport const BROADCAST_LOGOUT_MESSAGE = 'io.deephaven.broadcast.Logout';\n\nexport interface Message<T = unknown> {\n id: string;\n message: string;\n payload?: T;\n}\n\nexport interface BroadcastLoginMessage extends Message<void> {\n message: typeof BROADCAST_LOGIN_MESSAGE;\n}\n\nexport interface BroadcastLogoutMessage extends Message<void> {\n message: typeof BROADCAST_LOGOUT_MESSAGE;\n}\n\nexport interface Response<T = unknown> {\n id: string;\n payload: T;\n}\n\nexport function isMessage(obj: unknown): obj is Message {\n const message = obj as Message;\n return (\n message != null &&\n typeof message.id === 'string' &&\n typeof message.message === 'string'\n );\n}\n\nexport function isBroadcastLoginMessage(\n obj: unknown\n): obj is BroadcastLoginMessage {\n return isMessage(obj) && obj.message === BROADCAST_LOGIN_MESSAGE;\n}\n\nexport function isBroadcastLogoutMessage(\n obj: unknown\n): obj is BroadcastLogoutMessage {\n return isMessage(obj) && obj.message === BROADCAST_LOGOUT_MESSAGE;\n}\n\nexport function isResponse(obj: unknown): obj is Response {\n const response = obj as Response;\n return response != null && typeof response.id === 'string';\n}\n\n/**\n * Make message object with optional payload\n * @param message Message string\n * @param id Unique message id\n * @param payload Payload to send\n * @returns Message\n */\nexport function makeMessage<T>(\n message: string,\n id = nanoid(),\n payload?: T\n): Message<T> {\n return { message, id, payload };\n}\n\n/**\n * Make response object for given message id\n * @param messageId Id of the request message to respond to\n * @param payload Payload to respond with\n * @returns Response\n */\nexport function makeResponse<T>(messageId: string, payload: T): Response<T> {\n return { id: messageId, payload };\n}\n\nexport function getWindowParent(): Window | null {\n if (window.opener != null) {\n return window.opener;\n }\n if (window.parent != null && window.parent !== window) {\n return window.parent;\n }\n return null;\n}\n\n/**\n * Request data from the parent window and wait for response\n * @param request Request message to send to the parent window\n * @param timeout Timeout in ms\n * @returns Payload of the given type, or undefined\n */\nexport async function requestParentResponse(\n request: string,\n timeout = 30000\n): Promise<unknown> {\n const parent = getWindowParent();\n if (parent == null) {\n throw new Error('window parent is null, unable to send request.');\n }\n return new Promise((resolve, reject) => {\n let timeoutId: number;\n const id = nanoid();\n const listener = (event: MessageEvent): void => {\n const { data } = event;\n if (!isResponse(data)) {\n log.debug('Ignoring non-deephaven response', data);\n return;\n }\n log.debug('Received message', data);\n if (data?.id !== id) {\n log.debug(\"Ignore message, id doesn't match\", data);\n return;\n }\n window.clearTimeout(timeoutId);\n window.removeEventListener('message', listener);\n resolve(data.payload);\n };\n window.addEventListener('message', listener);\n timeoutId = window.setTimeout(() => {\n window.removeEventListener('message', listener);\n reject(new TimeoutError('Request timed out'));\n }, timeout);\n parent.postMessage(makeMessage(request, id), '*');\n });\n}\n"],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
2
2
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
3
3
  import Log from '@deephaven/log';
4
- import shortid from 'shortid';
4
+ import { nanoid } from 'nanoid';
5
5
  import { requestParentResponse, SESSION_DETAILS_REQUEST } from "./MessageUtils.js";
6
6
  import NoConsolesError, { isNoConsolesError } from "./NoConsolesError.js";
7
7
  var log = Log.module('SessionUtils');
@@ -33,7 +33,7 @@ function _createSessionWrapper() {
33
33
  var session = yield connection.startSession(type);
34
34
  var config = {
35
35
  type,
36
- id: shortid.generate()
36
+ id: nanoid()
37
37
  };
38
38
  log.info('Console session established', config);
39
39
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"SessionUtils.js","names":["Log","shortid","requestParentResponse","SESSION_DETAILS_REQUEST","NoConsolesError","isNoConsolesError","log","module","createConnection","dh","websocketUrl","info","concat","IdeConnection","createSessionWrapper","_x","_x2","_x3","_createSessionWrapper","apply","arguments","_asyncToGenerator","connection","details","types","getConsoleTypes","length","type","session","startSession","config","id","generate","createCoreClient","options","CoreClient","isSessionDetails","obj","requestParentSessionDetails","_requestParentSessionDetails","response","Error","getSessionDetails","_getSessionDetails","searchParams","URLSearchParams","window","location","search","get","loadSessionWrapper","_x4","_x5","_x6","_loadSessionWrapper","sessionDetails","sessionWrapper","e"],"sources":["../src/SessionUtils.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport shortid from 'shortid';\nimport { requestParentResponse, SESSION_DETAILS_REQUEST } from './MessageUtils';\nimport NoConsolesError, { isNoConsolesError } from './NoConsolesError';\n\nconst log = Log.module('SessionUtils');\n\nexport interface SessionConfig {\n type: string;\n id: string;\n}\n\nexport interface SessionDetails {\n workerName?: string;\n processInfoId?: string;\n}\n\nexport interface SessionWrapper {\n session: DhType.IdeSession;\n connection: DhType.IdeConnection;\n config: SessionConfig;\n details?: SessionDetails;\n dh: typeof DhType;\n}\n\n/**\n * @returns New connection to the server\n */\nexport function createConnection(\n dh: typeof DhType,\n websocketUrl: string\n): DhType.IdeConnection {\n log.info(`Starting connection to '${websocketUrl}'...`);\n\n return new dh.IdeConnection(websocketUrl);\n}\n\n/**\n * Create a new session using the default URL\n * @returns A session and config that is ready to use\n */\nexport async function createSessionWrapper(\n dh: typeof DhType,\n connection: DhType.IdeConnection,\n details: SessionDetails\n): Promise<SessionWrapper> {\n log.info('Getting console types...');\n\n const types = await connection.getConsoleTypes();\n\n if (types.length === 0) {\n throw new NoConsolesError('No console types available');\n }\n\n log.info('Available types:', types);\n\n const type = types[0];\n\n log.info('Starting session with type', type);\n\n const session = await connection.startSession(type);\n\n const config = { type, id: shortid.generate() };\n\n log.info('Console session established', config);\n\n return {\n session,\n config,\n connection,\n details,\n dh,\n };\n}\n\nexport function createCoreClient(\n dh: typeof DhType,\n websocketUrl: string,\n options?: DhType.ConnectOptions\n): DhType.CoreClient {\n log.info('createCoreClient', websocketUrl);\n\n return new dh.CoreClient(websocketUrl, options);\n}\n\nfunction isSessionDetails(obj: unknown): obj is SessionDetails {\n return obj != null && typeof obj === 'object';\n}\n\nasync function requestParentSessionDetails(): Promise<SessionDetails> {\n const response = await requestParentResponse(SESSION_DETAILS_REQUEST);\n if (!isSessionDetails(response)) {\n throw new Error(`Unexpected session details response: ${response}`);\n }\n return response;\n}\n\nexport async function getSessionDetails(): Promise<SessionDetails> {\n const searchParams = new URLSearchParams(window.location.search);\n switch (searchParams.get('authProvider')) {\n case 'parent':\n return requestParentSessionDetails();\n }\n return {};\n}\n\nexport async function loadSessionWrapper(\n dh: typeof DhType,\n connection: DhType.IdeConnection,\n sessionDetails: SessionDetails\n): Promise<SessionWrapper | undefined> {\n let sessionWrapper: SessionWrapper | undefined;\n try {\n sessionWrapper = await createSessionWrapper(dh, connection, sessionDetails);\n } catch (e) {\n // Consoles may be disabled on the server, but we should still be able to start up and open existing objects\n if (!isNoConsolesError(e)) {\n throw e;\n }\n }\n return sessionWrapper;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"SessionUtils.js","names":["Log","nanoid","requestParentResponse","SESSION_DETAILS_REQUEST","NoConsolesError","isNoConsolesError","log","module","createConnection","dh","websocketUrl","info","concat","IdeConnection","createSessionWrapper","_x","_x2","_x3","_createSessionWrapper","apply","arguments","_asyncToGenerator","connection","details","types","getConsoleTypes","length","type","session","startSession","config","id","createCoreClient","options","CoreClient","isSessionDetails","obj","requestParentSessionDetails","_requestParentSessionDetails","response","Error","getSessionDetails","_getSessionDetails","searchParams","URLSearchParams","window","location","search","get","loadSessionWrapper","_x4","_x5","_x6","_loadSessionWrapper","sessionDetails","sessionWrapper","e"],"sources":["../src/SessionUtils.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport { nanoid } from 'nanoid';\nimport { requestParentResponse, SESSION_DETAILS_REQUEST } from './MessageUtils';\nimport NoConsolesError, { isNoConsolesError } from './NoConsolesError';\n\nconst log = Log.module('SessionUtils');\n\nexport interface SessionConfig {\n type: string;\n id: string;\n}\n\nexport interface SessionDetails {\n workerName?: string;\n processInfoId?: string;\n}\n\nexport interface SessionWrapper {\n session: DhType.IdeSession;\n connection: DhType.IdeConnection;\n config: SessionConfig;\n details?: SessionDetails;\n dh: typeof DhType;\n}\n\n/**\n * @returns New connection to the server\n */\nexport function createConnection(\n dh: typeof DhType,\n websocketUrl: string\n): DhType.IdeConnection {\n log.info(`Starting connection to '${websocketUrl}'...`);\n\n return new dh.IdeConnection(websocketUrl);\n}\n\n/**\n * Create a new session using the default URL\n * @returns A session and config that is ready to use\n */\nexport async function createSessionWrapper(\n dh: typeof DhType,\n connection: DhType.IdeConnection,\n details: SessionDetails\n): Promise<SessionWrapper> {\n log.info('Getting console types...');\n\n const types = await connection.getConsoleTypes();\n\n if (types.length === 0) {\n throw new NoConsolesError('No console types available');\n }\n\n log.info('Available types:', types);\n\n const type = types[0];\n\n log.info('Starting session with type', type);\n\n const session = await connection.startSession(type);\n\n const config = { type, id: nanoid() };\n\n log.info('Console session established', config);\n\n return {\n session,\n config,\n connection,\n details,\n dh,\n };\n}\n\nexport function createCoreClient(\n dh: typeof DhType,\n websocketUrl: string,\n options?: DhType.ConnectOptions\n): DhType.CoreClient {\n log.info('createCoreClient', websocketUrl);\n\n return new dh.CoreClient(websocketUrl, options);\n}\n\nfunction isSessionDetails(obj: unknown): obj is SessionDetails {\n return obj != null && typeof obj === 'object';\n}\n\nasync function requestParentSessionDetails(): Promise<SessionDetails> {\n const response = await requestParentResponse(SESSION_DETAILS_REQUEST);\n if (!isSessionDetails(response)) {\n throw new Error(`Unexpected session details response: ${response}`);\n }\n return response;\n}\n\nexport async function getSessionDetails(): Promise<SessionDetails> {\n const searchParams = new URLSearchParams(window.location.search);\n switch (searchParams.get('authProvider')) {\n case 'parent':\n return requestParentSessionDetails();\n }\n return {};\n}\n\nexport async function loadSessionWrapper(\n dh: typeof DhType,\n connection: DhType.IdeConnection,\n sessionDetails: SessionDetails\n): Promise<SessionWrapper | undefined> {\n let sessionWrapper: SessionWrapper | undefined;\n try {\n sessionWrapper = await createSessionWrapper(dh, connection, sessionDetails);\n } catch (e) {\n // Consoles may be disabled on the server, but we should still be able to start up and open existing objects\n if (!isNoConsolesError(e)) {\n throw e;\n }\n }\n return sessionWrapper;\n}\n"],"mappings":"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"}