Merge remote-tracking branch 'lhc-git/master' into feature/LF-2985/async-functions

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json

Author: yuriy-sedinkin

CHANGELOG.md

@@ -3,11 +3,31 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
-## [3.12.0] - 2024-04-01
+## [3.14.0] - 2024-05-28
 ### Added
 - Support for asynchronous functions: if any function in an expression returns
   a Promise, then the result of evaluating the expression is a Promise.
 
+## [3.13.2] - 2024-05-15
+### Fixed
+- an issue with evaluating an expression for a resource passed through an
+  environment variable.
+- an issue with "statusShift" during performance tests.
+
+## [3.13.1] - 2024-04-25
+### Fixed
+- Added flag 'u' for regular expressions in the specification's `matches` and
+  `replaceMatches` functions to support the use of unicode character class
+  escapes.
+
+## [3.13.0] - 2024-04-10
+### Added
+- Function `defineVariable(name: String [, expr: expression])`.
+
+## [3.12.0] - 2024-04-10
+### Changed
+- Updated Cypress to version 13.
+
 ## [3.11.0] - 2024-03-29
 ### Added
 - Storing the FHIR data type along with the path in internal ResourceNode

cypress.config.js

@@ -7,6 +7,7 @@ module.exports = defineConfig({
   screenshotsFolder: 'test/cypress/screenshots',
   videosFolder: 'test/cypress/videos',
   e2e: {
+    testIsolation: false,
     specPattern: 'test/cypress/e2e/**/*.cy.js',
     supportFile: 'test/cypress/support/e2e.js',
   },

fhir-context/dstu2/index.js

@@ -1,3 +1,4 @@
+const updateWithGeneratedData = require('../general-additions');
 /**
  *  Exports the FHIR model data for DSTU2.  This is an internal structure that
  *  will likely evolve as more FHIR specific processing is added.
@@ -24,10 +25,7 @@ const modelInfo = {
   path2Type: require('./path2Type.json')
 };
 
-// Generate a set of available data types
-modelInfo.availableTypes = new Set();
-// IE11 probably doesn't support `new Set(iterable)`
-Object.keys(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
-Object.values(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+// Update with generated data
+updateWithGeneratedData(modelInfo)
 
 module.exports = modelInfo;

fhir-context/general-additions.js

@@ -0,0 +1,17 @@
+// Update the model with generated data
+module.exports = (modelInfo) => {
+  // Generate a set of available data types
+  modelInfo.availableTypes = new Set();
+  // IE11 probably doesn't support `new Set(iterable)`
+  Object.keys(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+  Object.values(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+
+  // Generate a hash map to map paths to data types excluding "BackboneElement" and "Element".
+  modelInfo.path2TypeWithoutElements = {};
+  for(let i in modelInfo.path2Type) {
+    if (modelInfo.path2Type[i] === 'Element' || modelInfo.path2Type[i] === 'BackboneElement') {
+      continue;
+    }
+    modelInfo.path2TypeWithoutElements[i] = modelInfo.path2Type[i];
+  }
+};

fhir-context/r4/index.js

@@ -1,3 +1,5 @@
+const updateWithGeneratedData = require('../general-additions');
+
 /**
  *  Exports the FHIR model data for R4.  This is an internal structure that
  *  will likely evolve as more FHIR specific processing is added.
@@ -24,10 +26,7 @@ const modelInfo = {
   path2Type: require('./path2Type.json')
 };
 
-// Generate a set of available data types
-modelInfo.availableTypes = new Set();
-// IE11 probably doesn't support `new Set(iterable)`
-Object.keys(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
-Object.values(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+// Update with generated data
+updateWithGeneratedData(modelInfo)
 
 module.exports = modelInfo;

fhir-context/r5/index.js

@@ -1,3 +1,4 @@
+const updateWithGeneratedData = require('../general-additions');
 /**
  *  Exports the FHIR model data for R5.  This is an internal structure that
  *  will likely evolve as more FHIR specific processing is added.
@@ -24,10 +25,7 @@ const modelInfo = {
   path2Type: require('./path2Type.json')
 };
 
-// Generate a set of available data types
-modelInfo.availableTypes = new Set();
-// IE11 probably doesn't support `new Set(iterable)`
-Object.keys(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
-Object.values(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+// Update with generated data
+updateWithGeneratedData(modelInfo)
 
 module.exports = modelInfo;

fhir-context/stu3/index.js

@@ -1,3 +1,4 @@
+const updateWithGeneratedData = require('../general-additions');
 /**
  *  Exports the FHIR model data for STU3.  This is an internal structure that
  *  will likely evolve as more FHIR specific processing is added.
@@ -24,11 +25,8 @@ const modelInfo = {
   path2Type: require('./path2Type.json')
 };
 
-// Generate a set of available data types
-modelInfo.availableTypes = new Set();
-// IE11 probably doesn't support `new Set(iterable)`
-Object.keys(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
-Object.values(modelInfo.type2Parent).forEach(i => modelInfo.availableTypes.add(i));
+// Update with generated data
+updateWithGeneratedData(modelInfo)
 
 module.exports = modelInfo;
 

index.d.ts

@@ -21,6 +21,8 @@ declare module "fhirpath" {
   ): any[];
   export function resolveInternalTypes(value: any): any;
   export function types(value: any): string[];
+  export function parse(expression: string): any;
+  export const version :string;
 }
 
 declare module "fhirpath/fhir-context/dstu2" {