Switch to ES Modules and balanced-match 3.0.0 (#62)

juliangruber · Oct 7, 2023 · c0360e8 · c0360e8
1 parent 2520537
commit c0360e8
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 47 deletions.
diff --git a/bench/bench.js b/bench/bench.js
@@ -1,7 +1,7 @@
-'use strict';
-const expand = require('..');
-const fs = require('fs');
-const resfile = __dirname + '/../test/cases.txt';
+import expand from '..';
+import fs from 'fs';
+
+const resfile = new URL('../test/cases.txt', import.meta.url);
 const cases = fs.readFileSync(resfile, 'utf8').split('\n');
 
 bench('Average', function() {

diff --git a/example.js b/example.js
@@ -1,4 +1,4 @@
-const expand = require('./');
+import expand from './index.js'
 
 console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
 console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));

diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-const balanced = require('balanced-match');
+import balanced from 'balanced-match';
 
 const escSlash = '\0SLASH'+Math.random()+'\0';
 const escOpen = '\0OPEN'+Math.random()+'\0';
@@ -71,7 +71,7 @@ function parseCommaParts(str) {
 /**
  * @param {string} str
  */
-function expandTop(str) {
+export default function expandTop(str) {
  if (!str)
  return [];
 
@@ -231,5 +231,3 @@ function expand(str, isTop) {
 
  return expansions;
 }
-
-module.exports = expandTop;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,14 +7,15 @@
  "url": "git://github.com/juliangruber/brace-expansion.git"
  },
  "homepage": "https://github.com/juliangruber/brace-expansion",
- "main": "index.js",
+ "exports": "./index.js",
+ "type": "module",
  "scripts": {
  "test": "node--test",
  "gentest": "bash test/generate.sh",
  "bench": "matcha bench/bench.js"
  },
  "dependencies": {
- "balanced-match": "^1.0.0"
+ "balanced-match": "^3.0.0"
  },
  "devDependencies": {
  "@c4312/matcha": "^1.3.1",
@@ -42,5 +43,8 @@
  "iphone/6.0..latest",
  "android-browser/4.2..latest"
  ]
+ },
+ "engines": {
+ "node": ">= 16"
  }
 }
diff --git a/test/bash-comparison.js b/test/bash-comparison.js
@@ -1,8 +1,9 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
-const fs = require('fs');
-const resfile = __dirname + '/bash-results.txt';
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
+import fs from 'fs';
+
+const resfile = new URL('./bash-results.txt', import.meta.url);
 const cases = fs.readFileSync(resfile, 'utf8').split('><><><><');
 
 // throw away the EOF marker

diff --git a/test/dollar.js b/test/dollar.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('ignores ${', function() {
  assert.deepStrictEqual(expand('${1..3}'), ['${1..3}']);

diff --git a/test/empty-option.js b/test/empty-option.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('empty option', function() {
  assert.deepStrictEqual(expand('-v{,,,,}'), [

diff --git a/test/negative-increment.js b/test/negative-increment.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('negative increment', function() {
  assert.deepStrictEqual(expand('{3..1}'), ['3', '2', '1']);

diff --git a/test/nested.js b/test/nested.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('nested', function() {
  assert.deepStrictEqual(expand('{a,b{1..3},c}'), [

diff --git a/test/order.js b/test/order.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('order', function() {
  assert.deepStrictEqual(expand('a{d,c,b}e'), [

diff --git a/test/pad.js b/test/pad.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('pad', function() {
  assert.deepStrictEqual(expand('{9..11}'), [

diff --git a/test/same-type.js b/test/same-type.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('x and y of same type', function() {
  assert.deepStrictEqual(expand('{a..9}'), ['{a..9}']);

diff --git a/test/sequence.js b/test/sequence.js
@@ -1,6 +1,6 @@
-const test = require('test');
-const assert = require('assert');
-const expand = require('..');
+import test from 'node:test';
+import assert from 'assert';
+import expand from '../index.js';
 
 test('numeric sequences', function() {
  assert.deepStrictEqual(expand('a{1..2}b{2..3}c'), [