Skip to content

Commit

Permalink
Merge pull request #35 in LFOR/fhirpath.js from feature/LF-2169/time-…
Browse files Browse the repository at this point in the history
…of-day to master

* commit '1ebd519d0eef04dcd521648d2a356c8e39c4c4d2':
  npm audit fix
  Fixed issues found during review
  npm audit fix
  Fixed issues found during review
  Fixed issues found during review
  timeOfDay() should return System.Time
  Current time function: timeOfDay()
  • Loading branch information
yuriy-sedinkin committed Mar 16, 2022
2 parents 9aa95fd + 1ebd519 commit f4178a2
Show file tree
Hide file tree
Showing 11 changed files with 3,044 additions and 1,039 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ env:
es6: true
jest: true
extends: 'eslint:recommended'
parser: "babel-eslint"
parser: "@babel/eslint-parser"
parserOptions:
ecmaVersion: 2016
requireConfigFile: false
sourceType: module
rules:
indent:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
This log documents significant changes for each release. This project follows
[Semantic Versioning](http://semver.org/).

## [2.13.0] - 2022-02-28
### Added
- Current time function: timeOfDay().

## [2.12.0] - 2022-01-06
### Added
- FHIRPath extension functions: sum(), min(), max(), and avg().
Expand Down
4 changes: 2 additions & 2 deletions converter/converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const transform = (node, model = null) => {
case 'test':
return [...acc, ...node[key].map(item => {
let test = transform(item, model);
if (!test.hasOwnProperty('result') && !test.error) {
if (!Object.prototype.hasOwnProperty.call(test,'result') && !test.error) {
test.result = [];
}
if (!validateTest(test)) {
Expand Down Expand Up @@ -146,4 +146,4 @@ module.exports = {
});
return yaml.dump(transformed);
}
};
};
12 changes: 6 additions & 6 deletions demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f4178a2

Please sign in to comment.