Merge pull request #12 in LFOR/fhirpath.js from bugfix/LF-1465/substr…

…ing-function-issue to master

* commit 'e18db57735e40b28b09d99256d5ac4e249322231':
  Updated version info
  Fixed issue with calling function "substring" without a second parameter

CHANGELOG.md

@@ -3,6 +3,10 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
+## [2.2.1] - 2020-06-03
+### Fixed
+- Issue with substring function without a second parameter
+
 ## [2.2.0] - 2020-05-26
 ### Added
 - Function aggregate(aggregator, init)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A FHIRPath engine",
   "main": "src/fhirpath.js",
   "dependencies": {

src/strings.js

@@ -17,6 +17,12 @@ engine.indexOf = function(coll, substr){
 
 engine.substring = function(coll, start, length){
   var str = ensureStringSingleton(coll);
+  if (util.isEmpty(start) || start < 0 || start >= str.length) {
+    return  [];
+  }
+  if (length === undefined || util.isEmpty(length)) {
+    return str.substring(start);
+  }
   return str.substring(start, start + length);
 };
 

test/cases/5.5_conversion.yaml

@@ -71,7 +71,6 @@ tests:
     - desc: inequality
       expression: "datetime.toDateTime() = @2010-02-06T19:17-05:00"
       result: [false]
-    focus: true
 
   - 'group: toTime':
     - desc: equality
@@ -85,7 +84,6 @@ tests:
     - desc: inequality operator
       expression: "time.toTime() != @T18:15-05:00"
       result: [true]
-    focus: true
 
 
   - desc: '5.5.4. toString() : string'

test/cases/5.6_string_manipulation.yaml

@@ -25,18 +25,24 @@ tests:
 
   - desc: '** substring without length'
     expression: Functions.str.attr.substring(5)
-    disable: true
     result: ['string']
 
   - desc: '** substring with outside index'
     expression: Functions.str.attr.substring(55)
-    disable: true
+    result: []
+
+  - desc: '** substring with empty index'
+    expression: Functions.str.attr.substring(EmptyStart)
     result: []
 
   - desc: '** substring with outside length'
     expression: Functions.str.attr.substring(5, 55)
     result: ['string']
 
+  - desc: '** substring with empty length'
+    expression: Functions.str.attr.substring(5, EmptyLength)
+    result: ['string']
+
 
   - desc: '5.6.3. startsWith(prefix : string) : boolean'
 # If the input collection contains a single item of type string, the function will return true when the input string starts with the given prefix. Also returns true when prefix is the empty string.

test/cases/fhir-r4.yaml

@@ -107,11 +107,10 @@ tests:
   - 'group: Dollar':
       - desc: '** testDollarThis1'
         inputfile: patient-example.json
-        disable: true
         expression: Patient.name.given.where(substring($this.length()-3) = 'out')
+        result: []
       - desc: '** testDollarThis2'
         inputfile: patient-example.json
-        disable: true
         expression: Patient.name.given.where(substring($this.length()-3) = 'ter')
         result:
           - Peter
@@ -1023,11 +1022,10 @@ tests:
           - ''
       - desc: '** test'
         inputfile: questionnaire-example.json
-        disable: true
         expression: 'Questionnaire.descendants().linkId.select(substring(0,1)).distinct()'
         result:
-          - ''
-          - ''
+          - '1'
+          - '2'
   - 'group: testCount':
       - desc: '** test'
         inputfile: patient-example.json
@@ -1363,7 +1361,6 @@ tests:
   - 'group: testSubstring':
       - desc: '** test'
         inputfile: patient-example.json
-        disable: true
         expression: '''12345''.substring(2) = ''345'''
         result:
           - true
@@ -1374,19 +1371,16 @@ tests:
           - true
       - desc: '** test'
         inputfile: patient-example.json
-        disable: true
         expression: '''12345''.substring(2,5) = ''345'''
         result:
           - true
       - desc: '** test'
         inputfile: patient-example.json
-        disable: true
         expression: '''12345''.substring(25).empty()'
         result:
           - true
       - desc: '** test'
         inputfile: patient-example.json
-        disable: true
         expression: '''12345''.substring(-1).empty()'
         result:
           - true