scv-bilara 3.166.3 → 3.167.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scv-bilara",
-  "version": "3.166.3",
+  "version": "3.167.1",
   "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.81",
+    "scv-esm": "^1.111.82",
     "suttacentral-api": "^2.16.11",
     "tmp": "^0.2.3"
   },

package/scripts/js/search.js

@@ -8,10 +8,7 @@ const {
     English,
     ExampleV2,
     ExecGitMock,
-    FuzzyWordSet,
-    Pali,
     Seeker,
-    SegDoc,
     SuttaCentralId,
     Verse,
 
@@ -430,7 +427,7 @@ found     : segs:${segsMatched} by:${method} mlDocs:${nDocs} docs:${nRefs} ${ref
     );
   }
   mlDocs.forEach((mld,im) => {
-    let {suid, author, author_uid, lang} = mld;
+    let {suid, docAuthor, docAuthorName, docFooter, lang} = mld;
     mld.segments().forEach((seg,i) => {
       var scid = seg.scid;
       var sep = '---';
@@ -439,7 +436,7 @@ found     : segs:${segsMatched} by:${method} mlDocs:${nDocs} docs:${nRefs} ${ref
         let score = mld.score.toFixed(3);
         let title = [
           `doc:${im+1}/${nDocs}`,
-          `${author} ${suid}/${lang}/${author_uid}`,
+          `${docAuthorName} ${suid}/${lang}/${docAuthor}`,
           `score:${score}`
         ].join(' ');
         console.log(`${sep} ${title} ${sep}`);
@@ -499,6 +496,9 @@ found     : segs:${segsMatched} by:${method} mlDocs:${nDocs} docs:${nRefs} ${ref
           break;
       }
     });
+    let footer = mld.docFooter
+      .replaceAll(/<[^>]*>/g, '');
+    console.log('\n', footer);
   });
 }
 

package/src/bilara-data.js

@@ -532,14 +532,17 @@
     async trilingualDoc(suttaRef, opts={}) {
       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',
         refLang,
         refAuthor = 'sujato',
+        refAuthorName,
         docLang = suttaRef.lang,
         docAuthor = suttaRef.author,
+        docAuthorName,
         logLevel,
       } = opts;
       let suid = suttaRef.sutta_uid;
@@ -548,6 +551,15 @@
         let msgData = JSON.stringify({ suidRef, suid });
         throw new Error(`${msg} no suttaInfo(${msgData})`);
       }
+      if (docAuthorName == null) {
+        let info = AuthorsV2.authorInfo(docAuthor);
+        docAuthorName = info?.name?.join(', ');
+      }
+      if (refAuthorName == null) {
+        let info = AuthorsV2.authorInfo(refAuthor);
+        refAuthorName = info?.name?.join(', ');
+      }
+
       let bilaraPaths = bpm.trilingualPaths({
         suid,
         rootLang,
@@ -567,16 +579,21 @@
         bilaraPaths,
         refAuthor,
         refLang,
+        refAuthorName,
         docAuthor,
+        docAuthorName,
         docLang,
         trilingual:true,
       };
       logLevel && (mldOpts.logLevel = logLevel);
-      dbg && console.log(msg, '[1]mldOpts', mldOpts);
+      dbg>1 && console.log(msg, '[1]mldOpts', mldOpts);
       let mld = await new MLDoc(mldOpts).load(root);
       if (dbg) {
         let dbgOut = mld && {
           author: mld.author,
+          refLang: mld.refLang,
+          refAuthor: mld.refAuthor,
+          refAuthorName: mld.refAuthorName,
           docLang: mld.docLang,
           docAuthor: mld.docAuthor,
           docAuthorName: mld.docAuthorName,

package/src/ml-doc.js

@@ -21,7 +21,6 @@ class MLDoc {
       author_uid,
       bilaraPaths,
       category = 'sutta',
-      docAuthorName,
       footer = MLDoc.SC_FOOTER,
       hyphen = "\u00ad",
       lang,
@@ -71,11 +70,20 @@ class MLDoc {
       this.trilingual = trilingual;
       this.docLang = opts.docLang;
       this.docAuthor = opts.docAuthor;
-      if (author) {
-        this.docAuthorName = docAuthorName || author;
+      this.docAuthorName = opts.docAuthorName;
+      let docInfo = AuthorsV2.authorInfo(this.docAuthor);
+      if (docInfo) {
+        this.docAuthorName = docInfo.name?.join(', ');
+        this.docFooter = MLDoc.SC_FOOTER;
       }
       this.refLang = opts.refLang || 'en';
       this.refAuthor = opts.refAuthor || 'sujato';
+      this.refAuthorName = opts.refAuthorName;
+      let refInfo = AuthorsV2.authorInfo(this.refAuthor);
+      if (refInfo) {
+        this.refAuthorName = refInfo.name?.join(', ');
+        this.refFooter = MLDoc.SC_FOOTER;
+      }
     }
     Object.defineProperty(this, "unicode", {
       value: opts.unicode || new Unicode(),
@@ -212,15 +220,17 @@ class MLDoc {
         bilaraPaths,
         docLang,
         docAuthor,
+        docAuthorName,
         refLang,
         refAuthor,
+        refAuthorName,
         trilingual,
       } = this;
       this.langSegs = {};
       let langMap = {};
       var p_bp = [];
       dbg && console.log(msg, '[1]', 
-        {bilaraPaths, lang, docAuthor, refAuthor});
+        {bilaraPaths, docLang, docAuthor, refLang, refAuthor});
 
       for (var ip = 0; ip < bilaraPaths.length; ip++) {
         var parts = BilaraPath.pathParts(bilaraPaths[ip]);
@@ -272,15 +282,34 @@ class MLDoc {
           header = strings.__header__;
           if (header) {
             delete strings.__header__;
+            let { refAuthor, docAuthor } = this;
             this.sutta_uid = header.suid;
-            this.author = header.author;
-            this.author_uid = header.author_uid;
-            this.footer = header.footer;
-            if (trilingual) {
-              this.docAuthorName = this.author;
+            this.lang = this.lang || header.lang;
+            if (refAuthor === header.author_uid) {
+              dbg && console.log(msg, 'ref');
+              this.refAuthorName = header.author;
+              this.refFooter = header.footer;
+            }
+            if (docAuthor === header.author_uid) {
+              this.docAuthorName = header.author;
+              this.docFooter = header.footer;
             }
 
-            dbg && console.log(msg, '[3]header', header);
+            if (dbg) {
+              let show = {
+                lang: this.lang,
+                docAuthor,
+                docAuthorName: this.docAuthorName,
+                docFooter: this.docFooter,
+                refAuthor,
+                refAuthorName: this.refAuthorName,
+                refFooter: this.refFooter,
+              }
+              if (dbg > 1) {
+                show.header = header;
+              }
+              console.log(msg, '[3]__header__', show);
+            }
           }
           fh.close();
           let keys = Object.keys(strings);