Syncing expression tests with app-lib-dotnet

.eslintrc.json

@@ -42,7 +42,13 @@
       "version": "detect"
     }
   },
-  "ignorePatterns": ["node_modules", "coverage", "dist", "**/*.snap"],
+  "ignorePatterns": [
+    "node_modules",
+    "coverage",
+    "dist",
+    "**/*.snap",
+    "src/features/expressions/shared-tests/**/*.json"
+  ],
   "rules": {
     "no-console": [
       "warn",

package.json

@@ -154,7 +154,8 @@
       ".husky/pre-commit-check-for-skipped-tests",
       "eslint --cache --fix"
     ],
-    "*.{css,md,json}": "prettier --write"
+    "*.{json}": "eslint --cache --fix",
+    "*.{css,md}": "prettier --write"
   },
   "jest": {
     "transform": {

src/features/expressions/shared-tests/functions/component/hide-group-component.json

@@ -0,0 +1,111 @@
+{
+  "name": "Lookup for hidden component inside repeating group",
+  "expression": ["component", "single-top-component"],
+  "expects": "singleTopValue",
+  "layouts": {
+    "Page1": {
+      "$schema": "https://altinncdn.no/schemas/json/layout/layout.schema.v1.json",
+      "data": {
+        "layout": [
+          {
+            "id": "single-top-component",
+            "type": "Input",
+            "dataModelBindings": {
+              "simpleBinding": "Single.Top"
+            }
+          },
+          {
+            "id": "bedrifter",
+            "type": "Group",
+            "maxCount": 99,
+            "dataModelBindings": {
+              "group": "Bedrifter"
+            },
+            "children": ["bedriftsNavn", "ansatte"]
+          },
+          {
+            "id": "bedriftsNavn",
+            "type": "Input",
+            "dataModelBindings": {
+              "simpleBinding": "Bedrifter.Navn"
+            }
+          },
+          {
+            "id": "ansatte",
+            "type": "Group",
+            "maxCount": 99,
+            "dataModelBindings": {
+              "group": "Bedrifter.Ansatte"
+            },
+            "children": ["navn", "alder", "myndig"]
+          },
+          {
+            "id": "navn",
+            "type": "Input",
+            "dataModelBindings": {
+              "simpleBinding": "Bedrifter.Ansatte.Navn"
+            }
+          },
+          {
+            "id": "alder",
+            "type": "Input",
+            "dataModelBindings": {
+              "simpleBinding": "Bedrifter.Ansatte.Alder"
+            },
+            "hidden": [
+              "if",
+              ["dataModel", "Bedrifter.Ansatte.AlderSkjult"],
+              true
+            ]
+          },
+          {
+            "id": "myndig",
+            "type": "Paragraph",
+            "textResourceBindings": {
+              "title": "Hurra, den ansatte er myndig!"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "dataModel": {
+    "Single": {
+      "Top": "singleTopValue"
+    },
+    "Bedrifter": [
+      {
+        "Navn": "Hell og lykke AS",
+        "Ansatte": [
+          {
+            "Navn": "Kaare",
+            "Alder": 24
+          },
+          {
+            "Navn": "Per",
+            "Alder": 24
+          }
+        ]
+      },
+      {
+        "Navn": "Nedtur og motgang AS",
+        "Ansatte": [
+          {
+            "Navn": "Arne",
+            "Alder": 24,
+            "AlderSkjult": true
+          },
+          {
+            "Navn": "Vidar",
+            "Alder": 14
+          }
+        ]
+      }
+    ]
+  },
+  "context": {
+    "component": "ansatte",
+    "currentLayout": "Page1",
+    "rowIndices": [1,0]
+  }
+}

src/features/expressions/shared-tests/functions/component/simple-lookup-equals.json

@@ -1,6 +1,10 @@
 {
   "name": "Simple lookup equals other lookup",
-  "expression": ["equals", ["component", "my-component"], ["component", "my-other-component"]],
+  "expression": [
+    "equals",
+    ["component", "my-component"],
+    ["component", "my-other-component"]
+  ],
   "expects": true,
   "layouts": {
     "Page1": {

src/features/expressions/shared-tests/functions/concat/inside-lookup.json

@@ -2,7 +2,14 @@
   "name": "Inside a lookup argument",
   "expression": [
     "dataModel",
-    ["concat", "FirstPart", ".", ["dataModel", "Middle"], ".Last", ["frontendSettings", "suffix"]]
+    [
+      "concat",
+      "FirstPart",
+      ".",
+      ["dataModel", "Middle"],
+      ".Last",
+      ["frontendSettings", "suffix"]
+    ]
   ],
   "expects": "foo bar",
   "dataModel": {

src/features/expressions/shared-tests/functions/frontendSettings/simple-lookup-equals.json

@@ -1,6 +1,10 @@
 {
   "name": "Simple lookup equals other lookup",
-  "expression": ["equals", ["frontendSettings", "mySetting1"], ["frontendSettings", "mySetting2"]],
+  "expression": [
+    "equals",
+    ["frontendSettings", "mySetting1"],
+    ["frontendSettings", "mySetting2"]
+  ],
   "expects": true,
   "frontendSettings": {
     "mySetting1": "foo",

src/features/expressions/shared-tests/functions/instanceContext/simple-lookup-equals.json

@@ -1,6 +1,10 @@
 {
   "name": "Simple lookup equals other lookup",
-  "expression": ["equals", ["instanceContext", "instanceOwnerPartyId"], ["instanceContext", "appId"]],
+  "expression": [
+    "equals",
+    ["instanceContext", "instanceOwnerPartyId"],
+    ["instanceContext", "appId"]
+  ],
   "expects": false,
   "instanceContext": {
     "instanceId": "d00ce51c-800b-416a-a906-ccab55f597e9",

src/features/expressions/shared-tests/layout-preprocessor/successful.json

@@ -55,7 +55,11 @@
             "dataModelBindings": {
               "simpleBinding": "Bedrifter.Ansatte.Navn"
             },
-            "hidden": ["and", ["greaterThan", ["component", "alder"], 99], ["notEquals", ["component", "alder"], 101]],
+            "hidden": [
+              "and",
+              ["greaterThan", ["component", "alder"], 99],
+              ["notEquals", ["component", "alder"], 101]
+            ],
             "required": ["dataModel", "Bedrifter.isRequired"]
           },
           {
@@ -132,7 +136,11 @@
             "dataModelBindings": {
               "simpleBinding": "Bedrifter.Ansatte.Navn"
             },
-            "hidden": ["and", ["greaterThan", ["component", "alder"], 99], ["notEquals", ["component", "alder"], 101]],
+            "hidden": [
+              "and",
+              ["greaterThan", ["component", "alder"], 99],
+              ["notEquals", ["component", "alder"], 101]
+            ],
             "required": ["dataModel", "Bedrifter.isRequired"]
           },
           {

src/features/expressions/shared.test.ts

@@ -11,10 +11,30 @@ import type { FunctionTest, SharedTestContext, SharedTestContextList } from 'src
 import type { Expression } from 'src/features/expressions/types';
 import type { IRepeatingGroups } from 'src/types';
 import type { IApplicationSettings, IInstanceContext } from 'src/types/shared';
-import type { LayoutNode } from 'src/utils/layout/hierarchy';
+import type { LayoutNode, LayoutRootNodeCollection } from 'src/utils/layout/hierarchy';
+
+function findComponent(context: FunctionTest['context'], collection: LayoutRootNodeCollection<any>) {
+  const { component, rowIndices } = context || { component: 'no-component' };
+  const componentId = (component || 'no-component') + (rowIndices ? `-${rowIndices.join('-')}` : '');
+  const found = collection.findById(componentId);
+  if (found) {
+    return found;
+  }
+
+  if (component && rowIndices && rowIndices.length) {
+    const componentId2 = `${component}-${rowIndices.slice(0, rowIndices.length - 1).join('-')}`.replace(/-+$/, '');
+    const foundMaybeGroup = collection.findById(componentId2);
+    if (foundMaybeGroup && foundMaybeGroup.item.type === 'Group') {
+      // Special case for using a group component with a row index, looking up within the
+      // group context, but actually pointing to a row inside the group. This is supported
+      // in useExpressions() itself, but evalExpr() requires the context of an actual component
+      // inside the group.
+      const rowIndex = [...rowIndices].pop();
+      return foundMaybeGroup.children(undefined, rowIndex)[0];
+    }
+  }
 
-function toComponentId({ component, rowIndices }: Exclude<FunctionTest['context'], undefined>) {
-  return (component || 'no-component') + (rowIndices ? `-${rowIndices.join('-')}` : '');
+  return new NodeNotFoundWithoutContext(componentId);
 }
 
 describe('Expressions shared function tests', () => {
@@ -44,8 +64,7 @@ describe('Expressions shared function tests', () => {
         const rootCollection = expectsFailure
           ? nodesInLayouts(_layouts, currentLayout, repeatingGroups)
           : resolvedNodesInLayouts(_layouts, currentLayout, repeatingGroups, dataSources);
-        const componentId = context ? toComponentId(context) : 'no-component';
-        const component = rootCollection.findById(componentId) || new NodeNotFoundWithoutContext(componentId);
+        const component = findComponent(context, rootCollection);
 
         if (expectsFailure) {
           expect(() => {