@hebcal/geo-sqlite 5.9.2 → 5.10.1

package/dist/index.js

@@ -1,5 +1,6 @@
-/*! @hebcal/geo-sqlite v5.9.2 */
-import Database from 'better-sqlite3';
+/*! @hebcal/geo-sqlite v5.10.1 */
+import { DatabaseSync } from 'node:sqlite';
+import fs$1, { existsSync } from 'node:fs';
 import QuickLRU from 'quick-lru';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -7,7 +8,6 @@ import { transliterate } from 'transliteration';
 import events from 'events';
 import fs from 'fs';
 import readline from 'readline';
-import fs$1 from 'node:fs';
 
 var city2geonameid = {
 "AD-Andorra La Vella":3041563,
@@ -512,7 +512,7 @@ function munge(s) {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.9.2';
+const version = '5.10.1';
 
 const GEONAME_SQL = `SELECT
   g.name as name,
@@ -558,7 +558,7 @@ FROM ZIPCodes_Primary`;
 
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
-WHERE ZipCode LIKE ?
+WHERE ZipCode >= ? AND ZipCode < ?
 ORDER BY Population DESC
 LIMIT 10`;
 
@@ -641,9 +641,15 @@ class GeoDb {
   constructor(logger, zipsFilename, geonamesFilename, options) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
-    this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
+    if (!existsSync(zipsFilename)) {
+      throw new Error(`GeoDb: ${zipsFilename} does not exist`);
+    }
+    this.zipsDb = new DatabaseSync(zipsFilename);
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
-    this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
+    if (!existsSync(geonamesFilename)) {
+      throw new Error(`GeoDb: ${geonamesFilename} does not exist`);
+    }
+    this.geonamesDb = new DatabaseSync(geonamesFilename);
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
     const zipsCacheSize = options?.zipsCacheSize || 150;
     /** @type {Map<string, Location>} */
@@ -813,9 +819,6 @@ class GeoDb {
     if (admin1) {
       location.admin1 = admin1;
     }
-    if (result.cc === 'IL' && admin1.startsWith('Jerusalem') && result.name.startsWith('Jerualem')) {
-      location.jersualem = true;
-    }
     if (result.population) {
       location.population = result.population;
     }
@@ -879,11 +882,18 @@ class GeoDb {
     }
     const firstCharCode = qraw.charCodeAt(0);
     if (firstCharCode >= 48 && firstCharCode <= 57) {
+      // special-case PK query instead of full-table scan
+      if (GeoDb.is5DigitZip(qraw)) {
+        const loc = this.lookupZip(qraw);
+        return loc ? [GeoDb.zipLocToAutocomplete(loc)] : [];
+      }
       if (!this.zipCompStmt) {
         this.zipCompStmt = this.zipsDb.prepare(ZIP_COMPLETE_SQL);
       }
-      const zip5 = qraw.substring(0, 5);
-      return this.zipCompStmt.all(zip5 + '%').map(GeoDb.zipResultToObj);
+      // this is a ZIP code prefix, a string with 1-4 digits
+      const zipA = qraw.substring(0, 5);
+      const zipB = String(+zipA + 1).padStart(zipA.length, '0');
+      return this.zipCompStmt.all(zipA, zipB).map(GeoDb.zipResultToObj);
     } else {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
@@ -1047,6 +1057,26 @@ class GeoDb {
   static version() {
     return version;
   }
+
+  /**
+   * @param {string} str
+   * @return {boolean}
+   */
+  static is5DigitZip(str) {
+    if (typeof str !== 'string') {
+      return false;
+    }
+    const s = str.trim();
+    if (s.length < 5) {
+      return false;
+    }
+    for (let i = 0; i < 5; i++) {
+      if (s.charCodeAt(i) > 57 || s.charCodeAt(i) < 48) {
+        return false;
+      }
+    }
+    return true;
+  }
 }
 
 /* eslint-disable no-multi-spaces */
@@ -1080,8 +1110,8 @@ async function buildGeonamesSqlite(opts) {
   const ILalternate = opts.ILalternate;
   const logger = opts.logger;
   logger.info(`Opening ${dbFilename}`);
-  const db = new Database(dbFilename);
-  db.pragma('journal_mode = MEMORY');
+  const db = new DatabaseSync(dbFilename);
+  db.exec('PRAGMA journal_mode = MEMORY');
 
   doSql(logger, db,
       `DROP TABLE IF EXISTS country`,
@@ -1419,7 +1449,7 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
             return;
           }
         }
-        stmt.run(a);
+        stmt.run(...a);
         accepted++;
       });
 
@@ -1444,7 +1474,7 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
  */
 function makeZipsSqlite(dbFilename, sqlFile) {
   const sql = fs$1.readFileSync(sqlFile, 'utf8');
-  const db = new Database(dbFilename);
+  const db = new DatabaseSync(dbFilename);
   console.log(sql);
   db.exec(sql);
   db.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "5.9.2",
+  "version": "5.10.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -27,7 +27,7 @@
   },
   "typings": "geo-sqlite.d.ts",
   "engines": {
-    "node": ">= 20.0.0"
+    "node": ">= 22.5.0"
   },
   "files": [
     "dist",
@@ -39,8 +39,7 @@
   ],
   "dependencies": {
     "@hebcal/cities": "^6.1.0",
-    "@hebcal/core": "^6.0.8",
-    "better-sqlite3": "^12.8.0",
+    "@hebcal/core": "^6.4.1",
     "minimist": "^1.2.8",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
@@ -66,13 +65,13 @@
     "@eslint/js": "^10.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "ava": "^7.0.0",
-    "eslint": "^10.0.3",
+    "ava": "^8.0.0",
+    "eslint": "^10.3.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-n": "^17.24.0",
-    "globals": "^17.4.0",
+    "eslint-plugin-n": "^18.0.1",
+    "globals": "^17.6.0",
     "jsdoc": "^4.0.5",
     "jsdoc-to-markdown": "^9.1.3",
-    "rollup": "^4.59.0"
+    "rollup": "^4.60.3"
   }
 }