balanced-match 1.0.2 → 3.0.0

package/README.md

@@ -2,21 +2,19 @@
 
 Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`. Supports regular expressions as well!
 
-[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
+[![CI](https://github.com/juliangruber/balanced-match/actions/workflows/ci.yml/badge.svg)](https://github.com/juliangruber/balanced-match/actions/workflows/ci.yml)
 [![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
 
-[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
-
 ## Example
 
 Get the first matching pair of braces:
 
 ```js
-var balanced = require('balanced-match');
+import balanced from 'balanced-match'
 
-console.log(balanced('{', '}', 'pre{in{nested}}post'));
-console.log(balanced('{', '}', 'pre{first}between{second}post'));
-console.log(balanced(/\s+\{\s+/, /\s+\}\s+/, 'pre  {   in{nest}   }  post'));
+console.log(balanced('{', '}', 'pre{in{nested}}post'))
+console.log(balanced('{', '}', 'pre{first}between{second}post'))
+console.log(balanced(/\s+\{\s+/, /\s+\}\s+/, 'pre  {   in{nest}   }  post'))
 ```
 
 The matches are:
@@ -34,22 +32,22 @@ $ node example.js
 
 ## API
 
-### var m = balanced(a, b, str)
+### const m = balanced(a, b, str)
 
 For the first non-nested matching pair of `a` and `b` in `str`, return an
 object with those keys:
 
-* **start** the index of the first match of `a`
-* **end** the index of the matching `b`
-* **pre** the preamble, `a` and `b` not included
-* **body** the match, `a` and `b` not included
-* **post** the postscript, `a` and `b` not included
+- **start** the index of the first match of `a`
+- **end** the index of the matching `b`
+- **pre** the preamble, `a` and `b` not included
+- **body** the match, `a` and `b` not included
+- **post** the postscript, `a` and `b` not included
 
 If there's no match, `undefined` will be returned.
 
 If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']` and `{a}}` will match `['', 'a', '}']`.
 
-### var r = balanced.range(a, b, str)
+### const r = balanced.range(a, b, str)
 
 For the first non-nested matching pair of `a` and `b` in `str`, return an
 array with indexes: `[ <a index>, <b index> ]`.

package/index.js

@@ -1,62 +1,75 @@
-'use strict';
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
-
-  var r = range(a, b, str);
-
-  return r && {
-    start: r[0],
-    end: r[1],
-    pre: str.slice(0, r[0]),
-    body: str.slice(r[0] + a.length, r[1]),
-    post: str.slice(r[1] + b.length)
-  };
+/**
+ * @param {string | RegExp} a
+ * @param {string | RegExp} b
+ * @param {string} str
+ */
+export default function balanced (a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str)
+  if (b instanceof RegExp) b = maybeMatch(b, str)
+
+  const r = range(a, b, str)
+
+  return (
+    r && {
+      start: r[0],
+      end: r[1],
+      pre: str.slice(0, r[0]),
+      body: str.slice(r[0] + a.length, r[1]),
+      post: str.slice(r[1] + b.length)
+    }
+  )
 }
 
-function maybeMatch(reg, str) {
-  var m = str.match(reg);
-  return m ? m[0] : null;
+/**
+ * @param {RegExp} reg
+ * @param {string} str
+ */
+function maybeMatch (reg, str) {
+  const m = str.match(reg)
+  return m ? m[0] : null
 }
 
-balanced.range = range;
-function range(a, b, str) {
-  var begs, beg, left, right, result;
-  var ai = str.indexOf(a);
-  var bi = str.indexOf(b, ai + 1);
-  var i = ai;
+/**
+ * @param {string} a
+ * @param {string} b
+ * @param {string} str
+ */
+export function range (a, b, str) {
+  let begs, beg, left, right, result
+  let ai = str.indexOf(a)
+  let bi = str.indexOf(b, ai + 1)
+  let i = ai
 
   if (ai >= 0 && bi > 0) {
-    if(a===b) {
-      return [ai, bi];
+    if (a === b) {
+      return [ai, bi]
     }
-    begs = [];
-    left = str.length;
+    begs = []
+    left = str.length
 
     while (i >= 0 && !result) {
-      if (i == ai) {
-        begs.push(i);
-        ai = str.indexOf(a, i + 1);
-      } else if (begs.length == 1) {
-        result = [ begs.pop(), bi ];
+      if (i === ai) {
+        begs.push(i)
+        ai = str.indexOf(a, i + 1)
+      } else if (begs.length === 1) {
+        result = [begs.pop(), bi]
       } else {
-        beg = begs.pop();
+        beg = begs.pop()
         if (beg < left) {
-          left = beg;
-          right = bi;
+          left = beg
+          right = bi
         }
 
-        bi = str.indexOf(b, i + 1);
+        bi = str.indexOf(b, i + 1)
       }
 
-      i = ai < bi && ai >= 0 ? ai : bi;
+      i = ai < bi && ai >= 0 ? ai : bi
     }
 
     if (begs.length) {
-      result = [ left, right ];
+      result = [left, right]
     }
   }
 
-  return result;
+  return result
 }

package/package.json

@@ -1,20 +1,24 @@
 {
   "name": "balanced-match",
   "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "version": "1.0.2",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/balanced-match.git"
   },
   "homepage": "https://github.com/juliangruber/balanced-match",
   "main": "index.js",
+  "type": "module",
   "scripts": {
-    "test": "tape test/test.js",
-    "bench": "matcha test/bench.js"
+    "test": "standard --fix && node--test test/test.js",
+    "bench": "matcha test/bench.js",
+    "release": "np"
   },
   "devDependencies": {
-    "matcha": "^0.7.0",
-    "tape": "^4.6.0"
+    "@c4312/matcha": "^1.3.1",
+    "np": "^8.0.4",
+    "standard": "^17.1.0",
+    "test": "^3.3.0"
   },
   "keywords": [
     "match",
@@ -44,5 +48,8 @@
       "iphone/6.0..latest",
       "android-browser/4.2..latest"
     ]
+  },
+  "engines": {
+    "node": ">= 16"
   }
 }

package/.github/FUNDING.yml

@@ -1,2 +0,0 @@
-tidelift: "npm/balanced-match"
-patreon: juliangruber