Updating the dist and cleanup scripts

Author: bhousel

.gitignore

@@ -1,8 +1,5 @@
 coverage/
-dist/javascript/
-dist/js/
-dist/json/
-dist/ts/
+dist/
 node_modules/
 
 .DS_Store

RELEASE.md

@@ -5,14 +5,14 @@
 ```bash
 git checkout main
 git pull origin
-npm install
-npm run build
-npm run wikidata
-npm run dist      # version number updates automatically and will print to console
+bun install
+bun run build
+bun run wikidata
+bun run dist      # version number updates automatically and will print to console
 git add . && git commit -m 'vA.B.C'
 git tag vA.B.C
 git push origin main vA.B.C
-npm publish
+bun publish
 ```
 
 ### Purge JSDelivr CDN cache

package.json

@@ -94,9 +94,7 @@
     "build:json": "bun ./scripts/build_json.ts",
     "build:ts": "tsc",
     "clean": "bun ./scripts/clean.ts",
-    "dist": "run-s dist:version dist:files",
-    "dist:files": "bun ./scripts/dist_files.js",
-    "dist:version": "bun ./scripts/dist_version.js",
+    "dist": "bun ./scripts/dist.ts",
     "lint": "eslint ./test/*.js",
     "prepublishOnly": "bun ./scripts/prepublish.ts",
     "postpublish": "bun ./scripts/postpublish.ts",

scripts/build_json.ts

@@ -1,4 +1,4 @@
-// External
+import { $ } from 'bun';
 //import geojsonArea from '@mapbox/geojson-area';
 //import geojsonBounds from 'geojson-bounds';
 import geojsonPrecision from 'geojson-precision';
@@ -14,15 +14,13 @@ import { styleText } from 'bun:util';
 import { Validator } from 'jsonschema';
 const withLocale = localeCompare('en-US');
 
-// Internal
 import { fileTree } from '../lib/file_tree.ts';
 import { idgen } from '../lib/idgen.ts';
 import { Matcher } from '../lib/matcher.ts';
 import { simplify } from '../lib/simplify.ts';
 import { sortObject } from '../lib/sort_object.ts';
 import { stemmer } from '../lib/stemmer.ts';
 import { validate } from '../lib/validate.ts';
-import { writeFileWithMeta } from '../lib/write_file_with_meta.ts';
 const matcher = new Matcher();
 
 // JSON
@@ -37,8 +35,10 @@ const _discard = {};
 const _keep = {};
 let _loco = null;
 
-await buildAll();
+$.nothrow();  // If a shell command returns nonzero, keep going.
+
 
+await buildAll();
 
 async function buildAll() {
   // GeoJSON features
@@ -88,10 +88,13 @@ async function buildFeatureCollection() {
   console.log(START);
   console.time(END);
 
+  // Start fresh
+  await $`rm -f ./dist/json/featureCollection.*`;
+
   const features = await loadFeatures();
   const featureCollection = { type: 'FeatureCollection', features: features };
   const stringified = stringify(featureCollection, { maxLength: 9999 }) + '\n';
-  await writeFileWithMeta('./dist/json/featureCollection.json', stringified);
+  await Bun.write('./dist/json/featureCollection.json', stringified);
 
   console.timeEnd(END);
   return featureCollection;
@@ -352,7 +355,9 @@ async function filterCollected() {
   const END = '👍  ' + styleText('green', `done filtering`);
   console.log(START);
   console.time(END);
-  let shownSparkle = false;
+
+  // Start fresh
+  await $`rm -rf ./dist/json/filtered`;
 
   // Before starting, cache genericWords regexes.
   let genericRegex = _config.genericWords.map(s => new RegExp(s, 'i'));
@@ -364,15 +369,6 @@ async function filterCollected() {
 
     let discard = _discard[t] = {};
     let keep = _keep[t] = {};
-//    let data;
-//
-//    try {  // Load existing "keep" file
-//      data = await Bun.file(`dist/filtered/${t}_keep.json`).json();
-//      lastCollectionDate = +(data._meta.collectionDate) || -1;
-//      keep = _keep[t] = data.keep;
-//    } catch (err) {
-//      /* ignore - we can overwrite the keep file */
-//    }
 
     //
     // STEP 1:  All the collected "names" from OSM start out in `discard`
@@ -414,8 +410,8 @@ async function filterCollected() {
     const keepCount = Object.keys(keep).length;
     console.log(`${tree.emoji}  ${t}:\t${keepCount} keep, ${discardCount} discard`);
 
-    await writeFileWithMeta(`dist/json/filtered/${t}_discard.json`, stringify({ discard: sortObject(discard) }) + '\n');
-    await writeFileWithMeta(`dist/json/filtered/${t}_keep.json`, stringify({ keep: sortObject(keep) }) + '\n');
+    await Bun.write(`./dist/json/filtered/${t}_discard.json`, stringify({ discard: sortObject(discard) }) + '\n');
+    await Bun.write(`./dist/json/filtered/${t}_keep.json`, stringify({ keep: sortObject(keep) }) + '\n');
   }
 
   console.timeEnd(END);

scripts/clean.ts

@@ -1,5 +1,7 @@
 import { $, Glob } from 'bun';
 
+$.nothrow();  // If a shell command returns nonzero, keep going.
+
 // Remove these files if found anywhere
 const files = [
   '.DS_Store',
@@ -17,11 +19,13 @@ for (const f of files) {
 }
 
 // Remove these specific folders
+// (Because some of the files in ./dist/json take a while to generate,
+//  each script will be responsible for removing them)
 const folders = [
   './coverage',
   './dist/javascript',
   './dist/js',
-  './dist/json',
+//  './dist/json',
   './dist/ts'
 ];
 for (const f of folders) {