scv-esm 1.111.126 → 1.113.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scv-esm",
-  "version": "1.111.126",
+  "version": "1.113.0",
   "description": "SuttaCentral Voice ES Module",
   "main": "index.js",
   "module": "main.mjs",

package/src/authors-v2.mjs

@@ -1,6 +1,6 @@
 import AUTHORSV2 from "./auto/authors-v2.mjs";
 import { default as SuttaRef } from './sutta-ref.mjs';
-import { DBG, } from './defines.mjs';
+import { DBG } from './defines.mjs';
 
 import { default as  suidMap } from './auto/suid-map.mjs';
 
@@ -10,9 +10,8 @@ export default class AuthorsV2 {
   }
 
   static authorInfo(author, lang) {
-    const msg = "AuthorsV2.authorInfo() ";
-    const dbg = DBG.AUTHOR;
-    const dbgv = DBG.VERBOSE && dbg;
+    const msg = "a72.authorInfo() ";
+    const dbg = DBG.A72_AUTHOR_INFO;
     let keys = Object.keys(AUTHORSV2);
     let authorInfo = keys.reduce((a,k)=>{
       let info = AUTHORSV2[k];
@@ -20,13 +19,13 @@ export default class AuthorsV2 {
         return a;
       }
       if (info.lang === lang || a==null) {
-        dbgv && console.log(msg, '[1]info', info.author);
+        dbg>1 && console.log(msg, '[1]info', info.author);
         return info;
       }
-      dbgv && console.log(msg, '[2]!lang', info.lang, info.author);
+      dbg>1 && console.log(msg, '[2]!lang', info.lang, info.author);
       return a;
     }, undefined);
-    dbgv && console.log(msg, '[3]info', author, authorInfo);
+    dbg>1 && console.log(msg, '[3]info', author, authorInfo);
     return authorInfo;
   }
 
@@ -75,8 +74,8 @@ export default class AuthorsV2 {
   }
 
   static langAuthor(lang, opts={}) {
-    const msg = "AuthorsV2.langAuthor()";
-    const dbg = DBG.AUTHOR;
+    const msg = "a72.langAuthor()";
+    const dbg = DBG.A72_LANG_AUTHOR;
     let {
       category='sutta',
     } = opts;
@@ -99,8 +98,22 @@ export default class AuthorsV2 {
            dbg && console.log(msg, '[1]lang', info.name);
            return info;
          }
-         let cmp = AuthorsV2.compare(info.author, a && a.author);
-         dbg && console.log(msg, '[2]compare', info.name, cmp);
+
+         // compare by number of MN suttas translated
+         let sutta_mn1 = info?.stats?.['sutta/mn'] || 0;
+         let sutta_mn2 = a?.stats?.['sutta/mn'] || 0;
+         let cmp = sutta_mn1 - sutta_mn2;
+
+         if (cmp === 0) { // compare by number of suttas translated
+           let sutta1 = info?.stats?.sutta || 0;
+           let sutta2 = a?.stats?.sutta || 0;
+           cmp = sutta1 - sutta2;
+         }
+         dbg && console.log(msg, '[2]stats', {sutta1, sutta2, cmp});
+         if (cmp === 0) { // compare by author name
+           cmp = AuthorsV2.compare(info.author, a && a.author);
+           dbg && console.log(msg, '[3]author', info.name, cmp);
+         }
          if (cmp === 0) {
            return a;
          }
@@ -114,9 +127,8 @@ export default class AuthorsV2 {
   }
 
   static compareInfo(info1, info2) {
-    const msg = "AuthorsV2.compareInfo()";
-    const dbg = DBG.AUTHOR;
-    const dbgv = DBG.VERBOSE && dbg;
+    const msg = "a72.compareInfo()";
+    const dbg = DBG.A72_COMPARE_INFO;
     if (info1 === info2) {
       return 0;
     }
@@ -135,10 +147,10 @@ export default class AuthorsV2 {
       let deepl2 = info2.author.startsWith('ebt-deepl') ? 1 : 2;
       let cmp = deepl1 - deepl2;
       //if (info1.author.startsWith('ebt-deepl')) {
-        //dbgv && console.log(msg, '[1]info1', info1.name);
+        //dbg>1 && console.log(msg, '[1]info1', info1.name);
         //cmp = -1;
       //} else if (info2.author.startsWith('ebt-deepl')) {
-        //dbgv && console.log(msg, '[2]info2', info2.name);
+        //dbg>1 && console.log(msg, '[2]info2', info2.name);
         //cmp = 1;
       //}
     }
@@ -149,8 +161,8 @@ export default class AuthorsV2 {
   }
 
   static compare(author1, author2) {
-    const msg = "authors-v2.compare() ";
-    const dbg = 0 || DBG.AUTHOR;
+    const msg = "a72.compare() ";
+    const dbg = DBG.A72_COMPARE;
     author1 = !!author1 ? author1 : '';
     author2 = !!author2 ? author2 : '';
     let noauthor = {author:'no-author'};
@@ -193,7 +205,7 @@ export default class AuthorsV2 {
       let sutta1 = info1.sutta ? 1 : 0;
       let sutta2 = info2.sutta ? 1 : 0;
       cmp = sutta1 - sutta2;
-      dbg && console.log(msg, '[7]sutta', cmp);
+      dbg && console.log(msg, '[7]sutta', cmp, info1.sutta, info2.sutta);
     }
     if (!cmp) {
       let vinaya1 = info1.vinaya ? 1 : 0;
@@ -206,8 +218,8 @@ export default class AuthorsV2 {
   }
 
   static suttaAuthor(suttaRef) {
-    const msg = 'AuthorsV2.suttaAuthor()';
-    const dbg = DBG.AUTHOR;
+    const msg = 'a72.suttaAuthor()';
+    const dbg = DBG.A72_SUTTA_AUTHOR;
     let { 
       sutta_uid, lang, author 
     } = SuttaRef.create(suttaRef);
@@ -223,6 +235,10 @@ export default class AuthorsV2 {
       let bpv = bPaths[bpk] || '';
       let [ ignore, bpLang, bpAuthor ] = bpk.split('/');
       let info = AuthorsV2.authorInfo(bpAuthor, bpLang); 
+      if (info == null) { // aligned legacy (fr/wijayaratna)
+        dbg && console.log(msg, {bpAuthor, bpLang});
+        return a;
+      }
       let { stats } = info;
       let bpvParts = bpv && bpv.split('/');
       let statsScore = stats 

package/src/defines.mjs

@@ -1,7 +1,7 @@
 export const DBG = {
-  AUTHOR: 0,
-  COMPARE: 0,
-  SUTTA_REF: 0,
-  VERBOSE: 0,
+  A72_SUTTA_AUTHOR: 0,
+  A72_LANG_AUTHOR: 0,
+  A72_COMPARE: 0,
+  S6F_CREATE_OPTS: 0,
 };
 

package/src/sutta-ref.mjs

@@ -24,8 +24,8 @@ export default class SuttaRef {
   }
 
   static createFromString(str='', defaultLang="pli", suids=SUIDS) {
-    const msg = 'SuttaRef.createFromString()';
-    const dbg = DBG.SUTTA_REF;
+    const msg = 's6f.createFromString()';
+    const dbg = DBG.S6F_CREATE_FROM_STRING;
     let refLower = str.toLowerCase();
     let segMatch = refLower.match(/:[-0-9.]*/);
     let segnum;
@@ -114,7 +114,7 @@ export default class SuttaRef {
   }
 
   static createFromObject(obj, defaultLang="pli", suids=SUIDS) {
-    const msg = "SuttaRef.createFromObject() ";
+    const msg = "s6f.createFromObject() ";
     let parsed = SuttaRef.createFromString(
       obj.sutta_uid,
       obj.lang || defaultLang
@@ -145,18 +145,21 @@ export default class SuttaRef {
   }
 
   static create(strOrObj, defaultLang="pli", suids=SUIDS) {
+    const msg = 's6f.create:';
     try {
       return SuttaRef.createWithError(strOrObj, defaultLang, suids);
     } catch(e) {
       let args = JSON.stringify(strOrObj);
-      let msg = `SuttaRef.create() ${args} => ${e.message}`;
-      logger.warn(msg);
+      let emsg = `${msg} ${args} => ${e.message}`;
+      logger.warn(emsg);
     }
 
     return null;
   }
 
   static createOpts(strOrObj, opts={}) {
+    const msg = 's6f.createOpts:';
+    const dbg = DBG.S6F_CREATE_OPTS;
     let {
       defaultLang = 'pli',
       suids = SUIDS,
@@ -167,6 +170,7 @@ export default class SuttaRef {
       return undefined;
     }
 
+    dbg && console.log(msg, '[1]', {strOrObj, defaultLang, normalize});
     let sref = typeof strOrObj === 'string'
       ? SuttaRef.create(strOrObj, defaultLang, suids)
       : SuttaRef.create(Object.assign({},strOrObj), defaultLang, suids);
@@ -174,6 +178,7 @@ export default class SuttaRef {
     if (normalize && sref) {
       let { sutta_uid, lang, author, segnum } = sref;
       if (sutta_uid && author == null) {
+        dbg && console.log(msg, '[2]author?', {sref});
         sref.author = AuthorsV2.suttaAuthor(sref);
       }
     }