@hebcal/geo-sqlite 5.0.1 → 5.0.3

package/bin/build-geonames-sqlite

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const {buildGeonamesSqlite} = require('@hebcal/geo-sqlite');
-const {pino} = require('pino');
+import {buildGeonamesSqlite} from '@hebcal/geo-sqlite';
+import {pino} from 'pino';
 
 const logger = pino({
   // level: argv.quiet ? 'warn' : 'info',

package/dist/{index.js → index.cjs}

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v5.0.1 */
+/*! @hebcal/geo-sqlite v5.0.2 */
 'use strict';
 
 var Database = require('better-sqlite3');
@@ -18,7 +18,10 @@ let a=[["\0","
","","","","","","","\b","\t","\n","\v","\f","\r","","","
  * @return {string}
  */
 function munge(s) {
-  return s.toLowerCase().replace(/'/g, '').replace(/ /g, '').replace(/\+/g, '');
+  return s.toLowerCase()
+      .replace(/'/g, '')
+      .replace(/ /g, '')
+      .replace(/\+/g, '');
 }
 
 const GEONAME_SQL = `SELECT
@@ -37,6 +40,7 @@ LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 WHERE g.geonameid = ?
 `;
+
 const GEONAME_ALL_SQL = `SELECT
   g.geonameid as geonameid,
   g.name as name,
@@ -53,27 +57,35 @@ FROM geoname g
 LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 `;
+
 const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
 TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
+
 const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
 TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
+
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode
+
+const ZIP_FULLTEXT_COMPLETE_SQL =
+`SELECT ZipCode
 FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
 ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
+
+const GEONAME_COMPLETE_SQL =
+`SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
 LIMIT 20`;
+
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -125,7 +137,7 @@ const stateNames = {
   'WA': 'Washington',
   'WI': 'Wisconsin',
   'WV': 'West Virginia',
-  'WY': 'Wyoming'
+  'WY': 'Wyoming',
 };
 
 /** Wrapper around sqlite databases */
@@ -138,13 +150,9 @@ class GeoDb {
   constructor(logger, zipsFilename, geonamesFilename) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
-    this.zipsDb = new Database(zipsFilename, {
-      fileMustExist: true
-    });
+    this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
-    this.geonamesDb = new Database(geonamesFilename, {
-      fileMustExist: true
-    });
+    this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
     /** @type {Map<string, Location>} */
     this.zipCache = new Map();
@@ -164,6 +172,7 @@ class GeoDb {
     }
     /** @type {Map<string, string>} */
     this.countryNames = map;
+    if (logger) logger.info(`GeoDb: ${map.size} countries, ${this.legacyCities.size} legacy cities`);
   }
 
   /** Closes database handles */
@@ -215,7 +224,8 @@ class GeoDb {
     const tzid = core.Location.getUsaTzid(result.State, result.TimeZone, result.DayLightSaving);
     const cityDescr = `${result.CityMixedCase}, ${result.State} ${zip}`;
     const elevation = result?.Elevation > 0 ? result.Elevation : 0;
-    const location = new core.Location(result.Latitude, result.Longitude, false, tzid, cityDescr, 'US', zip, elevation);
+    const location = new core.Location(result.Latitude, result.Longitude, false, tzid, cityDescr,
+        'US', zip, elevation);
     location.admin1 = location.state = result.State;
     location.stateName = stateNames[location.state];
     location.geo = 'zip';
@@ -292,7 +302,16 @@ class GeoDb {
     const admin1 = result.admin1 || '';
     const cityDescr = GeoDb.geonameCityDescr(result.name, admin1, country);
     const elevation = result?.elevation > 0 ? result.elevation : 0;
-    const location = new core.Location(result.latitude, result.longitude, result.cc == 'IL', result.timezone, cityDescr, result.cc, geonameid, elevation);
+    const location = new core.Location(
+        result.latitude,
+        result.longitude,
+        result.cc == 'IL',
+        result.timezone,
+        cityDescr,
+        result.cc,
+        geonameid,
+        elevation,
+    );
     location.geo = 'geoname';
     location.geonameid = geonameid;
     location.asciiname = result.asciiname;
@@ -344,7 +363,7 @@ class GeoDb {
       longitude: res.Longitude,
       timezone: core.Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
-      geo: 'zip'
+      geo: 'zip',
     };
     if (res.Elevation && res.Elevation > 0) {
       obj.elevation = res.Elevation;
@@ -358,7 +377,7 @@ class GeoDb {
    * @param {boolean} latlong
    * @return {Object[]}
    */
-  autoComplete(qraw, latlong = false) {
+  autoComplete(qraw, latlong=false) {
     qraw = qraw.trim();
     if (qraw.length === 0) {
       return [];
@@ -385,7 +404,7 @@ class GeoDb {
           geoRows.push(row);
         }
       }
-      const geoMatches = geoRows.map(res => {
+      const geoMatches = geoRows.map((res) => {
         const loc = this.lookupGeoname(res.geonameid);
         return this.geonameLocToAutocomplete(loc, res);
       });
@@ -393,7 +412,7 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
-      const zipMatches = zipRows.map(res => {
+      const zipMatches = zipRows.map((res) => {
         const loc = this.lookupZip(res.ZipCode);
         return GeoDb.zipLocToAutocomplete(loc);
       });
@@ -431,7 +450,7 @@ class GeoDb {
       latitude: loc.latitude,
       longitude: loc.longitude,
       timezone: loc.getTzid(),
-      geo: 'geoname'
+      geo: 'geoname',
     };
     if (loc.population) {
       obj.population = loc.population;
@@ -468,7 +487,7 @@ class GeoDb {
       longitude: loc.longitude,
       timezone: loc.getTzid(),
       population: loc.population,
-      geo: 'zip'
+      geo: 'zip',
     };
   }
 
@@ -544,7 +563,11 @@ async function buildGeonamesSqlite(opts) {
   logger.info(`Opening ${dbFilename}`);
   const db = new Database(dbFilename);
   db.pragma('journal_mode = MEMORY');
-  doSql(logger, db, `DROP TABLE IF EXISTS country`, `CREATE TABLE country (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS country`,
+
+      `CREATE TABLE country (
       ISO TEXT PRIMARY KEY,
       ISO3 TEXT NOT NULL,
       IsoNumeric TEXT NOT NULL,
@@ -564,9 +587,14 @@ async function buildGeonamesSqlite(opts) {
       geonameid INT NOT NULL,
       neighbours TEXT NOT NULL,
       EquivalentFipsCode TEXT NOT NULL
-    );`);
+    );`,
+  );
   await doFile(logger, db, countryInfotxt, 'country', 19);
-  doSql(logger, db, `DROP TABLE IF EXISTS geoname`, `CREATE TABLE geoname (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS geoname`,
+
+      `CREATE TABLE geoname (
       geonameid int PRIMARY KEY,
       name nvarchar(200),
       asciiname nvarchar(200),
@@ -585,32 +613,48 @@ async function buildGeonamesSqlite(opts) {
       elevation int,
       gtopo30 int,
       timezone nvarchar(40),
-      moddate date);`);
-  const truncateAlternateNames = a => {
+      moddate date);`,
+  );
+
+  const truncateAlternateNames = (a) => {
     a[3] = '';
     return true;
   };
   await doFile(logger, db, cities5000txt, 'geoname', 19, truncateAlternateNames);
   await doFile(logger, db, citiesPatch, 'geoname', 19, truncateAlternateNames);
-  await doFile(logger, db, ILtxt, 'geoname', 19, a => {
+  await doFile(logger, db, ILtxt, 'geoname', 19, (a) => {
     a[3] = '';
     return a[6] == 'P' && (a[7] == 'PPL' || a[7] == 'STLMT');
   });
-  doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS admin1`,
+
+      `CREATE TABLE admin1 (
       key TEXT PRIMARY KEY,
       name nvarchar(200) NOT NULL,
       asciiname nvarchar(200) NOT NULL,
       geonameid int NOT NULL
-      );`);
+      );`,
+  );
+
   await doFile(logger, db, admin1CodesASCIItxt, 'admin1', 4);
 
   // fix inconsistencies with the USA capitol
-  doSql(logger, db, `UPDATE geoname
+  doSql(logger, db,
+      `UPDATE geoname
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE geonameid = 4140963;`, `UPDATE admin1
+      WHERE geonameid = 4140963;`,
+
+      `UPDATE admin1
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE key = 'US.DC';`);
-  doSql(logger, db, `DROP TABLE IF EXISTS alternatenames`, `CREATE TABLE alternatenames (
+      WHERE key = 'US.DC';`,
+  );
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS alternatenames`,
+
+      `CREATE TABLE alternatenames (
     id int PRIMARY KEY,
     geonameid int NOT NULL,
     isolanguage varchar(7),
@@ -621,8 +665,10 @@ async function buildGeonamesSqlite(opts) {
     isHistoric tinyint,
     periodFrom NULL,
     periodTo NULL
-    );`);
-  await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
+    );`,
+  );
+
+  await doFile(logger, db, ILalternate, 'alternatenames', 10, (a) => {
     const firstchar = a[3][0];
     if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
       a[2] = 'en';
@@ -650,16 +696,35 @@ async function buildGeonamesSqlite(opts) {
   });
 
   // remove duplicates from alternatenames
-  doSql(logger, db, `DROP TABLE IF EXISTS altnames`, `CREATE TABLE altnames
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS altnames`,
+
+      `CREATE TABLE altnames
     AS SELECT geonameid, isolanguage, name
     FROM alternatenames
     GROUP BY 1, 2, 3
-    `);
-  doSql(logger, db, `update admin1 set name='',asciiname='' where key like 'PS.%';`, `update country set country = '' where iso = 'PS';`, `delete from geoname where geonameid = 7303419;`);
-  doSql(logger, db, `DROP TABLE IF EXISTS geoname_fulltext`, `CREATE VIRTUAL TABLE geoname_fulltext
+    `,
+  );
+
+  doSql(logger, db,
+      `update admin1 set name='',asciiname='' where key like 'PS.%';`,
+      `update country set country = '' where iso = 'PS';`,
+      `delete from geoname where geonameid = 7303419;`,
+  );
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS geoname_fulltext`,
+
+      `CREATE VIRTUAL TABLE geoname_fulltext
       USING fts5(geonameid UNINDEXED, longname, population, city, admin1, country);
-    `, `DROP TABLE IF EXISTS geoname_non_ascii`, `CREATE TABLE geoname_non_ascii AS
-      SELECT geonameid FROM geoname WHERE asciiname <> name`, `INSERT INTO geoname_fulltext
+    `,
+
+      `DROP TABLE IF EXISTS geoname_non_ascii`,
+
+      `CREATE TABLE geoname_non_ascii AS
+      SELECT geonameid FROM geoname WHERE asciiname <> name`,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', '||c.Country,
       g.population,
@@ -670,7 +735,9 @@ async function buildGeonamesSqlite(opts) {
       AND g.country <> 'IL'
       AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
@@ -678,7 +745,9 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', UK',
       g.population,
@@ -686,14 +755,18 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', Israel',
       g.population,
       g.asciiname,NULL,'Israel'
       FROM geoname g
       WHERE g.country = 'IL'
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
@@ -701,7 +774,9 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
       g.population,
@@ -710,7 +785,9 @@ async function buildGeonamesSqlite(opts) {
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
       g.population,
@@ -719,7 +796,9 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', Israel',
       g.population,
@@ -728,7 +807,11 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      `, 'VACUUM');
+      `,
+
+      'VACUUM',
+  );
+
   return new Promise((resolve, reject) => {
     try {
       logger.info(`Closing ${dbFilename}`);
@@ -776,11 +859,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
     try {
       const rl = readline.createInterface({
         input: fs.createReadStream(infile),
-        crlfDelay: Infinity
+        crlfDelay: Infinity,
       });
       let num = 0;
       let accepted = 0;
-      rl.on('line', line => {
+      rl.on('line', (line) => {
         num++;
         if (line[0] == '#') {
           return;
@@ -799,11 +882,13 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
         stmt.run(a);
         accepted++;
       });
+
       rl.on('close', () => {
         logger.info(`Inserted ${accepted} / ${num} into ${tableName} from ${infile}`);
         stmt = null;
         db.exec('COMMIT');
       });
+
       return resolve(events.once(rl, 'close'));
     } catch (err) {
       logger.error(err);

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/geo-sqlite v5.0.1 */
+/*! @hebcal/geo-sqlite v5.0.2 */
 import Database from 'better-sqlite3';
 import { Location, Locale } from '@hebcal/core';
 import '@hebcal/cities';
@@ -16,7 +16,10 @@ let a=[["\0","
","","","","","","","\b","\t","\n","\v","\f","\r","","","
  * @return {string}
  */
 function munge(s) {
-  return s.toLowerCase().replace(/'/g, '').replace(/ /g, '').replace(/\+/g, '');
+  return s.toLowerCase()
+      .replace(/'/g, '')
+      .replace(/ /g, '')
+      .replace(/\+/g, '');
 }
 
 const GEONAME_SQL = `SELECT
@@ -35,6 +38,7 @@ LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 WHERE g.geonameid = ?
 `;
+
 const GEONAME_ALL_SQL = `SELECT
   g.geonameid as geonameid,
   g.name as name,
@@ -51,27 +55,35 @@ FROM geoname g
 LEFT JOIN country c on g.country = c.iso
 LEFT JOIN admin1 a on g.country||'.'||g.admin1 = a.key
 `;
+
 const ZIPCODE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
 TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary WHERE ZipCode = ?`;
+
 const ZIPCODE_ALL_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,Elevation,
 TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary`;
+
 const ZIP_COMPLETE_SQL = `SELECT ZipCode,CityMixedCase,State,Latitude,Longitude,TimeZone,DayLightSaving,Population
 FROM ZIPCodes_Primary
 WHERE ZipCode LIKE ?
 ORDER BY Population DESC
 LIMIT 10`;
-const ZIP_FULLTEXT_COMPLETE_SQL = `SELECT ZipCode
+
+const ZIP_FULLTEXT_COMPLETE_SQL =
+`SELECT ZipCode
 FROM ZIPCodes_CityFullText5
 WHERE ZIPCodes_CityFullText5 MATCH ?
 ORDER BY Population DESC
 LIMIT 20`;
-const GEONAME_COMPLETE_SQL = `SELECT geonameid, longname, city, admin1, country
+
+const GEONAME_COMPLETE_SQL =
+`SELECT geonameid, longname, city, admin1, country
 FROM geoname_fulltext
 WHERE geoname_fulltext MATCH ?
 ORDER BY population DESC
 LIMIT 20`;
+
 const stateNames = {
   'AK': 'Alaska',
   'AL': 'Alabama',
@@ -123,7 +135,7 @@ const stateNames = {
   'WA': 'Washington',
   'WI': 'Wisconsin',
   'WV': 'West Virginia',
-  'WY': 'Wyoming'
+  'WY': 'Wyoming',
 };
 
 /** Wrapper around sqlite databases */
@@ -136,13 +148,9 @@ class GeoDb {
   constructor(logger, zipsFilename, geonamesFilename) {
     this.logger = logger;
     if (logger) logger.info(`GeoDb: opening ${zipsFilename}...`);
-    this.zipsDb = new Database(zipsFilename, {
-      fileMustExist: true
-    });
+    this.zipsDb = new Database(zipsFilename, {fileMustExist: true});
     if (logger) logger.info(`GeoDb: opening ${geonamesFilename}...`);
-    this.geonamesDb = new Database(geonamesFilename, {
-      fileMustExist: true
-    });
+    this.geonamesDb = new Database(geonamesFilename, {fileMustExist: true});
     this.zipStmt = this.zipsDb.prepare(ZIPCODE_SQL);
     /** @type {Map<string, Location>} */
     this.zipCache = new Map();
@@ -162,6 +170,7 @@ class GeoDb {
     }
     /** @type {Map<string, string>} */
     this.countryNames = map;
+    if (logger) logger.info(`GeoDb: ${map.size} countries, ${this.legacyCities.size} legacy cities`);
   }
 
   /** Closes database handles */
@@ -213,7 +222,8 @@ class GeoDb {
     const tzid = Location.getUsaTzid(result.State, result.TimeZone, result.DayLightSaving);
     const cityDescr = `${result.CityMixedCase}, ${result.State} ${zip}`;
     const elevation = result?.Elevation > 0 ? result.Elevation : 0;
-    const location = new Location(result.Latitude, result.Longitude, false, tzid, cityDescr, 'US', zip, elevation);
+    const location = new Location(result.Latitude, result.Longitude, false, tzid, cityDescr,
+        'US', zip, elevation);
     location.admin1 = location.state = result.State;
     location.stateName = stateNames[location.state];
     location.geo = 'zip';
@@ -290,7 +300,16 @@ class GeoDb {
     const admin1 = result.admin1 || '';
     const cityDescr = GeoDb.geonameCityDescr(result.name, admin1, country);
     const elevation = result?.elevation > 0 ? result.elevation : 0;
-    const location = new Location(result.latitude, result.longitude, result.cc == 'IL', result.timezone, cityDescr, result.cc, geonameid, elevation);
+    const location = new Location(
+        result.latitude,
+        result.longitude,
+        result.cc == 'IL',
+        result.timezone,
+        cityDescr,
+        result.cc,
+        geonameid,
+        elevation,
+    );
     location.geo = 'geoname';
     location.geonameid = geonameid;
     location.asciiname = result.asciiname;
@@ -342,7 +361,7 @@ class GeoDb {
       longitude: res.Longitude,
       timezone: Location.getUsaTzid(res.State, res.TimeZone, res.DayLightSaving),
       population: res.Population,
-      geo: 'zip'
+      geo: 'zip',
     };
     if (res.Elevation && res.Elevation > 0) {
       obj.elevation = res.Elevation;
@@ -356,7 +375,7 @@ class GeoDb {
    * @param {boolean} latlong
    * @return {Object[]}
    */
-  autoComplete(qraw, latlong = false) {
+  autoComplete(qraw, latlong=false) {
     qraw = qraw.trim();
     if (qraw.length === 0) {
       return [];
@@ -383,7 +402,7 @@ class GeoDb {
           geoRows.push(row);
         }
       }
-      const geoMatches = geoRows.map(res => {
+      const geoMatches = geoRows.map((res) => {
         const loc = this.lookupGeoname(res.geonameid);
         return this.geonameLocToAutocomplete(loc, res);
       });
@@ -391,7 +410,7 @@ class GeoDb {
         this.zipFulltextCompStmt = this.zipsDb.prepare(ZIP_FULLTEXT_COMPLETE_SQL);
       }
       const zipRows = this.zipFulltextCompStmt.all(`{longname} : "${qraw}" *`);
-      const zipMatches = zipRows.map(res => {
+      const zipMatches = zipRows.map((res) => {
         const loc = this.lookupZip(res.ZipCode);
         return GeoDb.zipLocToAutocomplete(loc);
       });
@@ -429,7 +448,7 @@ class GeoDb {
       latitude: loc.latitude,
       longitude: loc.longitude,
       timezone: loc.getTzid(),
-      geo: 'geoname'
+      geo: 'geoname',
     };
     if (loc.population) {
       obj.population = loc.population;
@@ -466,7 +485,7 @@ class GeoDb {
       longitude: loc.longitude,
       timezone: loc.getTzid(),
       population: loc.population,
-      geo: 'zip'
+      geo: 'zip',
     };
   }
 
@@ -542,7 +561,11 @@ async function buildGeonamesSqlite(opts) {
   logger.info(`Opening ${dbFilename}`);
   const db = new Database(dbFilename);
   db.pragma('journal_mode = MEMORY');
-  doSql(logger, db, `DROP TABLE IF EXISTS country`, `CREATE TABLE country (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS country`,
+
+      `CREATE TABLE country (
       ISO TEXT PRIMARY KEY,
       ISO3 TEXT NOT NULL,
       IsoNumeric TEXT NOT NULL,
@@ -562,9 +585,14 @@ async function buildGeonamesSqlite(opts) {
       geonameid INT NOT NULL,
       neighbours TEXT NOT NULL,
       EquivalentFipsCode TEXT NOT NULL
-    );`);
+    );`,
+  );
   await doFile(logger, db, countryInfotxt, 'country', 19);
-  doSql(logger, db, `DROP TABLE IF EXISTS geoname`, `CREATE TABLE geoname (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS geoname`,
+
+      `CREATE TABLE geoname (
       geonameid int PRIMARY KEY,
       name nvarchar(200),
       asciiname nvarchar(200),
@@ -583,32 +611,48 @@ async function buildGeonamesSqlite(opts) {
       elevation int,
       gtopo30 int,
       timezone nvarchar(40),
-      moddate date);`);
-  const truncateAlternateNames = a => {
+      moddate date);`,
+  );
+
+  const truncateAlternateNames = (a) => {
     a[3] = '';
     return true;
   };
   await doFile(logger, db, cities5000txt, 'geoname', 19, truncateAlternateNames);
   await doFile(logger, db, citiesPatch, 'geoname', 19, truncateAlternateNames);
-  await doFile(logger, db, ILtxt, 'geoname', 19, a => {
+  await doFile(logger, db, ILtxt, 'geoname', 19, (a) => {
     a[3] = '';
     return a[6] == 'P' && (a[7] == 'PPL' || a[7] == 'STLMT');
   });
-  doSql(logger, db, `DROP TABLE IF EXISTS admin1`, `CREATE TABLE admin1 (
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS admin1`,
+
+      `CREATE TABLE admin1 (
       key TEXT PRIMARY KEY,
       name nvarchar(200) NOT NULL,
       asciiname nvarchar(200) NOT NULL,
       geonameid int NOT NULL
-      );`);
+      );`,
+  );
+
   await doFile(logger, db, admin1CodesASCIItxt, 'admin1', 4);
 
   // fix inconsistencies with the USA capitol
-  doSql(logger, db, `UPDATE geoname
+  doSql(logger, db,
+      `UPDATE geoname
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE geonameid = 4140963;`, `UPDATE admin1
+      WHERE geonameid = 4140963;`,
+
+      `UPDATE admin1
       SET name = 'Washington, D.C.', asciiname = 'Washington, D.C.'
-      WHERE key = 'US.DC';`);
-  doSql(logger, db, `DROP TABLE IF EXISTS alternatenames`, `CREATE TABLE alternatenames (
+      WHERE key = 'US.DC';`,
+  );
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS alternatenames`,
+
+      `CREATE TABLE alternatenames (
     id int PRIMARY KEY,
     geonameid int NOT NULL,
     isolanguage varchar(7),
@@ -619,8 +663,10 @@ async function buildGeonamesSqlite(opts) {
     isHistoric tinyint,
     periodFrom NULL,
     periodTo NULL
-    );`);
-  await doFile(logger, db, ILalternate, 'alternatenames', 10, a => {
+    );`,
+  );
+
+  await doFile(logger, db, ILalternate, 'alternatenames', 10, (a) => {
     const firstchar = a[3][0];
     if (a[2] === 'he' && (firstchar < '\u05D0' || firstchar > '\u05EA')) {
       a[2] = 'en';
@@ -648,16 +694,35 @@ async function buildGeonamesSqlite(opts) {
   });
 
   // remove duplicates from alternatenames
-  doSql(logger, db, `DROP TABLE IF EXISTS altnames`, `CREATE TABLE altnames
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS altnames`,
+
+      `CREATE TABLE altnames
     AS SELECT geonameid, isolanguage, name
     FROM alternatenames
     GROUP BY 1, 2, 3
-    `);
-  doSql(logger, db, `update admin1 set name='',asciiname='' where key like 'PS.%';`, `update country set country = '' where iso = 'PS';`, `delete from geoname where geonameid = 7303419;`);
-  doSql(logger, db, `DROP TABLE IF EXISTS geoname_fulltext`, `CREATE VIRTUAL TABLE geoname_fulltext
+    `,
+  );
+
+  doSql(logger, db,
+      `update admin1 set name='',asciiname='' where key like 'PS.%';`,
+      `update country set country = '' where iso = 'PS';`,
+      `delete from geoname where geonameid = 7303419;`,
+  );
+
+  doSql(logger, db,
+      `DROP TABLE IF EXISTS geoname_fulltext`,
+
+      `CREATE VIRTUAL TABLE geoname_fulltext
       USING fts5(geonameid UNINDEXED, longname, population, city, admin1, country);
-    `, `DROP TABLE IF EXISTS geoname_non_ascii`, `CREATE TABLE geoname_non_ascii AS
-      SELECT geonameid FROM geoname WHERE asciiname <> name`, `INSERT INTO geoname_fulltext
+    `,
+
+      `DROP TABLE IF EXISTS geoname_non_ascii`,
+
+      `CREATE TABLE geoname_non_ascii AS
+      SELECT geonameid FROM geoname WHERE asciiname <> name`,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', '||c.Country,
       g.population,
@@ -668,7 +733,9 @@ async function buildGeonamesSqlite(opts) {
       AND g.country <> 'IL'
       AND g.country <> 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', USA',
       g.population,
@@ -676,7 +743,9 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'US'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||a.asciiname||', UK',
       g.population,
@@ -684,14 +753,18 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, admin1 a
       WHERE g.country = 'GB'
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', Israel',
       g.population,
       g.asciiname,NULL,'Israel'
       FROM geoname g
       WHERE g.country = 'IL'
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.asciiname||', '||c.Country,
       g.population,
@@ -699,7 +772,9 @@ async function buildGeonamesSqlite(opts) {
       FROM geoname g, country c
       WHERE g.country = c.ISO
       AND (g.admin1 = '' OR g.admin1 = '00')
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       g.name||', '||a.name||', '||c.Country,
       g.population,
@@ -708,7 +783,9 @@ async function buildGeonamesSqlite(opts) {
       WHERE gna.geonameid = g.geonameid
       AND g.country = c.ISO
       AND g.country||'.'||g.admin1 = a.key
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', ישראל',
       g.population,
@@ -717,7 +794,9 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'he'
       AND g.geonameid = alt.geonameid
-      `, `INSERT INTO geoname_fulltext
+      `,
+
+      `INSERT INTO geoname_fulltext
       SELECT g.geonameid,
       alt.name||', Israel',
       g.population,
@@ -726,7 +805,11 @@ async function buildGeonamesSqlite(opts) {
       WHERE g.country = 'IL'
       AND alt.isolanguage = 'en'
       AND g.geonameid = alt.geonameid
-      `, 'VACUUM');
+      `,
+
+      'VACUUM',
+  );
+
   return new Promise((resolve, reject) => {
     try {
       logger.info(`Closing ${dbFilename}`);
@@ -774,11 +857,11 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
     try {
       const rl = readline.createInterface({
         input: fs.createReadStream(infile),
-        crlfDelay: Infinity
+        crlfDelay: Infinity,
       });
       let num = 0;
       let accepted = 0;
-      rl.on('line', line => {
+      rl.on('line', (line) => {
         num++;
         if (line[0] == '#') {
           return;
@@ -797,11 +880,13 @@ async function doFile(logger, db, infile, tableName, expectedFields, callback) {
         stmt.run(a);
         accepted++;
       });
+
       rl.on('close', () => {
         logger.info(`Inserted ${accepted} / ${num} into ${tableName} from ${infile}`);
         stmt = null;
         db.exec('COMMIT');
       });
+
       return resolve(events.once(rl, 'close'));
     } catch (err) {
       logger.error(err);

package/package.json

@@ -1,13 +1,19 @@
 {
   "name": "@hebcal/geo-sqlite",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal"
   ],
   "description": "Hebcal ES6 interface to GeoNames and USA ZIP code SQLite databases",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
+  "type": "module",
+  "exports": {
+    "import": "./dist/index.mjs",
+    "require": "./dist/index.cjs",
+    "types": "./geo-sqlite.d.ts"
+  },
   "bin": {
     "build-geonames-sqlite": "bin/build-geonames-sqlite",
     "download-and-make-dbs": "bin/download-and-make-dbs"
@@ -20,6 +26,9 @@
     "url": "https://github.com/hebcal/hebcal-geo-sqlite/issues"
   },
   "typings": "geo-sqlite.d.ts",
+  "engines": {
+    "node": ">= 20.0.0"
+  },
   "files": [
     "dist",
     "bin",
@@ -28,11 +37,11 @@
     "geo-sqlite.d.ts"
   ],
   "dependencies": {
-    "@hebcal/cities": "^5.0.0",
-    "@hebcal/core": "^5.0.0-rc2",
-    "better-sqlite3": "^9.1.1",
-    "pino": "^8.16.2",
-    "pino-pretty": "^10.2.3",
+    "@hebcal/cities": "^5.0.1",
+    "@hebcal/core": "^5.0.7",
+    "better-sqlite3": "^9.2.2",
+    "pino": "^8.17.2",
+    "pino-pretty": "^10.3.1",
     "transliteration": "^2.3.5"
   },
   "scripts": {
@@ -41,25 +50,16 @@
     "readme": "npx jsdoc2md dist/index.js",
     "test": "ava"
   },
-  "ava": {
-    "require": [
-      "@babel/register"
-    ]
-  },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "@babel/register": "^7.22.15",
-    "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "ava": "^5.3.1",
-    "eslint": "^8.54.0",
+    "ava": "^6.0.1",
+    "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "rollup": "^4.5.1"
+    "rollup": "^4.9.4"
   }
 }