@emuanalytics/flow-rdf-core 0.0.18 → 0.0.20

package/dist/index.cjs

@@ -4,9 +4,9 @@ const mobx = require('mobx');
 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.278a260a.cjs');
-const maplibregl = require('@emuanalytics/maplibre-gl');
+const mapFeatureStream = require('./shared/flow-rdf-core.585aa641.cjs');
 const EventEmitter = require('eventemitter3');
+const maplibre = require('@emuanalytics/maplibre-gl');
 const mobxUtils = require('mobx-utils');
 const functional = require('./shared/flow-rdf-core.c44cf082.cjs');
 require('@emuanalytics/maplibre-gl-style-spec');
@@ -31,6 +31,7 @@ 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);
 
 function deferred() {
   let methods;
@@ -2318,7 +2319,7 @@ const _FlowMap = class _FlowMap extends EventEmitter__default {
     };
   }
   setCenter(center, animationOptions) {
-    const lngLat = stringUtils.isDefined(center.lng) && stringUtils.isDefined(center.lat) ? new maplibregl.LngLat(center.lng, center.lat) : void 0;
+    const lngLat = stringUtils.isDefined(center.lng) && stringUtils.isDefined(center.lat) ? new maplibre__default.LngLat(center.lng, center.lat) : void 0;
     let method = this.maplibreMap.jumpTo;
     if (animationOptions) {
       switch (animationOptions.mode) {
@@ -2495,7 +2496,7 @@ const _FlowMap = class _FlowMap extends EventEmitter__default {
     this._style.bindState(this._context.state);
     const baseStyle = await this.loadBaseStyle(this._options.baseStyle);
     this._style.setBaseStyle(baseStyle);
-    this.maplibreMap = new maplibregl.Map({
+    this.maplibreMap = new maplibre__default.Map({
       ...this._options,
       transformRequest: this.transformMapRequest.bind(this),
       style: baseStyle
@@ -3074,7 +3075,7 @@ function traceReaction() {
   mobx.trace();
 }
 
-mobx.configure({ isolateGlobalState: true });
+mobx.configure({ isolateGlobalState: false, useProxies: "always" });
 const initializeContext = globalContextRegistry.initializeContext.bind(globalContextRegistry);
 const uninitializeContext = globalContextRegistry.uninitializeContext.bind(globalContextRegistry);
 const getContext = globalContextRegistry.getContext.bind(globalContextRegistry);

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.b618ecc3.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.b618ecc3.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.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';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import '@emuanalytics/maplibre-gl';
 import 'eventemitter3';
+import '@emuanalytics/maplibre-gl';
 
 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.b618ecc3.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.b618ecc3.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.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';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import '@emuanalytics/maplibre-gl';
 import 'eventemitter3';
+import '@emuanalytics/maplibre-gl';
 
 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.b618ecc3.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.b618ecc3.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.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';
 export { IDisposer, IObservableStream, ISubscription } from 'mobx-utils';
 import '@emuanalytics/flow-engine-client';
-import '@emuanalytics/maplibre-gl';
 import 'eventemitter3';
+import '@emuanalytics/maplibre-gl';
 
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T): string;

package/dist/index.mjs

@@ -3,9 +3,9 @@ import { isObservable, isComputed, isObservableArray, isObservableSet, isObserva
 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.b4b16e78.mjs';
-import { LngLat, Map as Map$1 } from '@emuanalytics/maplibre-gl';
+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 maplibre from '@emuanalytics/maplibre-gl';
 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';
@@ -2299,7 +2299,7 @@ const _FlowMap = class _FlowMap extends EventEmitter {
     };
   }
   setCenter(center, animationOptions) {
-    const lngLat = isDefined(center.lng) && isDefined(center.lat) ? new LngLat(center.lng, center.lat) : void 0;
+    const lngLat = isDefined(center.lng) && isDefined(center.lat) ? new maplibre.LngLat(center.lng, center.lat) : void 0;
     let method = this.maplibreMap.jumpTo;
     if (animationOptions) {
       switch (animationOptions.mode) {
@@ -2476,7 +2476,7 @@ const _FlowMap = class _FlowMap extends EventEmitter {
     this._style.bindState(this._context.state);
     const baseStyle = await this.loadBaseStyle(this._options.baseStyle);
     this._style.setBaseStyle(baseStyle);
-    this.maplibreMap = new Map$1({
+    this.maplibreMap = new maplibre.Map({
       ...this._options,
       transformRequest: this.transformMapRequest.bind(this),
       style: baseStyle
@@ -3055,7 +3055,7 @@ function traceReaction() {
   trace();
 }
 
-configure({ isolateGlobalState: true });
+configure({ isolateGlobalState: false, useProxies: "always" });
 const initializeContext = globalContextRegistry.initializeContext.bind(globalContextRegistry);
 const uninitializeContext = globalContextRegistry.uninitializeContext.bind(globalContextRegistry);
 const getContext = globalContextRegistry.getContext.bind(globalContextRegistry);

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const mapFeatureStream = require('../../../shared/flow-rdf-core.278a260a.cjs');
+const mapFeatureStream = require('../../../shared/flow-rdf-core.585aa641.cjs');
 const MapboxDraw = require('@emuanalytics/mapbox-gl-draw');
 const turfArea = require('@turf/area');
 const turfBBox = require('@turf/bbox');
@@ -12,7 +12,7 @@ const featureTypeChecks = require('../../../shared/flow-rdf-core.84eded74.cjs');
 const EventEmitter = require('eventemitter3');
 const stringUtils = require('../../../shared/flow-rdf-core.3042be4a.cjs');
 const lit = require('lit-html');
-const maplibregl = require('@emuanalytics/maplibre-gl');
+const maplibre = require('@emuanalytics/maplibre-gl');
 const turfCircle = require('@turf/circle');
 const turfDistance = require('@turf/distance');
 const helpers = require('@turf/helpers');
@@ -47,7 +47,7 @@ const turfLength__default = /*#__PURE__*/_interopDefaultCompat(turfLength);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
 const EventEmitter__default = /*#__PURE__*/_interopDefaultCompat(EventEmitter);
 const lit__namespace = /*#__PURE__*/_interopNamespaceCompat(lit);
-const maplibregl__default = /*#__PURE__*/_interopDefaultCompat(maplibregl);
+const maplibre__default = /*#__PURE__*/_interopDefaultCompat(maplibre);
 const turfCircle__default = /*#__PURE__*/_interopDefaultCompat(turfCircle);
 const turfDistance__default = /*#__PURE__*/_interopDefaultCompat(turfDistance);
 
@@ -171,7 +171,7 @@ class MapPopup extends EventEmitter__default {
     if (feature) {
       mapFeatureStream.assert(isFeatureWithId(feature), "MapPopup.open(): feature must have unique ID");
     }
-    this._maplibrePopup = new maplibregl__default.Popup({
+    this._maplibrePopup = new maplibre__default.Popup({
       className: this.cssClasses().join(" "),
       closeButton: this.options.closeButton,
       closeOnClick: this.options.closeOnClick,

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.b618ecc3.cjs';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.b618ecc3.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.90aa4382.cjs';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.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.b618ecc3.mjs';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.b618ecc3.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.90aa4382.mjs';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.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.b618ecc3.js';
-export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.b618ecc3.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.90aa4382.js';
+export { _ as EventHandlers, Z as PluginConstructor, Y as PluginEventsType, X as PluginOptionsType } from '../../../shared/flow-rdf-core.90aa4382.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.b4b16e78.mjs';
-export { P as PluginManager } from '../../../shared/flow-rdf-core.b4b16e78.mjs';
+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 MapboxDraw from '@emuanalytics/mapbox-gl-draw';
 import turfArea from '@turf/area';
 import turfBBox from '@turf/bbox';
@@ -11,7 +11,7 @@ import { c as isPolygon, i as isLineString, b as isPoint } from '../../../shared
 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 * as lit from 'lit-html';
-import maplibregl from '@emuanalytics/maplibre-gl';
+import maplibre from '@emuanalytics/maplibre-gl';
 import turfCircle from '@turf/circle';
 import turfDistance from '@turf/distance';
 import { point } from '@turf/helpers';
@@ -143,7 +143,7 @@ class MapPopup extends EventEmitter$1 {
     if (feature) {
       assert(isFeatureWithId(feature), "MapPopup.open(): feature must have unique ID");
     }
-    this._maplibrePopup = new maplibregl.Popup({
+    this._maplibrePopup = new maplibre.Popup({
       className: this.cssClasses().join(" "),
       closeButton: this.options.closeButton,
       closeOnClick: this.options.closeOnClick,

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

@@ -96,7 +96,10 @@ class ExpressionParser {
       { type: BINARY_LEFT, ops: this.operators({ "+": "+", "-": "-" }) },
       { type: BINARY_LEFT, ops: this.operators({ ">=": ">=", "<=": "<=" }) },
       { type: BINARY_LEFT, ops: this.operators({ "<": "<", ">": ">" }) },
-      { type: BINARY_LEFT, ops: this.operators({ iregex: "~*", regex: "~", iequal: "==*", "==": "==", "!=": "!=" }) },
+      {
+        type: BINARY_LEFT,
+        ops: this.operators({ regexi: "~*", equali: "=*", "==": "==", "!=": "!=", "~": "~" })
+      },
       { type: BINARY_LEFT, ops: this.operators({ all: "&&" }) },
       { type: BINARY_LEFT, ops: this.operators({ any: "||" }) },
       { type: TERNARY_RIGHT, ops: this.operators({ case: "?" }) }
@@ -137,7 +140,9 @@ class ExpressionParser {
         return P.regexp(/#(?:[0-9a-f]{3}){1,2}/i).desc("hex color");
       },
       String: (r) => {
-        return P.alt(r.SingleQuoteString, r.DoubleQuoteString, r.HexColor, r.UnquotedString).map((s) => s.replace(/\\n/gm, "\n"));
+        return P.alt(r.SingleQuoteString, r.DoubleQuoteString, r.HexColor, r.UnquotedString).map(
+          (s) => s.replace(/\\n/gm, "\n")
+        );
       },
       Symbol: () => {
         return P.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/).desc("symbol");
@@ -146,14 +151,26 @@ class ExpressionParser {
         return P.regexp(/[a-zA-Z0-9_-]+/).desc("symbol");
       },
       Feature: (r) => {
-        return P.seqMap(P.string("@"), r.PartialSymbol.sepBy(P.string(".")), (_feat, symbols) => ["get"].concat(symbols));
+        return P.seqMap(
+          P.string("@"),
+          r.PartialSymbol.sepBy(P.string(".")),
+          (_feat, symbols) => ["get"].concat(symbols)
+        );
       },
       FeatureState: (r) => {
-        return P.seqMap(P.string("@@"), r.PartialSymbol.sepBy(P.string(".")), (_feat, symbols) => this.expandFeatureState(symbols));
+        return P.seqMap(
+          P.string("@@"),
+          r.PartialSymbol.sepBy(P.string(".")),
+          (_feat, symbols) => this.expandFeatureState(symbols)
+        );
       },
       Array: (r) => P.string("[").trim(r._).then(r.Value.trim(r._).sepBy(P.string(","))).skip(P.string("]")),
       State: (r) => {
-        return P.seqMap(P.string("$"), r.PartialSymbol.sepBy(P.string(".")), (_state, symbols) => ["state"].concat(symbols));
+        return P.seqMap(
+          P.string("$"),
+          r.PartialSymbol.sepBy(P.string(".")),
+          (_state, symbols) => ["state"].concat(symbols)
+        );
       },
       Paren: (r) => {
         return P.seqMap(P.string("("), r.Expr.trim(r._), P.string(")"), (_lb, expr, _rb) => expr);
@@ -168,7 +185,18 @@ class ExpressionParser {
         );
       },
       Value: (r) => {
-        return P.alt(r.Paren, r.Array, r.Func, r.Boolean, r.Null, r.Number, r.String, r.FeatureState, r.Feature, r.State);
+        return P.alt(
+          r.Paren,
+          r.Array,
+          r.Func,
+          r.Boolean,
+          r.Null,
+          r.Number,
+          r.String,
+          r.FeatureState,
+          r.Feature,
+          r.State
+        );
       },
       Expr: (r) => {
         return this.tableParser(operatorTable, r.Value);
@@ -208,9 +236,7 @@ class ExpressionParser {
    */
   operators(ops) {
     const keys = Object.keys(ops);
-    const ps = keys.map(
-      (k) => P.string(ops[k]).trim(P.optWhitespace).result(k)
-    );
+    const ps = keys.map((k) => P.string(ops[k]).trim(P.optWhitespace).result(k));
     return P.alt.apply(null, ps);
   }
   /**
@@ -302,17 +328,17 @@ const equal = {
   name: "equal",
   fn: regexFunction("==", true)
 };
-const iequal = {
+const equali = {
   name: "iequal",
   fn: regexFunction("==", false)
 };
 const regex = {
   name: "regex",
-  fn: regexFunction("~=", true)
+  fn: regexFunction("~", true)
 };
-const iregex = {
-  name: "iregex",
-  fn: regexFunction("~=", false)
+const regexi = {
+  name: "regexi",
+  fn: regexFunction("~", false)
 };
 
 function stateCustomFunction(expr, parentExpression) {
@@ -462,9 +488,9 @@ let ReactiveExpression = _ReactiveExpression;
 ReactiveExpression.registerCustomFunction(customStateFn);
 ReactiveExpression.registerCustomFunction(customFromPaletteFn);
 ReactiveExpression.registerCustomFunction(regex);
-ReactiveExpression.registerCustomFunction(iregex);
+ReactiveExpression.registerCustomFunction(regexi);
 ReactiveExpression.registerCustomFunction(equal);
-ReactiveExpression.registerCustomFunction(iequal);
+ReactiveExpression.registerCustomFunction(equali);
 
 var __defProp$5 = Object.defineProperty;
 var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;

package/dist/shared/{flow-rdf-core.278a260a.cjs → flow-rdf-core.585aa641.cjs}

@@ -117,7 +117,10 @@ class ExpressionParser {
       { type: BINARY_LEFT, ops: this.operators({ "+": "+", "-": "-" }) },
       { type: BINARY_LEFT, ops: this.operators({ ">=": ">=", "<=": "<=" }) },
       { type: BINARY_LEFT, ops: this.operators({ "<": "<", ">": ">" }) },
-      { type: BINARY_LEFT, ops: this.operators({ iregex: "~*", regex: "~", iequal: "==*", "==": "==", "!=": "!=" }) },
+      {
+        type: BINARY_LEFT,
+        ops: this.operators({ regexi: "~*", equali: "=*", "==": "==", "!=": "!=", "~": "~" })
+      },
       { type: BINARY_LEFT, ops: this.operators({ all: "&&" }) },
       { type: BINARY_LEFT, ops: this.operators({ any: "||" }) },
       { type: TERNARY_RIGHT, ops: this.operators({ case: "?" }) }
@@ -158,7 +161,9 @@ class ExpressionParser {
         return P__default.regexp(/#(?:[0-9a-f]{3}){1,2}/i).desc("hex color");
       },
       String: (r) => {
-        return P__default.alt(r.SingleQuoteString, r.DoubleQuoteString, r.HexColor, r.UnquotedString).map((s) => s.replace(/\\n/gm, "\n"));
+        return P__default.alt(r.SingleQuoteString, r.DoubleQuoteString, r.HexColor, r.UnquotedString).map(
+          (s) => s.replace(/\\n/gm, "\n")
+        );
       },
       Symbol: () => {
         return P__default.regexp(/[a-zA-Z_][a-zA-Z0-9_-]*/).desc("symbol");
@@ -167,14 +172,26 @@ class ExpressionParser {
         return P__default.regexp(/[a-zA-Z0-9_-]+/).desc("symbol");
       },
       Feature: (r) => {
-        return P__default.seqMap(P__default.string("@"), r.PartialSymbol.sepBy(P__default.string(".")), (_feat, symbols) => ["get"].concat(symbols));
+        return P__default.seqMap(
+          P__default.string("@"),
+          r.PartialSymbol.sepBy(P__default.string(".")),
+          (_feat, symbols) => ["get"].concat(symbols)
+        );
       },
       FeatureState: (r) => {
-        return P__default.seqMap(P__default.string("@@"), r.PartialSymbol.sepBy(P__default.string(".")), (_feat, symbols) => this.expandFeatureState(symbols));
+        return P__default.seqMap(
+          P__default.string("@@"),
+          r.PartialSymbol.sepBy(P__default.string(".")),
+          (_feat, symbols) => this.expandFeatureState(symbols)
+        );
       },
       Array: (r) => P__default.string("[").trim(r._).then(r.Value.trim(r._).sepBy(P__default.string(","))).skip(P__default.string("]")),
       State: (r) => {
-        return P__default.seqMap(P__default.string("$"), r.PartialSymbol.sepBy(P__default.string(".")), (_state, symbols) => ["state"].concat(symbols));
+        return P__default.seqMap(
+          P__default.string("$"),
+          r.PartialSymbol.sepBy(P__default.string(".")),
+          (_state, symbols) => ["state"].concat(symbols)
+        );
       },
       Paren: (r) => {
         return P__default.seqMap(P__default.string("("), r.Expr.trim(r._), P__default.string(")"), (_lb, expr, _rb) => expr);
@@ -189,7 +206,18 @@ class ExpressionParser {
         );
       },
       Value: (r) => {
-        return P__default.alt(r.Paren, r.Array, r.Func, r.Boolean, r.Null, r.Number, r.String, r.FeatureState, r.Feature, r.State);
+        return P__default.alt(
+          r.Paren,
+          r.Array,
+          r.Func,
+          r.Boolean,
+          r.Null,
+          r.Number,
+          r.String,
+          r.FeatureState,
+          r.Feature,
+          r.State
+        );
       },
       Expr: (r) => {
         return this.tableParser(operatorTable, r.Value);
@@ -229,9 +257,7 @@ class ExpressionParser {
    */
   operators(ops) {
     const keys = Object.keys(ops);
-    const ps = keys.map(
-      (k) => P__default.string(ops[k]).trim(P__default.optWhitespace).result(k)
-    );
+    const ps = keys.map((k) => P__default.string(ops[k]).trim(P__default.optWhitespace).result(k));
     return P__default.alt.apply(null, ps);
   }
   /**
@@ -323,17 +349,17 @@ const equal = {
   name: "equal",
   fn: regexFunction("==", true)
 };
-const iequal = {
+const equali = {
   name: "iequal",
   fn: regexFunction("==", false)
 };
 const regex = {
   name: "regex",
-  fn: regexFunction("~=", true)
+  fn: regexFunction("~", true)
 };
-const iregex = {
-  name: "iregex",
-  fn: regexFunction("~=", false)
+const regexi = {
+  name: "regexi",
+  fn: regexFunction("~", false)
 };
 
 function stateCustomFunction(expr, parentExpression) {
@@ -483,9 +509,9 @@ let ReactiveExpression = _ReactiveExpression;
 ReactiveExpression.registerCustomFunction(customStateFn);
 ReactiveExpression.registerCustomFunction(customFromPaletteFn);
 ReactiveExpression.registerCustomFunction(regex);
-ReactiveExpression.registerCustomFunction(iregex);
+ReactiveExpression.registerCustomFunction(regexi);
 ReactiveExpression.registerCustomFunction(equal);
-ReactiveExpression.registerCustomFunction(iequal);
+ReactiveExpression.registerCustomFunction(equali);
 
 var __defProp$5 = Object.defineProperty;
 var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;

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

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 import EventEmitter$1, { EventEmitter } from 'eventemitter3';
+import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 
 type Annotation = {
     annotationType: string;
@@ -1381,6 +1381,23 @@ interface MapPaddingOptions {
     left: number;
 }
 
+interface MapEventTypes {
+    click: (event: MapMouseEvent) => void;
+    dblClick: (event: MapMouseEvent) => void;
+    mouseMove: (event: MapMouseEvent) => void;
+    mouseOut: (event: MapMouseEvent) => void;
+    moveEnd: (event: MapEvent) => void;
+    sourceAdded: (event: MapSourceEvent) => void;
+    sourceRemoved: (event: MapSourceEvent) => void;
+    beforeSourceAdded: (event: MapSourceEvent) => void;
+    beforeSourceRemoved: (event: MapSourceEvent) => void;
+    sourceFeatureState: (event: MapSourceEvent) => void;
+    destroyed: (event: MapEvent) => void;
+    loading: (event: MapLoadingEvent) => void;
+    beforeStyleChanged: (event: MapStyleChangeEvent) => void;
+    styleChanged: (event: MapStyleChangeEvent) => void;
+    error: (event: FlowMapError) => void;
+}
 interface MapEventTypes {
     click: (event: MapMouseEvent) => void;
     dblClick: (event: MapMouseEvent) => void;

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

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 import EventEmitter$1, { EventEmitter } from 'eventemitter3';
+import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 
 type Annotation = {
     annotationType: string;
@@ -1381,6 +1381,23 @@ interface MapPaddingOptions {
     left: number;
 }
 
+interface MapEventTypes {
+    click: (event: MapMouseEvent) => void;
+    dblClick: (event: MapMouseEvent) => void;
+    mouseMove: (event: MapMouseEvent) => void;
+    mouseOut: (event: MapMouseEvent) => void;
+    moveEnd: (event: MapEvent) => void;
+    sourceAdded: (event: MapSourceEvent) => void;
+    sourceRemoved: (event: MapSourceEvent) => void;
+    beforeSourceAdded: (event: MapSourceEvent) => void;
+    beforeSourceRemoved: (event: MapSourceEvent) => void;
+    sourceFeatureState: (event: MapSourceEvent) => void;
+    destroyed: (event: MapEvent) => void;
+    loading: (event: MapLoadingEvent) => void;
+    beforeStyleChanged: (event: MapStyleChangeEvent) => void;
+    styleChanged: (event: MapStyleChangeEvent) => void;
+    error: (event: FlowMapError) => void;
+}
 interface MapEventTypes {
     click: (event: MapMouseEvent) => void;
     dblClick: (event: MapMouseEvent) => void;

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

@@ -1,7 +1,7 @@
 import { Client } from '@emuanalytics/flow-engine-client';
 import { IObservableStream, IDisposer, ISubscription } from 'mobx-utils';
-import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 import EventEmitter$1, { EventEmitter } from 'eventemitter3';
+import { MapLibreEvent, MapMouseEvent as MapMouseEvent$1, MapOptions as MapOptions$1, Map } from '@emuanalytics/maplibre-gl';
 
 type Annotation = {
     annotationType: string;
@@ -1381,6 +1381,23 @@ interface MapPaddingOptions {
     left: number;
 }
 
+interface MapEventTypes {
+    click: (event: MapMouseEvent) => void;
+    dblClick: (event: MapMouseEvent) => void;
+    mouseMove: (event: MapMouseEvent) => void;
+    mouseOut: (event: MapMouseEvent) => void;
+    moveEnd: (event: MapEvent) => void;
+    sourceAdded: (event: MapSourceEvent) => void;
+    sourceRemoved: (event: MapSourceEvent) => void;
+    beforeSourceAdded: (event: MapSourceEvent) => void;
+    beforeSourceRemoved: (event: MapSourceEvent) => void;
+    sourceFeatureState: (event: MapSourceEvent) => void;
+    destroyed: (event: MapEvent) => void;
+    loading: (event: MapLoadingEvent) => void;
+    beforeStyleChanged: (event: MapStyleChangeEvent) => void;
+    styleChanged: (event: MapStyleChangeEvent) => void;
+    error: (event: FlowMapError) => void;
+}
 interface MapEventTypes {
     click: (event: MapMouseEvent) => void;
     dblClick: (event: MapMouseEvent) => void;

package/package.json

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