@emuanalytics/flow-rdf-core 0.0.21 → 0.0.23

package/dist/index.cjs

@@ -5,8 +5,8 @@ const Debug = require('debug');
 const flowEngineClient = require('@emuanalytics/flow-engine-client');
 const stringUtils = require('./shared/flow-rdf-core.3042be4a.cjs');
 const mapFeatureStream = require('./shared/flow-rdf-core.585aa641.cjs');
-const EventEmitter = require('eventemitter3');
 const maplibre = require('@emuanalytics/maplibre-gl');
+const EventEmitter = require('eventemitter3');
 const mobxUtils = require('mobx-utils');
 const functional = require('./shared/flow-rdf-core.c44cf082.cjs');
 require('@emuanalytics/maplibre-gl-style-spec');
@@ -30,8 +30,19 @@ function _interopNamespaceCompat(e) {
 
 const mobx__namespace = /*#__PURE__*/_interopNamespaceCompat(mobx);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
-const EventEmitter__default = /*#__PURE__*/_interopDefaultCompat(EventEmitter);
 const maplibre__default = /*#__PURE__*/_interopDefaultCompat(maplibre);
+const EventEmitter__default = /*#__PURE__*/_interopDefaultCompat(EventEmitter);
+
+const version = "0.0.23";
+
+const CONSOLE_HIGHLIGHT_STYLE$1 = `
+  padding: 2px 4px;
+  border-radius: 2px;
+  background: #389DFF;
+  color: white;`;
+function announce() {
+  console.log("%cFlo.w RDF Core v%s", CONSOLE_HIGHLIGHT_STYLE$1, version);
+}
 
 const mockGlobal = {};
 function getGlobal() {
@@ -65,7 +76,7 @@ var __publicField$d = (obj, key, value) => {
   return value;
 };
 const FLOW_GLOBAL = "FDBG";
-const CONSOLE_HIGHLIGHT_STYLE$1 = `
+const CONSOLE_HIGHLIGHT_STYLE = `
   padding: 2px 4px;
   border-radius: 2px;
   background: #389DFF;
@@ -164,17 +175,17 @@ class Debugger {
     }
   }
   spyListener(event) {
-    console.log(`%cspy`, CONSOLE_HIGHLIGHT_STYLE$1, event);
+    console.log(`%cspy`, CONSOLE_HIGHLIGHT_STYLE, event);
   }
   logStateValue(path) {
     const value = toJSHelper(this.context.state.get(path), { recurseEverything: false });
-    console.log(`%cwatch%c %s`, CONSOLE_HIGHLIGHT_STYLE$1, CONSOLE_BOLD_STYLE, path, value);
+    console.log(`%cwatch%c %s`, CONSOLE_HIGHLIGHT_STYLE, CONSOLE_BOLD_STYLE, path, value);
   }
 }
 function installGlobalDebugger(dbg) {
   console.log(
     `%cFlow.w RDF Debbugger`,
-    CONSOLE_HIGHLIGHT_STYLE$1,
+    CONSOLE_HIGHLIGHT_STYLE,
     `Enabled for context '${dbg.context.id}' - access using ${FLOW_GLOBAL} in web developer console.`
   );
   const g = typeof global !== "undefined" ? global : window;
@@ -525,12 +536,10 @@ let globalState = function() {
     return new FlowRdfCoreGlobals();
   } else if (global.__flowRdfCoreGlobals) {
     global.__flowRdfCoreInstanceCount += 1;
-    if (!global.__mobxGlobals.UNCHANGED) {
-      global.__mobxGlobals.UNCHANGED = {};
-    }
     return global.__flowRdfCoreGlobals;
   } else {
-    global.__mobxInstanceCount = 1;
+    global.__flowRdfCoreInstanceCount = 1;
+    announce();
     return global.__flowRdfCoreGlobals = new FlowRdfCoreGlobals();
   }
 }();
@@ -548,17 +557,6 @@ function getGlobalState() {
   return globalState;
 }
 
-const version = "0.0.21";
-
-const CONSOLE_HIGHLIGHT_STYLE = `
-  padding: 2px 4px;
-  border-radius: 2px;
-  background: #389DFF;
-  color: white;`;
-function announce() {
-  console.log("%cFlo.w RDF Core v%s", CONSOLE_HIGHLIGHT_STYLE, version);
-}
-
 var __defProp$7 = Object.defineProperty;
 var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$7 = (obj, key, value) => {
@@ -610,7 +608,7 @@ class MapLayerStyleBuilder {
     this._styles.set(property, this.formatValue(value));
   }
   formatValue(value) {
-    if (value instanceof StyleExpression) {
+    if (isStyleExpression(value)) {
       return value.toString();
     } else if (stringUtils.isString(value)) {
       return `'${value.toString()}'`;
@@ -629,11 +627,15 @@ __publicField$7(MapLayerStyleBuilder, "_styleBuilders", /* @__PURE__ */ new Map(
 class StyleExpression {
   constructor(_expr) {
     this._expr = _expr;
+    __publicField$7(this, "__styleExpression", "styleexpression");
   }
   toString() {
     return this._expr;
   }
 }
+function isStyleExpression(val) {
+  return val && val.__styleExpression;
+}
 function expr(expr2) {
   return new StyleExpression(expr2);
 }
@@ -2266,12 +2268,12 @@ const _FlowMap = class _FlowMap extends EventEmitter__default {
     return this._style.styleSpecification;
   }
   addLayer(layerOrOptions) {
-    const layer = layerOrOptions instanceof mapFeatureStream.MapLayer ? layerOrOptions : new mapFeatureStream.MapLayer(layerOrOptions);
+    const layer = stringUtils.isPlainObject(layerOrOptions) ? new mapFeatureStream.MapLayer(layerOrOptions) : layerOrOptions;
     this._style.addLayer(layer);
     return layer;
   }
   addSource(sourceOrOptions) {
-    const source = sourceOrOptions instanceof mapFeatureStream.MapDataSource ? sourceOrOptions : new mapFeatureStream.MapDataSource(sourceOrOptions);
+    const source = stringUtils.isPlainObject(sourceOrOptions) ? new mapFeatureStream.MapDataSource(sourceOrOptions) : sourceOrOptions;
     this.emitEvent(new mapFeatureStream.MapSourceEvent("beforeSourceAdded", this, source.id));
     source.setFlowEndpoint({
       host: this.context.flowClient.baseUrl,
@@ -3171,7 +3173,6 @@ const globalContextRegistry = getGlobalState().globalContextRegistry;
 const initializeContext = globalContextRegistry.initializeContext.bind(globalContextRegistry);
 const uninitializeContext = globalContextRegistry.uninitializeContext.bind(globalContextRegistry);
 const getContext = globalContextRegistry.getContext.bind(globalContextRegistry);
-announce();
 
 exports.MapDataSource = mapFeatureStream.MapDataSource;
 exports.MapLayer = mapFeatureStream.MapLayer;

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.90aa4382.cjs';
-export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.90aa4382.cjs';
+import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.25dff7db.cjs';
+export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.25dff7db.cjs';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import 'eventemitter3';
 import '@emuanalytics/maplibre-gl';
+import 'eventemitter3';
 
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T): string;

package/dist/index.d.mts

@@ -1,9 +1,9 @@
-import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.90aa4382.mjs';
-export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.90aa4382.mjs';
+import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.25dff7db.mjs';
+export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.25dff7db.mjs';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import 'eventemitter3';
 import '@emuanalytics/maplibre-gl';
+import 'eventemitter3';
 
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T): string;

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.90aa4382.js';
-export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.90aa4382.js';
+import { A as Annotation, S as StateStore, F as FlowContextOptions, a as FlowContext, M as MapStyleSpecification, b as MapDataSource, c as MapLayer } from './shared/flow-rdf-core.25dff7db.js';
+export { D as DEFAULT_CONTEXT_ID, d as FlowEngineEndpoint, y as FlowMap, r as MapAnimationOptions, s as MapCenterOptions, o as MapDataSourceOptions, p as MapDataSourceSpecification, n as MapDataSourceType, t as MapFeature, u as MapFeatureIdentifier, q as MapGeojsonData, j as MapLayerExpression, i as MapLayerOptions, m as MapLayerPropertyMetadataIndex, k as MapLayerSpecification, f as MapLayerStyleBuilder, e as MapLayerType, x as MapOptions, v as MapPaddingOptions, w as MapSourceIdentifier, P as Path, G as PathValue, Q as Query, R as ReactiveExpression, I as StoreAnnotations, H as StoreConstructor, g as StyleExpression, h as expr, l as layerStyle, z as query, B as queryMany, C as queryOne, E as traceReaction } from './shared/flow-rdf-core.25dff7db.js';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import 'eventemitter3';
 import '@emuanalytics/maplibre-gl';
+import 'eventemitter3';
 
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T): string;

package/dist/index.mjs

@@ -2,10 +2,10 @@ import * as mobx from 'mobx';
 import { isObservable, isComputed, isObservableArray, isObservableSet, isObservableMap, makeObservable, observable as observable$1, computed as computed$1, action, runInAction, onBecomeObserved, onBecomeUnobserved, reaction, trace, configure } from 'mobx';
 import Debug from 'debug';
 import { Client } from '@emuanalytics/flow-engine-client';
-import { i as isUndefined, f as isString, o as isNumber, s as isBoolean, j as isArray, b as isNil, d as isDefined, g as isStringFull, z as isURL, e as ensureArray } from './shared/flow-rdf-core.b80085b4.mjs';
-import { R as ReactiveExpression, F as FlowError, g as MapStyleChangeEvent, r as randomId, P as PluginManager, f as MapLayer, e as MapDataSource, h as MapSourceEvent, M as MapEvent, d as FlowMapError, c as MapFeatureStream, b as assert, i as MapLoadingEvent, a as MapMouseEvent, j as die } from './shared/flow-rdf-core.33c3a1eb.mjs';
-import EventEmitter from 'eventemitter3';
+import { i as isUndefined, f as isString, o as isNumber, s as isBoolean, j as isArray, b as isNil, y as isPlainObject, d as isDefined, g as isStringFull, z as isURL, e as ensureArray } from './shared/flow-rdf-core.b80085b4.mjs';
+import { R as ReactiveExpression, F as FlowError, f as MapStyleChangeEvent, r as randomId, P as PluginManager, e as MapLayer, d as MapDataSource, g as MapSourceEvent, M as MapEvent, c as FlowMapError, b as MapFeatureStream, a as assert, h as MapLoadingEvent, i as MapMouseEvent, j as die } from './shared/flow-rdf-core.9f1d67b5.mjs';
 import maplibre from '@emuanalytics/maplibre-gl';
+import EventEmitter from 'eventemitter3';
 import { toStream } from 'mobx-utils';
 import { t as throttle, a as debounceWithArgs } from './shared/flow-rdf-core.2e456f93.mjs';
 import '@emuanalytics/maplibre-gl-style-spec';
@@ -13,6 +13,17 @@ import 'parsimmon';
 import 'colorbrewer';
 import 'nanoid';
 
+const version = "0.0.23";
+
+const CONSOLE_HIGHLIGHT_STYLE$1 = `
+  padding: 2px 4px;
+  border-radius: 2px;
+  background: #389DFF;
+  color: white;`;
+function announce() {
+  console.log("%cFlo.w RDF Core v%s", CONSOLE_HIGHLIGHT_STYLE$1, version);
+}
+
 const mockGlobal = {};
 function getGlobal() {
   if (typeof globalThis !== "undefined") {
@@ -45,7 +56,7 @@ var __publicField$d = (obj, key, value) => {
   return value;
 };
 const FLOW_GLOBAL = "FDBG";
-const CONSOLE_HIGHLIGHT_STYLE$1 = `
+const CONSOLE_HIGHLIGHT_STYLE = `
   padding: 2px 4px;
   border-radius: 2px;
   background: #389DFF;
@@ -144,17 +155,17 @@ class Debugger {
     }
   }
   spyListener(event) {
-    console.log(`%cspy`, CONSOLE_HIGHLIGHT_STYLE$1, event);
+    console.log(`%cspy`, CONSOLE_HIGHLIGHT_STYLE, event);
   }
   logStateValue(path) {
     const value = toJSHelper(this.context.state.get(path), { recurseEverything: false });
-    console.log(`%cwatch%c %s`, CONSOLE_HIGHLIGHT_STYLE$1, CONSOLE_BOLD_STYLE, path, value);
+    console.log(`%cwatch%c %s`, CONSOLE_HIGHLIGHT_STYLE, CONSOLE_BOLD_STYLE, path, value);
   }
 }
 function installGlobalDebugger(dbg) {
   console.log(
     `%cFlow.w RDF Debbugger`,
-    CONSOLE_HIGHLIGHT_STYLE$1,
+    CONSOLE_HIGHLIGHT_STYLE,
     `Enabled for context '${dbg.context.id}' - access using ${FLOW_GLOBAL} in web developer console.`
   );
   const g = typeof global !== "undefined" ? global : window;
@@ -505,12 +516,10 @@ let globalState = function() {
     return new FlowRdfCoreGlobals();
   } else if (global.__flowRdfCoreGlobals) {
     global.__flowRdfCoreInstanceCount += 1;
-    if (!global.__mobxGlobals.UNCHANGED) {
-      global.__mobxGlobals.UNCHANGED = {};
-    }
     return global.__flowRdfCoreGlobals;
   } else {
-    global.__mobxInstanceCount = 1;
+    global.__flowRdfCoreInstanceCount = 1;
+    announce();
     return global.__flowRdfCoreGlobals = new FlowRdfCoreGlobals();
   }
 }();
@@ -528,17 +537,6 @@ function getGlobalState() {
   return globalState;
 }
 
-const version = "0.0.21";
-
-const CONSOLE_HIGHLIGHT_STYLE = `
-  padding: 2px 4px;
-  border-radius: 2px;
-  background: #389DFF;
-  color: white;`;
-function announce() {
-  console.log("%cFlo.w RDF Core v%s", CONSOLE_HIGHLIGHT_STYLE, version);
-}
-
 var __defProp$7 = Object.defineProperty;
 var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$7 = (obj, key, value) => {
@@ -590,7 +588,7 @@ class MapLayerStyleBuilder {
     this._styles.set(property, this.formatValue(value));
   }
   formatValue(value) {
-    if (value instanceof StyleExpression) {
+    if (isStyleExpression(value)) {
       return value.toString();
     } else if (isString(value)) {
       return `'${value.toString()}'`;
@@ -609,11 +607,15 @@ __publicField$7(MapLayerStyleBuilder, "_styleBuilders", /* @__PURE__ */ new Map(
 class StyleExpression {
   constructor(_expr) {
     this._expr = _expr;
+    __publicField$7(this, "__styleExpression", "styleexpression");
   }
   toString() {
     return this._expr;
   }
 }
+function isStyleExpression(val) {
+  return val && val.__styleExpression;
+}
 function expr(expr2) {
   return new StyleExpression(expr2);
 }
@@ -2246,12 +2248,12 @@ const _FlowMap = class _FlowMap extends EventEmitter {
     return this._style.styleSpecification;
   }
   addLayer(layerOrOptions) {
-    const layer = layerOrOptions instanceof MapLayer ? layerOrOptions : new MapLayer(layerOrOptions);
+    const layer = isPlainObject(layerOrOptions) ? new MapLayer(layerOrOptions) : layerOrOptions;
     this._style.addLayer(layer);
     return layer;
   }
   addSource(sourceOrOptions) {
-    const source = sourceOrOptions instanceof MapDataSource ? sourceOrOptions : new MapDataSource(sourceOrOptions);
+    const source = isPlainObject(sourceOrOptions) ? new MapDataSource(sourceOrOptions) : sourceOrOptions;
     this.emitEvent(new MapSourceEvent("beforeSourceAdded", this, source.id));
     source.setFlowEndpoint({
       host: this.context.flowClient.baseUrl,
@@ -3151,6 +3153,5 @@ const globalContextRegistry = getGlobalState().globalContextRegistry;
 const initializeContext = globalContextRegistry.initializeContext.bind(globalContextRegistry);
 const uninitializeContext = globalContextRegistry.uninitializeContext.bind(globalContextRegistry);
 const getContext = globalContextRegistry.getContext.bind(globalContextRegistry);
-announce();
 
 export { ContextRegistry, DEFAULT_CONTEXT_ID, FlowContext, FlowMap, FlowRdfCoreGlobals, MapDataSource, MapLayer, MapLayerStyleBuilder, MapStyle, Query, ReactiveExpression, StateStore, StyleExpression, computed, expr, getContext, getGlobalState, initializeContext, isolateGlobalState, layerStyle, observable, query, queryMany, queryOne, serialize, traceReaction, uninitializeContext };

package/dist/lib/map/plugins/index.cjs

@@ -162,7 +162,7 @@ class MapPopup extends EventEmitter__default {
     if (this._maplibrePopup) {
       return;
     }
-    if (eventOrLngLat instanceof mapFeatureStream.MapMouseEvent) {
+    if (!stringUtils.isArray(eventOrLngLat)) {
       if (isFeatureWithId(eventOrLngLat.features[0])) {
         feature = eventOrLngLat.features[0];
       }
@@ -277,10 +277,10 @@ class PopupPlugin extends MapPluginBase {
     popup.once("closed", () => {
       this._popups.delete(popup);
     });
-    if (eventOrLngLat instanceof mapFeatureStream.MapMouseEvent) {
-      popup.open(eventOrLngLat);
-    } else {
+    if (stringUtils.isArray(eventOrLngLat)) {
       popup.open(eventOrLngLat, feature);
+    } else {
+      popup.open(eventOrLngLat);
     }
     return popup;
   }

package/dist/lib/map/plugins/index.d.cts

@@ -1,5 +1,5 @@
-import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.90aa4382.cjs';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.cjs';
+import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.25dff7db.cjs';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.25dff7db.cjs';
 import { F as Func } from '../../../shared/flow-rdf-core.08975378.cjs';
 import EventEmitter from 'eventemitter3';
 import * as lit from 'lit-html';

package/dist/lib/map/plugins/index.d.mts

@@ -1,5 +1,5 @@
-import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.90aa4382.mjs';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.mjs';
+import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.25dff7db.mjs';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.25dff7db.mjs';
 import { F as Func } from '../../../shared/flow-rdf-core.08975378.mjs';
 import EventEmitter from 'eventemitter3';
 import * as lit from 'lit-html';

package/dist/lib/map/plugins/index.d.ts

@@ -1,5 +1,5 @@
-import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.90aa4382.js';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.js';
+import { J as MapEvent, y as FlowMap, w as MapSourceIdentifier, K as MapFeatureId, L as MapPluginBase, N as PluginManager, O as MapSourceEvent, T as MapMouseEvent, U as MapFeatureStream, V as PartialBy, r as MapAnimationOptions, W as MapStyleChangeEvent, M as MapStyleSpecification, S as StateStore, u as MapFeatureIdentifier, t as MapFeature } from '../../../shared/flow-rdf-core.25dff7db.js';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.25dff7db.js';
 import { F as Func } from '../../../shared/flow-rdf-core.08975378.js';
 import EventEmitter from 'eventemitter3';
 import * as lit from 'lit-html';

package/dist/lib/map/plugins/index.mjs

@@ -1,5 +1,5 @@
-import { M as MapEvent, a as MapMouseEvent, b as assert, c as MapFeatureStream, F as FlowError, d as FlowMapError, e as MapDataSource, f as MapLayer, r as randomId, R as ReactiveExpression } from '../../../shared/flow-rdf-core.33c3a1eb.mjs';
-export { P as PluginManager } from '../../../shared/flow-rdf-core.33c3a1eb.mjs';
+import { M as MapEvent, a as assert, b as MapFeatureStream, F as FlowError, c as FlowMapError, d as MapDataSource, e as MapLayer, r as randomId, R as ReactiveExpression } from '../../../shared/flow-rdf-core.9f1d67b5.mjs';
+export { P as PluginManager } from '../../../shared/flow-rdf-core.9f1d67b5.mjs';
 import MapboxDraw from '@emuanalytics/mapbox-gl-draw';
 import turfArea from '@turf/area';
 import turfBBox from '@turf/bbox';
@@ -9,7 +9,7 @@ import turfLength from '@turf/length';
 import Debug from 'debug';
 import { c as isPolygon, i as isLineString, b as isPoint } from '../../../shared/flow-rdf-core.bd95d618.mjs';
 import EventEmitter$1, { EventEmitter } from 'eventemitter3';
-import { d as isDefined, g as isStringFull, x as isFunction, f as isString, e as ensureArray, o as isNumber, z as isURL, k as isArrayFull, b as isNil, a as isNull, m as isObject } from '../../../shared/flow-rdf-core.b80085b4.mjs';
+import { d as isDefined, j as isArray, g as isStringFull, x as isFunction, f as isString, e as ensureArray, o as isNumber, z as isURL, k as isArrayFull, b as isNil, a as isNull, m as isObject } from '../../../shared/flow-rdf-core.b80085b4.mjs';
 import * as lit from 'lit-html';
 import maplibre from '@emuanalytics/maplibre-gl';
 import turfCircle from '@turf/circle';
@@ -134,7 +134,7 @@ class MapPopup extends EventEmitter$1 {
     if (this._maplibrePopup) {
       return;
     }
-    if (eventOrLngLat instanceof MapMouseEvent) {
+    if (!isArray(eventOrLngLat)) {
       if (isFeatureWithId(eventOrLngLat.features[0])) {
         feature = eventOrLngLat.features[0];
       }
@@ -249,10 +249,10 @@ class PopupPlugin extends MapPluginBase {
     popup.once("closed", () => {
       this._popups.delete(popup);
     });
-    if (eventOrLngLat instanceof MapMouseEvent) {
-      popup.open(eventOrLngLat);
-    } else {
+    if (isArray(eventOrLngLat)) {
       popup.open(eventOrLngLat, feature);
+    } else {
+      popup.open(eventOrLngLat);
     }
     return popup;
   }

package/dist/shared/{flow-rdf-core.90aa4382.d.cts → flow-rdf-core.25dff7db.d.cts}

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
+import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 
 type Annotation = {
     annotationType: string;
@@ -176,6 +176,7 @@ declare class MapLayerStyleBuilder {
 }
 declare class StyleExpression {
     private _expr;
+    __styleExpression: string;
     constructor(_expr: string);
     toString(): string;
 }

package/dist/shared/{flow-rdf-core.90aa4382.d.mts → flow-rdf-core.25dff7db.d.mts}

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
+import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 
 type Annotation = {
     annotationType: string;
@@ -176,6 +176,7 @@ declare class MapLayerStyleBuilder {
 }
 declare class StyleExpression {
     private _expr;
+    __styleExpression: string;
     constructor(_expr: string);
     toString(): string;
 }

package/dist/shared/{flow-rdf-core.90aa4382.d.ts → flow-rdf-core.25dff7db.d.ts}

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
+import EventEmitter$1, { EventEmitter } from 'eventemitter3';
 
 type Annotation = {
     annotationType: string;
@@ -176,6 +176,7 @@ declare class MapLayerStyleBuilder {
 }
 declare class StyleExpression {
     private _expr;
+    __styleExpression: string;
     constructor(_expr: string);
     toString(): string;
 }

package/dist/shared/{flow-rdf-core.33c3a1eb.mjs → flow-rdf-core.9f1d67b5.mjs}

@@ -1352,4 +1352,4 @@ class MapFeatureStream {
   }
 }
 
-export { FlowError as F, MapEvent as M, PluginManager as P, ReactiveExpression as R, MapMouseEvent as a, assert as b, MapFeatureStream as c, FlowMapError as d, MapDataSource as e, MapLayer as f, MapStyleChangeEvent as g, MapSourceEvent as h, MapLoadingEvent as i, die as j, randomId as r };
+export { FlowError as F, MapEvent as M, PluginManager as P, ReactiveExpression as R, assert as a, MapFeatureStream as b, FlowMapError as c, MapDataSource as d, MapLayer as e, MapStyleChangeEvent as f, MapSourceEvent as g, MapLoadingEvent as h, MapMouseEvent as i, die as j, randomId as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emuanalytics/flow-rdf-core",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "",
   "sideEffects": false,
   "type": "module",