@ca-plant-list/ca-plant-list 0.1.14 → 0.1.15

package/jekyll/assets/css/main.css

@@ -1,7 +1,10 @@
 /* Defaults */
 
 :root {
-    --bs-body-bg: #ECF87F;
+    /* See https://visme.co/blog/website-color-schemes/ theme 4 */
+    --bs-body-bg: #5cdb95;
+    --bs-link-color: #05386b;
+    --pl-navbar-bg: #379683;
 }
 
 .navbar-nav {
@@ -14,7 +17,7 @@
     --bs-navbar-brand-hover-color: rgba(255, 255, 255, .5);
     --bs-navbar-brand-color: white;
     --bs-navbar-nav-link-padding-x: 1rem;
-    background-color: #3D550C;
+    background-color: var(--pl-navbar-bg);
 }
 
 span.label {

package/lib/dataloader.js

@@ -1,7 +1,5 @@
 import { Taxa } from "./taxa.js";
-import { Genera } from "./genera.js";
 import { Families } from "./families.js";
-import { Config } from "./config.js";
 import { Exceptions } from "./exceptions.js";
 
 const OPTION_DEFS = [
@@ -15,12 +13,8 @@ class DataLoader {
     }
 
     static init( taxaDir ) {
-
-        const defaultDataDir = Config.getPackageDir() + "/data";
-
         Exceptions.init( taxaDir );
-        Families.init( defaultDataDir );
-        Genera.init( defaultDataDir );
+        Families.init();
     }
 
     static load( options ) {

package/lib/families.js

@@ -3,6 +3,8 @@ import { HTML } from "./html.js";
 import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
 import { Files } from "./files.js";
+import { Config } from "./config.js";
+import { Genera } from "./genera.js";
 
 class Families {
 
@@ -12,11 +14,17 @@ class Families {
         return this.#families[ familyName ];
     }
 
-    static init( dataDir ) {
+    static init() {
+
+        const dataDir = Config.getPackageDir() + "/data";
+
         this.#families = JSON.parse( Files.read( dataDir + "/families.json" ) );
         for ( const [ k, v ] of Object.entries( this.#families ) ) {
             this.#families[ k ] = new Family( k, { id: v } );
         }
+
+        Genera.init( dataDir );
+
     }
 
     static renderPages( outputDir, columns ) {

package/lib/files.js

@@ -23,28 +23,23 @@ class Files {
     }
 
     /**
-     * Retrieve data from a URL and write it to a file.
+     * Retrieve data from a URL and write it to a file. If the response status is anything other than 200, an Error is thrown.
      * @param {string|URL} url 
      * @param {string|undefined} targetFileName If targetFileName is undefined, the data will be retrieved but not written to a file.
      * @param {Object} [headers={}] Request Headers.
+     * @returns {Headers} The Response headers.
      */
     static async fetch( url, targetFileName, headers = {} ) {
         const response = await fetch( url, headers );
+        if ( response.status !== 200 ) {
+            throw new Error( response.status + " retrieving " + url );
+        }
         const data = await response.blob();
         const arrayBuffer = await data.arrayBuffer();
         const buffer = Buffer.from( arrayBuffer );
         if ( targetFileName ) {
             fs.writeFileSync( targetFileName, buffer );
         }
-    }
-
-    /**
-     * Retrieve data from a URL and return the Response Header.
-     * @param {string|URL} url 
-     * @returns {Headers}
-     */
-    static async fetchHeaders( url ) {
-        const response = await fetch( url );
         return response.headers;
     }
 

package/lib/genera.js

@@ -1,5 +1,5 @@
-import * as fs from "node:fs";
 import { Families } from "./families.js";
+import { Files } from "./files.js";
 
 class Genera {
 
@@ -39,7 +39,7 @@ class Genera {
     }
 
     static init( dataDir ) {
-        this.#genera = JSON.parse( fs.readFileSync( dataDir + "/genera.json" ) );
+        this.#genera = JSON.parse( Files.read( dataDir + "/genera.json" ) );
     }
 
 }

package/lib/genericpage.js

@@ -14,6 +14,10 @@ class GenericPage {
         this.#js = js;
     }
 
+    getBaseFileName() {
+        return this.#baseFileName;
+    }
+
     getDefaultIntro() {
         let html = this.#getFrontMatter();
         html += HTML.textElement( "h1", this.#title );

package/lib/index.d.ts

@@ -3,18 +3,13 @@ export class Files {
     static createFileFromStream(fileName: any, inStream: any): Promise<any>;
     static exists(path: any): boolean;
     /**
-     * Retrieve data from a URL and write it to a file.
+     * Retrieve data from a URL and write it to a file. If the response status is anything other than 200, an Error is thrown.
      * @param {string|URL} url
      * @param {string|undefined} targetFileName If targetFileName is undefined, the data will be retrieved but not written to a file.
      * @param {Object} [headers={}] Request Headers.
+     * @returns {Headers} The Response headers.
      */
-    static fetch(url: string | URL, targetFileName: string | undefined, headers?: any): Promise<void>;
-    /**
-     * Retrieve data from a URL and return the Response Header.
-     * @param {string|URL} url
-     * @returns {Headers}
-     */
-    static fetchHeaders(url: string | URL): Headers;
+    static fetch(url: string | URL, targetFileName: string | undefined, headers?: any): Headers;
     static mkdir(path: any): void;
     static read(path: any): string;
     static rmDir(dir: any): void;

package/lib/pagerenderer.js

@@ -1,11 +1,11 @@
 import { HTML } from "./html.js";
 import { Taxa, TAXA_LIST_COLS } from "./taxa.js";
-import { HTMLPage } from "./htmlpage.js";
 import { PageTaxon } from "./pagetaxon.js";
 import { Config } from "./config.js";
 import { RarePlants } from "./rareplants.js";
 import { BasePageRenderer } from "./basepagerenderer.js";
 import { Files } from "./files.js";
+import { GenericPage } from "./genericpage.js";
 
 const RPI_CESA = [ TAXA_LIST_COLS.SPECIES, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CESA ];
 const RPI_COLUMNS = [ TAXA_LIST_COLS.SPECIES_BARE, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CNPS_RANK ];
@@ -50,7 +50,7 @@ class PageRenderer extends BasePageRenderer {
                 Files.write( outputDir + "/inat_" + list.filename + ".txt", iNatTaxa.join( "\n" ) );
 
                 const cols = columns ? columns : list.columns;
-                new PageTaxonList().render( outputDir, taxa, list.filename, list.name, cols );
+                new PageTaxonList( outputDir, list.name, list.filename ).render( taxa, cols );
 
                 // Check for sublists.
                 const subListHTML = list.listInfo ? getListArray( list.listInfo, { class: "indent" }, cols ) : "";
@@ -128,28 +128,6 @@ class PageRenderer extends BasePageRenderer {
                         filename: "list_cesa",
                         include: ( t ) => t.getCESA() !== undefined,
                         columns: RPI_CESA,
-                        listInfo: [
-                            {
-                                name: RarePlants.getCESADescription( "CE" ),
-                                filename: "list_rpi_ce",
-                                include: ( t ) => t.getCESA() === "CE",
-                            },
-                            {
-                                name: RarePlants.getCESADescription( "CT" ),
-                                filename: "list_rpi_ct",
-                                include: ( t ) => t.getCESA() === "CT",
-                            },
-                            {
-                                name: RarePlants.getCESADescription( "CR" ),
-                                filename: "list_rpi_cr",
-                                include: ( t ) => t.getCESA() === "CR",
-                            },
-                            {
-                                name: RarePlants.getCESADescription( "CC" ),
-                                filename: "list_rpi_cc",
-                                include: ( t ) => t.getCESA() === "CC",
-                            },
-                        ]
                     },
                 ]
             },
@@ -176,13 +154,15 @@ class PageRenderer extends BasePageRenderer {
 
 }
 
-class PageTaxonList extends HTMLPage {
+class PageTaxonList extends GenericPage {
 
-    render( outputDir, taxa, baseName, title, columns ) {
+    constructor( outputDir, title, baseName ) {
+        super( outputDir, title, baseName );
+    }
 
-        let html = this.getFrontMatter( title );
+    render( taxa, columns ) {
 
-        html += HTML.textElement( "h1", title );
+        let html = this.getDefaultIntro();
 
         html += "<div class=\"wrapper\">";
 
@@ -193,14 +173,14 @@ class PageTaxonList extends HTMLPage {
         html += "<div class=\"section\">";
         html += HTML.textElement( "h2", "Download" );
         html += "<ul>";
-        html += "<li>" + HTML.getLink( "./calflora_" + baseName + ".txt", "Calflora List" ) + "</li>";
-        html += "<li>" + HTML.getLink( "./inat_" + baseName + ".txt", "iNaturalist List" ) + "</li>";
+        html += "<li>" + HTML.getLink( "./calflora_" + this.getBaseFileName() + ".txt", "Calflora List" ) + "</li>";
+        html += "<li>" + HTML.getLink( "./inat_" + this.getBaseFileName() + ".txt", "iNaturalist List" ) + "</li>";
         html += "</ul>";
         html += "</div>";
 
         html += "</div>";
 
-        this.writeFile( outputDir, baseName + ".html", html );
+        this.writeFile( html );
 
     }
 }

package/lib/taxa.js

@@ -3,6 +3,7 @@ import { ErrorLog } from "./errorlog.js";
 import { HTML } from "./html.js";
 import { CSV } from "./csv.js";
 import { RarePlants } from "./rareplants.js";
+import { Exceptions } from "./exceptions.js";
 
 const TAXA_LIST_COLS = {
     CESA: {
@@ -95,7 +96,7 @@ class Taxa {
                         row[ "CRPR" ],
                         row[ "CESA" ]
                     );
-                    if ( !jepsonID ) {
+                    if ( !jepsonID && !Exceptions.hasException( name, "jepson", "badjepsonid" ) ) {
                         ErrorLog.log( name, "has no Jepson ID" );
                     }
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.1.14",
+    "version": "0.1.15",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -11,6 +11,7 @@
     "type": "module",
     "exports": {
         ".": "./lib/index.js",
+        "./Families": "./lib/families.js",
         "./Files": "./lib/files.js",
         "./HTML": "./lib/html.js",
         "./Jekyll": "./lib/jekyll.js"
@@ -21,6 +22,7 @@
     },
     "dependencies": {
         "command-line-args": "^5.2.1",
+        "command-line-usage": "^6.1.3",
         "csv-parse": "^5.3.1",
         "unzipper": "^0.10.11"
     },