@uwdata/mosaic-inputs 0.14.1 → 0.16.1

package/dist/types/Menu.d.ts

@@ -74,6 +74,6 @@ export class Menu extends Input {
     queryResult(data: any): this;
     update(): this;
 }
-import { Selection } from '@uwdata/mosaic-core';
-import { Param } from '@uwdata/mosaic-core';
+import type { Selection } from '@uwdata/mosaic-core';
+import type { Param } from '@uwdata/mosaic-core';
 import { Input } from './input.js';

package/dist/types/Search.d.ts

@@ -64,6 +64,6 @@ export class Search extends Input {
     update(): this;
     datalist: HTMLDataListElement;
 }
-import { Selection } from '@uwdata/mosaic-core';
-import { Param } from '@uwdata/mosaic-core';
+import type { Selection } from '@uwdata/mosaic-core';
+import type { Param } from '@uwdata/mosaic-core';
 import { Input } from './input.js';

package/dist/types/Slider.d.ts

@@ -79,6 +79,6 @@ export class Slider extends Input {
     clause(value: any): import("@uwdata/mosaic-core").SelectionClause;
     publish(value: any): void;
 }
-import { Selection } from '@uwdata/mosaic-core';
-import { Param } from '@uwdata/mosaic-core';
+import type { Selection } from '@uwdata/mosaic-core';
+import type { Param } from '@uwdata/mosaic-core';
 import { Input } from './input.js';

package/dist/types/Table.d.ts

@@ -98,12 +98,7 @@ export class Table extends Input {
     sourceTable(): any;
     clause(rows?: any[]): import("@uwdata/mosaic-core").SelectionClause;
     requestData(offset?: number): void;
-    fields(): {
-        column: string;
-        table: any;
-    }[];
-    fieldInfo(info: any): this;
-    schema: any;
+    schema: import("@uwdata/mosaic-core").FieldInfo[];
     formats: any;
     query(filter?: any[]): import("@uwdata/mosaic-sql").SelectQuery;
     queryResult(data: any): this;
@@ -112,5 +107,5 @@ export class Table extends Input {
     update(): this;
     sort(event: any, column: any): void;
 }
-import { Selection } from '@uwdata/mosaic-core';
+import type { Selection } from '@uwdata/mosaic-core';
 import { Input } from './input.js';

package/dist/types/util/format.d.ts

@@ -1,6 +1,6 @@
 export function stringify(x: any): string;
 export function formatTrim(value: any): any;
-export function formatDate(date: any): any;
+export function formatDate(date: any): string;
 export function localize(f: any): (locale?: string) => any;
 export function formatLocaleAuto(locale?: string): any;
 export function formatLocaleNumber(locale?: string): any;

package/jsconfig.json

@@ -0,0 +1,11 @@
+{
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "checkJs": true,
+    "noEmit": true,
+    "noImplicitAny": false,
+    "module": "node16",
+    "skipLibCheck": true,
+    "types": []
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-inputs",
-  "version": "0.14.1",
+  "version": "0.16.1",
   "description": "Mosaic input components.",
   "keywords": [
     "inputs",
@@ -10,6 +10,7 @@
   "author": "Jeffrey Heer (https://idl.uw.edu)",
   "type": "module",
   "exports": {
+    "types": "./dist/types/index.d.ts",
     "default": "./src/index.js"
   },
   "repository": {
@@ -17,14 +18,17 @@
     "url": "https://github.com/uwdata/mosaic.git"
   },
   "scripts": {
+    "prebuild": "rimraf dist && mkdir dist",
+    "build": "npm run types",
+    "types": "tsc -p tsconfig.json",
     "lint": "eslint src test",
-    "test": "vitest run",
-    "prepublishOnly": "npm run test && npm run lint"
+    "test": "vitest run && npm run tsc",
+    "tsc": "tsc -p jsconfig.json",
+    "prepublishOnly": "npm run test && npm run lint && npm run build"
   },
   "dependencies": {
-    "@uwdata/mosaic-core": "^0.14.1",
-    "@uwdata/mosaic-sql": "^0.14.1",
-    "isoformat": "^0.2.1"
+    "@uwdata/mosaic-core": "^0.16.1",
+    "@uwdata/mosaic-sql": "^0.16.1"
   },
-  "gitHead": "5959cb169e95bd8467e1e5d7a9b98954f09474f3"
+  "gitHead": "e12af9927b0a35a0e3194850ef569d0d24a022ce"
 }

package/src/Menu.js

@@ -1,4 +1,5 @@
-import { Param, Selection, isParam, isSelection, clausePoint } from '@uwdata/mosaic-core';
+/** @import { Param, Selection } from '@uwdata/mosaic-core' */
+import { isParam, isSelection, clausePoint } from '@uwdata/mosaic-core';
 import { Query } from '@uwdata/mosaic-sql';
 import { Input, input } from './input.js';
 

package/src/Search.js

@@ -1,4 +1,5 @@
-import { Param, Selection, isParam, isSelection, clauseMatch } from '@uwdata/mosaic-core';
+/** @import { Param, Selection } from '@uwdata/mosaic-core' */
+import { isParam, isSelection, clauseMatch } from '@uwdata/mosaic-core';
 import { Query } from '@uwdata/mosaic-sql';
 import { Input, input } from './input.js';
 

package/src/Slider.js

@@ -1,4 +1,5 @@
-import { Param, Selection, clauseInterval, clausePoint, isParam, isSelection } from '@uwdata/mosaic-core';
+/** @import { Param, Selection } from '@uwdata/mosaic-core' */
+import { clauseInterval, clausePoint, isParam, isSelection } from '@uwdata/mosaic-core';
 import { Query, max, min } from '@uwdata/mosaic-sql';
 import { Input, input } from './input.js';
 

package/src/Table.js

@@ -1,4 +1,5 @@
-import { Selection, clausePoints, coordinator, isParam, isSelection, toDataColumns } from '@uwdata/mosaic-core';
+/** @import { Selection } from '@uwdata/mosaic-core' */
+import { clausePoints, coordinator, isParam, isSelection, queryFieldInfo, toDataColumns } from '@uwdata/mosaic-core';
 import { Query, desc } from '@uwdata/mosaic-sql';
 import { formatDate, formatLocaleAuto, formatLocaleNumber } from './util/format.js';
 import { Input, input } from './input.js';
@@ -186,18 +187,18 @@ export class Table extends Input {
     coordinator().prefetch(query.clone().offset(offset + this.limit));
   }
 
-  fields() {
+  async prepare() {
+    // query for column scheam information
     const table = this.sourceTable();
-    return this.columns.map(column => ({ column, table }));
-  }
-
-  fieldInfo(info) {
-    this.schema = info;
+    const fields = this.columns.map(column => ({ column, table }));
+    const schema = await queryFieldInfo(this.coordinator, fields);
+    this.schema = schema;
 
+    // create table header row
     const thead = this.head;
     thead.innerHTML = '';
     const tr = document.createElement('tr');
-    for (const { column } of info) {
+    for (const { column } of schema) {
       const th = document.createElement('th');
       th.addEventListener('click', evt => this.sort(evt, column));
       th.appendChild(document.createElement('span'));
@@ -207,16 +208,14 @@ export class Table extends Input {
     thead.appendChild(tr);
 
     // get column formatters
-    this.formats = formatof(this.format, info);
+    this.formats = formatof(this.format, schema);
 
     // get column alignment style
     this.style.innerText = tableCSS(
       this.id,
-      alignof(this.align, info),
-      widthof(this.widths, info)
+      alignof(this.align, schema),
+      widthof(this.widths, schema)
     );
-
-    return this;
   }
 
   query(filter = []) {

package/src/util/format.js

@@ -1,4 +1,3 @@
-import { format as isoformat } from 'isoformat';
 
 // Note: use formatAuto (or any other localized format) to present values to the
 // user; stringify is only intended for machine values.
@@ -48,3 +47,52 @@ export function localize(f) {
     ? value
     : (value = f(key = locale));
 }
+
+// Code below modified from https://github.com/mbostock/isoformat/
+// Added here due to longstanding unmerged fixes on original package
+//
+// Copyright 2021 Mike Bostock
+//
+// Permission to use, copy, modify, and/or distribute this software for any purpose
+// with or without fee is hereby granted, provided that the above copyright notice
+// and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+// OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+// THIS SOFTWARE.
+
+/**
+ * Format a Date in ISO format.
+ * @param {Date} date The date to format
+ * @param {string | ((date: Date) => string)} fallback Fallback value or function.
+ * @returns {string}
+ */
+function isoformat(date, fallback) {
+  if (!(date instanceof Date)) date = new Date(+date);
+  if (isNaN(+date)) return typeof fallback === "function" ? fallback(date) : fallback;
+  const hours = date.getUTCHours();
+  const minutes = date.getUTCMinutes();
+  const seconds = date.getUTCSeconds();
+  const milliseconds = date.getUTCMilliseconds();
+  return `${formatYear(date.getUTCFullYear())}-${pad(date.getUTCMonth() + 1, 2)}-${pad(date.getUTCDate(), 2)}${
+    hours || minutes || seconds || milliseconds ? `T${pad(hours, 2)}:${pad(minutes, 2)}${
+      seconds || milliseconds ? `:${pad(seconds, 2)}${
+        milliseconds ? `.${pad(milliseconds, 3)}` : ``
+      }` : ``
+    }Z` : ``
+  }`;
+}
+
+function formatYear(year) {
+  return year < 0 ? `-${pad(-year, 6)}`
+    : year > 9999 ? `+${pad(year, 6)}`
+    : pad(year, 4);
+}
+
+function pad(value, width) {
+  return `${value}`.padStart(width, "0");
+}

package/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "include": ["src/**/*.js", "src/**/*.ts"],
+  "compilerOptions": {
+    "allowJs": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "dist/types",
+    "module": "node16",
+    "skipLibCheck": true
+  }
+}

package/dist/types/index-types.d.ts

@@ -1 +0,0 @@
-export * from './index.js';