node-abi 3.0.0 → 3.4.0

package/.circleci/config.yml

@@ -29,6 +29,10 @@ jobs:
     docker:
       - image: circleci/node:14
     <<: *steps-test
+  test-linux-16:
+    docker:
+      - image: circleci/node:16
+    <<: *steps-test
 
   release:
     docker:
@@ -46,12 +50,14 @@ workflows:
       - test-linux-10
       - test-linux-12
       - test-linux-14
+      - test-linux-16
       - release:
           requires:
             - test-linux-10
             - test-linux-12
             - test-linux-14
+            - test-linux-16
           filters:
             branches:
               only:
-                - master
+                - main

package/.releaserc.json

@@ -5,5 +5,5 @@
       "@continuous-auth/semantic-release-npm",
       "@semantic-release/github"
     ],
-    "branches": [ "master" ]
+    "branches": [ "main" ]
   }

package/abi_registry.json

@@ -50,6 +50,13 @@
     "future": false,
     "abi": "93"
   },
+  {
+    "runtime": "node",
+    "target": "17.0.0",
+    "lts": false,
+    "future": false,
+    "abi": "102"
+  },
   {
     "abi": "70",
     "future": false,
@@ -122,17 +129,17 @@
   },
   {
     "abi": "89",
-    "future": true,
+    "future": false,
     "lts": false,
     "runtime": "electron",
-    "target": "15.0.0-alpha.1"
+    "target": "13.0.0-beta.2"
   },
   {
     "abi": "89",
     "future": false,
     "lts": false,
     "runtime": "electron",
-    "target": "13.0.0-beta.2"
+    "target": "15.0.0-alpha.1"
   },
   {
     "abi": "89",
@@ -140,5 +147,26 @@
     "lts": false,
     "runtime": "electron",
     "target": "14.0.0-beta.1"
+  },
+  {
+    "abi": "97",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "14.0.2"
+  },
+  {
+    "abi": "98",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "15.0.0-beta.7"
+  },
+  {
+    "abi": "99",
+    "future": false,
+    "lts": false,
+    "runtime": "electron",
+    "target": "16.0.0-alpha.1"
   }
 ]

package/index.js

@@ -24,12 +24,15 @@ function getAbi (target, runtime) {
   }
 
   var abi
+  var lastTarget
 
   for (var i = 0; i < allTargets.length; i++) {
     var t = allTargets[i]
     if (t.runtime !== runtime) continue
-    if (semver.lte(t.target, target)) abi = t.abi
-    else break
+    if (semver.lte(t.target, target) && (!lastTarget || semver.gte(t.target, lastTarget))) {
+      abi = t.abi
+      lastTarget = t.target
+    }
   }
 
   if (abi && semver.lt(target, getNextTarget(runtime))) return abi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-abi",
-  "version": "3.0.0",
+  "version": "3.4.0",
   "description": "Get the Node ABI for a given target and runtime, and vice versa.",
   "main": "index.js",
   "scripts": {

package/test/index.js

@@ -41,6 +41,7 @@ test('getTarget calculates correct Electron target', function (t) {
   t.equal(getTarget('50', 'electron'), '1.4.0')
   t.equal(getTarget('76', 'electron'), '8.0.0')
   t.equal(getTarget('82', 'electron'), '10.0.0')
+  t.equal(getTarget('89', 'electron'), '13.0.0')
   t.end()
 })
 
@@ -99,7 +100,12 @@ test('getAbi calculates correct Node ABI', function (t) {
 test('getAbi calculates correct Electron ABI', function (t) {
   t.throws(function () { getAbi(undefined, 'electron') })
   t.throws(function () { getAbi(getNextTarget('electron'), 'electron') })
-  t.equal(getAbi('10.0.0-beta.1', 'electron'), '82')
+  t.equal(getAbi('15.0.0-beta.1', 'electron'), '89')
+  t.equal(getAbi('14.1.1', 'electron'), '97')
+  t.equal(getAbi('14.0.0', 'electron'), '89')
+  t.equal(getAbi('13.0.0', 'electron'), '89')
+  t.equal(getAbi('12.0.0', 'electron'), '87')
+  t.equal(getAbi('11.0.0', 'electron'), '85')
   t.equal(getAbi('10.0.0', 'electron'), '82')
   t.equal(getAbi('9.0.0', 'electron'), '80')
   t.equal(getAbi('8.0.0', 'electron'), '76')
@@ -158,17 +164,3 @@ test('getAbi returns abi if passed as target', function (t) {
   t.equal(getAbi('57'), '57')
   t.end()
 })
-
-test('allTargets are sorted', function (t) {
-  var electron = allTargets.filter(function (t) { return t.runtime === 'electron' })
-  var node = allTargets.filter(function (t) { return t.runtime === 'node' })
-  var nodeWebkit = allTargets.filter(function (t) { return t.runtime === 'node-webkit' })
-  function sort (t1, t2) {
-    return semver.compare(t1.target, t2.target)
-  }
-
-  t.deepEqual(electron, electron.slice().sort(sort), 'electron targets are sorted')
-  t.deepEqual(node, node.slice().sort(sort), 'node targets are sorted')
-  t.deepEqual(nodeWebkit, nodeWebkit.slice().sort(sort), 'node-webkit targets are sorted')
-  t.end()
-})