Add more tests for #26

Author: ruscoder

README.md

@@ -611,6 +611,7 @@ POST /r4/parse-template
 #### Strict mode
 
 There's a flag, called `strict` that is set to `false` by default. If it set to `true`, all accesses to the variables without the percent sign will be rejected and exception will be thrown.
+NOTE: there's a known issue with accessing the resource by resource type (e.g. QuestionnaireResponse.item), see details [here](https://github.com/beda-software/FHIRPathMappingLanguage/issues/27).
 
 The previous example using strict mode:
 

python/tests/core/test_extract.py

@@ -27,12 +27,22 @@ def test_transformation_fails_on_accessing_props_of_resource_in_strict_mode() ->
         resolve_template(resource, {"key": "{{ list.key }}"}, {}, strict=True)
 
 
-def test_transformation_fails_on_accessing_props_of_resource_with_capital_letter_in_strict_mode() -> None:  # noqa: E501
-    resource: Resource = {"resourceType": "Resource", "key": [1,2,3]}
+def test_transformation_fails_on_accessing_props_of_resource_with_capital_letter_in_strict_mode() -> (  # noqa: E501
+    None
+):
+    resource: Resource = {"resourceType": "Resource", "key": [1, 2, 3]}
     with pytest.raises(FPMLValidationError):
         resolve_template(resource, {"key": "{{ Resource.key }}"}, {}, strict=True)
 
 
+def test_transformation_fails_on_accessing_props_of_undefined_resource_with_capital_letter_in_strict_mode() -> (  # noqa: E501
+    None
+):
+    resource: Resource = {"resourceType": "Resource", "key": [1, 2, 3]}
+    with pytest.raises(FPMLValidationError):
+        resolve_template(resource, {"key": "{{ UndefinedResource.key }}"}, {}, strict=True)
+
+
 def test_transformation_works_on_accessing_props_of_explicit_context_in_strict_mode() -> None:
     resource: Resource = {"list": [{"key": 1}, {"key": 2}, {"key": 3}]}
     result = resolve_template(
@@ -213,16 +223,19 @@ def test_assign_block_with_undefined_intermediate_values() -> None:
         "resourceType": "Resource",
         "sourceValue": 100,
     }
-    assert resolve_template(
-        resource,
-        {
-            "{% assign %}": [
-                {"varA": "{{ {} }}"},
-                {"varB": "{{ %varA }}"},
-            ],
-            "valueA": "{{ %varB }}",
-        },
-    ) == {}
+    assert (
+        resolve_template(
+            resource,
+            {
+                "{% assign %}": [
+                    {"varA": "{{ {} }}"},
+                    {"varB": "{{ %varA }}"},
+                ],
+                "valueA": "{{ %varB }}",
+            },
+        )
+        == {}
+    )
 
 
 def test_assign_block_multiple_vars_as_array_of_objects() -> None:

ts/server/src/core/extract.spec.ts

@@ -9,7 +9,7 @@ describe('Transformation', () => {
         ).toThrow(FPMLValidationError);
     });
 
-    test.skip('fails on accessing props of resource (with capital letter) in strict mode', () => {
+    test('fails on accessing props of resource (with capital letter) in strict mode', () => {
         expect(() =>
             resolveTemplate(
                 { resourceType: 'Resource', key: [1, 2, 3] },
@@ -22,6 +22,19 @@ describe('Transformation', () => {
         ).toThrow(FPMLValidationError);
     });
 
+    test.skip('fails on accessing props of undefined resource (with capital letter) in strict mode (issue #27)', () => {
+        expect(() =>
+            resolveTemplate(
+                { resourceType: 'Resource', key: [1, 2, 3] },
+                { key: '{{ UndefinedResource.key }}' },
+                {},
+                null,
+                null,
+                true,
+            ),
+        ).toThrow(FPMLValidationError);
+    });
+
     test('works on accessing props of explicit context in strict mode', () => {
         expect(
             resolveTemplate(

ts/server/src/core/extract.ts

@@ -23,22 +23,24 @@ export class FPMLValidationError extends Error {
     }
 }
 
-const guardedResource = new Proxy(
-    {},
-    {
+const guardedResourceFactory = (resource: any) =>
+    new Proxy(resource, {
         get: (obj, prop) => {
-            if (prop === '__path__' || prop === 'resourceType') {
+            if (prop === '__path__') {
                 return undefined;
             }
 
+            if (prop === 'resourceType') {
+                return obj.resourceType;
+            }
+
             throw new Error(
                 `Forbidden access to resource property ${String(
                     prop,
                 )} in strict mode. Use context instead`,
             );
         },
-    },
-);
+    });
 
 export function resolveTemplate(
     resource: Resource,
@@ -50,7 +52,7 @@ export function resolveTemplate(
 ): any {
     return resolveTemplateRecur(
         [],
-        strict ? guardedResource : resource,
+        strict ? guardedResourceFactory(resource) : resource,
         template,
         { context: resource, ...(context ?? {}) },
         model,