@hebcal/geo-sqlite 5.7.4 → 5.9.0

package/bin/download-and-make-dbs

@@ -39,6 +39,8 @@ $CURDIR/node_modules/.bin/build-geonames-sqlite \
 
 rm -rf $TMPDIR
 
-sqlite3 -echo zips.sqlite3 < "$CURDIR/node_modules/@hebcal/geo-sqlite/zips-dummy.sql"
+$CURDIR/node_modules/.bin/make-zips-sqlite \
+  $CURDIR/zips.sqlite3 \
+  "$CURDIR/node_modules/@hebcal/geo-sqlite/zips-dummy.sql"
 
 ls -lh geonames.sqlite3 zips.sqlite3

package/bin/make-zips-sqlite

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+import {makeZipsSqlite} from '@hebcal/geo-sqlite';
+import {createRequire} from 'module';
+import path from 'path';
+
+const require = createRequire(import.meta.url);
+const pkgPath = require.resolve('@hebcal/geo-sqlite/package.json');
+const defaultSqlFile = path.join(path.dirname(pkgPath), 'zips-dummy.sql');
+
+const args = process.argv.slice(2);
+if (args.length < 1 || args.length > 2) {
+  console.log('Usage: make-zips-sqlite zips.sqlite3 [zips-dummy.sql]');
+  process.exit(1);
+}
+
+const dbFilename = args[0];
+const sqlFile = args[1] || defaultSqlFile;
+makeZipsSqlite(dbFilename, sqlFile);
+console.log('Done!');

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v5.7.4 */
+/*! @hebcal/geo-sqlite v5.9.0 */
 import Database from 'better-sqlite3';
 import QuickLRU from 'quick-lru';
 import { Location, Locale } from '@hebcal/core';
@@ -511,7 +511,7 @@ function munge(s) {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.7.4';
+const version = '5.9.0';
 
 const GEONAME_SQL = `SELECT
   g.name as name,
@@ -635,19 +635,22 @@ class GeoDb {
    * @param {any} logger
    * @param {string} zipsFilename
    * @param {string} geonamesFilename
+   * @param {any} options
    */
-  constructor(logger, zipsFilename, geonamesFilename) {
+  constructor(logger, zipsFilename, geonamesFilename, options) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
     this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
     this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
+    const zipsCacheSize = options?.zipsCacheSize || 150;
     /** @type {Map<string, Location>} */
-    this.zipCache = new QuickLRU({maxSize: 150});
+    this.zipCache = new QuickLRU({maxSize: zipsCacheSize});
     this.geonamesStmt = this.geonamesDb.prepare(GEONAME_SQL);
+    const geonamesCacheSize = options?.geonamesCacheSize || 750;
     /** @type {Map<number, Location>} */
-    this.geonamesCache = new QuickLRU({maxSize: 750});
+    this.geonamesCache = new QuickLRU({maxSize: geonamesCacheSize});
     /** @type {Map<string, number>} */
     this.legacyCities = new Map();
     for (const [name, id] of Object.entries(city2geonameid)) {
@@ -690,7 +693,7 @@ class GeoDb {
   lookupZip(zip) {
     const zip5 = zip.trim().substring(0, 5);
     const found = this.zipCache.get(zip5);
-    if (typeof found !== 'undefined') return found;
+    if (found !== undefined) return found;
     const result = this.zipStmt.get(zip5);
     if (!result) {
       if (this.logger) this.logger.warn(`GeoDb: unknown zipcode=${zip5}`);
@@ -735,7 +738,7 @@ class GeoDb {
       geonameid = 293397;
     }
     const found = this.geonamesCache.get(geonameid);
-    if (typeof found !== 'undefined') return found;
+    if (found !== undefined) return found;
     const result = this.geonamesStmt.get(geonameid);
     if (!result) {
       if (this.logger) this.logger.warn(`GeoDb: unknown geonameid=${geonameid}`);
@@ -884,7 +887,7 @@ class GeoDb {
       if (!this.geonamesCompStmt) {
         this.geonamesCompStmt = this.geonamesDb.prepare(GEONAME_COMPLETE_SQL);
       }
-      qraw = qraw.replace(/"/g, '""');
+      qraw = qraw.replaceAll('"', '""');
       const geoRows0 = this.geonamesCompStmt.all(`{longname} : "${qraw}" *`);
       const ids = new Set();
       const geoRows = [];
@@ -1433,4 +1436,16 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
   });
 }
 
-export { GeoDb, buildGeonamesSqlite };
+/**
+ * Builds `zips.sqlite3` from the bundled zips-dummy.sql schema file
+ * @param {string} dbFilename path to the output SQLite database file
+ * @param {string} sqlFile path to the SQL schema file
+ */
+function makeZipsSqlite(dbFilename, sqlFile) {
+  const sql = fs.readFileSync(sqlFile, 'utf8');
+  const db = new Database(dbFilename);
+  db.exec(sql);
+  db.close();
+}
+
+export { GeoDb, buildGeonamesSqlite, makeZipsSqlite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "5.7.4",
+  "version": "5.9.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
@@ -14,7 +14,8 @@
   },
   "bin": {
     "build-geonames-sqlite": "bin/build-geonames-sqlite",
-    "download-and-make-dbs": "bin/download-and-make-dbs"
+    "download-and-make-dbs": "bin/download-and-make-dbs",
+    "make-zips-sqlite": "bin/make-zips-sqlite"
   },
   "repository": {
     "type": "git",
@@ -60,16 +61,16 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "ava": "^6.4.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.2",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-n": "^17.23.2",
+    "eslint-plugin-n": "^17.24.0",
     "globals": "^17.3.0",
     "jsdoc": "^4.0.5",
     "jsdoc-to-markdown": "^9.1.3",
-    "rollup": "^4.57.1"
+    "rollup": "^4.59.0"
   }
 }