@ca-plant-list/ca-plant-list 0.1.10 → 0.1.12

package/lib/families.js

@@ -1,8 +1,8 @@
-import * as fs from "node:fs";
 import { HTMLPage } from "./htmlpage.js";
 import { HTML } from "./html.js";
 import { Jepson } from "./jepson.js";
 import { Taxa } from "./taxa.js";
+import { Files } from "./files.js";
 
 class Families {
 
@@ -13,7 +13,7 @@ class Families {
     }
 
     static init( dataDir ) {
-        this.#families = JSON.parse( fs.readFileSync( dataDir + "/families.json" ) );
+        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 } );
         }

package/lib/html.js

@@ -57,6 +57,11 @@ export class HTML {
         return html + ">" + this.escapeText( linkText ) + "</a >";
     }
 
+    static getToolTip( text, tooltip ) {
+        const func = text.charAt( 0 ) === "<" ? HTML.wrap : HTML.textElement;
+        return func( "span", text + " ⓘ", { title: tooltip } );
+    }
+
     static renderAttribute( n, v ) {
         return " " + n + "=\"" + this.escapeAttribute( v ) + "\"";
     }
@@ -70,11 +75,11 @@ export class HTML {
     }
 
     static textElement( elName, text, attributes = {} ) {
-        return this.#getElement( elName, text, attributes, true );
+        return HTML.#getElement( elName, text, attributes, true );
     }
 
     static wrap( elName, text, attributes = {} ) {
-        return this.#getElement( elName, text, attributes, false );
+        return HTML.#getElement( elName, text, attributes, false );
     }
 
 }

package/lib/index.d.ts

@@ -22,6 +22,7 @@ export class HTML {
     static getElement(elName: any, text: any, attributes?: {}, options?: number): string;
     static "__#2@#getElement"(elName: any, text: any, attributes: any, escape: any): string;
     static getLink(href: any, linkText: any, attributes?: {}, options?: number): string;
+    static getToolTip(text: any, tooltip: any): string;
     static renderAttribute(n: any, v: any): string;
     static renderAttributes(attributes: any): string;
     static textElement(elName: any, text: any, attributes?: {}): string;

package/lib/index.js

@@ -4,10 +4,11 @@ import { CSV } from "./csv.js";
 import { DataLoader } from "./dataloader.js";
 import { ErrorLog } from "./errorlog.js";
 import { Exceptions } from "./exceptions.js";
+import { Families } from "./families.js";
 import { Files } from "./files.js";
 import { HTML, HTML_OPTIONS } from "./html.js";
 import { Jekyll } from "./jekyll.js";
 import { Taxa } from "./taxa.js";
 import { Taxon } from "./taxon.js";
 
-export { BasePageRenderer, Config, CSV, DataLoader, ErrorLog, Exceptions, Files, HTML, HTML_OPTIONS, Jekyll, Taxa, Taxon };
+export { BasePageRenderer, Config, CSV, DataLoader, ErrorLog, Exceptions, Families, Files, HTML, HTML_OPTIONS, Jekyll, Taxa, Taxon };

package/lib/jekyll.js

@@ -7,7 +7,8 @@ class Jekyll {
     }
 
     static include( path ) {
-        return "{%include " + path + "%}";
+        // This works for .md includes; should have conditional logic to detect other types.
+        return "{% capture my_include %}{% include " + path + " %}{% endcapture %}{{ my_include | markdownify }}";
     }
 
     static writeInclude( baseDir, path, data ) {

package/lib/taxon.js

@@ -47,6 +47,11 @@ class Taxon {
         }
     }
 
+    getBaseFileName() {
+        // Convert spaces to "-" and remove ".".
+        return this.#name.replaceAll( " ", "-" ).replaceAll( ".", "" );
+    }
+
     getCalfloraName() {
         if ( this.#cfSyn ) {
             return this.#cfSyn;
@@ -83,13 +88,8 @@ class Taxon {
         return Genera.getFamily( this.#genus );
     }
 
-    getFileName( ext ) {
-        return Taxon.getFileName( this.getName(), ext );
-    }
-
-    static getFileName( name, ext = "html" ) {
-        // Convert spaces to "-" and remove ".".
-        return name.replaceAll( " ", "-" ).replaceAll( ".", "" ) + "." + ext;
+    getFileName( ext = "html" ) {
+        return this.getBaseFileName() + "." + ext;
     }
 
     getGenus() {

package/package.json

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