@ca-plant-list/ca-plant-list 0.2.12 → 0.2.13

package/lib/config.js

@@ -4,18 +4,15 @@ import { Files } from "./files.js";
 
 class Config {
 
-    static #config = {};
     static #packageDir = path.dirname( path.dirname( url.fileURLToPath( import.meta.url ) ) );
 
-    static {
-        try {
-            this.#config = JSON.parse( Files.read( "./data/config.json" ) );
-        } catch ( e ) {
-            console.log( e );
-        }
+    #config = {};
+
+    constructor( dataDir ) {
+        this.#config = JSON.parse( Files.read( dataDir + "/config.json" ) );
     }
 
-    static getConfigValue( prefix, name, subcat, dflt ) {
+    getConfigValue( prefix, name, subcat, dflt ) {
         const obj = this.#config[ prefix ];
         if ( obj ) {
             if ( Object.hasOwn( obj, name ) ) {
@@ -34,11 +31,11 @@ class Config {
         return dflt;
     }
 
-    static getCountyCodes() {
+    getCountyCodes() {
         return this.#config[ "counties" ];
     }
 
-    static getLabel( name, dflt ) {
+    getLabel( name, dflt ) {
         return this.getConfigValue( "labels", name, undefined, dflt );
     }
 

package/lib/index.d.ts

@@ -3,12 +3,13 @@ export class BasePageRenderer {
     static renderTools(outputDir: any, taxa: any): void;
 }
 export class Config {
-    static "__#1@#config": {};
     static "__#1@#packageDir": string;
-    static getConfigValue(prefix: any, name: any, subcat: any, dflt: any): any;
-    static getCountyCodes(): any;
-    static getLabel(name: any, dflt: any): any;
     static getPackageDir(): string;
+    constructor(dataDir: any);
+    getConfigValue(prefix: any, name: any, subcat: any, dflt: any): any;
+    getCountyCodes(): any;
+    getLabel(name: any, dflt: any): any;
+    #private;
 }
 export class CSV {
     static getMap(dir: any, fileName: any): {};
@@ -256,7 +257,7 @@ export class Taxon {
     getRPIRankAndThreatTooltip(): string;
     getRPITaxonLink(): string;
     getStatus(): any;
-    getStatusDescription(): any;
+    getStatusDescription(config: any): any;
     getSynonyms(): any[];
     isCANative(): boolean;
     /**

package/lib/pagerenderer.js

@@ -1,7 +1,6 @@
 import { Files, HTML } from "@ca-plant-list/ca-plant-list";
 import { Taxa, TAXA_LIST_COLS } from "./taxa.js";
 import { PageTaxon } from "./web/pagetaxon.js";
-import { Config } from "./config.js";
 import { RarePlants } from "./rareplants.js";
 import { BasePageRenderer } from "./basepagerenderer.js";
 import { GenericPage } from "./genericpage.js";
@@ -11,20 +10,20 @@ const RPI_COLUMNS = [ TAXA_LIST_COLS.SPECIES_BARE, TAXA_LIST_COLS.COMMON_NAME, T
 
 class PageRenderer extends BasePageRenderer {
 
-    static render( outputDir, taxa ) {
+    static render( outputDir, config, taxa ) {
 
         super.render( outputDir, taxa );
 
-        this.renderLists( outputDir, taxa );
+        this.renderLists( outputDir, config, taxa );
 
         const taxonList = taxa.getTaxa();
         for ( const taxon of taxonList ) {
-            new PageTaxon( outputDir, taxon ).render();
+            new PageTaxon( outputDir, config, taxon ).render();
         }
 
     }
 
-    static renderLists( outputDir, taxa ) {
+    static renderLists( outputDir, config, taxa ) {
 
         function getListArray( listInfo, attributes = {}, columns ) {
 
@@ -76,8 +75,8 @@ class PageRenderer extends BasePageRenderer {
             {
                 title: "All Species",
                 listInfo: [
-                    { name: Config.getLabel( "native", "Native" ), filename: "list_native", include: ( t ) => t.isNative() },
-                    { name: Config.getLabel( "introduced", "Introduced" ), filename: "list_introduced", include: ( t ) => !t.isNative() },
+                    { name: config.getLabel( "native", "Native" ), filename: "list_native", include: ( t ) => t.isNative() },
+                    { name: config.getLabel( "introduced", "Introduced" ), filename: "list_introduced", include: ( t ) => !t.isNative() },
                     { name: "All Plants", filename: "list_all", include: () => true },
                 ]
             },

package/lib/taxon.js

@@ -1,4 +1,3 @@
-import { Config } from "./config.js";
 import { Genera } from "./genera.js";
 import { HTML } from "./html.js";
 import { RarePlants } from "./rareplants.js";
@@ -224,12 +223,12 @@ class Taxon {
         return this.#status;
     }
 
-    getStatusDescription() {
+    getStatusDescription( config ) {
         switch ( this.#status ) {
             case "N":
                 return "Native";
             case "NC":
-                return Config.getLabel( "status-NC", "Introduced" );
+                return config.getLabel( "status-NC", "Introduced" );
             case "X":
                 return "Introduced";
         }

package/lib/web/pagetaxon.js

@@ -1,6 +1,5 @@
 import { HTML } from "@ca-plant-list/ca-plant-list";
 import { Jepson } from "../jepson.js";
-import { Config } from "../config.js";
 import { RarePlants } from "../rareplants.js";
 import { GenericPage } from "../genericpage.js";
 import { ExternalSites } from "../externalsites.js";
@@ -8,10 +7,12 @@ import { DateUtils } from "../dateutils.js";
 
 class PageTaxon extends GenericPage {
 
+    #config;
     #taxon;
 
-    constructor( outputDir, taxon ) {
+    constructor( outputDir, config, taxon ) {
         super( outputDir, taxon.getName(), taxon.getBaseFileName() );
+        this.#config = config;
         this.#taxon = taxon;
     }
 
@@ -73,7 +74,7 @@ class PageTaxon extends GenericPage {
         links.push(
             HTML.getLink(
                 "https://www.calflora.org/entry/observ.html?track=m#srch=t&grezc=5&cols=b&lpcli=t&cc="
-                + Config.getCountyCodes().join( "!" ) + "&incobs=f&taxon="
+                + this.#config.getCountyCodes().join( "!" ) + "&incobs=f&taxon="
                 + this.#taxon.getCalfloraName().replaceAll( " ", "+" ),
                 "Calflora",
                 {},
@@ -86,7 +87,7 @@ class PageTaxon extends GenericPage {
                 HTML.getLink(
                     ExternalSites.getInatObsLink(
                         {
-                            project_id: Config.getConfigValue( "inat", "project_id" ),
+                            project_id: this.#config.getConfigValue( "inat", "project_id" ),
                             subview: "map",
                             taxon_id: iNatID
                         }
@@ -163,7 +164,7 @@ class PageTaxon extends GenericPage {
             html += HTML.textElement( "div", cn.join( ", " ), { class: "section common-names" } );
         }
 
-        html += HTML.textElement( "div", this.#taxon.getStatusDescription(), { class: "section native-status" } );
+        html += HTML.textElement( "div", this.#taxon.getStatusDescription( this.#config ), { class: "section native-status" } );
 
         const family = this.#taxon.getFamily();
         html += HTML.wrap(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.2.12",
+    "version": "0.2.13",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {

package/scripts/build-site.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { Config } from "../lib/config.js";
 import { DataLoader } from "../lib/dataloader.js";
 import { ErrorLog } from "../lib/errorlog.js";
 import { PageRenderer } from "../lib/pagerenderer.js";
@@ -9,6 +10,6 @@ const options = commandLineArgs( DataLoader.getOptionDefs() );
 
 const OUTPUT_DIR = "./output";
 
-PageRenderer.render( OUTPUT_DIR, DataLoader.load( options ) );
+PageRenderer.render( OUTPUT_DIR, new Config( options.datadir ), DataLoader.load( options ) );
 
 ErrorLog.write( OUTPUT_DIR + "/errors.tsv" );