@ca-plant-list/ca-plant-list 0.3.6 → 0.3.7

package/lib/ebook/pages/taxonpage.js

@@ -1,13 +1,10 @@
 import imageSize from "image-size";
-import { Config, Files } from "@ca-plant-list/ca-plant-list";
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
 import { Markdown } from "../../markdown.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "../../taxon.js";
-// eslint-disable-next-line no-unused-vars
-import { Image } from "../image.js";
 import { HTMLTaxon } from "../../htmltaxon.js";
+import { Config } from "../../config.js";
+import { Files } from "../../files.js";
 
 class TaxonPage extends EBookPage {
     #outputDir;

package/lib/ebook/xhtml.js

@@ -1,7 +1,5 @@
-import { HTML } from "@ca-plant-list/ca-plant-list";
+import { HTML } from "../html.js";
 
-class XHTML extends HTML {
+class XHTML extends HTML {}
 
-}
-
-export { XHTML };
+export { XHTML };

package/lib/families.js

@@ -4,8 +4,6 @@ import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
 import { Files } from "./files.js";
 import { Config } from "./config.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "./index.js";
 
 class Family {
     #name;

package/lib/genera.js

@@ -1,14 +1,12 @@
 import { Config } from "./config.js";
-import { Families } from "./families.js";
 import { Files } from "./files.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "./taxon.js";
 
 class Genera {
     #families;
     #genera;
 
     /**
+     *
      * @param {Families} families
      */
     constructor(families) {

package/lib/genericpage.js

@@ -1,14 +1,16 @@
-import { Config, Files, HTML, Jekyll } from "@ca-plant-list/ca-plant-list";
+import { Config } from "./config.js";
+import { Files } from "./files.js";
+import { HTML } from "./html.js";
+import { Jekyll } from "./jekyll.js";
 import { Markdown } from "./markdown.js";
 
 class GenericPage {
-
     #outputDir;
     #title;
     #baseFileName;
     #js;
 
-    constructor( outputDir, title, baseFileName, js ) {
+    constructor(outputDir, title, baseFileName, js) {
         this.#outputDir = outputDir;
         this.#title = title;
         this.#baseFileName = baseFileName;
@@ -25,31 +27,38 @@ class GenericPage {
     }
 
     getFrontMatter() {
-        return "---\n"
-            + "title: \"" + this.#title + "\"\n"
-            + ( this.#js ? ( "js: " + this.#js + "\n" ) : "" )
-            + "---\n";
+        return (
+            "---\n" +
+            'title: "' +
+            this.#title +
+            '"\n' +
+            (this.#js ? "js: " + this.#js + "\n" : "") +
+            "---\n"
+        );
     }
 
     getMarkdown() {
         // Include site-specific markdown.
-        let html = this.#getMarkdown( "intros" );
+        let html = this.#getMarkdown("intros");
 
         // Include package markdown.
-        const mdPath = Config.getPackageDir() + "/data/text/" + this.#baseFileName + ".md";
-        if ( Files.exists( mdPath ) ) {
-            html += HTML.wrap( "div", Markdown.fileToHTML( mdPath ), { class: "section" } );
+        const mdPath =
+            Config.getPackageDir() + "/data/text/" + this.#baseFileName + ".md";
+        if (Files.exists(mdPath)) {
+            html += HTML.wrap("div", Markdown.fileToHTML(mdPath), {
+                class: "section",
+            });
         }
 
         return html;
     }
 
-    #getMarkdown( path ) {
+    #getMarkdown(path) {
         const textPath = path + "/" + this.#baseFileName + ".md";
-        if ( !Jekyll.hasInclude( this.#outputDir, textPath ) ) {
+        if (!Jekyll.hasInclude(this.#outputDir, textPath)) {
             return "";
         }
-        return HTML.wrap( "div", Jekyll.include( textPath ), { class: "section" } );
+        return HTML.wrap("div", Jekyll.include(textPath), { class: "section" });
     }
 
     getOutputDir() {
@@ -60,10 +69,9 @@ class GenericPage {
         return this.#title;
     }
 
-    writeFile( html ) {
-        Files.write( this.#outputDir + "/" + this.#baseFileName + ".html", html );
+    writeFile(html) {
+        Files.write(this.#outputDir + "/" + this.#baseFileName + ".html", html);
     }
-
 }
 
-export { GenericPage };
+export { GenericPage };

package/lib/generictaxaloader.js

@@ -1,4 +1,4 @@
-import { ErrorLog } from "./index.js";
+import { ErrorLog } from "./errorlog.js";
 
 class GenericTaxaLoader {
     #options;

package/lib/htmltaxon.js

@@ -1,10 +1,26 @@
 import { DateUtils } from "./dateutils.js";
 import { HTML } from "./html.js";
-// eslint-disable-next-line no-unused-vars
-import { Taxon } from "./taxon.js";
 import { TextUtils } from "./textutils.js";
 
 class HTMLTaxon {
+    /**
+     * @param {string[]} colors
+     */
+    static getFlowerColors(colors) {
+        let html = "";
+        if (colors) {
+            for (const color of colors) {
+                html += HTML.textElement("img", "", {
+                    src: "./i/f-" + color + ".svg",
+                    alt: color + " flowers",
+                    title: color,
+                    class: "flr-color",
+                });
+            }
+        }
+        return html;
+    }
+
     /**
      * @param {Taxon} taxon
      * @param {string} classNames
@@ -24,16 +40,7 @@ class HTMLTaxon {
 
         if (colors || monthStart) {
             let html = "Flowers: ";
-            if (colors) {
-                for (const color of colors) {
-                    html += HTML.textElement("img", "", {
-                        src: "./i/f-" + color + ".svg",
-                        alt: color + " flowers",
-                        title: color,
-                        class: "flr-color",
-                    });
-                }
-            }
+            html += this.getFlowerColors(colors);
             if (monthStart && monthEnd) {
                 html += HTML.wrap(
                     "span",
@@ -47,6 +54,16 @@ class HTMLTaxon {
         }
         return HTML.wrap("div", parts.join(""), { class: classNames });
     }
+
+    /**
+     * @param {Taxon} taxon
+     */
+    static getLink(taxon) {
+        return (
+            HTML.getLink(taxon.getFileName(), taxon.getName()) +
+            this.getFlowerColors(taxon.getFlowerColors())
+        );
+    }
 }
 
 export { HTMLTaxon };

package/lib/markdown.js

@@ -1,18 +1,16 @@
 import markdownIt from "markdown-it";
-import { Files } from "@ca-plant-list/ca-plant-list";
+import { Files } from "./files.js";
 
 class Markdown {
+    static #md = new markdownIt({ xhtmlOut: true });
 
-    static #md = new markdownIt( { xhtmlOut: true } );
-
-    static fileToHTML( filePath ) {
-        return this.strToHTML( Files.read( filePath ) );
+    static fileToHTML(filePath) {
+        return this.strToHTML(Files.read(filePath));
     }
 
-    static strToHTML( str ) {
-        return this.#md.render( str );
+    static strToHTML(str) {
+        return this.#md.render(str);
     }
-
 }
 
-export { Markdown };
+export { Markdown };

package/lib/pagerenderer.js

@@ -1,71 +1,93 @@
-import { Files, Taxa, HTML } from "@ca-plant-list/ca-plant-list";
-import { TAXA_LIST_COLS } from "./taxa.js";
+import { Taxa, TAXA_LIST_COLS } from "./taxa.js";
 import { PageTaxon } from "./web/pagetaxon.js";
 import { RarePlants } from "./rareplants.js";
 import { BasePageRenderer } from "./basepagerenderer.js";
 import { GenericPage } from "./genericpage.js";
-
-const ENDANGERED_COLS = [ TAXA_LIST_COLS.SPECIES, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CESA, TAXA_LIST_COLS.FESA ];
-const RPI_COLUMNS = [ TAXA_LIST_COLS.SPECIES_BARE, TAXA_LIST_COLS.COMMON_NAME, TAXA_LIST_COLS.CNPS_RANK ];
+import { Files } from "./files.js";
+import { HTML } from "./html.js";
+
+const ENDANGERED_COLS = [
+    TAXA_LIST_COLS.SPECIES,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CESA,
+    TAXA_LIST_COLS.FESA,
+];
+const RPI_COLUMNS = [
+    TAXA_LIST_COLS.SPECIES_BARE,
+    TAXA_LIST_COLS.COMMON_NAME,
+    TAXA_LIST_COLS.CNPS_RANK,
+];
 
 class PageRenderer extends BasePageRenderer {
+    static render(outputDir, config, taxa) {
+        super.render(outputDir, taxa);
 
-    static render( outputDir, config, taxa ) {
-
-        super.render( outputDir, taxa );
-
-        this.renderLists( outputDir, config, taxa );
+        this.renderLists(outputDir, config, taxa);
 
         const taxonList = taxa.getTaxonList();
-        for ( const taxon of taxonList ) {
-            new PageTaxon( outputDir, config, taxon ).render();
+        for (const taxon of taxonList) {
+            new PageTaxon(outputDir, config, taxon).render();
         }
-
     }
 
-    static renderLists( outputDir, config, taxa ) {
-
-        function getListArray( listInfo, attributes = {}, columns ) {
-
+    static renderLists(outputDir, config, taxa) {
+        function getListArray(listInfo, attributes = {}, columns) {
             const listArray = [];
-            for ( const list of listInfo ) {
+            for (const list of listInfo) {
                 const listTaxa = [];
                 const calfloraTaxa = [];
                 const iNatTaxa = [];
-                for ( const taxon of taxa.getTaxonList() ) {
-                    if ( list.include( taxon ) ) {
-                        listTaxa.push( taxon );
-                        calfloraTaxa.push( taxon.getCalfloraName() );
-                        iNatTaxa.push( taxon.getINatName() );
+                for (const taxon of taxa.getTaxonList()) {
+                    if (list.include(taxon)) {
+                        listTaxa.push(taxon);
+                        calfloraTaxa.push(taxon.getCalfloraName());
+                        iNatTaxa.push(taxon.getINatName());
                     }
                 }
 
-                if ( listTaxa.length === 0 ) {
+                if (listTaxa.length === 0) {
                     continue;
                 }
 
-                Files.write( outputDir + "/calflora_" + list.filename + ".txt", calfloraTaxa.join( "\n" ) );
-                Files.write( outputDir + "/inat_" + list.filename + ".txt", iNatTaxa.join( "\n" ) );
+                Files.write(
+                    outputDir + "/calflora_" + list.filename + ".txt",
+                    calfloraTaxa.join("\n")
+                );
+                Files.write(
+                    outputDir + "/inat_" + list.filename + ".txt",
+                    iNatTaxa.join("\n")
+                );
 
                 const cols = columns ? columns : list.columns;
-                new PageTaxonList( outputDir, list.name, list.filename ).render( listTaxa, cols );
+                new PageTaxonList(outputDir, list.name, list.filename).render(
+                    listTaxa,
+                    cols
+                );
 
                 // Check for sublists.
-                const subListHTML = list.listInfo ? getListArray( list.listInfo, { class: "indent" }, cols ) : "";
-
-                listArray.push( HTML.getLink( "./" + list.filename + ".html", list.name ) + " (" + listTaxa.length + ")" + subListHTML );
+                const subListHTML = list.listInfo
+                    ? getListArray(list.listInfo, { class: "indent" }, cols)
+                    : "";
+
+                listArray.push(
+                    HTML.getLink("./" + list.filename + ".html", list.name) +
+                        " (" +
+                        listTaxa.length +
+                        ")" +
+                        subListHTML
+                );
             }
 
-            return renderList( listArray, attributes );
+            return renderList(listArray, attributes);
         }
 
-        function renderList( listsHTML, attributes = {} ) {
-            return HTML.wrap( "ul", HTML.arrayToLI( listsHTML ), attributes );
+        function renderList(listsHTML, attributes = {}) {
+            return HTML.wrap("ul", HTML.arrayToLI(listsHTML), attributes);
         }
 
-        function renderSection( title, listsHTML ) {
-            let html = "<div class=\"section\">";
-            html += HTML.textElement( "h2", title );
+        function renderSection(title, listsHTML) {
+            let html = '<div class="section">';
+            html += HTML.textElement("h2", title);
             html += listsHTML;
             html += "</div>";
             return html;
@@ -75,10 +97,22 @@ 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: "All Plants", filename: "list_all", include: () => true },
-                ]
+                    {
+                        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,
+                    },
+                ],
             },
             {
                 title: "Rare Plants",
@@ -86,101 +120,112 @@ class PageRenderer extends BasePageRenderer {
                     {
                         name: "CNPS Ranked Plants",
                         filename: "list_rpi",
-                        include: ( t ) => t.getRPIRank() !== undefined,
+                        include: (t) => t.getRPIRank() !== undefined,
                         columns: RPI_COLUMNS,
                         listInfo: [
                             {
-                                name: RarePlants.getRPIRankDescription( "1A" ),
+                                name: RarePlants.getRPIRankDescription("1A"),
                                 filename: "list_rpi_1a",
-                                include: ( t ) => t.getRPIRank() === "1A",
+                                include: (t) => t.getRPIRank() === "1A",
                             },
                             {
-                                name: RarePlants.getRPIRankDescription( "1B" ),
+                                name: RarePlants.getRPIRankDescription("1B"),
                                 filename: "list_rpi_1b",
-                                include: ( t ) => t.getRPIRank() === "1B",
+                                include: (t) => t.getRPIRank() === "1B",
                             },
                             {
-                                name: RarePlants.getRPIRankDescription( "2A" ),
+                                name: RarePlants.getRPIRankDescription("2A"),
                                 filename: "list_rpi_2a",
-                                include: ( t ) => t.getRPIRank() === "2A",
+                                include: (t) => t.getRPIRank() === "2A",
                             },
                             {
-                                name: RarePlants.getRPIRankDescription( "2B" ),
+                                name: RarePlants.getRPIRankDescription("2B"),
                                 filename: "list_rpi_2b",
-                                include: ( t ) => t.getRPIRank() === "2B",
+                                include: (t) => t.getRPIRank() === "2B",
                             },
                             {
-                                name: RarePlants.getRPIRankDescription( "3" ),
+                                name: RarePlants.getRPIRankDescription("3"),
                                 filename: "list_rpi_3",
-                                include: ( t ) => t.getRPIRank() === "3",
+                                include: (t) => t.getRPIRank() === "3",
                             },
                             {
-                                name: RarePlants.getRPIRankDescription( "4" ),
+                                name: RarePlants.getRPIRankDescription("4"),
                                 filename: "list_rpi_4",
-                                include: ( t ) => t.getRPIRank() === "4",
+                                include: (t) => t.getRPIRank() === "4",
                             },
-                        ]
+                        ],
                     },
                     {
                         name: "Endangered Species",
                         filename: "list_endangered",
-                        include: ( t ) => ( t.getCESA() || t.getFESA() ),
+                        include: (t) => t.getCESA() || t.getFESA(),
                         columns: ENDANGERED_COLS,
                     },
-                ]
+                ],
             },
         ];
 
-        let html = "<div class=\"wrapper\">";
-        for ( const section of sections ) {
+        let html = '<div class="wrapper">';
+        for (const section of sections) {
+            const listHTML = getListArray(
+                section.listInfo,
+                section.listInfo.columns
+            );
 
-            const listHTML = getListArray( section.listInfo, section.listInfo.columns );
-
-            if ( listHTML.length > 0 ) {
-                html += renderSection( section.title, listHTML );
+            if (listHTML.length > 0) {
+                html += renderSection(section.title, listHTML);
             }
-
         }
-        html += renderSection( "Taxonomy", renderList( [ HTML.getLink( "./list_families.html", "Plant Families" ) ] ) );
+        html += renderSection(
+            "Taxonomy",
+            renderList([HTML.getLink("./list_families.html", "Plant Families")])
+        );
 
         html += "</div>";
 
         // Write lists to includes directory so it can be inserted into pages.
-        Files.write( outputDir + "/_includes/plantlists.html", html );
-
+        Files.write(outputDir + "/_includes/plantlists.html", html);
     }
-
 }
 
 class PageTaxonList extends GenericPage {
-
-    constructor( outputDir, title, baseName ) {
-        super( outputDir, title, baseName );
+    constructor(outputDir, title, baseName) {
+        super(outputDir, title, baseName);
     }
 
-    render( taxa, columns ) {
-
+    render(taxa, columns) {
         let html = this.getDefaultIntro();
 
-        html += "<div class=\"wrapper\">";
+        html += '<div class="wrapper">';
 
-        html += "<div class=\"section\">";
-        html += Taxa.getHTMLTable( taxa, columns );
+        html += '<div class="section">';
+        html += Taxa.getHTMLTable(taxa, columns);
         html += "</div>";
 
-        html += "<div class=\"section\">";
-        html += HTML.textElement( "h2", "Download" );
+        html += '<div class="section">';
+        html += HTML.textElement("h2", "Download");
         html += "<ul>";
-        html += "<li>" + HTML.getLink( "./calflora_" + this.getBaseFileName() + ".txt", "Calflora List" ) + "</li>";
-        html += "<li>" + HTML.getLink( "./inat_" + this.getBaseFileName() + ".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( html );
-
+        this.writeFile(html);
     }
 }
 
-export { PageRenderer };
+export { PageRenderer };

package/lib/plants/glossary.js

@@ -1,38 +1,34 @@
-import { Config, Files } from "@ca-plant-list/ca-plant-list";
+import { Config } from "../config.js";
+import { Files } from "../files.js";
 
 class Glossary {
-
     #srcPath;
     #srcEntries = [];
 
     constructor() {
-
         this.#srcPath = Config.getPackageDir() + "/data/glossary";
 
         // Find all entries in the glossary directory.
-        const entries = Files.getDirEntries( this.#srcPath ).sort();
-        for ( const entry of entries ) {
-            this.#srcEntries.push( new GlossaryEntry( this.#srcPath, entry ) );
+        const entries = Files.getDirEntries(this.#srcPath).sort();
+        for (const entry of entries) {
+            this.#srcEntries.push(new GlossaryEntry(this.#srcPath, entry));
         }
-
     }
 
     getEntries() {
         return this.#srcEntries;
     }
-
 }
 
 class GlossaryEntry {
-
     #srcPath;
     #fileName;
     #term;
 
-    constructor( srcPath, fileName ) {
+    constructor(srcPath, fileName) {
         this.#srcPath = srcPath;
         this.#fileName = fileName;
-        this.#term = fileName.split( "." )[ 0 ];
+        this.#term = fileName.split(".")[0];
     }
 
     getHTMLFileName() {
@@ -40,13 +36,12 @@ class GlossaryEntry {
     }
 
     getMarkdown() {
-        return Files.read( this.#srcPath + "/" + this.#fileName );
+        return Files.read(this.#srcPath + "/" + this.#fileName);
     }
 
     getTermName() {
         return this.#term;
     }
-
 }
 
-export { Glossary };
+export { Glossary };