wip

Author: ibgreen

modules/editable-layers/src/lib/layers/segments-layer.ts

@@ -6,7 +6,7 @@ import {ArrowStyles, DEFAULT_STYLE, MAX_ARROWS} from '../style';
 import {NebulaLayer} from '../nebula-layer';
 import {toDeckColor} from '../../utils/utils';
 import {DeckCache} from '../deck-renderer/deck-cache';
-import {PathMarkerLayer} from '@deck.gl-community/layers';
+import {PathMarkerLayer} from '../../../../layers/src/path-marker-layer/path-marker-layer';
 
 const NEBULA_TO_DECK_DIRECTIONS = {
   [ArrowStyles.NONE]: {forward: false, backward: false},

modules/graph-layers/src/style/graph-layer-stylesheet.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {GraphStylesheet, GraphStyleValue, GraphStyleType} from './graph-style-engine';
+import type {GraphStylesheet, GraphStyleType} from './graph-style-engine';
 
 export type GraphNodeStyleType = Exclude<
   GraphStyleType,
@@ -35,11 +35,6 @@ export type GraphLayerStylesheet = {
   edges?: GraphLayerEdgeStyle | GraphLayerEdgeStyle[];
 };
 
-export type NormalizedGraphLayerStylesheet = {
-  nodes: GraphLayerNodeStyle[];
-  edges: GraphLayerEdgeStyle[];
-};
-
 export type GraphLayerStylesheetInput = GraphLayerStylesheet | null | undefined;
 
 export type NormalizedGraphLayerStylesheet = {
@@ -87,12 +82,12 @@ export function normalizeGraphLayerStylesheet({
     ? [resolvedEdgeStyles]
     : DEFAULT_GRAPH_LAYER_STYLESHEET.edges;
 
-  const edges: GraphLayerEdgeStyle[] = (edgeEntries as GraphLayerEdgeStyle[])
+  const edges: GraphLayerEdgeStyle[] = (edgeEntries)
     .filter(Boolean)
     .map((edgeStyleEntry) => ({
       ...edgeStyleEntry,
-      type: ((edgeStyleEntry as GraphLayerEdgeStyle).type ?? 'edge') as EdgeStyleType,
-      decorators: (edgeStyleEntry as GraphLayerEdgeStyle).decorators ?? []
+      type: ((edgeStyleEntry).type ?? 'edge'),
+      decorators: (edgeStyleEntry).decorators ?? []
     })) as GraphLayerEdgeStyle[];
 
   return {
@@ -101,8 +96,4 @@ export function normalizeGraphLayerStylesheet({
   };
 }
 
-export type {
-  GraphStyleValue,
-  GraphStylesheet,
-  GraphStyleType
-} from './graph-style-engine';
+export type {GraphStyleValue, GraphStylesheet, GraphStyleType} from './graph-style-engine';

modules/graph-layers/src/style/style-property.ts

@@ -343,15 +343,39 @@ type LeafParseResult = {
   updateTrigger: unknown;
 };
 
+function describeStyleValue(value: unknown): string {
+  if (typeof value === 'string') {
+    return value;
+  }
+  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'undefined') {
+    return String(value);
+  }
+  if (value === null) {
+    return 'null';
+  }
+  if (typeof value === 'function') {
+    return value.name ? `[Function ${value.name}]` : '[Function]';
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => describeStyleValue(item)).join(', ')}]`;
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+
 /** Parse a non-stateful style value into deck.gl compatible form. */
 function parseLeafValue(key: string, value: GraphStyleLeafValue | undefined): LeafParseResult {
   const formatter = PROPERTY_FORMATTERS[key] || IDENTITY;
 
   if (typeof value === 'undefined') {
     const formatted = formatter(DEFAULT_STYLES[key]);
     if (formatted === null) {
-      log.warn(`Invalid ${key} value: ${value}`);
-      throw new Error(`Invalid ${key} value: ${value}`);
+      const description = describeStyleValue(value);
+      log.warn(`Invalid ${key} value: ${description}`);
+      throw new Error(`Invalid ${key} value: ${description}`);
     }
     return {value: formatted, isAccessor: false, updateTrigger: false};
   }
@@ -372,8 +396,9 @@ function parseLeafValue(key: string, value: GraphStyleLeafValue | undefined): Le
 
   const formatted = formatter(value);
   if (formatted === null) {
-    log.warn(`Invalid ${key} value: ${value}`);
-    throw new Error(`Invalid ${key} value: ${value}`);
+    const description = describeStyleValue(value);
+    log.warn(`Invalid ${key} value: ${description}`);
+    throw new Error(`Invalid ${key} value: ${description}`);
   }
 
   return {value: formatted, isAccessor: false, updateTrigger: false};