@uwdata/mosaic-spec 0.12.1 → 0.12.2

package/dist/types/spec/Param.d.ts

@@ -27,7 +27,7 @@ export interface ParamDate extends ParamBase {
     date: string;
 }
 /** Literal Param values. */
-export type ParamLiteral = string | number | boolean;
+export type ParamLiteral = null | string | number | boolean;
 /** Valid Param values. */
 export type ParamValue = ParamLiteral | Array<ParamLiteral | ParamRef>;
 /** A Selection definition. */

package/dist/types/spec/marks/Density.d.ts

@@ -1,10 +1,10 @@
-import { ParamRef } from "../Param.js";
-import { AreaXOptions, AreaYOptions } from "./Area.js";
-import { DotOptions } from "./Dot.js";
-import { LineXOptions, LineYOptions } from "./Line.js";
-import { MarkData, MarkOptions, TextStyles } from "./Marks.js";
-import { Grid2DOptions } from "./Raster.js";
-import { TextOptions } from "./Text.js";
+import { ParamRef } from '../Param.js';
+import { AreaXOptions, AreaYOptions } from './Area.js';
+import { DotOptions } from './Dot.js';
+import { LineXOptions, LineYOptions } from './Line.js';
+import { MarkData, MarkOptions, TextStyles } from './Marks.js';
+import { Grid2DOptions } from './Raster.js';
+import { TextOptions } from './Text.js';
 export interface Density2DOptions extends MarkOptions, Omit<DotOptions, 'x' | 'y'>, TextStyles, Grid2DOptions {
     /**
      * The basic mark type to use to render 2D density values.
@@ -36,6 +36,13 @@ export interface Density1DOptions {
      * Defaults to 1024.
      */
     bins?: number | ParamRef;
+    /**
+     * Normalization method for density estimates. If `false` or `'none'` (the
+     * default), the density estimates are smoothed weighted counts. If `true`
+     * or `'sum'`, density estimates are divided by the sum of the total point
+     * mass. If `'max'`, estimates are divided by the maximum smoothed value.
+     */
+    normalize?: boolean | 'max' | 'sum' | 'none' | ParamRef;
 }
 export interface DensityAreaXOptions extends Omit<AreaXOptions, 'x' | 'x1' | 'x2'> {
     /**
@@ -43,6 +50,10 @@ export interface DensityAreaXOptions extends Omit<AreaXOptions, 'x' | 'x1' | 'x2
      * areaX mark; lineX, dotX, and textX marks are also supported.
      */
     type: 'areaX';
+    /**
+     * Flag indicating if densities should be stacked. Defaults to false.
+     */
+    stack?: boolean | ParamRef;
 }
 export interface DensityAreaYOptions extends Omit<AreaYOptions, 'y' | 'y1' | 'y2'> {
     /**
@@ -50,6 +61,10 @@ export interface DensityAreaYOptions extends Omit<AreaYOptions, 'y' | 'y1' | 'y2
      * areaY mark; lineY, dot, and text marks are also supported.
      */
     type?: 'areaY';
+    /**
+     * Flag indicating if densities should be stacked. Defaults to false.
+     */
+    stack?: boolean | ParamRef;
 }
 export interface DensityLineXOptions extends Omit<LineXOptions, 'x' | 'x1' | 'x2'> {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-spec",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Declarative specification of Mosaic-powered applications.",
   "keywords": [
     "mosaic",
@@ -33,10 +33,10 @@
     "prepublishOnly": "npm run test && npm run lint && npm run build"
   },
   "dependencies": {
-    "@uwdata/mosaic-core": "^0.12.1",
-    "@uwdata/mosaic-sql": "^0.12.1",
-    "@uwdata/vgplot": "^0.12.1",
+    "@uwdata/mosaic-core": "^0.12.2",
+    "@uwdata/mosaic-sql": "^0.12.2",
+    "@uwdata/vgplot": "^0.12.2",
     "ts-json-schema-generator": "^2.3.0"
   },
-  "gitHead": "fe3a7c34352da54ec36a1ebf557846f46a649782"
+  "gitHead": "0ca741d840b98039255f26a5ceedf10be66f790e"
 }

package/src/spec/Param.ts

@@ -32,6 +32,7 @@ export interface ParamDate extends ParamBase {
 
 /** Literal Param values. */
 export type ParamLiteral =
+  | null
   | string
   | number
   | boolean;

package/src/spec/marks/Density.ts

@@ -1,10 +1,10 @@
-import { ParamRef } from "../Param.js";
-import { AreaXOptions, AreaYOptions } from "./Area.js";
-import { DotOptions } from "./Dot.js";
-import { LineXOptions, LineYOptions } from "./Line.js";
-import { MarkData, MarkOptions, TextStyles } from "./Marks.js";
-import { Grid2DOptions } from "./Raster.js";
-import { TextOptions } from "./Text.js";
+import { ParamRef } from '../Param.js';
+import { AreaXOptions, AreaYOptions } from './Area.js';
+import { DotOptions } from './Dot.js';
+import { LineXOptions, LineYOptions } from './Line.js';
+import { MarkData, MarkOptions, TextStyles } from './Marks.js';
+import { Grid2DOptions } from './Raster.js';
+import { TextOptions } from './Text.js';
 
 // Density2D
 
@@ -44,6 +44,14 @@ export interface Density1DOptions {
    * Defaults to 1024.
    */
   bins?: number | ParamRef;
+
+  /**
+   * Normalization method for density estimates. If `false` or `'none'` (the
+   * default), the density estimates are smoothed weighted counts. If `true`
+   * or `'sum'`, density estimates are divided by the sum of the total point
+   * mass. If `'max'`, estimates are divided by the maximum smoothed value.
+   */
+  normalize?: boolean | 'max' | 'sum' | 'none' | ParamRef;
 }
 
 export interface DensityAreaXOptions extends Omit<AreaXOptions, 'x' | 'x1' | 'x2'> {
@@ -52,6 +60,11 @@ export interface DensityAreaXOptions extends Omit<AreaXOptions, 'x' | 'x1' | 'x2
    * areaX mark; lineX, dotX, and textX marks are also supported.
    */
   type: 'areaX';
+
+  /**
+   * Flag indicating if densities should be stacked. Defaults to false.
+   */
+  stack?: boolean | ParamRef;
 }
 
 export interface DensityAreaYOptions extends Omit<AreaYOptions, 'y' | 'y1' | 'y2'> {
@@ -60,6 +73,11 @@ export interface DensityAreaYOptions extends Omit<AreaYOptions, 'y' | 'y1' | 'y2
    * areaY mark; lineY, dot, and text marks are also supported.
    */
   type?: 'areaY';
+
+  /**
+   * Flag indicating if densities should be stacked. Defaults to false.
+   */
+  stack?: boolean | ParamRef;
 }
 
 export interface DensityLineXOptions extends Omit<LineXOptions, 'x' | 'x1' | 'x2'> {