@emuanalytics/flow-rdf-core 4.0.8 → 4.0.10

package/dist/index.d.mts

@@ -7,11 +7,15 @@ import 'lit-html';
 import '@emuanalytics/flow-engine-client';
 import '@emuanalytics/maplibre-gl';
 
+type SyncAnnotationArg = string | string[] | {
+    scope?: string | string[];
+    name?: string;
+};
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T, scope?: string): string;
     deserialize(val: string, target?: T): T;
     type: string;
-    arg?: string | string[];
+    arg?: SyncAnnotationArg;
 }
 declare const serialize: PropertyDecorator & SyncAnnotation<any> & {
     raw: PropertyDecorator & SyncAnnotation<any>;
@@ -19,7 +23,7 @@ declare const serialize: PropertyDecorator & SyncAnnotation<any> & {
     number: PropertyDecorator & SyncAnnotation<number>;
     json: PropertyDecorator & SyncAnnotation<Record<string, boolean>>;
     state: PropertyDecorator & SyncAnnotation<any>;
-    for: (arg: string | string[] | undefined) => PropertyDecorator & SyncAnnotation<any>;
+    for: (arg: SyncAnnotationArg | undefined) => PropertyDecorator & SyncAnnotation<any>;
 };
 interface ReactiveAnnotation extends Annotation {
     mobxAnnotation: any;

package/dist/index.d.ts

@@ -7,11 +7,15 @@ import 'lit-html';
 import '@emuanalytics/flow-engine-client';
 import '@emuanalytics/maplibre-gl';
 
+type SyncAnnotationArg = string | string[] | {
+    scope?: string | string[];
+    name?: string;
+};
 interface SyncAnnotation<T = any> extends Annotation {
     serialize(val: T, scope?: string): string;
     deserialize(val: string, target?: T): T;
     type: string;
-    arg?: string | string[];
+    arg?: SyncAnnotationArg;
 }
 declare const serialize: PropertyDecorator & SyncAnnotation<any> & {
     raw: PropertyDecorator & SyncAnnotation<any>;
@@ -19,7 +23,7 @@ declare const serialize: PropertyDecorator & SyncAnnotation<any> & {
     number: PropertyDecorator & SyncAnnotation<number>;
     json: PropertyDecorator & SyncAnnotation<Record<string, boolean>>;
     state: PropertyDecorator & SyncAnnotation<any>;
-    for: (arg: string | string[] | undefined) => PropertyDecorator & SyncAnnotation<any>;
+    for: (arg: SyncAnnotationArg | undefined) => PropertyDecorator & SyncAnnotation<any>;
 };
 interface ReactiveAnnotation extends Annotation {
     mobxAnnotation: any;

package/dist/lib/expressions/functions/regex.mjs

@@ -10,7 +10,7 @@ const equal = {
   fn: regexFunction("==", true)
 };
 const equali = {
-  name: "iequal",
+  name: "equali",
   fn: regexFunction("==", false)
 };
 const regex = {

package/dist/lib/map/plugins/export/map-exporter.mjs

@@ -105,7 +105,7 @@ const _MapExporter = class _MapExporter {
       preserveDrawingBuffer: true,
       transformRequest: this.transformMapRequest.bind(this)
     });
-    mapCopy.on("styleimagemissing", this.handleMissingImage.bind(this));
+    mapCopy.on("styleimagemissing", (e) => this.handleMissingImage(e, mapCopy));
     return new Promise((resolve) => {
       mapCopy.once("load", () => {
         Object.keys(this.map.maplibreMap.style.sourceCaches).forEach((sourceId) => {
@@ -138,18 +138,18 @@ const _MapExporter = class _MapExporter {
       get: () => pixelRatio
     });
   }
-  async handleMissingImage(e) {
+  async handleMissingImage(e, mapCopy) {
     const imageInfo = this.map.imageRegistry.getImage(e.id);
     if (imageInfo === this.map.imageRegistry.unknownImage) {
-      console.error(`Map ${this.map.id}: Image '${e.id}' not registered`);
+      console.error(`Export copy of map ${this.map.id}: Image '${e.id}' not registered`);
     }
     if (!imageInfo.image.complete) {
       imageInfo.image.onload = () => {
-        this.map.maplibreMap.updateImage(e.id, imageInfo.image);
-        this.map.maplibreMap.redraw();
+        mapCopy.updateImage(e.id, imageInfo.image);
+        mapCopy.redraw();
       };
     }
-    this.map.maplibreMap.addImage(e.id, imageInfo.image, {
+    mapCopy.addImage(e.id, imageInfo.image, {
       pixelRatio: imageInfo.pixelDensity,
       sdf: imageInfo.recolor
     });

package/dist/lib/state-store/state-store.mjs

@@ -6,7 +6,7 @@ import { collectStoredAnnotations } from '../utils/decorators.mjs';
 import { randomId } from '../utils/random-id.mjs';
 import { REACTIVE_ANNOTATION_TYPE, SYNC_ANNOTATION_TYPE } from './decorators.mjs';
 import { ensureArray } from '../utils/ensure-array.mjs';
-import { isDefined } from '../utils/type-checks.mjs';
+import { isStringFull, isArrayFull, isPlainObject, isDefined } from '../utils/type-checks.mjs';
 import { FlowCoreError } from '../errors/flow-error.mjs';
 
 var __defProp = Object.defineProperty;
@@ -424,7 +424,17 @@ class StateStore {
   serialize(format = "raw", scope) {
     const annotations = this.serializationAnnotations;
     const serializedProps = Object.keys(annotations).reduce((accum, prop) => {
-      const annotationScopes = ensureArray(annotations[prop].arg);
+      const annotationArg = annotations[prop].arg;
+      let annotationScopes = [];
+      let persistedName;
+      if (isStringFull(annotationArg)) {
+        annotationScopes = [annotationArg];
+      } else if (isArrayFull(annotationArg)) {
+        annotationScopes = annotationArg;
+      } else if (isPlainObject(annotationArg)) {
+        annotationScopes = ensureArray(annotationArg?.scope ?? []);
+        persistedName = annotationArg?.name;
+      }
       const annotationType = annotations[prop].type;
       if (scope && annotationType !== "state" && !annotationScopes.includes(scope)) {
         return accum;
@@ -432,7 +442,7 @@ class StateStore {
       const val = this[prop];
       if (isDefined(val)) {
         const serializedValue = annotations[prop].serialize(val, scope);
-        accum[prop] = serializedValue;
+        accum[persistedName ?? prop] = serializedValue;
       }
       return accum;
     }, {});
@@ -463,12 +473,21 @@ class StateStore {
         deserializedValue = value;
         break;
     }
+    const annotations = this.serializationAnnotations;
+    const renameMap = {};
+    for (const [prop, annotation] of Object.entries(annotations)) {
+      const renamedProp = annotation.arg?.name ?? prop;
+      renameMap[renamedProp] = prop;
+    }
     this.transaction(() => {
-      const annotations = this.serializationAnnotations;
       Object.keys(deserializedValue).forEach((prop) => {
-        const annotation = annotations[prop];
+        const originalProp = renameMap[prop];
+        const annotation = annotations[originalProp];
         if (annotation) {
-          this[prop] = annotation.deserialize(deserializedValue[prop], this[prop]);
+          this[originalProp] = annotation.deserialize(
+            deserializedValue[prop],
+            this[originalProp]
+          );
         }
       });
     });

package/dist/lib/utils/index.d.mts

@@ -25,7 +25,7 @@ declare const isDate: (val: unknown) => val is Date;
 declare const isValue: (val: unknown) => boolean;
 declare const hasValue: (val: unknown) => boolean;
 declare const isFunction: (val: unknown) => val is Function;
-declare function isPlainObject(o: unknown): boolean;
+declare function isPlainObject(o: unknown): o is object;
 declare function isURL(val: unknown): val is string;
 
 declare function ensureArray<T>(a: T | T[], ...rest: T[]): T[];

package/dist/lib/utils/index.d.ts

@@ -25,7 +25,7 @@ declare const isDate: (val: unknown) => val is Date;
 declare const isValue: (val: unknown) => boolean;
 declare const hasValue: (val: unknown) => boolean;
 declare const isFunction: (val: unknown) => val is Function;
-declare function isPlainObject(o: unknown): boolean;
+declare function isPlainObject(o: unknown): o is object;
 declare function isURL(val: unknown): val is string;
 
 declare function ensureArray<T>(a: T | T[], ...rest: T[]): T[];

package/dist/package.json.mjs

@@ -1,3 +1,3 @@
-const version = "4.0.8";
+const version = "4.0.10";
 
 export { version };

package/package.json

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