Merge branch 'jsonata-js:master' into master

Author: roopen219

CHANGELOG.md

@@ -1,6 +1,11 @@
+#### 2.0.3 Maintenance Release
+
+- Fix regex termination lexer (PR https://github.com/jsonata-js/jsonata/pull/623)
+- Fix TypeScript definition (PR https://github.com/jsonata-js/jsonata/pull/633)
+
 #### 2.0.2 Maintenance Release
 
-- Typescript definition: fix return type of evaluate method (PR #615)
+- Typescript definition: fix return type of evaluate method (PR https://github.com/jsonata-js/jsonata/pull/615)
 
 #### 2.0.1 Maintenance Release
 

docs/predicate.md

@@ -31,7 +31,7 @@ At any step in a location path, the selected items can be filtered using a predi
 
 ## Singleton array and value equivalence
 
-Within a JSONata expression or subexpression, any value (which is not itself an array) and an array containing just that value are deemed to be equivalent.  This allows the language to be composable such that location paths that extract a single value from and object and location paths that extract multiple values from arrays can both be used as inputs to other expressions without needing to use different syntax for the two forms.
+Within a JSONata expression or subexpression, any value (which is not itself an array) and an array containing just that value are deemed to be equivalent.  This allows the language to be composable such that location paths that extract a single value from an object and location paths that extract multiple values from arrays can both be used as inputs to other expressions without needing to use different syntax for the two forms.
 
 Consider the following examples:
 

jsonata.d.ts

@@ -2,9 +2,14 @@
 // Project: https://github.com/jsonata-js/jsonata
 // Definitions by: Nick <https://github.com/nick121212> and Michael M. Tiller <https://github.com/xogeny>
 
-declare function jsonata(str: string): jsonata.Expression;
+declare function jsonata(str: string, options?: jsonata.JsonataOptions): jsonata.Expression;
 declare namespace jsonata {
 
+  interface JsonataOptions {
+    recover?: boolean,
+    RegexEngine?: RegExp
+  }
+
   interface ExprNode {
     type: string;
     value?: any;
@@ -15,7 +20,7 @@ declare namespace jsonata {
     steps?: ExprNode[];
     expressions?: ExprNode[];
     stages?: ExprNode[];
-    lhs?: ExprNode;
+    lhs?: ExprNode[];
     rhs?: ExprNode;
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonata",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "JSON query and transformation language",
   "module": "jsonata.js",
   "main": "jsonata.js",