@sqlrooms/deck 0.29.0-rc.2 → 0.29.0-rc.4

package/dist/json/compileGeoArrowAccessor.js

@@ -1,7 +1,58 @@
+const GEOARROW_COMPILED_ACCESSOR = Symbol.for('@sqlrooms/deck/compiled-geoarrow-accessor');
 function isValidIdentifier(name) {
     return /^[A-Za-z_$][\w$]*$/.test(name);
 }
 const RESERVED_IDENTIFIERS = new Set([
+    // JS keywords & future reserved words
+    'abstract',
+    'arguments',
+    'async',
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'enum',
+    'eval',
+    'export',
+    'extends',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'implements',
+    'import',
+    'in',
+    'instanceof',
+    'interface',
+    'let',
+    'new',
+    'of',
+    'package',
+    'private',
+    'protected',
+    'public',
+    'return',
+    'static',
+    'super',
+    'switch',
+    'this',
+    'throw',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+    // Literals & globals used in expressions
     'true',
     'false',
     'null',
@@ -15,6 +66,7 @@ const RESERVED_IDENTIFIERS = new Set([
     'Array',
     'Object',
     'Date',
+    // Accessor runtime parameter
     'target',
 ]);
 function unique(values) {
@@ -54,7 +106,12 @@ function copyArrayLikeIntoTarget(result) {
 export function compileGeoArrowAccessor(expression, table) {
     const trimmedExpression = expression.trim();
     if (trimmedExpression === '-') {
-        return ({ index, data, }) => data.data.get(index);
+        const accessor = ({ index, data, }) => data.data.get(index);
+        Object.defineProperty(accessor, GEOARROW_COMPILED_ACCESSOR, {
+            value: true,
+            enumerable: false,
+        });
+        return accessor;
     }
     const bindings = resolveColumnBindings(trimmedExpression, table);
     const evaluator = new Function(...bindings.map((binding) => binding.identifier), 'target', `return (${trimmedExpression});`);
@@ -62,7 +119,7 @@ export function compileGeoArrowAccessor(expression, table) {
     // GeoArrow callbacks are batch-oriented rather than deck.gl/json row-oriented. If
     // the next version aligns with deck.gl/json accessors, remove this compiler and
     // let the standard JSON conversion pipeline handle expressions.
-    return ({ index, data, target, }) => {
+    const accessor = ({ index, data, target, }) => {
         const batch = data.data;
         const args = bindings.map((binding) => binding.columnName
             ? batch.getChild(binding.columnName)?.get(index)
@@ -70,5 +127,14 @@ export function compileGeoArrowAccessor(expression, table) {
         const result = evaluator(...args, target);
         return copyArrayLikeIntoTarget(result);
     };
+    Object.defineProperty(accessor, GEOARROW_COMPILED_ACCESSOR, {
+        value: true,
+        enumerable: false,
+    });
+    return accessor;
+}
+export function isCompiledGeoArrowAccessor(value) {
+    return (typeof value === 'function' &&
+        Boolean(value[GEOARROW_COMPILED_ACCESSOR]));
 }
 //# sourceMappingURL=compileGeoArrowAccessor.js.map

package/dist/json/compileGeoArrowAccessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"compileGeoArrowAccessor.js","sourceRoot":"","sources":["../../src/json/compileGeoArrowAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as arrow from 'apache-arrow';\n\nfunction isValidIdentifier(name: string) {\n  return /^[A-Za-z_$][\\w$]*$/.test(name);\n}\n\nconst RESERVED_IDENTIFIERS = new Set([\n  'true',\n  'false',\n  'null',\n  'undefined',\n  'NaN',\n  'Infinity',\n  'Math',\n  'Number',\n  'String',\n  'Boolean',\n  'Array',\n  'Object',\n  'Date',\n  'target',\n]);\n\nfunction unique<T>(values: T[]) {\n  return [...new Set(values)];\n}\n\nfunction resolveColumnBindings(expression: string, table: arrow.Table) {\n  const schemaFieldNames = table.schema.fields\n    .map((field) => field.name)\n    .filter(isValidIdentifier);\n\n  const identifiers = unique(\n    Array.from(expression.matchAll(/\\b[A-Za-z_$][\\w$]*\\b/g))\n      .map((match) => match[0])\n      .filter((identifier) => !RESERVED_IDENTIFIERS.has(identifier)),\n  );\n\n  return identifiers.map((identifier) => {\n    const exactMatch = schemaFieldNames.find(\n      (fieldName) => fieldName === identifier,\n    );\n    if (exactMatch) {\n      return {identifier, columnName: exactMatch};\n    }\n\n    const caseInsensitiveMatches = schemaFieldNames.filter(\n      (fieldName) => fieldName.toLowerCase() === identifier.toLowerCase(),\n    );\n\n    return {\n      identifier,\n      columnName:\n        caseInsensitiveMatches.length === 1\n          ? caseInsensitiveMatches[0]!\n          : undefined,\n    };\n  });\n}\n\nfunction copyArrayLikeIntoTarget(result: unknown) {\n  if (!Array.isArray(result) && !ArrayBuffer.isView(result)) {\n    return result;\n  }\n\n  // TODO(geoarrow-upgrade): Keep returning plain JS arrays for 0.3.x. Reusing deck's\n  // typed `target` buffer here caused `ScatterplotLayer` binary attribute errors\n  // (`Float64Array`) when GeoArrow delegated to deck sublayers. If the next GeoArrow\n  // runtime changes the callback contract, re-evaluate whether target reuse is safe.\n  return Array.from(result as ArrayLike<number>);\n}\n\nexport function compileGeoArrowAccessor(\n  expression: string,\n  table: arrow.Table,\n) {\n  const trimmedExpression = expression.trim();\n  if (trimmedExpression === '-') {\n    return ({\n      index,\n      data,\n    }: {\n      index: number;\n      data: {data: {get: (i: number) => unknown}};\n    }) => data.data.get(index);\n  }\n\n  const bindings = resolveColumnBindings(trimmedExpression, table);\n\n  const evaluator = new Function(\n    ...bindings.map((binding) => binding.identifier),\n    'target',\n    `return (${trimmedExpression});`,\n  ) as (...args: unknown[]) => unknown;\n\n  // TODO(geoarrow-upgrade): This custom evaluator exists because published 0.3.x\n  // GeoArrow callbacks are batch-oriented rather than deck.gl/json row-oriented. If\n  // the next version aligns with deck.gl/json accessors, remove this compiler and\n  // let the standard JSON conversion pipeline handle expressions.\n  return ({\n    index,\n    data,\n    target,\n  }: {\n    index: number;\n    data: {data: {get: (i: number) => Record<string, unknown>}};\n    target: number[];\n  }) => {\n    const batch = data.data as arrow.Table | arrow.RecordBatch;\n    const args = bindings.map((binding) =>\n      binding.columnName\n        ? batch.getChild(binding.columnName)?.get(index)\n        : undefined,\n    );\n    const result = evaluator(...args, target);\n    return copyArrayLikeIntoTarget(result);\n  };\n}\n"]}
+{"version":3,"file":"compileGeoArrowAccessor.js","sourceRoot":"","sources":["../../src/json/compileGeoArrowAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as arrow from 'apache-arrow';\n\nconst GEOARROW_COMPILED_ACCESSOR = Symbol.for(\n  '@sqlrooms/deck/compiled-geoarrow-accessor',\n);\n\nfunction isValidIdentifier(name: string) {\n  return /^[A-Za-z_$][\\w$]*$/.test(name);\n}\n\nconst RESERVED_IDENTIFIERS = new Set([\n  // JS keywords & future reserved words\n  'abstract',\n  'arguments',\n  'async',\n  'await',\n  'break',\n  'case',\n  'catch',\n  'class',\n  'const',\n  'continue',\n  'debugger',\n  'default',\n  'delete',\n  'do',\n  'else',\n  'enum',\n  'eval',\n  'export',\n  'extends',\n  'finally',\n  'for',\n  'function',\n  'if',\n  'implements',\n  'import',\n  'in',\n  'instanceof',\n  'interface',\n  'let',\n  'new',\n  'of',\n  'package',\n  'private',\n  'protected',\n  'public',\n  'return',\n  'static',\n  'super',\n  'switch',\n  'this',\n  'throw',\n  'try',\n  'typeof',\n  'var',\n  'void',\n  'while',\n  'with',\n  'yield',\n  // Literals & globals used in expressions\n  'true',\n  'false',\n  'null',\n  'undefined',\n  'NaN',\n  'Infinity',\n  'Math',\n  'Number',\n  'String',\n  'Boolean',\n  'Array',\n  'Object',\n  'Date',\n  // Accessor runtime parameter\n  'target',\n]);\n\nfunction unique<T>(values: T[]) {\n  return [...new Set(values)];\n}\n\nfunction resolveColumnBindings(expression: string, table: arrow.Table) {\n  const schemaFieldNames = table.schema.fields\n    .map((field) => field.name)\n    .filter(isValidIdentifier);\n\n  const identifiers = unique(\n    Array.from(expression.matchAll(/\\b[A-Za-z_$][\\w$]*\\b/g))\n      .map((match) => match[0])\n      .filter((identifier) => !RESERVED_IDENTIFIERS.has(identifier)),\n  );\n\n  return identifiers.map((identifier) => {\n    const exactMatch = schemaFieldNames.find(\n      (fieldName) => fieldName === identifier,\n    );\n    if (exactMatch) {\n      return {identifier, columnName: exactMatch};\n    }\n\n    const caseInsensitiveMatches = schemaFieldNames.filter(\n      (fieldName) => fieldName.toLowerCase() === identifier.toLowerCase(),\n    );\n\n    return {\n      identifier,\n      columnName:\n        caseInsensitiveMatches.length === 1\n          ? caseInsensitiveMatches[0]!\n          : undefined,\n    };\n  });\n}\n\nfunction copyArrayLikeIntoTarget(result: unknown) {\n  if (!Array.isArray(result) && !ArrayBuffer.isView(result)) {\n    return result;\n  }\n\n  // TODO(geoarrow-upgrade): Keep returning plain JS arrays for 0.3.x. Reusing deck's\n  // typed `target` buffer here caused `ScatterplotLayer` binary attribute errors\n  // (`Float64Array`) when GeoArrow delegated to deck sublayers. If the next GeoArrow\n  // runtime changes the callback contract, re-evaluate whether target reuse is safe.\n  return Array.from(result as ArrayLike<number>);\n}\n\nexport function compileGeoArrowAccessor(\n  expression: string,\n  table: arrow.Table,\n) {\n  const trimmedExpression = expression.trim();\n  if (trimmedExpression === '-') {\n    const accessor = ({\n      index,\n      data,\n    }: {\n      index: number;\n      data: {data: {get: (i: number) => unknown}};\n    }) => data.data.get(index);\n    Object.defineProperty(accessor, GEOARROW_COMPILED_ACCESSOR, {\n      value: true,\n      enumerable: false,\n    });\n    return accessor;\n  }\n\n  const bindings = resolveColumnBindings(trimmedExpression, table);\n\n  const evaluator = new Function(\n    ...bindings.map((binding) => binding.identifier),\n    'target',\n    `return (${trimmedExpression});`,\n  ) as (...args: unknown[]) => unknown;\n\n  // TODO(geoarrow-upgrade): This custom evaluator exists because published 0.3.x\n  // GeoArrow callbacks are batch-oriented rather than deck.gl/json row-oriented. If\n  // the next version aligns with deck.gl/json accessors, remove this compiler and\n  // let the standard JSON conversion pipeline handle expressions.\n  const accessor = ({\n    index,\n    data,\n    target,\n  }: {\n    index: number;\n    data: {data: {get: (i: number) => Record<string, unknown>}};\n    target: number[];\n  }) => {\n    const batch = data.data as arrow.Table | arrow.RecordBatch;\n    const args = bindings.map((binding) =>\n      binding.columnName\n        ? batch.getChild(binding.columnName)?.get(index)\n        : undefined,\n    );\n    const result = evaluator(...args, target);\n    return copyArrayLikeIntoTarget(result);\n  };\n\n  Object.defineProperty(accessor, GEOARROW_COMPILED_ACCESSOR, {\n    value: true,\n    enumerable: false,\n  });\n\n  return accessor;\n}\n\nexport function isCompiledGeoArrowAccessor(\n  value: unknown,\n): value is (info: {\n  index: number;\n  data: {data: unknown};\n  target: number[];\n}) => unknown {\n  return (\n    typeof value === 'function' &&\n    Boolean(\n      (value as {[GEOARROW_COMPILED_ACCESSOR]?: boolean})[\n        GEOARROW_COMPILED_ACCESSOR\n      ],\n    )\n  );\n}\n"]}

package/dist/json/createDeckJsonConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDeckJsonConfiguration.d.ts","sourceRoot":"","sources":["../../src/json/createDeckJsonConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAsB,wBAAwB,EAAC,MAAM,UAAU,CAAC;AAqB5E,KAAK,kCAAkC,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACxD,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAgCF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,kCAAkC,qBAqH5C"}
+{"version":3,"file":"createDeckJsonConfiguration.d.ts","sourceRoot":"","sources":["../../src/json/createDeckJsonConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGhD,OAAO,KAAK,EAAoB,wBAAwB,EAAC,MAAM,UAAU,CAAC;AAkB1E,KAAK,kCAAkC,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACxD,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAsHF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,kCAAkC,qBA2G5C"}

package/dist/json/createDeckJsonConfiguration.js

@@ -1,44 +1,97 @@
 import { JSONConfiguration } from '@deck.gl/json';
-import { DEFAULT_DECK_JSON_CLASSES, DEFAULT_DECK_JSON_CONSTANTS, DEFAULT_DECK_JSON_ENUMERATIONS, } from './defaultClasses';
-import { getLayerCompatibility, isSupportedGeoArrowLayerType, } from './layerCompatibility';
-import { isManagedLayer, resolveColorScale, resolveDatasetId, resolveGeometryColumn, stripLayerExtensionProps, } from './layerConfig';
-import { rewriteGeoArrowAccessors } from './rewriteGeoArrowAccessors';
 import { wkbGeometryDecoder } from '../prepare/wkbDecoder';
+import { createColorScaleMarker, getColorScale } from './colorScaleFunction';
 import { compileColorScale } from './compileColorScale';
+import { DEFAULT_DECK_JSON_CLASSES, DEFAULT_DECK_JSON_CONSTANTS, DEFAULT_DECK_JSON_ENUMERATIONS, } from './defaultClasses';
+import { getLayerCompatibility } from './layerCompatibility';
+import { isManagedLayer, resolveConfiguredColumn, resolveDatasetId, resolveGeometryColumn, stripLayerExtensionProps, } from './layerConfig';
+import { rewriteGeoArrowAccessors } from './rewriteGeoArrowAccessors';
 function getLayerName(Class) {
     const maybeClass = Class;
     return maybeClass.layerName ?? maybeClass.name ?? 'UnknownLayer';
 }
 function applyColorScale(options) {
-    const { props, layerProps, table } = options;
-    const colorScale = resolveColorScale(layerProps);
-    if (!colorScale) {
-        return props;
-    }
-    const targetProp = colorScale.prop ?? 'getFillColor';
-    if (props[targetProp] !== undefined) {
+    const { props, table } = options;
+    const resolved = getColorScale(props);
+    if (!resolved) {
         return props;
     }
+    const { propName, colorScale } = resolved;
+    const updateTriggers = props.updateTriggers &&
+        typeof props.updateTriggers === 'object' &&
+        !Array.isArray(props.updateTriggers)
+        ? props.updateTriggers
+        : {};
     return {
         ...props,
-        [targetProp]: compileColorScale({
+        [propName]: compileColorScale({
             table,
             colorScale,
         }),
+        updateTriggers: {
+            ...updateTriggers,
+            [propName]: JSON.stringify(colorScale),
+        },
     };
 }
+function resolveGeoArrowBindings(options) {
+    const { layerName, compatibility, layerProps, prepared, props } = options;
+    let table = prepared.table;
+    const boundProps = {};
+    for (const binding of compatibility.bindings) {
+        if (props[binding.prop] !== undefined) {
+            continue;
+        }
+        if (binding.kind === 'geometry') {
+            const columnName = resolveConfiguredColumn(layerProps, binding.configKey);
+            if (binding.required && !columnName) {
+                throw new Error(`Layer "${layerName}" requires _sqlroomsBinding.${binding.configKey}.`);
+            }
+            const resolvedGeometry = prepared.resolveGeometry(columnName);
+            if (!resolvedGeometry.nativeGeoArrow) {
+                if (!compatibility.allowGeoArrowPromotion ||
+                    !wkbGeometryDecoder.supportsGeoArrowPromotion(layerName, resolvedGeometry.encoding, prepared.table, resolvedGeometry.columnName)) {
+                    throw new Error(`Layer "${layerName}" cannot render geometry encoding "${resolvedGeometry.encoding}" for dataset "${prepared.datasetId}".`);
+                }
+            }
+            const layerData = prepared.getGeoArrowLayerData(columnName);
+            if (table !== prepared.table && table !== layerData.table) {
+                throw new Error(`Layer "${layerName}" cannot combine promoted geometry columns from different prepared tables.`);
+            }
+            table = layerData.table;
+            boundProps[binding.prop] = layerData.geometryColumn;
+            continue;
+        }
+        const columnName = resolveConfiguredColumn(layerProps, binding.configKey);
+        if (!columnName) {
+            if (binding.required) {
+                throw new Error(`Layer "${layerName}" requires _sqlroomsBinding.${binding.configKey}.`);
+            }
+            continue;
+        }
+        const vector = table.getChild(columnName) ?? prepared.table.getChild(columnName);
+        if (!vector) {
+            throw new Error(`Layer "${layerName}" references unknown column "${columnName}" for ${binding.prop}.`);
+        }
+        boundProps[binding.prop] = vector;
+    }
+    return { table, boundProps };
+}
 export function createDeckJsonConfiguration(options) {
     const { datasetStates, datasetIds } = options;
     return new JSONConfiguration({
         classes: DEFAULT_DECK_JSON_CLASSES,
         enumerations: DEFAULT_DECK_JSON_ENUMERATIONS,
         constants: DEFAULT_DECK_JSON_CONSTANTS,
+        functions: {
+            colorScale: (props) => createColorScaleMarker(props),
+        },
         // TODO(geoarrow-upgrade): In 0.3.x we preserve raw `@@=` strings here because
         // `@deck.gl/json` would otherwise eagerly compile them into row-based accessors
         // before `preProcessClassProps` can rewrite them for GeoArrow. If the next
         // GeoArrow version can consume deck.gl/json's converted accessors directly, or
         // exposes a cleaner injection seam, remove this shim.
-        convertFunction: (expression) => `@@=${expression}`,
+        convertFunction: ((expression) => `@@=${expression}`),
         preProcessClassProps: (Class, props) => {
             const layerName = getLayerName(Class);
             const compatibility = getLayerCompatibility(layerName);
@@ -54,7 +107,7 @@ export function createDeckJsonConfiguration(options) {
                 return props;
             }
             if (!datasetId) {
-                throw new Error(`Layer "${layerName}" must declare _sqlrooms.dataset when multiple datasets are available.`);
+                throw new Error(`Layer "${layerName}" must declare _sqlroomsBinding.dataset when multiple datasets are available.`);
             }
             const datasetState = datasetStates[datasetId];
             if (!datasetState) {
@@ -65,36 +118,36 @@ export function createDeckJsonConfiguration(options) {
             }
             const prepared = datasetState.prepared;
             const geometryColumn = resolveGeometryColumn(extensionProps);
-            const baseProps = applyColorScale({
-                props: stripLayerExtensionProps(layerProps),
-                layerProps: extensionProps,
-                table: prepared.table,
-            });
+            const strippedProps = stripLayerExtensionProps(layerProps);
             if (compatibility.representation === 'geojson') {
+                const baseProps = applyColorScale({
+                    props: strippedProps,
+                    table: prepared.table,
+                });
                 return {
                     ...baseProps,
                     data: prepared.getGeoJsonBinaryData(geometryColumn),
                 };
             }
-            const resolvedGeometry = prepared.resolveGeometry(geometryColumn);
-            if (!resolvedGeometry.nativeGeoArrow &&
-                !(isSupportedGeoArrowLayerType(layerName) &&
-                    wkbGeometryDecoder.supportsGeoArrowPromotion(layerName, resolvedGeometry.encoding, prepared.table, resolvedGeometry.columnName))) {
-                throw new Error(`Layer "${layerName}" cannot render geometry encoding "${resolvedGeometry.encoding}" for dataset "${datasetId}".`);
-            }
-            const geoArrowLayerData = prepared.getGeoArrowLayerData(geometryColumn);
+            const { table, boundProps } = resolveGeoArrowBindings({
+                layerName,
+                compatibility,
+                layerProps: extensionProps,
+                prepared,
+                props: strippedProps,
+            });
+            const baseProps = applyColorScale({
+                props: strippedProps,
+                table,
+            });
             const nextProps = {
                 ...baseProps,
-                // TODO(geoarrow-upgrade): 0.3.x expects `data` as an Arrow Table and the
-                // geometry accessor as an Arrow Vector. Re-check this payload contract when
-                // upgrading; newer GeoArrow code may prefer RecordBatch/Data chunks instead.
-                data: geoArrowLayerData.table,
-                [compatibility.geometryProp]: baseProps[compatibility.geometryProp] ??
-                    geoArrowLayerData.geometryColumn,
+                data: table,
+                ...boundProps,
             };
             return rewriteGeoArrowAccessors({
                 props: nextProps,
-                table: geoArrowLayerData.table,
+                table,
                 layerName,
             });
         },

package/dist/json/createDeckJsonConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDeckJsonConfiguration.js","sourceRoot":"","sources":["../../src/json/createDeckJsonConfiguration.ts"],"names":[],"mappings":"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","sourcesContent":["import {JSONConfiguration} from '@deck.gl/json';\nimport type {LayerExtensionProps, PreparedDeckDatasetState} from '../types';\nimport {\n  DEFAULT_DECK_JSON_CLASSES,\n  DEFAULT_DECK_JSON_CONSTANTS,\n  DEFAULT_DECK_JSON_ENUMERATIONS,\n} from './defaultClasses';\nimport {\n  getLayerCompatibility,\n  isSupportedGeoArrowLayerType,\n} from './layerCompatibility';\nimport {\n  isManagedLayer,\n  resolveColorScale,\n  resolveDatasetId,\n  resolveGeometryColumn,\n  stripLayerExtensionProps,\n} from './layerConfig';\nimport {rewriteGeoArrowAccessors} from './rewriteGeoArrowAccessors';\nimport {wkbGeometryDecoder} from '../prepare/wkbDecoder';\nimport {compileColorScale} from './compileColorScale';\n\ntype CreateDeckJsonConfigurationOptions = {\n  datasetStates: Record<string, PreparedDeckDatasetState>;\n  datasetIds: string[];\n};\n\nfunction getLayerName(Class: unknown) {\n  const maybeClass = Class as {layerName?: string; name?: string};\n  return maybeClass.layerName ?? maybeClass.name ?? 'UnknownLayer';\n}\n\nfunction applyColorScale(options: {\n  props: Record<string, unknown>;\n  layerProps: LayerExtensionProps & Record<string, unknown>;\n  table: import('apache-arrow').Table;\n}) {\n  const {props, layerProps, table} = options;\n  const colorScale = resolveColorScale(layerProps);\n  if (!colorScale) {\n    return props;\n  }\n\n  const targetProp = colorScale.prop ?? 'getFillColor';\n  if (props[targetProp] !== undefined) {\n    return props;\n  }\n\n  return {\n    ...props,\n    [targetProp]: compileColorScale({\n      table,\n      colorScale,\n    }),\n  };\n}\n\nexport function createDeckJsonConfiguration(\n  options: CreateDeckJsonConfigurationOptions,\n) {\n  const {datasetStates, datasetIds} = options;\n\n  return new JSONConfiguration({\n    classes: DEFAULT_DECK_JSON_CLASSES,\n    enumerations: DEFAULT_DECK_JSON_ENUMERATIONS,\n    constants: DEFAULT_DECK_JSON_CONSTANTS,\n    // TODO(geoarrow-upgrade): In 0.3.x we preserve raw `@@=` strings here because\n    // `@deck.gl/json` would otherwise eagerly compile them into row-based accessors\n    // before `preProcessClassProps` can rewrite them for GeoArrow. If the next\n    // GeoArrow version can consume deck.gl/json's converted accessors directly, or\n    // exposes a cleaner injection seam, remove this shim.\n    convertFunction: (expression: string) => `@@=${expression}`,\n    preProcessClassProps: (Class: unknown, props: unknown) => {\n      const layerName = getLayerName(Class);\n      const compatibility = getLayerCompatibility(layerName);\n\n      if (!compatibility) {\n        return props;\n      }\n\n      const layerProps = props as Record<string, unknown>;\n      const extensionProps = layerProps as typeof layerProps &\n        LayerExtensionProps;\n      const datasetId = resolveDatasetId(extensionProps, datasetIds);\n      const managed =\n        isManagedLayer(extensionProps, datasetIds) ||\n        (datasetIds.length > 1 && layerProps.data === undefined);\n\n      if (!managed) {\n        return props;\n      }\n\n      if (!datasetId) {\n        throw new Error(\n          `Layer \"${layerName}\" must declare _sqlrooms.dataset when multiple datasets are available.`,\n        );\n      }\n\n      const datasetState = datasetStates[datasetId];\n      if (!datasetState) {\n        throw new Error(\n          `Layer \"${layerName}\" references unknown dataset \"${datasetId}\".`,\n        );\n      }\n\n      if (datasetState.status !== 'ready') {\n        return stripLayerExtensionProps(layerProps);\n      }\n\n      const prepared = datasetState.prepared;\n      const geometryColumn = resolveGeometryColumn(extensionProps);\n      const baseProps = applyColorScale({\n        props: stripLayerExtensionProps(layerProps),\n        layerProps: extensionProps,\n        table: prepared.table,\n      });\n\n      if (compatibility.representation === 'geojson') {\n        return {\n          ...baseProps,\n          data: prepared.getGeoJsonBinaryData(geometryColumn),\n        };\n      }\n\n      const resolvedGeometry = prepared.resolveGeometry(geometryColumn);\n      if (\n        !resolvedGeometry.nativeGeoArrow &&\n        !(\n          isSupportedGeoArrowLayerType(layerName) &&\n          wkbGeometryDecoder.supportsGeoArrowPromotion(\n            layerName,\n            resolvedGeometry.encoding,\n            prepared.table,\n            resolvedGeometry.columnName,\n          )\n        )\n      ) {\n        throw new Error(\n          `Layer \"${layerName}\" cannot render geometry encoding \"${resolvedGeometry.encoding}\" for dataset \"${datasetId}\".`,\n        );\n      }\n\n      const geoArrowLayerData = prepared.getGeoArrowLayerData(geometryColumn);\n      const nextProps = {\n        ...baseProps,\n        // TODO(geoarrow-upgrade): 0.3.x expects `data` as an Arrow Table and the\n        // geometry accessor as an Arrow Vector. Re-check this payload contract when\n        // upgrading; newer GeoArrow code may prefer RecordBatch/Data chunks instead.\n        data: geoArrowLayerData.table,\n        [compatibility.geometryProp]:\n          baseProps[compatibility.geometryProp] ??\n          geoArrowLayerData.geometryColumn,\n      };\n\n      return rewriteGeoArrowAccessors({\n        props: nextProps,\n        table: geoArrowLayerData.table,\n        layerName,\n      });\n    },\n    postProcessConvertedJson: (json: unknown) => {\n      if (\n        json &&\n        typeof json === 'object' &&\n        'layers' in json &&\n        Array.isArray((json as {layers?: unknown[]}).layers)\n      ) {\n        (json as {layers: unknown[]}).layers = (\n          json as {layers: unknown[]}\n        ).layers.filter(Boolean);\n      }\n\n      return json;\n    },\n  });\n}\n"]}
+{"version":3,"file":"createDeckJsonConfiguration.js","sourceRoot":"","sources":["../../src/json/createDeckJsonConfiguration.ts"],"names":[],"mappings":"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","sourcesContent":["import {JSONConfiguration} from '@deck.gl/json';\nimport type {ColorScaleConfig} from '@sqlrooms/color-scales';\nimport {wkbGeometryDecoder} from '../prepare/wkbDecoder';\nimport type {LayerBindingProps, PreparedDeckDatasetState} from '../types';\nimport {createColorScaleMarker, getColorScale} from './colorScaleFunction';\nimport {compileColorScale} from './compileColorScale';\nimport {\n  DEFAULT_DECK_JSON_CLASSES,\n  DEFAULT_DECK_JSON_CONSTANTS,\n  DEFAULT_DECK_JSON_ENUMERATIONS,\n} from './defaultClasses';\nimport {getLayerCompatibility} from './layerCompatibility';\nimport {\n  isManagedLayer,\n  resolveConfiguredColumn,\n  resolveDatasetId,\n  resolveGeometryColumn,\n  stripLayerExtensionProps,\n} from './layerConfig';\nimport {rewriteGeoArrowAccessors} from './rewriteGeoArrowAccessors';\n\ntype CreateDeckJsonConfigurationOptions = {\n  datasetStates: Record<string, PreparedDeckDatasetState>;\n  datasetIds: string[];\n};\n\nfunction getLayerName(Class: unknown) {\n  const maybeClass = Class as {layerName?: string; name?: string};\n  return maybeClass.layerName ?? maybeClass.name ?? 'UnknownLayer';\n}\n\nfunction applyColorScale(options: {\n  props: Record<string, unknown>;\n  table: import('apache-arrow').Table;\n}) {\n  const {props, table} = options;\n  const resolved = getColorScale(props);\n  if (!resolved) {\n    return props;\n  }\n\n  const {propName, colorScale} = resolved;\n\n  const updateTriggers =\n    props.updateTriggers &&\n    typeof props.updateTriggers === 'object' &&\n    !Array.isArray(props.updateTriggers)\n      ? (props.updateTriggers as Record<string, unknown>)\n      : {};\n\n  return {\n    ...props,\n    [propName]: compileColorScale({\n      table,\n      colorScale,\n    }),\n    updateTriggers: {\n      ...updateTriggers,\n      [propName]: JSON.stringify(colorScale),\n    },\n  };\n}\n\nfunction resolveGeoArrowBindings(options: {\n  layerName: string;\n  compatibility: NonNullable<ReturnType<typeof getLayerCompatibility>> & {\n    representation: 'geoarrow';\n  };\n  layerProps: LayerBindingProps & Record<string, unknown>;\n  prepared: Extract<PreparedDeckDatasetState, {status: 'ready'}>['prepared'];\n  props: Record<string, unknown>;\n}) {\n  const {layerName, compatibility, layerProps, prepared, props} = options;\n  let table = prepared.table;\n  const boundProps: Record<string, unknown> = {};\n\n  for (const binding of compatibility.bindings) {\n    if (props[binding.prop] !== undefined) {\n      continue;\n    }\n\n    if (binding.kind === 'geometry') {\n      const columnName = resolveConfiguredColumn(layerProps, binding.configKey);\n      if (binding.required && !columnName) {\n        throw new Error(\n          `Layer \"${layerName}\" requires _sqlroomsBinding.${binding.configKey}.`,\n        );\n      }\n\n      const resolvedGeometry = prepared.resolveGeometry(columnName);\n      if (!resolvedGeometry.nativeGeoArrow) {\n        if (\n          !compatibility.allowGeoArrowPromotion ||\n          !wkbGeometryDecoder.supportsGeoArrowPromotion(\n            layerName,\n            resolvedGeometry.encoding,\n            prepared.table,\n            resolvedGeometry.columnName,\n          )\n        ) {\n          throw new Error(\n            `Layer \"${layerName}\" cannot render geometry encoding \"${resolvedGeometry.encoding}\" for dataset \"${prepared.datasetId}\".`,\n          );\n        }\n      }\n\n      const layerData = prepared.getGeoArrowLayerData(columnName);\n      if (table !== prepared.table && table !== layerData.table) {\n        throw new Error(\n          `Layer \"${layerName}\" cannot combine promoted geometry columns from different prepared tables.`,\n        );\n      }\n\n      table = layerData.table;\n      boundProps[binding.prop] = layerData.geometryColumn;\n      continue;\n    }\n\n    const columnName = resolveConfiguredColumn(layerProps, binding.configKey);\n    if (!columnName) {\n      if (binding.required) {\n        throw new Error(\n          `Layer \"${layerName}\" requires _sqlroomsBinding.${binding.configKey}.`,\n        );\n      }\n      continue;\n    }\n\n    const vector =\n      table.getChild(columnName) ?? prepared.table.getChild(columnName);\n    if (!vector) {\n      throw new Error(\n        `Layer \"${layerName}\" references unknown column \"${columnName}\" for ${binding.prop}.`,\n      );\n    }\n\n    boundProps[binding.prop] = vector;\n  }\n\n  return {table, boundProps};\n}\n\nexport function createDeckJsonConfiguration(\n  options: CreateDeckJsonConfigurationOptions,\n) {\n  const {datasetStates, datasetIds} = options;\n\n  return new JSONConfiguration({\n    classes: DEFAULT_DECK_JSON_CLASSES,\n    enumerations: DEFAULT_DECK_JSON_ENUMERATIONS,\n    constants: DEFAULT_DECK_JSON_CONSTANTS,\n    functions: {\n      colorScale: (props: ColorScaleConfig) => createColorScaleMarker(props),\n    },\n    // TODO(geoarrow-upgrade): In 0.3.x we preserve raw `@@=` strings here because\n    // `@deck.gl/json` would otherwise eagerly compile them into row-based accessors\n    // before `preProcessClassProps` can rewrite them for GeoArrow. If the next\n    // GeoArrow version can consume deck.gl/json's converted accessors directly, or\n    // exposes a cleaner injection seam, remove this shim.\n    convertFunction: ((expression: string) => `@@=${expression}`) as never,\n    preProcessClassProps: (Class: unknown, props: Record<string, unknown>) => {\n      const layerName = getLayerName(Class);\n      const compatibility = getLayerCompatibility(layerName);\n\n      if (!compatibility) {\n        return props;\n      }\n\n      const layerProps = props as Record<string, unknown>;\n      const extensionProps = layerProps as typeof layerProps &\n        LayerBindingProps;\n      const datasetId = resolveDatasetId(extensionProps, datasetIds);\n      const managed =\n        isManagedLayer(extensionProps, datasetIds) ||\n        (datasetIds.length > 1 && layerProps.data === undefined);\n\n      if (!managed) {\n        return props;\n      }\n\n      if (!datasetId) {\n        throw new Error(\n          `Layer \"${layerName}\" must declare _sqlroomsBinding.dataset when multiple datasets are available.`,\n        );\n      }\n\n      const datasetState = datasetStates[datasetId];\n      if (!datasetState) {\n        throw new Error(\n          `Layer \"${layerName}\" references unknown dataset \"${datasetId}\".`,\n        );\n      }\n\n      if (datasetState.status !== 'ready') {\n        return stripLayerExtensionProps(layerProps);\n      }\n\n      const prepared = datasetState.prepared;\n      const geometryColumn = resolveGeometryColumn(extensionProps);\n      const strippedProps = stripLayerExtensionProps(layerProps);\n\n      if (compatibility.representation === 'geojson') {\n        const baseProps = applyColorScale({\n          props: strippedProps,\n          table: prepared.table,\n        });\n        return {\n          ...baseProps,\n          data: prepared.getGeoJsonBinaryData(geometryColumn),\n        };\n      }\n\n      const {table, boundProps} = resolveGeoArrowBindings({\n        layerName,\n        compatibility,\n        layerProps: extensionProps,\n        prepared,\n        props: strippedProps,\n      });\n      const baseProps = applyColorScale({\n        props: strippedProps,\n        table,\n      });\n      const nextProps = {\n        ...baseProps,\n        data: table,\n        ...boundProps,\n      };\n\n      return rewriteGeoArrowAccessors({\n        props: nextProps,\n        table,\n        layerName,\n      });\n    },\n    postProcessConvertedJson: (json: unknown) => {\n      if (\n        json &&\n        typeof json === 'object' &&\n        'layers' in json &&\n        Array.isArray((json as {layers?: unknown[]}).layers)\n      ) {\n        (json as {layers: unknown[]}).layers = (\n          json as {layers: unknown[]}\n        ).layers.filter(Boolean);\n      }\n\n      return json;\n    },\n  });\n}\n"]}

package/dist/json/defaultClasses.d.ts

@@ -1,6 +1,6 @@
 import { FirstPersonView, MapView, OrbitView, OrthographicView } from '@deck.gl/core';
 import { GeoJsonLayer } from '@deck.gl/layers';
-import { GeoArrowPathLayer, GeoArrowScatterplotLayer, GeoArrowSolidPolygonLayer } from '@geoarrow/deck.gl-layers';
+import { GeoArrowArcLayer, GeoArrowColumnLayer, _GeoArrowH3HexagonLayer as GeoArrowH3HexagonLayer, GeoArrowHeatmapLayer, GeoArrowPathLayer, GeoArrowPolygonLayer, GeoArrowScatterplotLayer, GeoArrowSolidPolygonLayer, GeoArrowTripsLayer } from '@geoarrow/deck.gl-layers';
 export declare const DEFAULT_DECK_JSON_CLASSES: {
     MapView: typeof MapView;
     FirstPersonView: typeof FirstPersonView;
@@ -8,16 +8,22 @@ export declare const DEFAULT_DECK_JSON_CLASSES: {
     OrthographicView: typeof OrthographicView;
     GeoJsonLayer: typeof GeoJsonLayer;
     GeoArrowScatterplotLayer: typeof GeoArrowScatterplotLayer;
+    GeoArrowHeatmapLayer: typeof GeoArrowHeatmapLayer;
+    GeoArrowColumnLayer: typeof GeoArrowColumnLayer;
     GeoArrowPathLayer: typeof GeoArrowPathLayer;
+    GeoArrowPolygonLayer: typeof GeoArrowPolygonLayer;
     GeoArrowSolidPolygonLayer: typeof GeoArrowSolidPolygonLayer;
+    GeoArrowArcLayer: typeof GeoArrowArcLayer;
+    GeoArrowTripsLayer: typeof GeoArrowTripsLayer;
+    GeoArrowH3HexagonLayer: typeof GeoArrowH3HexagonLayer;
 };
 export declare const DEFAULT_DECK_JSON_ENUMERATIONS: {
     COORDINATE_SYSTEM: {
-        readonly DEFAULT: -1;
-        readonly LNGLAT: 1;
-        readonly METER_OFFSETS: 2;
-        readonly LNGLAT_OFFSETS: 3;
-        readonly CARTESIAN: 0;
+        readonly DEFAULT: "default";
+        readonly LNGLAT: "lnglat";
+        readonly METER_OFFSETS: "meter-offsets";
+        readonly LNGLAT_OFFSETS: "lnglat-offsets";
+        readonly CARTESIAN: "cartesian";
     };
 };
 export declare const DEFAULT_DECK_JSON_CONSTANTS: {};

package/dist/json/defaultClasses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultClasses.d.ts","sourceRoot":"","sources":["../../src/json/defaultClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,OAAO,EACP,SAAS,EACT,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,yBAAyB;;;;;;;;;CASrC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;CAE1C,CAAC;AAEF,eAAO,MAAM,2BAA2B,IAAK,CAAC"}
+{"version":3,"file":"defaultClasses.d.ts","sourceRoot":"","sources":["../../src/json/defaultClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,OAAO,EACP,SAAS,EACT,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,IAAI,sBAAsB,EACjD,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;CAerC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;CAE1C,CAAC;AAEF,eAAO,MAAM,2BAA2B,IAAK,CAAC"}

package/dist/json/defaultClasses.js

@@ -1,6 +1,6 @@
 import { COORDINATE_SYSTEM, FirstPersonView, MapView, OrbitView, OrthographicView, } from '@deck.gl/core';
 import { GeoJsonLayer } from '@deck.gl/layers';
-import { GeoArrowPathLayer, GeoArrowScatterplotLayer, GeoArrowSolidPolygonLayer, } from '@geoarrow/deck.gl-layers';
+import { GeoArrowArcLayer, GeoArrowColumnLayer, _GeoArrowH3HexagonLayer as GeoArrowH3HexagonLayer, GeoArrowHeatmapLayer, GeoArrowPathLayer, GeoArrowPolygonLayer, GeoArrowScatterplotLayer, GeoArrowSolidPolygonLayer, GeoArrowTripsLayer, } from '@geoarrow/deck.gl-layers';
 // TODO(geoarrow-upgrade): Revisit this import surface on the next GeoArrow bump.
 // Published 0.3.x uses `@geoarrow/deck.gl-layers`; newer lines may rename the package
 // and/or move the exported layer classes.
@@ -11,8 +11,14 @@ export const DEFAULT_DECK_JSON_CLASSES = {
     OrthographicView,
     GeoJsonLayer,
     GeoArrowScatterplotLayer,
+    GeoArrowHeatmapLayer,
+    GeoArrowColumnLayer,
     GeoArrowPathLayer,
+    GeoArrowPolygonLayer,
     GeoArrowSolidPolygonLayer,
+    GeoArrowArcLayer,
+    GeoArrowTripsLayer,
+    GeoArrowH3HexagonLayer,
 };
 export const DEFAULT_DECK_JSON_ENUMERATIONS = {
     COORDINATE_SYSTEM,

package/dist/json/defaultClasses.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultClasses.js","sourceRoot":"","sources":["../../src/json/defaultClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,OAAO,EACP,SAAS,EACT,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAElC,iFAAiF;AACjF,sFAAsF;AACtF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,OAAO;IACP,eAAe;IACf,SAAS;IACT,gBAAgB;IAChB,YAAY;IACZ,wBAAwB;IACxB,iBAAiB;IACjB,yBAAyB;CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,iBAAiB;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,CAAC","sourcesContent":["import {\n  COORDINATE_SYSTEM,\n  FirstPersonView,\n  MapView,\n  OrbitView,\n  OrthographicView,\n} from '@deck.gl/core';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {\n  GeoArrowPathLayer,\n  GeoArrowScatterplotLayer,\n  GeoArrowSolidPolygonLayer,\n} from '@geoarrow/deck.gl-layers';\n\n// TODO(geoarrow-upgrade): Revisit this import surface on the next GeoArrow bump.\n// Published 0.3.x uses `@geoarrow/deck.gl-layers`; newer lines may rename the package\n// and/or move the exported layer classes.\nexport const DEFAULT_DECK_JSON_CLASSES = {\n  MapView,\n  FirstPersonView,\n  OrbitView,\n  OrthographicView,\n  GeoJsonLayer,\n  GeoArrowScatterplotLayer,\n  GeoArrowPathLayer,\n  GeoArrowSolidPolygonLayer,\n};\n\nexport const DEFAULT_DECK_JSON_ENUMERATIONS = {\n  COORDINATE_SYSTEM,\n};\n\nexport const DEFAULT_DECK_JSON_CONSTANTS = {};\n"]}
+{"version":3,"file":"defaultClasses.js","sourceRoot":"","sources":["../../src/json/defaultClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,OAAO,EACP,SAAS,EACT,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,IAAI,sBAAsB,EACjD,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,iFAAiF;AACjF,sFAAsF;AACtF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,OAAO;IACP,eAAe;IACf,SAAS;IACT,gBAAgB;IAChB,YAAY;IACZ,wBAAwB;IACxB,oBAAoB;IACpB,mBAAmB;IACnB,iBAAiB;IACjB,oBAAoB;IACpB,yBAAyB;IACzB,gBAAgB;IAChB,kBAAkB;IAClB,sBAAsB;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,iBAAiB;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,CAAC","sourcesContent":["import {\n  COORDINATE_SYSTEM,\n  FirstPersonView,\n  MapView,\n  OrbitView,\n  OrthographicView,\n} from '@deck.gl/core';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {\n  GeoArrowArcLayer,\n  GeoArrowColumnLayer,\n  _GeoArrowH3HexagonLayer as GeoArrowH3HexagonLayer,\n  GeoArrowHeatmapLayer,\n  GeoArrowPathLayer,\n  GeoArrowPolygonLayer,\n  GeoArrowScatterplotLayer,\n  GeoArrowSolidPolygonLayer,\n  GeoArrowTripsLayer,\n} from '@geoarrow/deck.gl-layers';\n\n// TODO(geoarrow-upgrade): Revisit this import surface on the next GeoArrow bump.\n// Published 0.3.x uses `@geoarrow/deck.gl-layers`; newer lines may rename the package\n// and/or move the exported layer classes.\nexport const DEFAULT_DECK_JSON_CLASSES = {\n  MapView,\n  FirstPersonView,\n  OrbitView,\n  OrthographicView,\n  GeoJsonLayer,\n  GeoArrowScatterplotLayer,\n  GeoArrowHeatmapLayer,\n  GeoArrowColumnLayer,\n  GeoArrowPathLayer,\n  GeoArrowPolygonLayer,\n  GeoArrowSolidPolygonLayer,\n  GeoArrowArcLayer,\n  GeoArrowTripsLayer,\n  GeoArrowH3HexagonLayer,\n};\n\nexport const DEFAULT_DECK_JSON_ENUMERATIONS = {\n  COORDINATE_SYSTEM,\n};\n\nexport const DEFAULT_DECK_JSON_CONSTANTS = {};\n"]}

package/dist/json/extractColorScaleLegends.d.ts

@@ -1,5 +1,5 @@
+import type { ResolvedColorLegend } from '@sqlrooms/color-scales';
 import type { PreparedDeckDatasetState } from '../types';
-import { type ResolvedColorLegend } from './compileColorScale';
 export declare function extractColorScaleLegends(options: {
     spec: Record<string, unknown> | null;
     datasetIds: string[];

package/dist/json/extractColorScaleLegends.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractColorScaleLegends.d.ts","sourceRoot":"","sources":["../../src/json/extractColorScaleLegends.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,wBAAwB,EAAC,MAAM,UAAU,CAAC;AAC5E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,qBAAqB,CAAC;AAuB7B,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;CACzD,yBA4CA"}
+{"version":3,"file":"extractColorScaleLegends.d.ts","sourceRoot":"","sources":["../../src/json/extractColorScaleLegends.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAoB,wBAAwB,EAAC,MAAM,UAAU,CAAC;AAuB1E,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;CACzD,yBA4CA"}

package/dist/json/extractColorScaleLegends.js

@@ -1,7 +1,9 @@
-import { buildColorScaleLegend, } from './compileColorScale';
-import { resolveColorLegend, resolveColorScale, resolveDatasetId, } from './layerConfig';
+import { getColorScale } from './colorScaleFunction';
+import { buildColorScaleLegend } from './compileColorScale';
+import { resolveColorLegend, resolveDatasetId } from './layerConfig';
 function resolveLegendTitle(layerProps, fallbackField) {
-    const legend = resolveColorLegend(layerProps);
+    const legend = resolveColorLegend(layerProps, 'getFillColor') ??
+        resolveColorLegend(layerProps, 'getLineColor');
     if (legend &&
         typeof legend === 'object' &&
         typeof legend.title === 'string') {
@@ -21,11 +23,11 @@ export function extractColorScaleLegends(options) {
         }
         const layerProps = layer;
         const extensionProps = layerProps;
-        const colorScale = resolveColorScale(extensionProps);
-        const legend = resolveColorLegend(extensionProps);
-        if (!colorScale || legend === false) {
+        const resolvedColorScale = getColorScale(layerProps);
+        if (!resolvedColorScale) {
             continue;
         }
+        const { colorScale } = resolvedColorScale;
         const datasetId = resolveDatasetId(layerProps, datasetIds);
         if (!datasetId) {
             continue;

package/dist/json/extractColorScaleLegends.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractColorScaleLegends.js","sourceRoot":"","sources":["../../src/json/extractColorScaleLegends.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,GAEtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,eAAe,CAAC;AAEvB,SAAS,kBAAkB,CACzB,UAAmC,EACnC,aAAqB;IAErB,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC9C,IACE,MAAM;QACN,OAAO,MAAM,KAAK,QAAQ;QAC1B,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAChC,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAIxC;IACC,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAC,GAAG,OAAO,CAAC;IAClD,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,OAAO,EAA2B,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAA0B,EAAE,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,KAAgC,CAAC;QACpD,MAAM,cAAc,GAAG,UACE,CAAC;QAC1B,MAAM,UAAU,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAAG,qBAAqB,CAAC;YAC3C,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK;YAClC,UAAU;YACV,KAAK,EAAE,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;SACxD,CAAC,CAAC;QAEH,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type {LayerExtensionProps, PreparedDeckDatasetState} from '../types';\nimport {\n  buildColorScaleLegend,\n  type ResolvedColorLegend,\n} from './compileColorScale';\nimport {\n  resolveColorLegend,\n  resolveColorScale,\n  resolveDatasetId,\n} from './layerConfig';\n\nfunction resolveLegendTitle(\n  layerProps: Record<string, unknown>,\n  fallbackField: string,\n) {\n  const legend = resolveColorLegend(layerProps);\n  if (\n    legend &&\n    typeof legend === 'object' &&\n    typeof legend.title === 'string'\n  ) {\n    return legend.title;\n  }\n\n  return fallbackField;\n}\n\nexport function extractColorScaleLegends(options: {\n  spec: Record<string, unknown> | null;\n  datasetIds: string[];\n  datasetStates: Record<string, PreparedDeckDatasetState>;\n}) {\n  const {spec, datasetIds, datasetStates} = options;\n  if (!spec || !Array.isArray(spec.layers)) {\n    return [] as ResolvedColorLegend[];\n  }\n\n  const legends: ResolvedColorLegend[] = [];\n\n  for (const layer of spec.layers) {\n    if (!layer || typeof layer !== 'object') {\n      continue;\n    }\n\n    const layerProps = layer as Record<string, unknown>;\n    const extensionProps = layerProps as LayerExtensionProps &\n      Record<string, unknown>;\n    const colorScale = resolveColorScale(extensionProps);\n    const legend = resolveColorLegend(extensionProps);\n    if (!colorScale || legend === false) {\n      continue;\n    }\n\n    const datasetId = resolveDatasetId(layerProps, datasetIds);\n    if (!datasetId) {\n      continue;\n    }\n\n    const datasetState = datasetStates[datasetId];\n    if (!datasetState || datasetState.status !== 'ready') {\n      continue;\n    }\n\n    const resolvedLegend = buildColorScaleLegend({\n      table: datasetState.prepared.table,\n      colorScale,\n      title: resolveLegendTitle(layerProps, colorScale.field),\n    });\n\n    if (resolvedLegend) {\n      legends.push(resolvedLegend);\n    }\n  }\n\n  return legends;\n}\n"]}
+{"version":3,"file":"extractColorScaleLegends.js","sourceRoot":"","sources":["../../src/json/extractColorScaleLegends.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAC,kBAAkB,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAEnE,SAAS,kBAAkB,CACzB,UAAmC,EACnC,aAAqB;IAErB,MAAM,MAAM,GACV,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC;QAC9C,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACjD,IACE,MAAM;QACN,OAAO,MAAM,KAAK,QAAQ;QAC1B,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAChC,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAIxC;IACC,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAC,GAAG,OAAO,CAAC;IAClD,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,OAAO,EAA2B,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAA0B,EAAE,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,KAAgC,CAAC;QACpD,MAAM,cAAc,GAAG,UACE,CAAC;QAC1B,MAAM,kBAAkB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,MAAM,EAAC,UAAU,EAAC,GAAG,kBAAkB,CAAC;QAExC,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAAG,qBAAqB,CAAC;YAC3C,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK;YAClC,UAAU;YACV,KAAK,EAAE,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC;SACxD,CAAC,CAAC;QAEH,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type {ResolvedColorLegend} from '@sqlrooms/color-scales';\nimport type {LayerBindingProps, PreparedDeckDatasetState} from '../types';\nimport {getColorScale} from './colorScaleFunction';\nimport {buildColorScaleLegend} from './compileColorScale';\nimport {resolveColorLegend, resolveDatasetId} from './layerConfig';\n\nfunction resolveLegendTitle(\n  layerProps: Record<string, unknown>,\n  fallbackField: string,\n) {\n  const legend =\n    resolveColorLegend(layerProps, 'getFillColor') ??\n    resolveColorLegend(layerProps, 'getLineColor');\n  if (\n    legend &&\n    typeof legend === 'object' &&\n    typeof legend.title === 'string'\n  ) {\n    return legend.title;\n  }\n\n  return fallbackField;\n}\n\nexport function extractColorScaleLegends(options: {\n  spec: Record<string, unknown> | null;\n  datasetIds: string[];\n  datasetStates: Record<string, PreparedDeckDatasetState>;\n}) {\n  const {spec, datasetIds, datasetStates} = options;\n  if (!spec || !Array.isArray(spec.layers)) {\n    return [] as ResolvedColorLegend[];\n  }\n\n  const legends: ResolvedColorLegend[] = [];\n\n  for (const layer of spec.layers) {\n    if (!layer || typeof layer !== 'object') {\n      continue;\n    }\n\n    const layerProps = layer as Record<string, unknown>;\n    const extensionProps = layerProps as LayerBindingProps &\n      Record<string, unknown>;\n    const resolvedColorScale = getColorScale(layerProps);\n    if (!resolvedColorScale) {\n      continue;\n    }\n    const {colorScale} = resolvedColorScale;\n\n    const datasetId = resolveDatasetId(layerProps, datasetIds);\n    if (!datasetId) {\n      continue;\n    }\n\n    const datasetState = datasetStates[datasetId];\n    if (!datasetState || datasetState.status !== 'ready') {\n      continue;\n    }\n\n    const resolvedLegend = buildColorScaleLegend({\n      table: datasetState.prepared.table,\n      colorScale,\n      title: resolveLegendTitle(layerProps, colorScale.field),\n    });\n\n    if (resolvedLegend) {\n      legends.push(resolvedLegend);\n    }\n  }\n\n  return legends;\n}\n"]}

package/dist/json/layerCompatibility.d.ts

@@ -1,15 +1,21 @@
-import type { SupportedGeoArrowLayerType } from '../prepare/geometryDecoder';
+import type { LayerConfigColumnKey } from './layerConfig';
 type GeoJsonCompatibility = {
     representation: 'geojson';
     vectorAccessorProps: string[];
 };
+type GeoArrowBinding = {
+    prop: string;
+    kind: 'geometry' | 'column';
+    configKey: LayerConfigColumnKey;
+    required?: boolean;
+};
 type GeoArrowCompatibility = {
     representation: 'geoarrow';
-    geometryProp: string;
+    bindings: GeoArrowBinding[];
     vectorAccessorProps: string[];
+    allowGeoArrowPromotion?: boolean;
 };
 type LayerCompatibility = GeoJsonCompatibility | GeoArrowCompatibility;
 export declare function getLayerCompatibility(layerName: string): LayerCompatibility | undefined;
-export declare function isSupportedGeoArrowLayerType(layerName: string): layerName is SupportedGeoArrowLayerType;
 export {};
 //# sourceMappingURL=layerCompatibility.d.ts.map

package/dist/json/layerCompatibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layerCompatibility.d.ts","sourceRoot":"","sources":["../../src/json/layerCompatibility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,4BAA4B,CAAC;AAE3E,KAAK,oBAAoB,GAAG;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,cAAc,EAAE,UAAU,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,kBAAkB,GAAG,oBAAoB,GAAG,qBAAqB,CAAC;AA8BvE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,kCAEtD;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,SAAS,IAAI,0BAA0B,CAMzC"}
+{"version":3,"file":"layerCompatibility.d.ts","sourceRoot":"","sources":["../../src/json/layerCompatibility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAExD,KAAK,oBAAoB,GAAG;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC5B,SAAS,EAAE,oBAAoB,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,cAAc,EAAE,UAAU,CAAC;IAC3B,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,KAAK,kBAAkB,GAAG,oBAAoB,GAAG,qBAAqB,CAAC;AAiKvE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,kCAEtD"}