@appsemble/utils 0.20.20 → 0.20.22

package/remap.ts

@@ -172,10 +172,16 @@ const mapperImplementations: MapperImplementations = {
     throw new Error(`Unknown page property: ${prop}`);
   },
 
-  context: (prop, input, context) =>
-    String(prop)
-      .split('.')
-      .reduce((acc, p) => acc?.[p] ?? null, context.context),
+  context(prop, input, context) {
+    let result = context.context;
+    for (const p of String(prop).split('.')) {
+      if (result == null) {
+        return null;
+      }
+      result = result[p];
+    }
+    return result ?? null;
+  },
 
   equals(mappers, input: any, context) {
     if (mappers.length <= 1) {
@@ -260,14 +266,14 @@ const mapperImplementations: MapperImplementations = {
     const result = { ...input };
     for (const key of keys) {
       if (Array.isArray(key)) {
-        key.reduce((acc, k, index) => {
+        let acc = result;
+        for (const [index, k] of key.entries()) {
           if (index === key.length - 1) {
             delete acc[k];
           } else {
-            return acc?.[k];
+            acc = acc?.[k];
           }
-          return acc;
-        }, result);
+        }
       } else {
         delete result[key];
       }
@@ -313,12 +319,30 @@ const mapperImplementations: MapperImplementations = {
       ? input.concat(mappers.map((mapper) => remap(mapper, input, context)))
       : [],
 
-  'array.omit': (indecies, input) =>
-    Array.isArray(input) ? input.filter((value, i) => !indecies.includes(i)) : [],
+  'array.omit'(mappers, input, context) {
+    const indices = new Set(
+      mappers.map((mapper) => {
+        const remapped = remap(mapper, input, context);
+        if (typeof remapped === 'number') {
+          return remapped;
+        }
+      }),
+    );
+    return Array.isArray(input) ? input.filter((value, i) => !indices.has(i)) : [];
+  },
 
   static: (input) => input,
 
-  prop: (prop, obj: Record<string, unknown>) => [].concat(prop).reduce((acc, p) => acc?.[p], obj),
+  prop(prop, obj) {
+    let result: any = obj;
+    for (const p of [prop].flat()) {
+      if (result == null) {
+        return result;
+      }
+      result = result[p];
+    }
+    return result;
+  },
 
   'date.parse': (format, input: string) =>
     format ? parse(input, format, new Date()) : parseISO(input),
@@ -365,6 +389,9 @@ const mapperImplementations: MapperImplementations = {
 
   history: (index, input, context) => context.history?.[index],
 
+  'from.history': ({ index, props }, input, context) =>
+    mapValues(props, (mapper) => remap(mapper, context.history[index], context)),
+
   'assign.history': ({ index, props }, input: any, context) => ({
     ...input,
     ...mapValues(props, (mapper) => remap(mapper, context.history[index], context)),
@@ -374,14 +401,14 @@ const mapperImplementations: MapperImplementations = {
     const result = { ...(context.history[index] as Record<string, any>) };
     for (const key of keys) {
       if (Array.isArray(key)) {
-        key.reduce((acc, k, i) => {
+        let acc = result;
+        for (const [i, k] of key.entries()) {
           if (i === key.length - 1) {
             delete acc[k];
           } else {
-            return acc?.[k];
+            acc = acc?.[k];
           }
-          return acc;
-        }, result);
+        }
       } else {
         delete result[key];
       }

package/validation.d.ts

@@ -9,7 +9,7 @@ import { IdentifiableBlock } from './blockUtils.js';
  * @returns Whether or not the given link represents a link related to the Appsemble core.
  */
 export declare function isAppLink(link: string[] | string): boolean;
-export declare type BlockVersionsGetter = (blockMap: IdentifiableBlock[]) => Promisable<BlockManifest[]>;
+export type BlockVersionsGetter = (blockMap: IdentifiableBlock[]) => Promisable<BlockManifest[]>;
 /**
  * Validate an app definition.
  *