scv-bilara 3.165.2 → 3.166.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scv-bilara",
-  "version": "3.165.2",
+  "version": "3.166.2",
   "description": "SuttaCentral bilara-data library",
   "main": "index.js",
   "directories": {
@@ -15,7 +15,7 @@
     "log-instance": "^1.6.0",
     "memo-again": "^0.10.0",
     "merkle-json": "^2.2.0",
-    "scv-esm": "^1.111.78",
+    "scv-esm": "^1.111.80",
     "suttacentral-api": "^2.16.11",
     "tmp": "^0.2.3"
   },

package/scripts/js/search.js

@@ -430,14 +430,18 @@ found     : segs:${segsMatched} by:${method} mlDocs:${nDocs} docs:${nRefs} ${ref
     );
   }
   mlDocs.forEach((mld,im) => {
-    let {suid, author_uid, lang} = mld;
+    let {suid, author, author_uid, lang} = mld;
     mld.segments().forEach((seg,i) => {
       var scid = seg.scid;
-      var sep = '-----------------------';
+      var sep = '---';
       if (i === 0) {
         let sm = mld.hasOwnProperty('segsMatched') ? mld.segsMatched : '';
         let score = mld.score.toFixed(3);
-        let title = `doc:${im+1}/${nDocs} ${suid}/${lang}/${author_uid} score:${score}`;
+        let title = [
+          `doc:${im+1}/${nDocs}`,
+          `${author} ${suid}/${lang}/${author_uid}`,
+          `score:${score}`
+        ].join(' ');
         console.log(`${sep} ${title} ${sep}`);
       }
       let scidText = [
@@ -550,13 +554,18 @@ function outLines(res, pattern, n=0) {
     var {
         lang,
         searchLang,
+        author,
         docLang, 
         docAuthor,
+        docAuthorName,
         refLang,
         refAuthor,
     } = res;
     console.log(
-      `---:pli/ms doc:${docLang}/${docAuthor} ref:${refLang}/${refAuthor}`);
+      `---:pli/ms`,
+      `doc:${docLang}/${docAuthor} ${docAuthorName}`,
+      `ref:${refLang}/${refAuthor}`
+    );
     n = Number(n);
     res.mlDocs.forEach(mld => {
         var suid = mld.suid;

package/src/bilara-data.js

@@ -29,7 +29,7 @@
 
   class BilaraData {
     constructor(opts = {}) {
-      const msg = "BilaraData.ctor()";
+      const msg = "B8a.ctor()";
       const dbg = DBG_BD_INIT;
       (opts.logger || logger).logInstance(this, opts);
       this.name = opts.name || "bilara-data";
@@ -49,6 +49,7 @@
         opts.publication ||
         new Publication({
           includeUnpublished,
+          name: this.name,
           root: this.root,
         });
       this.bilaraPathMap = this.publication.bilaraPathMap;
@@ -101,7 +102,7 @@
       author,
       includeUnpublished = this.includeUnpublished,
     }) {
-      const msg = "BilaraData.isBilaraDoc() ";
+      const msg = "B8a.isBilaraDoc() ";
       let { bilaraPathMap: bpm, publication } = this;
       let sp = bpm.suidPaths(suid);
 
@@ -456,7 +457,7 @@
     }
 
     loadMLDoc(...args) {
-      const msg = "BilaraData.loadMLDoc() ";
+      const msg = "B8a.loadMLDoc() ";
       var loadArgs = this.loadArgs(args);
       var {
         suid: suidRef,
@@ -529,10 +530,9 @@
     }
 
     async trilingualDoc(suttaRef, opts={}) {
-      const msg = "BilaraData.trilingualDoc() ";
+      const msg = "B8a.trilingualDoc() ";
       const dbg = DBG.TRILINGUALDOC;
-      let { bilaraPathMap: bpm, root } = this;
-      suttaRef = SuttaRef.create(suttaRef); 
+      let { bilaraPathMap: bpm, root } = this; suttaRef = SuttaRef.create(suttaRef); 
       let {
         rootLang = 'pli',
         rootAuthor = 'ms',
@@ -574,61 +574,24 @@
       logLevel && (mldOpts.logLevel = logLevel);
       dbg && console.log(msg, '[1]mldOpts', mldOpts);
       let mld = await new MLDoc(mldOpts).load(root);
-      dbg && console.log(msg, 'mld=>', {
-        docLang: mld?.docLang,
-        docAuthor: mld?.docAuthor,
-        bilaraPaths: mld?.bilaraPaths,
-        langSegs: mld?.langSegs,
-        '...': '...',
-      });
+      if (dbg) {
+        let dbgOut = mld && {
+          author: mld.author,
+          docLang: mld.docLang,
+          docAuthor: mld.docAuthor,
+          docAuthorName: mld.docAuthorName,
+          trilingual: mld.trilingual,
+          bilaraPaths: mld.bilaraPaths,
+          langSegs: mld.langSegs,
+          '...': '...',
+        };
+        console.log(msg, '[2]mld', dbgOut);
+      } 
       return mld;
     }
 
-    async loadMLDocLegacy(suidRef) {
-      try {
-        let suidParts = suidRef.split("/");
-        let sutta = await this.scApi.loadLegacySutta.apply(
-          this.scApi,
-          suidParts
-        );
-        if (!sutta) {
-          let e = new Error(`loadMLDocLegacy() not found:${suidRef}`);
-          e.suidRef = suidRef;
-          throw e;
-        }
-        let {
-          lang,
-          author_uid,
-          sutta_uid,
-          segmented,
-          segments = [],
-          suttaplex,
-        } = sutta;
-        let segMap = {};
-        segments.forEach((seg) => {
-          segMap[seg.scid] = seg;
-        });
-        this.info(`loadMLDocLegacy(${suidRef})`);
-        return new MLDoc({
-          bilaraPaths: [], // legacy have no paths
-          lang,
-          author_uid,
-          segMap,
-          suttaplex,
-          segmented,
-          sutta_uid,
-          langSegs: {
-            [lang]: segments.length,
-          },
-        });
-      } catch (e) {
-        this.warn(`loadMLDocLegacy(${suidRef})`, e.message);
-        throw e;
-      }
-    }
-
     canonicalSuttaId(id, type="acro") {
-      const msg = 'BilaraData.canonicalSuttaId()';
+      const msg = 'B8a.canonicalSuttaId()';
       if (!this.initialized) {
         let emsg = `${msg}, initialize() required`;
         throw new Error(emsg);
@@ -851,7 +814,7 @@
     }
 
     expandRange(suttaRef) {
-      const msg = "BilaraData.expandRange";
+      const msg = "B8a.expandRange";
       const dbg = DBG.SUTTA_UIDSEARCH;
       suttaRef = suttaRef.split(":")[0];
       var reCollection = new RegExp("[0-9].*", "u");
@@ -950,7 +913,7 @@
     }
 
     sutta_uidSearch(pattern, maxResults = 5) {
-      const msg = 'BilaraData.sutta_uidSearch() ';
+      const msg = 'B8a.sutta_uidSearch() ';
       const dbg = DBG.SUTTA_UIDSEARCH;
       var method = "sutta_uid";
       var uids = this.suttaList(pattern).slice(0, maxResults);

package/src/bilara-path-map.js

@@ -1,396 +1,396 @@
 (function(exports) {
-    const fs = require('fs');
-    const path = require('path');
-    const { logger } = require('log-instance');
-    const { Files } = require('memo-again');
-    const { AuthorsV2, BilaraPath, SuttaCentralId } = require("scv-esm");
-    const STUBFILESIZE = 5;
+  const fs = require('fs');
+  const path = require('path');
+  const { logger } = require('log-instance');
+  const { Files } = require('memo-again');
+  const { AuthorsV2, BilaraPath, SuttaCentralId } = require("scv-esm");
+  const STUBFILESIZE = 5;
 
-    class BilaraPathMap {
-        constructor(opts = {}) {
-            (opts.logger || logger).logInstance(this);
-            this.root = opts.root || 
-                path.join(Files.LOCAL_DIR, "bilara-data");
-            let rootDir = path.dirname(this.root);
-            let rootName = this.root.replace(rootDir,'').substring(1);
-            this.rootLang = opts.rootLang || 'pli';
-            this.rootAuthor = opts.rootAuthor || 'ms';
-            if (opts.suidMapFile) {
-              this.suidMapFile = opts.suidMapFile;
-            } else if ( rootName === 'ebt-data') {
-              this.suidMapFile = path.join(__dirname, "auto", "suidmap.json");
-            } else {
-              this.suidMapFile = path.join(rootDir, `suidmap-${rootName}.json`);
-            }
-            this.validatePath = opts.validatePath || ((key,value,suid)=>true);
-            this.publication = opts.publication;
-            this.initialized = false;
-        }
+  class BilaraPathMap {
+    constructor(opts = {}) {
+      (opts.logger || logger).logInstance(this);
+      this.root = opts.root || 
+        path.join(Files.LOCAL_DIR, "ebt-data");
+      let rootDir = path.dirname(this.root);
+      let rootName = this.root.replace(rootDir,'').substring(1);
+      this.rootLang = opts.rootLang || 'pli';
+      this.rootAuthor = opts.rootAuthor || 'ms';
+      if (opts.suidMapFile) {
+        this.suidMapFile = opts.suidMapFile;
+      } else if ( rootName === 'ebt-data') {
+        this.suidMapFile = path.join(__dirname, "auto", "suidmap.json");
+      } else {
+        this.suidMapFile = path.join(rootDir, `suidmap-${rootName}.json`);
+      }
+      this.validatePath = opts.validatePath || ((key,value,suid)=>true);
+      this.publication = opts.publication;
+      this.initialized = false;
+    }
 
-        static get ALL_TYPES() { return [
-            'root', 
-            'translation', 
-            'html', 
-            'variant', 
-            'reference', 
-            'comment',
-        ]};
+    static get ALL_TYPES() { return [
+        'root', 
+        'translation', 
+        'html', 
+        'variant', 
+        'reference', 
+        'comment',
+    ]};
 
-        static langAuthorRegExp(lang, author) {
-          return lang && author
-            ? new RegExp(`-${lang}-${author}.json`, "i")
-            : undefined;
-        }
+    static langAuthorRegExp(lang, author) {
+      return lang && author
+        ? new RegExp(`-${lang}-${author}.json`, "i")
+        : undefined;
+    }
 
-        async initialize() { try {
-            var { suidMapFile } = this;
-            let suidMap;
+    async initialize() { try {
+        var { suidMapFile } = this;
+        let suidMap;
 
-            if (fs.existsSync(suidMapFile)) {
-                try {
-                    suidMap = JSON.parse(
-                      await fs.promises.readFile(suidMapFile))
-                } catch (e) {
-                    this.warn(`initialize() ${e.message} => rebuilding ${suidMapFile}`);
-                }
-            } 
-            if (!suidMap) {
-                this.info(`initialize() building ${suidMapFile}`);
-                suidMap = this.buildSuidMap();
+        if (fs.existsSync(suidMapFile)) {
+            try {
+                suidMap = JSON.parse(
+                  await fs.promises.readFile(suidMapFile))
+            } catch (e) {
+                this.warn(`initialize() ${e.message} => rebuilding ${suidMapFile}`);
             }
-            this.suidMap = await suidMap;
-            this.initialized = true;
-            return this;
-        } catch(e) {
-            this.warn(`initialize()`, suidMapFile, e.message);
-            throw e;
-        }}
+        } 
+        if (!suidMap) {
+            this.info(`initialize() building ${suidMapFile}`);
+            suidMap = this.buildSuidMap();
+        }
+        this.suidMap = await suidMap;
+        this.initialized = true;
+        return this;
+    } catch(e) {
+        this.warn(`initialize()`, suidMapFile, e.message);
+        throw e;
+    }}
 
-        async tipitakaPaths(opts={}) { try {
-            var {
-                root,
-                rootLang,
-                rootAuthor,
-            } = this;
-            let { 
-                lang=rootLang,
-                author=rootAuthor,
-            } = opts;
-            var takaPath = path.join(root, 
-                lang===rootLang ? 'root' : 'translation',
-                lang,
-                author,
-                '/',
-            );
-            var readOpts = {withFileTypes:true};
-            var exclude = [
-                '[0-9]',
-                'playground',   // Blake
-            ].join('|');
-            var reExclude = new RegExp(`(${exclude})`,"ui");
-            let pathStack = [];
-            let pathList = [];
-            if (fs.existsSync(takaPath)) {
-                pathStack.push(takaPath);
+    async tipitakaPaths(opts={}) { try {
+        var {
+            root,
+            rootLang,
+            rootAuthor,
+        } = this;
+        let { 
+            lang=rootLang,
+            author=rootAuthor,
+        } = opts;
+        var takaPath = path.join(root, 
+            lang===rootLang ? 'root' : 'translation',
+            lang,
+            author,
+            '/',
+        );
+        var readOpts = {withFileTypes:true};
+        var exclude = [
+            '[0-9]',
+            'playground',   // Blake
+        ].join('|');
+        var reExclude = new RegExp(`(${exclude})`,"ui");
+        let pathStack = [];
+        let pathList = [];
+        if (fs.existsSync(takaPath)) {
+            pathStack.push(takaPath);
+        }
+        while (pathStack.length) {
+            let dirPath = pathStack.pop();
+            if (reExclude.test(dirPath)) {
+                this.info(`tipitakaPaths() exclude:`, dirPath);
+                continue;
             }
-            while (pathStack.length) {
-                let dirPath = pathStack.pop();
-                if (reExclude.test(dirPath)) {
-                    this.info(`tipitakaPaths() exclude:`, dirPath);
-                    continue;
+            var dirKids = fs.readdirSync(dirPath, readOpts);
+            let relativePath = dirPath.replace(takaPath, '');
+            relativePath && pathList.push(relativePath);
+            for (var i = 0; i < dirKids.length; i++) {
+                var e = dirKids[i];
+                if (e.isDirectory()) {
+                    let kidPath = path.join(dirPath, e.name);
+                    pathStack.push(kidPath);
                 }
-                var dirKids = fs.readdirSync(dirPath, readOpts);
-                let relativePath = dirPath.replace(takaPath, '');
-                relativePath && pathList.push(relativePath);
-                for (var i = 0; i < dirKids.length; i++) {
-                    var e = dirKids[i];
-                    if (e.isDirectory()) {
-                        let kidPath = path.join(dirPath, e.name);
-                        pathStack.push(kidPath);
-                    }
-                }
-            }
-            return pathList.sort();
-        } catch(e) {
-            this.warn(`tipitakaPaths()`, e.message);
-            throw e;
-        }}
-
-        bilaraPaths(opts={}) {
-            const msg = 'BilaraPathMap.bilaraPaths()';
-            const dbg = 0;
-            if (typeof opts === 'string') {
-                opts = { suid: opts };
             }
-            var {
-                suid,
-                lang,
-                author,
-                types,
-                refAuthor,
-            } = opts;
-            types = types || ['root','translation'];
-            var reTypes = new RegExp(`^(${types.join('|')})`, 'u');
-            var paths = this.suidPaths(suid) || [];
-            dbg && console.log(msg, {paths});
-            var bps = Object.keys(paths).reduce((a,k) => {
-                var bp = paths[k];
-                reTypes.test(bp) && a.push(bp);
-                return a;
-            },[]);
-            if (typeof lang === 'string') {
-                let re = new RegExp(`/${lang}/`,'u');
-                bps = bps.filter(bp => re.test(bp));
-            } else if (lang instanceof Array) {
-                let re = new RegExp(`/(${lang.join('|')})/`,'u');
-                bps = bps.filter(bp => re.test(bp));
-            }
-            if (author) {
-                let re = new RegExp(`.*-${author}.json`,'u');
-                bps = bps.filter(bp => re.test(bp));
-            }
-
-            return bps.map(bp => new BilaraPath(bp));;
         }
+        return pathList.sort();
+    } catch(e) {
+        this.warn(`tipitakaPaths()`, e.message);
+        throw e;
+    }}
 
-
-        transPath(rootPath, lang, author) {
-          const msg = "BilaraPathMap.transPat()";
-          const dbg = 0;
-          let { root } = this;
-          let bilaraPath = rootPath
-            .replace(/root/g, 'translation')
-            .replace(/pli/g, lang)
-            .replace(/ms/g, author);
-          let fullPath = path.join(root, bilaraPath);
-          if (!fs.existsSync(fullPath)) {
-            dbg && console.log(msg, '[1]!existsSync', {fullPath});
-            return null;
-          }
-          let stats = fs.statSync(fullPath);
-          if (stats.size < 5) {
-            dbg && console.log(msg, '[2]!size', {fullPath});
-            return null;
-          }
-
-          dbg && console.log(msg, '[3]ok', bilaraPath);
-          return bilaraPath;
+    bilaraPaths(opts={}) {
+        const msg = 'BilaraPathMap.bilaraPaths()';
+        const dbg = 0;
+        if (typeof opts === 'string') {
+            opts = { suid: opts };
         }
-
-        trilingualPaths(opts={}) {
-          const msg = "BilaraPathMap.trilingualPaths() ";
-          const dbg = 0;
-          let {
+        var {
             suid,
-            rootLang = 'pli',
-            rootAuthor = 'ms',
-            refLang,
+            lang,
+            author,
+            types,
             refAuthor,
-            docLang,
-            docAuthor,
-          } = opts;
-          let { root } = this;
-          if (!refAuthor && !refLang) {
-            refLang = 'en';
-            refAuthor = 'sujato';
-          }
-          
-          let pathMap = this.suidPaths(suid);
-          let paths = Object.keys(pathMap).reduce((a,k)=>{
-            a.push(pathMap[k]);
+        } = opts;
+        types = types || ['root','translation'];
+        var reTypes = new RegExp(`^(${types.join('|')})`, 'u');
+        var paths = this.suidPaths(suid) || [];
+        dbg && console.log(msg, {paths});
+        var bps = Object.keys(paths).reduce((a,k) => {
+            var bp = paths[k];
+            reTypes.test(bp) && a.push(bp);
             return a;
-          }, []);
-
-          let { langAuthorRegExp } = BilaraPathMap;
-          let reRoot = langAuthorRegExp(rootLang, rootAuthor);
-          let mldPaths = paths.filter(p=>reRoot && reRoot.test(p));
-          let rootPath = mldPaths[0];
-          if (rootPath) {
-            let docPath = this.transPath(rootPath, docLang, docAuthor);
-            let refPath = this.transPath(rootPath, refLang, refAuthor);
-            if (docPath) {
-              mldPaths.push(docPath);
-            }
-            if (refPath && refPath !== docPath) {
-              mldPaths.push(refPath);
-            }
-            dbg && console.log(msg, mldPaths);
-          }
-          dbg && console.log(msg, {mldPaths});
-          return mldPaths;
+        },[]);
+        if (typeof lang === 'string') {
+            let re = new RegExp(`/${lang}/`,'u');
+            bps = bps.filter(bp => re.test(bp));
+        } else if (lang instanceof Array) {
+            let re = new RegExp(`/(${lang.join('|')})/`,'u');
+            bps = bps.filter(bp => re.test(bp));
         }
-
-        suidPaths(suid) {
-            if (!this.initialized) {
-                throw new Error(`initialize() has not been called`);
-            }
-            if (!suid) {
-                throw new Error('BilaraPathMap.suidPaths() suid is required');
-            }
-            var suidParts = suid.split('/');
-            var key = suidParts[0];
-            let map = this.suidMap[key];
-            return map && Object.keys(map).reduce((a,k) => {
-                let v = map[k];
-                let kParts = k.split('/');
-                let vParts = v.split('/');
-                let suidParts = suid.split('/');
-                a[k] = `${k}/${v}/${suidParts[0]}_${kParts.join('-')}.json`;
-                return a;
-            }, {});
+        if (author) {
+            let re = new RegExp(`.*-${author}.json`,'u');
+            bps = bps.filter(bp => re.test(bp));
         }
 
-        suidLanguages(suid) {
-            let suidPaths = this.suidPaths(suid);
-            return !suidPaths 
-                ? undefined
-                : Object.keys(suidPaths)
-                    .sort()
-                    .reduce((a,k)=>{
-                        let bilaraPath = suidPaths[k];
-                        if (/^(translation|root)/.test(bilaraPath)) {
-                            let [type,lang,author,category,nikaya] = 
-                                bilaraPath.split('/');
-                            a.push({
-                                suid: suid.split('/')[0],
-                                lang,
-                                author,
-                                category,
-                                nikaya,
-                                bilaraPath,
-                            });
-                        }
-                        return a;
-                    },[]);
+        return bps.map(bp => new BilaraPath(bp));;
+    }
+
+
+    transPath(rootPath, lang, author) {
+      const msg = "BilaraPathMap.transPat()";
+      const dbg = 0;
+      let { root } = this;
+      let bilaraPath = rootPath
+        .replace(/root/g, 'translation')
+        .replace(/pli/g, lang)
+        .replace(/ms/g, author);
+      let fullPath = path.join(root, bilaraPath);
+      if (!fs.existsSync(fullPath)) {
+        dbg && console.log(msg, '[1]!existsSync', {fullPath});
+        return null;
+      }
+      let stats = fs.statSync(fullPath);
+      if (stats.size < 5) {
+        dbg && console.log(msg, '[2]!size', {fullPath});
+        return null;
+      }
+
+      dbg && console.log(msg, '[3]ok', bilaraPath);
+      return bilaraPath;
+    }
+
+    trilingualPaths(opts={}) {
+      const msg = "BilaraPathMap.trilingualPaths() ";
+      const dbg = 0;
+      let {
+        suid,
+        rootLang = 'pli',
+        rootAuthor = 'ms',
+        refLang,
+        refAuthor,
+        docLang,
+        docAuthor,
+      } = opts;
+      let { root } = this;
+      if (!refAuthor && !refLang) {
+        refLang = 'en';
+        refAuthor = 'sujato';
+      }
+      
+      let pathMap = this.suidPaths(suid);
+      let paths = Object.keys(pathMap).reduce((a,k)=>{
+        a.push(pathMap[k]);
+        return a;
+      }, []);
+
+      let { langAuthorRegExp } = BilaraPathMap;
+      let reRoot = langAuthorRegExp(rootLang, rootAuthor);
+      let mldPaths = paths.filter(p=>reRoot && reRoot.test(p));
+      let rootPath = mldPaths[0];
+      if (rootPath) {
+        let docPath = this.transPath(rootPath, docLang, docAuthor);
+        let refPath = this.transPath(rootPath, refLang, refAuthor);
+        if (docPath) {
+          mldPaths.push(docPath);
         }
+        if (refPath && refPath !== docPath) {
+          mldPaths.push(refPath);
+        }
+        dbg && console.log(msg, mldPaths);
+      }
+      dbg && console.log(msg, {mldPaths});
+      return mldPaths;
+    }
 
-        suidPath(suid) {
-            if (!suid) {
-                throw new Error('BilaraPathMap.suidPath() suid is required');
-            }
-            var pathInfo = this.suidPaths(suid);
-            var suidParts = suid.split('/');
-            var key = suidParts.length === 1
-                ? `root/pli/ms`
-                : `translation/${suidParts[1]}/${suidParts[2]}`;
-            return pathInfo && pathInfo[key];
+    suidPaths(suid) {
+        if (!this.initialized) {
+            throw new Error(`initialize() has not been called`);
+        }
+        if (!suid) {
+            throw new Error('BilaraPathMap.suidPaths() suid is required');
         }
+        var suidParts = suid.split('/');
+        var key = suidParts[0];
+        let map = this.suidMap[key];
+        return map && Object.keys(map).reduce((a,k) => {
+            let v = map[k];
+            let kParts = k.split('/');
+            let vParts = v.split('/');
+            let suidParts = suid.split('/');
+            a[k] = `${k}/${v}/${suidParts[0]}_${kParts.join('-')}.json`;
+            return a;
+        }, {});
+    }
 
-        async _loadPaths(key) { try {
-            var {
-                root,
-                suidMap,
-                validatePath,
-                publication,
-            } = this;
-            var keyRoot = path.join(root, key);
-            var rootPrefix = `${root}/`;
-            var readOpts = {withFileTypes:true};
-            var exclude = [
-                'abhidhamma',   // (later)
-                '\bma\b',       // Chinese
-                '\bsa\b',       // Chinese
-                'site',
-                'sc-page',
-                'blurb',
-                'name',         // metadata
-                'playground',   // Blake
-            ].join('|');
-            var reExclude = new RegExp(`(${exclude})`,"ui");
-            var traverse = (dirPath)=>{
-                if (reExclude.test(dirPath)) {
-                    this.debug(`_loadPaths(${key}) exclude:`, dirPath);
-                    return;
-                }
-                var dirKids = fs.readdirSync(dirPath, readOpts);
-                for (var i = 0; i < dirKids.length; i++) {
-                    var e = dirKids[i];
-                    if (e.isDirectory()) {
-                        let kidPath = path.join(dirPath, e.name);
-                        traverse(kidPath);
-                    } else if (/.*json$/u.test(e.name)) {
-                        var ePath = path.join(dirPath, e.name);
-                        var stat = fs.statSync(ePath);
-                        if (stat.size <= STUBFILESIZE) {
-                            // ignore stub file
-                        } else if (publication && !publication.isPublishedPath(ePath)) {
-                            this.debug(`skipping ${ePath}`);
-                        } else {
-                            let suid = e.name.replace(/_.*/,'');
-                            let suidPath = dirPath.replace(rootPrefix, '')  
-                                        + `/${e.name}`;
-                            let valueParts = suidPath
-                                .replace(new RegExp(`${key}/`),'')
-                                .split('/');
-                            valueParts.pop();
-                            let value = valueParts.join('/');
-                            if (validatePath(key,value,suid)) {
-                                (suidMap[suid] = suidMap[suid] || {})[key] = value;
-                            }
-                        }
+    suidLanguages(suid) {
+        let suidPaths = this.suidPaths(suid);
+        return !suidPaths 
+            ? undefined
+            : Object.keys(suidPaths)
+                .sort()
+                .reduce((a,k)=>{
+                    let bilaraPath = suidPaths[k];
+                    if (/^(translation|root)/.test(bilaraPath)) {
+                        let [type,lang,author,category,nikaya] = 
+                            bilaraPath.split('/');
+                        a.push({
+                            suid: suid.split('/')[0],
+                            lang,
+                            author,
+                            category,
+                            nikaya,
+                            bilaraPath,
+                        });
                     }
-                }
-            };
-            let msStart = Date.now();
-            fs.existsSync(keyRoot) && traverse(keyRoot);
-            return suidMap;
-        } catch(e) {
-            this.warn(`_loadPaths(${key})`, e.message);
-            throw e;
-        }}
+                    return a;
+                },[]);
+    }
 
-        async buildSuidMap(opts={}) {
-            let msStart = Date.now();
-            let {
-                loadHtml = false,
-                loadVariant = false,
-                loadReference = false,
-                loadComment = false,
-            } = opts;
-            var readdir = fs.promises.readdir;
-            let suidMap = this.suidMap = {};
-            var transPath = path.join(this.root, "translation");
-            var rdOpts = {withFileTypes:true};
-            var langs = (await readdir(transPath, rdOpts))
-                .reduce((a,e)=> (e.isDirectory() 
-                    ? [...a,e.name] : a),[]);
-            for (var il=0; il < langs.length; il++) {
-                var l = langs[il];
-                var authPath = path.join(transPath,l);
-                var auths = (await readdir(authPath, rdOpts))
-                    .reduce((a,e)=>(e.isDirectory() 
-                        ? [...a,e.name] : a), []);
-                for (var ia=0; ia < auths.length; ia++) {
-                    var key = `translation/${l}/${auths[ia]}`;
-                    if (/en\/(patton|comm-team)/.test(key)) {
-                        continue; // ignore lzh->en translations
-                    }
-                    await this._loadPaths(key);
-                    if (loadComment) {
-                        let key = `comment/${l}/${auths[ia]}`;
-                        await this._loadPaths(key);
+    suidPath(suid) {
+        if (!suid) {
+            throw new Error('BilaraPathMap.suidPath() suid is required');
+        }
+        var pathInfo = this.suidPaths(suid);
+        var suidParts = suid.split('/');
+        var key = suidParts.length === 1
+            ? `root/pli/ms`
+            : `translation/${suidParts[1]}/${suidParts[2]}`;
+        return pathInfo && pathInfo[key];
+    }
+
+    async _loadPaths(key) { try {
+        var {
+            root,
+            suidMap,
+            validatePath,
+            publication,
+        } = this;
+        var keyRoot = path.join(root, key);
+        var rootPrefix = `${root}/`;
+        var readOpts = {withFileTypes:true};
+        var exclude = [
+            'abhidhamma',   // (later)
+            '\bma\b',       // Chinese
+            '\bsa\b',       // Chinese
+            'site',
+            'sc-page',
+            'blurb',
+            'name',         // metadata
+            'playground',   // Blake
+        ].join('|');
+        var reExclude = new RegExp(`(${exclude})`,"ui");
+        var traverse = (dirPath)=>{
+            if (reExclude.test(dirPath)) {
+                this.debug(`_loadPaths(${key}) exclude:`, dirPath);
+                return;
+            }
+            var dirKids = fs.readdirSync(dirPath, readOpts);
+            for (var i = 0; i < dirKids.length; i++) {
+                var e = dirKids[i];
+                if (e.isDirectory()) {
+                    let kidPath = path.join(dirPath, e.name);
+                    traverse(kidPath);
+                } else if (/.*json$/u.test(e.name)) {
+                    var ePath = path.join(dirPath, e.name);
+                    var stat = fs.statSync(ePath);
+                    if (stat.size <= STUBFILESIZE) {
+                        // ignore stub file
+                    } else if (publication && !publication.isPublishedPath(ePath)) {
+                        this.debug(`skipping ${ePath}`);
+                    } else {
+                        let suid = e.name.replace(/_.*/,'');
+                        let suidPath = dirPath.replace(rootPrefix, '')  
+                                    + `/${e.name}`;
+                        let valueParts = suidPath
+                            .replace(new RegExp(`${key}/`),'')
+                            .split('/');
+                        valueParts.pop();
+                        let value = valueParts.join('/');
+                        if (validatePath(key,value,suid)) {
+                            (suidMap[suid] = suidMap[suid] || {})[key] = value;
+                        }
                     }
                 }
             }
-            suidMap = Object.keys(suidMap)
-                .sort(SuttaCentralId.compareLow)
-                .reduce((a,k) =>{
-                    a[k] = suidMap[k]; 
-                    return a;
-                }, {});
-            this.suidMap = suidMap;
+        };
+        let msStart = Date.now();
+        fs.existsSync(keyRoot) && traverse(keyRoot);
+        return suidMap;
+    } catch(e) {
+        this.warn(`_loadPaths(${key})`, e.message);
+        throw e;
+    }}
 
-            await this._loadPaths("root/pli/ms");
-            loadHtml && await this._loadPaths("html/pli/ms");
-            loadReference &&await this._loadPaths("reference/pli/ms");
-            loadVariant && await this._loadPaths("variant/pli/ms"); 
-            let { suidMapFile } = this;
-            await fs.promises.writeFile(suidMapFile, JSON.stringify(suidMap, null, '\t'));
-            this.info(`buildSuidMap() ${suidMapFile} ${Date.now()-msStart}ms`);
-            return suidMap;
-        }
+    async buildSuidMap(opts={}) {
+      let msStart = Date.now();
+      let {
+          loadHtml = false,
+          loadVariant = false,
+          loadReference = false,
+          loadComment = false,
+      } = opts;
+      var readdir = fs.promises.readdir;
+      let suidMap = this.suidMap = {};
+      var transPath = path.join(this.root, "translation");
+      var rdOpts = {withFileTypes:true};
+      var langs = (await readdir(transPath, rdOpts))
+          .reduce((a,e)=> (e.isDirectory() 
+              ? [...a,e.name] : a),[]);
+      for (var il=0; il < langs.length; il++) {
+          var l = langs[il];
+          var authPath = path.join(transPath,l);
+          var auths = (await readdir(authPath, rdOpts))
+              .reduce((a,e)=>(e.isDirectory() 
+                  ? [...a,e.name] : a), []);
+          for (var ia=0; ia < auths.length; ia++) {
+              var key = `translation/${l}/${auths[ia]}`;
+              if (/en\/(patton|comm-team)/.test(key)) {
+                  continue; // ignore lzh->en translations
+              }
+              await this._loadPaths(key);
+              if (loadComment) {
+                  let key = `comment/${l}/${auths[ia]}`;
+                  await this._loadPaths(key);
+              }
+          }
+      }
+      suidMap = Object.keys(suidMap)
+          .sort(SuttaCentralId.compareLow)
+          .reduce((a,k) =>{
+              a[k] = suidMap[k]; 
+              return a;
+          }, {});
+      this.suidMap = suidMap;
+
+      await this._loadPaths("root/pli/ms");
+      loadHtml && await this._loadPaths("html/pli/ms");
+      loadReference &&await this._loadPaths("reference/pli/ms");
+      loadVariant && await this._loadPaths("variant/pli/ms"); 
+      let { suidMapFile } = this;
+      await fs.promises.writeFile(suidMapFile, JSON.stringify(suidMap, null, '\t'));
+      this.info(`buildSuidMap() ${suidMapFile} ${Date.now()-msStart}ms`);
+      return suidMap;
     }
+  }
 
-    module.exports = exports.BilaraPathMap = BilaraPathMap;
+  module.exports = exports.BilaraPathMap = BilaraPathMap;
 })(typeof exports === "object" ? exports : (exports = {}));
 

package/src/defines.cjs

@@ -6,7 +6,9 @@ module.exports.DBG_MLD        = 0;
 module.exports.DBG = {
   FIND: 0,
   FINDARGS: 0,
+  MLD_CTOR: 0,
   MLD_LOAD: 0,
+  MLD_TITLES: 0,
   SEEKER: 0,
   SEARCH_SCRIPT: 0, 
   SLOWFIND: 0,

package/src/ml-doc.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const path = require("path");
 const { logger } = require('log-instance');
 const { Files } = require('memo-again');
-const { BilaraPath } = require("scv-esm");
+const { AuthorsV2, BilaraPath } = require("scv-esm");
 const Unicode = require('./unicode');
 const Pali = require('./pali');
 const { SuttaCentralId } = require('scv-esm');
@@ -12,31 +12,68 @@ const { DBG, DBG_MLD, } = require("./defines.cjs");
 
 class MLDoc {
   constructor(opts = {}) {
+    const msg = 'M3c.ctor:';
+    const dbg = DBG.MLD_CTOR;
+    dbg>1 && console.log(msg, '[1]opts', opts);
     (opts.logger || logger).logInstance(this, opts);
     var {
+      author,
+      author_uid,
       bilaraPaths,
+      category = 'sutta',
+      docAuthorName,
+      footer = MLDoc.SC_FOOTER,
+      hyphen = "\u00ad",
+      lang,
+      langSegs,
+      maxWord = 30,
+      minWord = 5,
+      score = 0, // search relevance
+      segMap = {},
+      segsMatched,
+      sutta_uid,
+      title,
+      trilingual,
+      type = 'translation',
     } = opts;
     if (bilaraPaths == null) {
       throw new Error(`bilaraPaths is required`);
     }
-    this.bilaraPaths = bilaraPaths;
-    this.author_uid = opts.author_uid;
-    this.type = opts.type || 'translation';
-    this.category = opts.category || 'sutta';
-    this.sutta_uid = opts.sutta_uid;
-    this.lang = opts.lang || this.languages().pop();
-    this.segMap = opts.segMap || {};
-    this.score = opts.score || 0; // search relevance
-    this.hyphen = opts.hyphen || "\u00ad";
-    this.maxWord = opts.maxWord || 30;
-    this.minWord = opts.minWord || 5;
-    this.title = opts.title;
-    this.segsMatched = opts.segsMatched;
-    this.langSegs = opts.langSegs;
-    if (opts.trilingual) {
-      this.trilingual = true;
+    lang = lang || MLDoc.bilaraPathLanguages(bilaraPaths, lang).pop();
+    if (author == null) {
+      let aInfo = AuthorsV2.authorInfo(author_uid);
+      author = aInfo?.name?.join(', ');
+    }
+    if (author) {
+      this.author = author;
+    }
+
+    Object.assign(this, {
+      segMap, // For console debugging, this is first
+
+      author,
+      author_uid,
+      bilaraPaths,
+      category,
+      footer,
+      hyphen,
+      lang,
+      langSegs,
+      maxWord,
+      minWord,
+      score,
+      segsMatched,
+      sutta_uid,
+      title,
+      type,
+    });
+    if (trilingual) {
+      this.trilingual = trilingual;
       this.docLang = opts.docLang;
       this.docAuthor = opts.docAuthor;
+      if (author) {
+        this.docAuthorName = docAuthorName || author;
+      }
       this.refLang = opts.refLang || 'en';
       this.refAuthor = opts.refAuthor || 'sujato';
     }
@@ -45,6 +82,14 @@ class MLDoc {
     });
   }
 
+  static get SC_FOOTER() {
+    return [
+      '<a href="https://suttacentral.net/licensing">',
+      'Creative Commons Zero (CC0 1.0 Universal)',
+      '</a>',
+    ].join('');
+  }
+
   static compare(m1, m2) {
     var cmp = m2.score - m1.score;
     return cmp ? cmp : SuttaCentralId.compareLow(m1.suid, m2.suid);
@@ -122,7 +167,7 @@ class MLDoc {
 
   titles(lang = this.lang) {
     const msg = 'M3c.titles:';
-    const dbg = DBG.MLD_LOAD;
+    const dbg = DBG.MLD_TITLES;
     let headSegs = this.segments().slice(0,4);
     dbg && console.log(msg, {lang, headSegs});
     var titles = headSegs.slice(0, 4).reduce((a, s, i) => {
@@ -149,11 +194,7 @@ class MLDoc {
     return result;
   }
 
-  languages() {
-    let {
-      bilaraPaths,
-      lang,
-    } = this;
+  static bilaraPathLanguages(bilaraPaths, lang='en') {
     return bilaraPaths.length
       ? Object.keys(bilaraPaths.reduce((a, bp) => {
         a[bp.split('/')[1]] = true;
@@ -235,6 +276,9 @@ class MLDoc {
             this.author = header.author;
             this.author_uid = header.author_uid;
             this.footer = header.footer;
+            if (trilingual) {
+              this.docAuthorName = this.author;
+            }
 
             dbg && console.log(msg, '[3]header', header);
           }

package/src/seeker.cjs

@@ -1038,25 +1038,7 @@
               `${suid}/${refLang || lang}/${author}`
             );
           } else {
-            this.debug(`slowFind() -> loadMLDocLegacy(${suid}/${lang})`);
-            try {
-              mld = await bd.loadMLDocLegacy(suttaRef);
-              mlDocs.push(mld);
-              matchingRefs.push(suttaRef);
-              var resFilter = mld.filterSegments({
-                pattern,
-                resultPattern,
-                languages: [searchLang],
-                showMatchesOnly,
-              });
-              segsMatched += resFilter.matched;
-              mld.segsMatched = resFilter.matched;
-              if (matchHighlight) {
-                mld.highlightMatch(resultPattern, matchHighlight);
-              }
-            } catch (e) {
-              this.warn(`suid:${suid} =>`, e.message);
-            }
+            this.warn(`NOT SUPPORTED: legacy ${suid}`);
           }
         }
       }