@ca-plant-list/ca-plant-list 0.2.17 → 0.2.18

package/lib/commandandtaxaprocessor.js

@@ -1,35 +1,20 @@
 import { CommandProcessor } from "./commandprocessor.js";
 import { TaxaProcessor } from "./taxaprocessor.js";
 
-class GenericTaxaProcessor extends TaxaProcessor {
-
-    #fnCustomProcess;
-
-    constructor( fnCustomProcess, options, taxaLoaderClass ) {
-        super( options, taxaLoaderClass );
-        this.#fnCustomProcess = fnCustomProcess;
-    }
-
-    async customProcess() {
-        await this.#fnCustomProcess( this );
-    }
-
-}
-
 class CommandAndTaxaProcessor extends CommandProcessor {
 
     #taxaProcessor;
 
-    constructor( commandName, commandDesc, fnCustomProcess, optionDefs = [], optionHelp = [], commandHelp = [], taxaLoaderClass ) {
+    constructor( commandName, commandDesc, optionDefs = [], optionHelp = [], commandHelp = [], taxaLoaderClass ) {
         super( commandName, commandDesc, optionDefs, optionHelp, commandHelp );
-        this.#taxaProcessor = new GenericTaxaProcessor( fnCustomProcess, this.getOptions(), taxaLoaderClass );
+        this.#taxaProcessor = new TaxaProcessor( this.getOptions(), taxaLoaderClass );
     }
 
-    async process() {
+    async process( commandRunner ) {
         if ( this.helpShown() ) {
             return;
         }
-        await this.#taxaProcessor.process();
+        await this.#taxaProcessor.process( commandRunner );
     }
 
 }

package/lib/index.d.ts

@@ -3,8 +3,8 @@ export class BasePageRenderer {
     static renderTools(outputDir: any, taxa: any): void;
 }
 export class CommandAndTaxaProcessor extends CommandProcessor {
-    constructor(commandName: any, commandDesc: any, fnCustomProcess: any, optionDefs: any[], optionHelp: any[], commandHelp: any[], taxaLoaderClass: any);
-    process(): Promise<void>;
+    constructor(commandName: any, commandDesc: any, optionDefs: any[], optionHelp: any[], commandHelp: any[], taxaLoaderClass: any);
+    process(commandRunner: any): Promise<void>;
     #private;
 }
 import { CommandProcessor } from "./commandprocessor.js";
@@ -156,6 +156,7 @@ export class HTML {
     static wrap(elName: any, text: any, attributes?: {}): string;
 }
 import { BasePageRenderer } from "./basepagerenderer.js";
+import { CommandProcessor } from "./commandprocessor.js";
 import { CommandAndTaxaProcessor } from "./commandandtaxaprocessor.js";
 import { Config } from "./config.js";
 import { CSV } from "./csv.js";
@@ -168,9 +169,11 @@ import { HTML } from "./html.js";
 import { Jekyll } from "./jekyll.js";
 import { PlantBook } from "./ebook/plantbook.js";
 import { Taxa } from "./taxa.js";
+import { TaxaLoader } from "./taxaloader.js";
+import { TaxaProcessor } from "./taxaprocessor.js";
 import { TAXA_COLNAMES } from "./taxon.js";
 import { Taxon } from "./taxon.js";
-export { BasePageRenderer, CommandAndTaxaProcessor, Config, CSV, ErrorLog, Exceptions, Families, Files, GenericTaxaLoader, HTML, Jekyll, PlantBook, Taxa, TAXA_COLNAMES, Taxon };
+export { BasePageRenderer, CommandProcessor, CommandAndTaxaProcessor, Config, CSV, ErrorLog, Exceptions, Families, Files, GenericTaxaLoader, HTML, Jekyll, PlantBook, Taxa, TaxaLoader, TaxaProcessor, TAXA_COLNAMES, Taxon };
 export class Jekyll {
     static getFrontMatter(atts: any): string;
     static hasInclude(baseDir: any, path: any): boolean;
@@ -247,11 +250,10 @@ import { GenericTaxaLoader } from "./generictaxaloader.js";
 import { Taxa } from "./taxa.js";
 export class TaxaProcessor {
     constructor(options: any, taxaLoaderClass?: typeof TaxaLoader);
-    customProcess(): Promise<void>;
     getErrorLog(): any;
     getOptions(): any;
     getTaxa(): any;
-    process(): Promise<void>;
+    process(commandRunner: any): Promise<void>;
     #private;
 }
 import { TaxaLoader } from "./taxaloader.js";

package/lib/index.js

@@ -1,4 +1,5 @@
 import { BasePageRenderer } from "./basepagerenderer.js";
+import { CommandProcessor } from "./commandprocessor.js";
 import { CommandAndTaxaProcessor } from "./commandandtaxaprocessor.js";
 import { Config } from "./config.js";
 import { CSV } from "./csv.js";
@@ -11,6 +12,11 @@ import { HTML } from "./html.js";
 import { Jekyll } from "./jekyll.js";
 import { PlantBook } from "./ebook/plantbook.js";
 import { Taxa } from "./taxa.js";
+import { TaxaLoader } from "./taxaloader.js";
+import { TaxaProcessor } from "./taxaprocessor.js";
 import { Taxon, TAXA_COLNAMES } from "./taxon.js";
 
-export { BasePageRenderer, CommandAndTaxaProcessor, Config, CSV, ErrorLog, Exceptions, Families, Files, GenericTaxaLoader, HTML, Jekyll, PlantBook, Taxa, TAXA_COLNAMES, Taxon };
+export {
+    BasePageRenderer, CommandProcessor, CommandAndTaxaProcessor, Config, CSV, ErrorLog, Exceptions, Families, Files,
+    GenericTaxaLoader, HTML, Jekyll, PlantBook, Taxa, TaxaLoader, TaxaProcessor, TAXA_COLNAMES, Taxon
+};

package/lib/taxaprocessor.js

@@ -11,10 +11,6 @@ class TaxaProcessor {
         this.#taxaLoaderClass = taxaLoaderClass;
     }
 
-    async customProcess() {
-        throw new Error( "must be implemented by subclass" );
-    }
-
     getErrorLog() {
         return this.#taxaLoader.getErrorLog();
     }
@@ -27,11 +23,11 @@ class TaxaProcessor {
         return this.#taxaLoader.getTaxa();
     }
 
-    async process() {
+    async process( commandRunner ) {
         console.log( "loading data" );
         this.#taxaLoader = new this.#taxaLoaderClass( this.#options );
         await this.#taxaLoader.load();
-        await this.customProcess();
+        await commandRunner( this );
         this.#taxaLoader.writeErrorLog();
     }
 

package/package.json

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

package/scripts/build-ebook.js

@@ -29,14 +29,10 @@ class BookCommand extends CommandProcessor {
 
 }
 
-class BookGenerator extends TaxaProcessor {
-
-    async customProcess() {
-        const options = this.getOptions();
-        const ebook = new PlantBook( options.outputdir, new Config( options.datadir ), this.getTaxa() );
-        await ebook.create();
-    }
-
+async function commandRunner( tp ) {
+    const options = tp.getOptions();
+    const ebook = new PlantBook( options.outputdir, new Config( options.datadir ), tp.getTaxa() );
+    await ebook.create();
 }
 
 async function generateEBooks( options ) {
@@ -54,14 +50,14 @@ async function generateEBooks( options ) {
             if ( Files.isDir( path ) ) {
                 options.datadir = path;
                 options.outputdir = outputBase + suffix;
-                const gen = new BookGenerator( options );
-                await gen.process( options );
+                const gen = new TaxaProcessor( options );
+                await gen.process( commandRunner );
             }
         }
     } else {
         // Otherwise use the default directory.
-        const gen = new BookGenerator( options );
-        await gen.process( options );
+        const gen = new TaxaProcessor( options );
+        await gen.process( commandRunner );
     }
 
 }

package/scripts/build-site.js

@@ -52,4 +52,4 @@ async function generateSite( taxaProcessor ) {
 }
 
 const gen = new CommandAndTaxaProcessor( "ca-plant-list", "A tool to generate a website with local plant data.", generateSite );
-await gen.process();
+await gen.process( generateSite );

package/lib/dataloader.js

@@ -1,46 +0,0 @@
-import { CSV } from "./csv.js";
-import { Taxa } from "./taxa.js";
-import { Files } from "./files.js";
-import { ErrorLog } from "./errorlog.js";
-
-class DataLoader {
-
-    static #errorLog = new ErrorLog();
-
-    static getErrorLog() {
-        return DataLoader.#errorLog;
-    }
-
-    static load( options ) {
-
-        function getIncludeList( dataDir ) {
-            // Read inclusion list.
-            const includeFileName = "taxa_include.csv";
-            const includeFilePath = dataDir + "/" + includeFileName;
-            if ( !Files.exists( includeFilePath ) ) {
-                console.log( includeFilePath + " not found; loading all taxa" );
-                return true;
-            }
-            const includeCSV = CSV.parseFile( dataDir, includeFileName );
-            const include = {};
-            for ( const row of includeCSV ) {
-                include[ row[ "taxon_name" ] ] = row;
-            }
-            return include;
-        }
-
-        const showFlowerErrors = options[ "show-flower-errors" ];
-
-        console.log( "loading data" );
-
-        return new Taxa( getIncludeList( options.datadir ), this.getErrorLog(), showFlowerErrors );
-
-    }
-
-    static writeErrorLog() {
-        DataLoader.#errorLog.write();
-    }
-
-}
-
-export { DataLoader };