@ca-plant-list/ca-plant-list 0.4.26 → 0.4.28

package/lib/web/pageFamily.js

@@ -1,5 +1,5 @@
 import { ExternalSites } from "../externalsites.js";
-import { GenericPage } from "../genericpage.js";
+import { GenericPage } from "./pageGeneric.js";
 import { HTML } from "../html.js";
 import { HTMLTaxon } from "../htmltaxon.js";
 import { Sections } from "../taxonomy/families.js";
@@ -8,11 +8,11 @@ export class PageFamilyList extends GenericPage {
     #families;
 
     /**
-     * @param {string} outputDir
+     * @param {import("../types.js").SiteGenerator} siteGenerator
      * @param {import("../types.js").Family[]} families
      */
-    constructor(outputDir, families) {
-        super(outputDir, "Families", "list_families");
+    constructor(siteGenerator, families) {
+        super(siteGenerator, "Families", "list_families");
         this.#families = families;
     }
 
@@ -28,7 +28,7 @@ export class PageFamilyList extends GenericPage {
             const taxa = sections[name];
 
             // Render the section page.
-            new PageSection(this.getOutputDir(), name, taxa).render(
+            new PageSection(this.getSiteGenerator(), name, taxa).render(
                 taxaColumns,
             );
 
@@ -69,13 +69,13 @@ export class PageFamilyList extends GenericPage {
     }
 
     /**
-     * @param {string} outputDir
+     * @param {import("../types.js").SiteGenerator} siteGenerator
      * @param {import("../types.js").TaxaColDef[]} [taxaColumns]
      */
-    renderPages(outputDir, taxaColumns) {
+    renderPages(siteGenerator, taxaColumns) {
         for (const family of this.#families) {
             if (family.getTaxa()) {
-                new PageFamily(outputDir, family).render(taxaColumns);
+                new PageFamily(siteGenerator, family).render(taxaColumns);
             }
         }
     }
@@ -85,11 +85,11 @@ class PageFamily extends GenericPage {
     #family;
 
     /**
-     * @param {string} outputDir
+     * @param {import("../types.js").SiteGenerator} siteGenerator
      * @param {import("../types.js").Family} family
      */
-    constructor(outputDir, family) {
-        super(outputDir, family.getName(), family.getBaseFileName());
+    constructor(siteGenerator, family) {
+        super(siteGenerator, family.getName(), family.getBaseFileName());
         this.#family = family;
     }
 
@@ -124,12 +124,12 @@ class PageSection extends GenericPage {
     #taxa;
 
     /**
-     * @param {string} outputDir
+     * @param {import("../types.js").SiteGenerator} siteGenerator
      * @param {string} name
      * @param {import("../types.js").Taxon[]} taxa
      */
-    constructor(outputDir, name, taxa) {
-        super(outputDir, name, name);
+    constructor(siteGenerator, name, taxa) {
+        super(siteGenerator, name, name);
         this.#taxa = taxa;
     }
 

package/lib/web/pageGeneric.js

@@ -0,0 +1,78 @@
+import path from "node:path";
+import { Config } from "../config.js";
+import { Files } from "../files.js";
+import { HTMLFragments } from "../utils/htmlFragments.js";
+
+export class GenericPage {
+    #siteGenerator;
+    #title;
+    #baseFileName;
+    #js;
+
+    /**
+     * @param {import("../types.js").SiteGenerator} siteGenerator
+     * @param {string} title
+     * @param {string} baseFileName
+     * @param {string} [js]
+     */
+    constructor(siteGenerator, title, baseFileName, js) {
+        this.#siteGenerator = siteGenerator;
+        this.#title = title;
+        this.#baseFileName = baseFileName;
+        this.#js = js;
+    }
+
+    getBaseFileName() {
+        return this.#baseFileName;
+    }
+
+    getDefaultIntro() {
+        let html = this.getFrontMatter();
+        return html + this.getMarkdown();
+    }
+
+    getFrontMatter() {
+        return this.#siteGenerator.getFrontMatter({
+            title: this.#title,
+            js: this.#js,
+        });
+    }
+
+    getMarkdown() {
+        const localTextPath = path.join(
+            "./data/intros",
+            `${this.#baseFileName}.md`,
+        );
+        const globalTextPath = path.join(
+            Config.getPackageDir(),
+            "./data/text/",
+            `${this.#baseFileName}.md`,
+        );
+        return (
+            HTMLFragments.getMarkdownSection(localTextPath) +
+            HTMLFragments.getMarkdownSection(globalTextPath)
+        );
+    }
+
+    getOutputDir() {
+        return this.#siteGenerator.getBaseDir();
+    }
+
+    getSiteGenerator() {
+        return this.#siteGenerator;
+    }
+
+    getTitle() {
+        return this.#title;
+    }
+
+    /**
+     * @param {string} html
+     */
+    writeFile(html) {
+        Files.write(
+            path.join(this.getOutputDir(), `${this.#baseFileName}.html`),
+            html,
+        );
+    }
+}

package/lib/web/{pagetaxon.js → pageTaxon.js}

@@ -1,5 +1,5 @@
 import { RarePlants } from "../rareplants.js";
-import { GenericPage } from "../genericpage.js";
+import { GenericPage } from "./pageGeneric.js";
 import { HTML } from "../html.js";
 import { HTMLTaxon } from "../htmltaxon.js";
 
@@ -8,12 +8,12 @@ export class PageTaxon extends GenericPage {
     #taxon;
 
     /**
-     * @param {string} outputDir
+     * @param {import("../types.js").SiteGenerator} siteGenerator
      * @param {import("../config.js").Config} config
      * @param {import("../types.js").Taxon} taxon
      */
-    constructor(outputDir, config, taxon) {
-        super(outputDir, taxon.getName(), taxon.getBaseFileName());
+    constructor(siteGenerator, config, taxon) {
+        super(siteGenerator, taxon.getName(), taxon.getBaseFileName());
         this.#config = config;
         this.#taxon = taxon;
     }

package/lib/web/pageTaxonList.js

@@ -0,0 +1,53 @@
+import { GenericPage } from "./pageGeneric.js";
+import { HTML } from "../html.js";
+import { HTMLTaxon } from "../htmltaxon.js";
+
+export class PageTaxonList extends GenericPage {
+    /**
+     * @param {import("../types.js").SiteGenerator} siteGenerator
+     * @param {string} title
+     * @param {string} baseName
+     */
+    constructor(siteGenerator, title, baseName) {
+        super(siteGenerator, title, baseName);
+    }
+
+    /**
+     *
+     * @param {import("../types.js").Taxon[]} taxa
+     * @param {import("../types.js").TaxaColDef[]|undefined} columns
+     */
+    render(taxa, columns) {
+        let html = this.getDefaultIntro();
+
+        html += '<div class="wrapper">';
+
+        html += '<div class="section">';
+        html += HTMLTaxon.getTaxaTable(taxa, columns);
+        html += "</div>";
+
+        html += '<div class="section nobullet">';
+        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 += "</ul>";
+        html += "</div>";
+
+        html += "</div>";
+
+        this.writeFile(html);
+    }
+}

package/lib/{pagerenderer.js → web/renderAllPages.js}

@@ -1,10 +1,11 @@
-import { PageTaxon } from "./web/pagetaxon.js";
-import { RarePlants } from "./rareplants.js";
-import { BasePageRenderer } from "./basepagerenderer.js";
-import { GenericPage } from "./genericpage.js";
-import { Files } from "./files.js";
-import { HTML } from "./html.js";
-import { HTMLTaxon, TAXA_LIST_COLS } from "./htmltaxon.js";
+import { RarePlants } from "../rareplants.js";
+import { BasePageRenderer } from "../basepagerenderer.js";
+import { Files } from "../files.js";
+import { HTML } from "../html.js";
+import { TAXA_LIST_COLS } from "../htmltaxon.js";
+import { PageTaxonList } from "./pageTaxonList.js";
+import { HTMLFragments } from "../utils/htmlFragments.js";
+import { PageTaxon } from "./pageTaxon.js";
 
 const ENDANGERED_COLS = [
     TAXA_LIST_COLS.SPECIES,
@@ -18,33 +19,33 @@ const RPI_COLUMNS = [
     TAXA_LIST_COLS.CNPS_RANK,
 ];
 
-class PageRenderer extends BasePageRenderer {
+export class PageRenderer extends BasePageRenderer {
     /**
-     * @param {string} outputDir
-     * @param {import('./config.js').Config} config
-     * @param {import("./types.js").Taxa} taxa
+     * @param {import("../types.js").SiteGenerator} siteGenerator
+     * @param {import('../config.js').Config} config
+     * @param {import("../types.js").Taxa} taxa
      */
-    static render(outputDir, config, taxa) {
-        super.renderBasePages(outputDir, taxa);
+    static renderAll(siteGenerator, config, taxa) {
+        super.renderBasePages(siteGenerator, taxa);
 
-        this.renderLists(outputDir, config, taxa);
+        this.renderLists(siteGenerator, config, taxa);
 
         const taxonList = taxa.getTaxonList();
         for (const taxon of taxonList) {
-            new PageTaxon(outputDir, config, taxon).render();
+            new PageTaxon(siteGenerator, config, taxon).render();
         }
     }
 
     /**
-     * @param {string} outputDir
-     * @param {import('./config.js').Config} config
-     * @param {import("./types.js").Taxa} taxa
+     * @param {import("../types.js").SiteGenerator} siteGenerator
+     * @param {import('../config.js').Config} config
+     * @param {import("../types.js").Taxa} taxa
      */
-    static renderLists(outputDir, config, taxa) {
+    static renderLists(siteGenerator, config, taxa) {
         /**
          * @param {ListInfo[]} listInfo
          * @param {Object<string,string>} attributes
-         * @param {import("./types.js").TaxaColDef[]} [columns]
+         * @param {import("../types.js").TaxaColDef[]} [columns]
          * @returns {string}
          */
         function getListArray(listInfo, attributes = {}, columns) {
@@ -75,10 +76,11 @@ class PageRenderer extends BasePageRenderer {
                 );
 
                 const cols = columns ? columns : list.columns;
-                new PageTaxonList(outputDir, list.name, list.filename).render(
-                    listTaxa,
-                    cols,
-                );
+                new PageTaxonList(
+                    siteGenerator,
+                    list.name,
+                    list.filename,
+                ).render(listTaxa, cols);
 
                 // Check for sublists.
                 const subListHTML = list.listInfo
@@ -117,7 +119,9 @@ class PageRenderer extends BasePageRenderer {
             return html;
         }
 
-        /** @typedef {{name:string,filename:string,include:function(import("./types.js").Taxon):boolean,columns?:import("./types.js").TaxaColDef[],listInfo?:ListInfo[]}} ListInfo */
+        const outputDir = siteGenerator.getBaseDir();
+
+        /** @typedef {{name:string,filename:string,include:function(import("../types.js").Taxon):boolean,columns?:import("../types.js").TaxaColDef[],listInfo?:ListInfo[]}} ListInfo */
         /** @type {{title:string,listInfo:ListInfo[]}[]} */
         const sections = [
             {
@@ -191,7 +195,10 @@ class PageRenderer extends BasePageRenderer {
             },
         ];
 
-        let html = '<div class="wrapper">';
+        let html =
+            HTMLFragments.getMarkdownSection("./data/intros/index_lists.md") +
+            '<div class="wrapper">';
+
         for (const section of sections) {
             const listHTML = getListArray(section.listInfo);
 
@@ -208,59 +215,10 @@ class PageRenderer extends BasePageRenderer {
 
         html += "</div>";
 
-        // Write lists to includes directory so it can be inserted into pages.
-        Files.write(outputDir + "/_includes/plantlists.html", html);
-    }
-}
-
-class PageTaxonList extends GenericPage {
-    /**
-     * @param {string} outputDir
-     * @param {string} title
-     * @param {string} baseName
-     */
-    constructor(outputDir, title, baseName) {
-        super(outputDir, title, baseName);
-    }
-
-    /**
-     *
-     * @param {import("./types.js").Taxon[]} taxa
-     * @param {import("./types.js").TaxaColDef[]|undefined} columns
-     */
-    render(taxa, columns) {
-        let html = this.getDefaultIntro();
-
-        html += '<div class="wrapper">';
-
-        html += '<div class="section">';
-        html += HTMLTaxon.getTaxaTable(taxa, columns);
-        html += "</div>";
-
-        html += '<div class="section nobullet">';
-        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 += "</ul>";
-        html += "</div>";
-
-        html += "</div>";
-
-        this.writeFile(html);
+        siteGenerator.writeTemplate(
+            html,
+            { title: "Plant lists" },
+            "index_lists.html",
+        );
     }
 }
-
-export { PageRenderer };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.4.26",
-    "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
+    "version": "0.4.28",
+    "description": "Tools to create files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -12,9 +12,10 @@
     "files": [
         "data",
         "ebook",
-        "jekyll",
+        "generators",
         "lib",
-        "scripts"
+        "scripts",
+        "static"
     ],
     "exports": {
         ".": "./lib/index.js"
@@ -22,10 +23,10 @@
     "types": "./lib/index.d.ts",
     "scripts": {
         "check": "npm run eslint && npm run tsc && npm run jest",
-        "eslint": "npx eslint",
+        "eslint": "eslint",
         "jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js tests",
-        "prettier": "npx prettier -l .",
-        "tsc": "npx tsc"
+        "prettier": "prettier -l .",
+        "tsc": "tsc"
     },
     "bin": {
         "ca-plant-list": "scripts/build-site.js",
@@ -35,10 +36,11 @@
         "inatobsphotos": "scripts/inatobsphotos.js"
     },
     "dependencies": {
+        "@11ty/eleventy": "^3.0.0",
         "@htmltools/scrape": "^0.1.1",
         "archiver": "^5.3.1",
         "cli-progress": "^3.12.0",
-        "commander": "^12.1.0",
+        "commander": "^13.1.0",
         "csv-parse": "^5.6.0",
         "csv-stringify": "^6.5.2",
         "exceljs": "^4.4.0",
@@ -55,9 +57,9 @@
         "@types/markdown-it": "^14.1.2",
         "@types/node": "^22.10.7",
         "@types/unzipper": "^0.10.9",
-        "eslint": "^9.18.0",
+        "eslint": "^9.20.1",
         "jest": "^29.7.0",
-        "prettier": "^3.4.2",
+        "prettier": "^3.5.1",
         "puppeteer": "^24.1.1",
         "typescript": "^5.7.3"
     }

package/scripts/build-site.js

@@ -1,76 +1,44 @@
 #!/usr/bin/env node
 
-import * as child_process from "node:child_process";
-import * as path from "node:path";
 import { Config } from "../lib/config.js";
-import { PageRenderer } from "../lib/pagerenderer.js";
+import { PageRenderer } from "../lib/web/renderAllPages.js";
 import { Files } from "../lib/files.js";
 import { Program } from "../lib/program.js";
 import { Taxa } from "../lib/taxonomy/taxa.js";
 import { ErrorLog } from "../lib/errorlog.js";
 
-class JekyllRenderer {
-    #srcDir = "./output";
-    #destDir = "./public";
-
-    async renderPages() {
-        /**
-         * @param {string[]} configFiles
-         * @param {string} dir
-         * @param {string} name
-         */
-        function addConfigFile(configFiles, dir, name) {
-            const fullPath = path.join(dir, name);
-            if (Files.exists(fullPath)) {
-                configFiles.push(fullPath);
-            }
-        }
-
-        // Remove existing files.
-        Files.rmDir(this.#destDir);
-
-        const options = [
-            "--source",
-            this.#srcDir,
-            "--destination",
-            this.#destDir,
-        ];
-
-        // Find out what config files are available.
-        /** @type {string[]} */
-        const configFiles = [];
-        addConfigFile(configFiles, this.#srcDir, "_config.yml");
-        addConfigFile(configFiles, this.#srcDir, "_config-local.yml");
-        addConfigFile(configFiles, ".", "_config-dev.yml");
-        options.push("--config", `"${configFiles.join()}"`);
-
-        const result = child_process.execSync(
-            "bundle exec jekyll build " + options.join(" "),
-        );
-        console.log(result.toString());
-    }
-}
-
 /**
- * @param {import("commander").OptionValues} options
+ * @param {{outputdir:string,datadir:string,webdir:string,showFlowerErrors:boolean,render:boolean}} options
  */
 async function build(options) {
-    Files.rmDir(options.outputdir);
-    const errorLog = new ErrorLog(options.outputdir + "/errors.tsv");
+    console.info("generating templates");
+    const outputDir = options.outputdir;
+    Files.rmDir(outputDir);
+    const errorLog = new ErrorLog(outputDir + "/errors.tsv");
     const taxa = new Taxa(
         Program.getIncludeList(options.datadir),
         errorLog,
         options.showFlowerErrors,
     );
-    PageRenderer.render(options.outputdir, new Config(options.datadir), taxa);
+    const config = new Config(options.datadir);
+    const generator = PageRenderer.newSiteGenerator(config, outputDir);
+    PageRenderer.renderAll(generator, config, taxa);
     errorLog.write();
 
-    console.log("generating site");
-    const r = new JekyllRenderer();
-    await r.renderPages();
+    if (options.render) {
+        console.info("generating site");
+        Files.rmDir(options.webdir);
+        await generator.generate(options.webdir);
+    }
 }
 
 const program = Program.getProgram();
+program.option(
+    "--no-render",
+    "Do not render full HTML output (only build the templates)",
+);
+program.option("-w, --webdir", "Directory for fully processed files", "public");
+
 program.action(build);
 
 await program.parseAsync();