@canboat/canboatjs 2.5.2 → 2.5.4

package/.github/workflows/test.yml

@@ -0,0 +1,28 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI & Test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x, 20.x]
+
+    steps:
+    - 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

package/lib/fromPgn.js

@@ -24,7 +24,6 @@ const BitStream = require('bit-buffer').BitStream
 const BitView = require('bit-buffer').BitView
 const Int64LE = require('int64-buffer').Int64LE
 const Uint64LE = require('int64-buffer').Uint64LE
-const { parse: parseDate } = require('date-fns')
 
 const { getPGNFromCanId } = require('./utilities')
 const { getIndustryName, getManufacturerName } = require('./codes')
@@ -120,9 +119,7 @@ class Parser extends EventEmitter {
       })
     }
 
-    const RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
-
-    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${RepeatingFields} ${couldBeMulti}`)
+    trace(`${pgn.pgn} ${len} ${pgnData.Length} ${couldBeMulti}`)
     if ( coalesced || len > 0x8 || (this.format == FORMAT_COALESCED && !this.mixedFormat) ) {
       this.format = FORMAT_COALESCED
       if ( sourceString ) {
@@ -204,6 +201,8 @@ class Parser extends EventEmitter {
       pgn.input = [ sourceString ]
     }
 
+    let RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
+
     pgn.fields = {}
     try {
       var fields = pgnData.Fields
@@ -246,6 +245,7 @@ class Parser extends EventEmitter {
             if ( value == null ) {
               value = pgnData.Fields[i].Match
             }
+            RepeatingFields = pgnData.RepeatingFieldSet1Size ? pgnData.RepeatingFieldSet1Size : 0
           }
         }
 

package/lib/stringMsg.js

@@ -8,7 +8,6 @@ const {
 const {
   buildCanId, encodeCanIdString, parseCanId, parseCanIdStr,
 } = require('./canId')
-const { parse: parseDate } = require('date-fns')
 
 /**
  * Helper function that helps merge canId fields with format, data, and others.

package/lib/toPgn.js

@@ -34,9 +34,11 @@ const RES_STRINGLZ = 'STRING_LZ' //'ASCII string starting with length byte'
 var fieldTypeWriters = {}
 var fieldTypeMappers = {}
 
-
 var lengthsOff = { 129029: 45, 127257:8, 127258:8, 127251:8 }
 
+const a126208_oldKey = '# of Parameters'
+const a126208_newKey = 'Number of Parameters'
+
 function toPgn(data) {
   const customPgns = getCustomPgn(data.pgn)
   let pgnList = pgns[data.pgn]
@@ -71,6 +73,13 @@ function toPgn(data) {
     data = data.fields
   }
 
+  if ( pgn_number === 126208 && !data[a126208_newKey] && data[a126208_oldKey] ) {
+    //a bit of a hack because this field name changed and I'm sure there is code out
+    //there that still uses the old field name
+
+    data[a126208_newKey] = data[a126208_oldKey]
+  }
+
   var fields = pgnData.Fields
   if ( !_.isArray(fields) ) {
     fields = [ fields.Field ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canboat/canboatjs",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Native javascript version of canboat",
   "main": "index.js",
   "scripts": {
@@ -57,7 +57,6 @@
   "dependencies": {
     "@canboat/pgns": "3.x.x",
     "bit-buffer": "0.2.3",
-    "date-fns": "2.0.0-alpha.27",
     "debug": "^4.3.4",
     "dnssd": "^0.4.1",
     "int64-buffer": "^0.1.10",