Merge remote-tracking branch 'origin/biome'

Author: pirxpilot

.jshintrc

@@ -1,16 +1,15 @@
-NODE_BIN=./node_modules/.bin
-SRC = index.js $(wildcard lib/*.js)
-
 check: lint test
 
-node_modules: package.json
-	yarn
-	touch $@
+lint:
+	./node_modules/.bin/biome ci
+
+format:
+	./node_modules/.bin/biome check --fix
 
-lint: | node_modules
-	$(NODE_BIN)/jshint $(SRC) test
+test:
+	node --test $(TEST_OPTS)
 
-test: | node_modules
-	node --test
+test-cov: TEST_OPTS := --experimental-test-coverage
+test-cov: test
 
-.PHONY: lint check test
+.PHONY: check format lint test test-cov

Makefile

@@ -0,0 +1,62 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  },
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "ignoreUnknown": true
+  },
+  "formatter": {
+    "enabled": true,
+    "useEditorconfig": true,
+    "lineWidth": 120
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "single",
+      "trailingCommas": "none",
+      "arrowParentheses": "asNeeded"
+    }
+  },
+  "json": {
+    "formatter": {
+      "expand": "always"
+    }
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "correctness": {
+        "noUndeclaredVariables": "error",
+        "noUnusedVariables": "error"
+      },
+      "complexity": {
+        "noForEach": "off"
+      },
+      "style": {
+        "noParameterAssign": "off",
+        "useDefaultParameterLast": "error",
+        "useSingleVarDeclarator": "error",
+        "noUnusedTemplateLiteral": "error",
+        "useNumberNamespace": "error",
+        "noUselessElse": "error"
+      },
+      "performance": {
+        "noDelete": "off"
+      },
+      "suspicious": {
+        "noAssignInExpressions": "off"
+      }
+    }
+  }
+}

biome.json

@@ -11,32 +11,21 @@ const keys = {
 };
 
 function geocoder(name) {
-  const g = {
-    order: [name]
+  return {
+    order: [name],
+    [`${name}_key`]: keys[name],
+    [`${name}_parameters`]: { interval: 1000 },
+    [`${name}_enable`]: () => true
   };
-  g[name + '_key'] = keys[name];
-  g[name + '_parameters'] = { interval : 1000 };
-  g[name + '_enable'] = () => true;
-  return g;
 }
 
-const geocoderAddress = [
-  'geocodio',
-  'graphhopper',
-  'locationiq',
-  'opencage',
-  'pelias',
-  'positionstack'
-].find(name => keys[name]);
-
-const geocoderPlace = [
-  'maptiler',
-  'graphhopper',
-  'locationiq',
-  'opencage',
-  'pelias',
-  'positionstack'
-].find(name => keys[name]);
+const geocoderAddress = ['geocodio', 'graphhopper', 'locationiq', 'opencage', 'pelias', 'positionstack'].find(
+  name => keys[name]
+);
+
+const geocoderPlace = ['maptiler', 'graphhopper', 'locationiq', 'opencage', 'pelias', 'positionstack'].find(
+  name => keys[name]
+);
 
 const result = document.getElementById('result');
 function onchange(event) {
@@ -55,6 +44,6 @@ geoplete(address, { type: 'address', geocoder: geocoder(geocoderAddress) });
 function item(text) {
   const v = text.value;
   const li = document.createElement('li');
-  li.innerHTML = '<mark>' + (v.place || '') + '</mark> <em>' + v.address + '</em>';
+  li.innerHTML = `<mark>${v.place || ''}</mark> <em>${v.address}</em>`;
   return li;
 }

demo/index.js

@@ -4,14 +4,16 @@ const debounce = require('debounce');
 
 module.exports = geoplete;
 
-/* global AbortController */
-
 const Suggestions = {
-  'address': {
-    toString() { return this.address || this.place; }
+  address: {
+    toString() {
+      return this.address || this.place;
+    }
   },
-  'place': {
-    toString() { return this.place || this.address; }
+  place: {
+    toString() {
+      return this.place || this.address;
+    }
   }
 };
 
@@ -28,18 +30,16 @@ function geoQuery(query) {
 }
 
 function regExpEscape(s) {
-  return s.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&");
+  return s.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&');
 }
 
-function geoplete(el, options) {
-  options = options || {};
+function geoplete(el, options = {}) {
   options.type = Suggestions[options.type] ? options.type : 'address';
-  options.minChars = options.minChars || 4;
-  options.trigger = options.trigger || trigger;
-
-  options.geoQuery = options.geoQuery || geoQuery;
-  options.minMatching = options.minMatching || 2;
-  options.filterMatches = options.filterMatches || filterMatches;
+  options.minChars ??= 4;
+  options.trigger ??= trigger;
+  options.geoQuery ??= geoQuery;
+  options.minMatching ??= 2;
+  options.filterMatches ??= filterMatches;
   const acOptions = {
     minChars: 0,
     filter: displayAll,
@@ -52,7 +52,6 @@ function geoplete(el, options) {
     acOptions.container = options.container;
   }
 
-
   const geoOptions = options.geocoder;
 
   let lastValue;
@@ -61,16 +60,16 @@ function geoplete(el, options) {
   const ac = new Awesomplete(el, acOptions);
 
   if (options.keepOpen) {
-    ac.close = function (close, o) {
-      if (o && o.reason && keepOpen[o.reason]) {
+    ac.close = function (close, o, ...args) {
+      if (o?.reason && keepOpen[o.reason]) {
         return;
       }
-      close.apply(this, Array.prototype.slice.call(arguments, 1));
+      close.call(this, o, ...args);
     }.bind(ac, ac.close);
     el.removeEventListener('blur', ac._events.input.blur);
   }
 
-  const oninput = debounce(function() {
+  const oninput = debounce(() => {
     const value = el.value.trim();
     if (!options.trigger(value)) {
       populate([]);
@@ -95,9 +94,7 @@ function geoplete(el, options) {
 
   function filterMatches(result, value) {
     value = new RegExp(regExpEscape(value), 'i');
-    return result.filter(function (entry) {
-      return value.test(entry);
-    });
+    return result.filter(entry => value.test(entry));
   }
 
   function matching(lastValue, value, bounds) {
@@ -110,7 +107,7 @@ function geoplete(el, options) {
     if (lastValue.value.length > value.length) {
       return;
     }
-    if (!(lastValue.result && lastValue.result.length)) {
+    if (!lastValue.result?.length) {
       return;
     }
     const result = options.filterMatches(lastValue.result, value);
@@ -146,13 +143,13 @@ function geoplete(el, options) {
       el.classList.add('geoplete-in-progress');
       abortController = new AbortController();
       const result = await geocode(options.geoQuery(params), { signal: abortController.signal });
-      if (result && result.places) {
+      if (result?.places) {
         lastValue.result = result.places.map(fromPlace);
         populate(lastValue.result, result);
       }
     } catch (error) {
       // ignore abort and timeout errors
-      if (error.name !== "AbortError" && error.cause !== Symbol.for('timeout')) {
+      if (error.name !== 'AbortError' && error.cause !== Symbol.for('timeout')) {
         throw error;
       }
     } finally {

lib/geoplete.js

@@ -7,7 +7,10 @@
     "email": "pirxpilot@furkot.com",
     "url": "https://pirxpilot.com"
   },
-  "repository": "github:furkot/geoplete",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/furkot/geoplete.git"
+  },
   "license": "ISC",
   "keywords": [
     "geoplete",
@@ -20,7 +23,7 @@
     "debounce": "^1.1.0||^2.0.0"
   },
   "devDependencies": {
-    "@pirxpilot/jshint": "~3",
+    "@biomejs/biome": "2.0.5",
     "jsdom": "~24",
     "jsdom-global": "~3"
   },

package.json

@@ -3,7 +3,7 @@ const assert = require('node:assert/strict');
 
 const geoplete = require('../');
 
-describe('geoplete', function () {
+describe('geoplete', () => {
   before(function () {
     this.jsdom = require('jsdom-global')();
   });
@@ -12,7 +12,7 @@ describe('geoplete', function () {
     this.jsdom();
   });
 
-  beforeEach(function () {
+  beforeEach(() => {
     document.body.innerHTML = '<input id="test" type="text">';
   });
 
@@ -22,7 +22,7 @@ describe('geoplete', function () {
 
   it('attach', function () {
     const input = document.getElementById('test');
-    const ac = this.ac = geoplete(input);
+    const ac = (this.ac = geoplete(input));
 
     assert.ok(ac, 'should create autocomplete object');
   });
@@ -54,25 +54,30 @@ describe('geoplete', function () {
             assert.fail();
           }
         },
-        synchronous_enable() { return true; }
+        synchronous_enable() {
+          return true;
+        }
       }
     });
     input.value = 'san franc';
-    input.dispatchEvent(new Event('input', {
-      'bubbles': true,
-      'cancelable': true
-    }));
-    setTimeout(function () {
+    input.dispatchEvent(
+      new Event('input', {
+        bubbles: true,
+        cancelable: true
+      })
+    );
+    setTimeout(() => {
       input.value = 'san franci';
-      input.dispatchEvent(new Event('input', {
-        'bubbles': true,
-        'cancelable': true
-      }));
-      setTimeout(function () {
+      input.dispatchEvent(
+        new Event('input', {
+          bubbles: true,
+          cancelable: true
+        })
+      );
+      setTimeout(() => {
         assert.equal(count, 1);
         done();
       }, 500);
     }, 500);
   });
 });
-