.github/workflows/jsonata.yml

@@ -0,0 +1,68 @@
+name: Build and publish JSONata
+on:
+  push:
+    branches: [ master, v1 ]
+  pull_request:
+    branches: [ master, v1 ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x, 18.x]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm test
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.repository == 'jsonata-js/jsonata' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: Install and build
+        run: npm install && npm test
+      - name: Publish to NPM
+        id: npmpub
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+      - if: steps.npmpub.outputs.type != 'none'
+        run: |
+          echo "Version changed: ${{ steps.npmpub.outputs.old-version }} => ${{ steps.npmpub.outputs.version }}"
+  documentation:
+    needs: build    
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.repository == 'jsonata-js/jsonata' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: Build documentation
+        run: |
+          cd website
+          npm install
+          npm run build
+      - name: Deploy to GitHub Pages
+        if: success()
+        run: |
+          cd website
+          git config --global user.name "andrew-coleman"
+          git config --global user.email "andrew_coleman@uk.ibm.com"
+          echo "machine github.com login andrew-coleman password ${{ secrets.DOCS_AUTH }}" > ~/.netrc
+          npm run publish-gh-pages
+        env:
+          GIT_USER: andrew-coleman

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
+- '16'
+- '14'
 - '12'
-- '10'
-- '8'
 after_success:
 - npm run coveralls
 jobs:
@@ -17,7 +17,7 @@ jobs:
     - cd website && npm install && GIT_USER="${GH_NAME}" npm run publish-gh-pages
   - stage: npm release
     if: branch = master AND repo = jsonata-js/jsonata
-    node_js: '10'
+    node_js: '14'
     script: echo "Deploying to npm..."
     deploy:
       provider: npm

CHANGELOG.md

@@ -1,3 +1,19 @@
+#### 1.8.7 Maintenance Release
+
+- Prevent writing to the object prototype or constructor (PR https://github.com/jsonata-js/jsonata/pull/681)
+
+#### 1.8.6 Maintenance Release
+
+- Fix bug in date/time picture string. Width formatting is not respected without a separator (issue #546)
+- Fix error when converting empty array to an object (issue #547)
+- Fix Buffer deprecation warning (PR #560)
+
+#### 1.8.5 Maintenance Release
+
+- Fix regression with singleton sequence of array type (issue #462)
+- Correctly handle empty array input to group expression (issue #527)
+- Fix bug with outer array when evaluating wildcard (issue #495)
+
 #### 1.8.4 Maintenance Release
 
 - Fix bug in `$eval` when second arg is an empty array (issue #463)

README.md

@@ -64,7 +64,6 @@ In a browser:
 - JSONata [documentation](http://docs.jsonata.org/)
 - [JavaScript API](http://docs.jsonata.org/embedding-extending)
 - [Intro talk](https://www.youtube.com/watch?v=TDWf6R8aqDo) at London Node User Group
-- JSONata [tech talk](https://www.youtube.com/watch?v=ZRtlkIj0uDY) 
 
 ## Contributing
 

docs/construction.md

@@ -16,7 +16,7 @@ Array constructors can also be used within location paths for making multiple se
 
 __Examples__
 
-- The four emails addresses are returned in a flat array.
+- The four email addresses are returned in a flat array.
   <div class="jsonata-ex">
     <div>Email.address</div>
     <div>[

docs/numeric-functions.md

@@ -29,7 +29,7 @@ If `number` is not specified (i.e. this function is invoked with no arguments),
 
 __Examples__  
 - `$abs(5)` => `5`  
-- `$abs(-5)` => `-5`
+- `$abs(-5)` => `5`
 
 ## `$floor()`
 __Signature:__ `$floor(number)`

docs/path-operators.md

@@ -56,7 +56,7 @@ To sort in descending order, the sort expression must be preceded by the `>` sym
 
 `Account.Order.Product^(>Price)`
 
-sorts all of the products into order of decreasing price.  The `<` symbol can be used explicitly indicate ascending order, although that is the default behaviour.
+sorts all of the products into order of decreasing price.  The `<` symbol can be used to explicitly indicate ascending order, although that is the default behaviour.
 
 Secondary (and more) sort expressions can be specified by separating them with commas (`,`).  The secondary expression will be used to determine order if the primary expression ranks two values the same.  For example,
 

docs/programming.md

@@ -48,7 +48,25 @@ The expression `predicate` is evaluated.  If its effective boolean value (see de
 
 __Examples__
 
-TBD
+<div class="jsonata-ex">
+  <div>Account.Order.Product.{
+    `Product Name`: $.Price > 100 ? "Premium" : "Basic"
+}</div>
+  <div>[
+  {
+    "Bowler Hat": "Basic"
+  },
+  {
+    "Trilby hat": "Basic"
+  },
+  {
+    "Bowler Hat": "Basic"
+  },
+  {
+    "Cloak": "Premium"
+  }
+]</div>
+</div>
 
 ## Variables
 

jsonata.d.ts

@@ -13,6 +13,10 @@ declare namespace jsonata {
     name?: string;
     procedure?: ExprNode;
     steps?: ExprNode[];
+    expressions?: ExprNode[];
+    stages?: ExprNode[];
+    lhs?: ExprNode;
+    rhs?: ExprNode;
   }
 
   interface JsonataError extends Error {

package.json

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

src/datetime.js

@@ -612,7 +612,7 @@ const dateTime = (function () {
                             def.integerFormat.mandatoryDigits = def.width.min;
                         }
                     }
-                    if (def.component === 'Y') {
+                    if ('YMD'.indexOf(def.component) !== -1) {
                         // §9.8.4.4
                         def.n = -1;
                         if (def.width && def.width.max !== undefined) {
@@ -983,6 +983,7 @@ const dateTime = (function () {
                         return offsetHours * 60 + offsetMinutes;
                     };
                 } else if (part.integerFormat) {
+                    part.integerFormat.n = part.n;
                     res = generateRegex(part.integerFormat);
                 } else {
                     // must be a month or day name
@@ -1027,6 +1028,17 @@ const dateTime = (function () {
         } else { // type === 'integer'
             matcher.type = 'integer';
             const isUpper = formatSpec.case === tcase.UPPER;
+            let occurrences;
+            if(formatSpec.n && formatSpec.n > 0){
+                if(formatSpec.optionalDigits === 0){
+                    occurrences = `{${formatSpec.n}}`;
+                } else {
+                    occurrences = `{${formatSpec.n - formatSpec.optionalDigits},${formatSpec.n}}`;
+                }
+            } else {
+                occurrences = '+';
+            }
+
             switch (formatSpec.primary) {
                 case formats.LETTERS:
                     matcher.regex = isUpper ? '[A-Z]+' : '[a-z]+';
@@ -1047,7 +1059,7 @@ const dateTime = (function () {
                     };
                     break;
                 case formats.DECIMAL:
-                    matcher.regex = '[0-9]+';
+                    matcher.regex = `[0-9]${occurrences}`;
                     if (formatSpec.ordinal) {
                         // ordinals
                         matcher.regex += '(?:th|st|nd|rd)';

src/functions.js

@@ -581,7 +581,7 @@ const functions = (() => {
                 // Simply doing `new Buffer` at this point causes Browserify to pull
                 // in the entire Buffer browser library, which is large and unnecessary.
                 // Using `global.Buffer` defeats this.
-                return new global.Buffer(str, 'base64').toString('binary');
+                return new global.Buffer.from(str, 'base64').toString('binary'); // eslint-disable-line new-cap
             };
         return atob(str);
     }