twl-generator 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twl-generator",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Generate term-to-article lists from unfoldingWord en_tw archive for Bible books. Works in both Node.js (CLI) and React.js (browser) environments.",
   "main": "src/index.js",
   "bin": {

package/src/utils/twl-matcher.js

@@ -116,24 +116,24 @@ class PrefixTrie {
 
   findMatches(text, startPos) {
     // First try exact case matches
-    let matches = this._findMatchesInTree(this.exactCaseRoot, text, startPos, true);
+    let matches = this._findMatchesInTree(this.exactCaseRoot, text, startPos, true, text);
 
     // If no exact case matches, try case-insensitive
     if (matches.length === 0) {
-      matches = this._findMatchesInTree(this.lowerCaseRoot, text.toLowerCase(), startPos, false);
+      matches = this._findMatchesInTree(this.lowerCaseRoot, text.toLowerCase(), startPos, false, text);
     }
 
     return matches;
   }
 
-  _findMatchesInTree(root, text, startPos, isExactCase) {
+  _findMatchesInTree(root, searchText, startPos, isExactCase, originalText) {
     const matches = [];
     let node = root;
     let currentPos = startPos;
 
     // Try to match as long as possible
-    while (currentPos < text.length) {
-      const char = text[currentPos];
+    while (currentPos < searchText.length) {
+      const char = searchText[currentPos];
 
       if (!node[char]) {
         break; // No more matches possible
@@ -145,16 +145,17 @@ class PrefixTrie {
       // If we found terms at this position, collect them
       if (node._terms) {
         const matchLength = currentPos - startPos;
-        const originalMatchedText = text.substring(startPos, currentPos);
+        // Always extract from the original text to preserve case
+        const originalMatchedText = originalText.substring(startPos, currentPos);
 
         // Check if this is a valid word boundary match (both start and end)
         const isStartBoundary = startPos === 0 ||
-          /[\s\p{P}]/.test(text[startPos - 1]) ||
-          !/[\w]/.test(text[startPos - 1]);
+          /[\s\p{P}]/.test(originalText[startPos - 1]) ||
+          !/[\w]/.test(originalText[startPos - 1]);
 
-        const isEndBoundary = currentPos >= text.length ||
-          /[\s\p{P}]/.test(text[currentPos]) ||
-          !/[\w]/.test(text[currentPos]);
+        const isEndBoundary = currentPos >= originalText.length ||
+          /[\s\p{P}]/.test(originalText[currentPos]) ||
+          !/[\w]/.test(originalText[currentPos]);
 
         const isWordBoundary = isStartBoundary && isEndBoundary;
 

package/src/utils/usfm-alignment-remover.js

@@ -7,18 +7,7 @@ const isNode = typeof window === 'undefined' && typeof process !== 'undefined' &
 
 // Get appropriate fetch implementation
 async function getFetch() {
-  if (isNode) {
-    // Use native fetch in Node.js 18+ or fallback to node-fetch
-    if (typeof globalThis.fetch !== 'undefined') {
-      return globalThis.fetch;
-    }
-    try {
-      const nodeFetch = await import('node-fetch');
-      return nodeFetch.default;
-    } catch (error) {
-      throw new Error('fetch not available. Please use Node.js 18+ or install node-fetch');
-    }
-  }
+  // Both Node.js 18+ and browsers have native fetch
   return globalThis.fetch;
 }
 

package/src/utils/zipProcessor.js

@@ -7,8 +7,7 @@
  *   import { generateTWTerms } from './utils/zipProcessor.js';
  *   const terms = await generateTWTerms();
  */
-
-import { BibleBookData } from '../common/books.js';
+import JSZip from "jszip";
 
 // Environment detection
 const isNode = typeof process !== 'undefined' && process.versions?.node;
@@ -21,38 +20,6 @@ const CACHE_VERSION = '1.0';
 // In-memory cache for processed terms (per session)
 let processedTermsCache = null;
 
-/**
- * Get dependencies dynamically (JSZip works in both environments)
- */
-async function getDeps() {
-  try {
-    const jsZipModule = await import('jszip');
-    const deps = {
-      JSZip: jsZipModule.default
-    };
-
-    // Add Node.js-specific fetch if needed (fallback for Node.js < 18)
-    if (isNode) {
-      if (typeof globalThis.fetch === 'undefined') {
-        try {
-          const nodeModule = await import('node-fetch');
-          deps.fetch = nodeModule.default;
-        } catch (error) {
-          console.warn('node-fetch not available, please use Node.js 18+ or install node-fetch');
-          deps.fetch = null;
-        }
-      } else {
-        deps.fetch = globalThis.fetch;
-      }
-    }
-
-    return deps;
-  } catch (error) {
-    console.error('Failed to load dependencies:', error);
-    return null;
-  }
-}
-
 async function getCachedZip() {
   if (isBrowser) {
     // Browser: Use localStorage for ZIP cache
@@ -144,26 +111,6 @@ async function getCachedTerms() {
         } catch (e) { /* ignore cleanup errors */ }
       }
     }
-  } else if (isNode) {
-    // Node.js file system caching
-    try {
-      const deps = await getNodeDeps();
-      if (!deps) return null;
-
-      const { fs, path, fileURLToPath } = deps;
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path.dirname(__filename);
-      const CACHE_FILE = path.join(__dirname, '../../article_terms.json');
-
-      if (fs.existsSync(CACHE_FILE)) {
-        const cachedData = JSON.parse(fs.readFileSync(CACHE_FILE, 'utf8'));
-        console.log('Using cached article terms from article_terms.json');
-        memoryCache = cachedData;
-        return cachedData;
-      }
-    } catch (error) {
-      console.log('File cache corrupted, regenerating...');
-    }
   }
 
   return null;
@@ -192,22 +139,6 @@ async function cacheTerms(termMap) {
         console.warn('Failed to cache in browser storage:', error.message);
       }
     }
-  } else if (isNode) {
-    // Node.js file system caching
-    try {
-      const deps = await getNodeDeps();
-      if (!deps) return;
-
-      const { fs, path, fileURLToPath } = deps;
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = path.dirname(__filename);
-      const CACHE_FILE = path.join(__dirname, '../../article_terms.json');
-
-      fs.writeFileSync(CACHE_FILE, JSON.stringify(termMap, null, 2), 'utf8');
-      console.log('Article terms cached to article_terms.json');
-    } catch (error) {
-      console.warn('Failed to cache article terms to file:', error.message);
-    }
   }
 }
 
@@ -215,11 +146,6 @@ async function cacheTerms(termMap) {
  * Process ZIP buffer and extract term mappings
  */
 async function processZipBuffer(zipBuffer) {
-  // Use JSZip universally for both Node.js and Browser
-  const deps = await getDeps();
-  if (!deps) throw new Error('Failed to load dependencies');
-  const { JSZip } = deps;
-
   const zip = new JSZip();
   const zipData = await zip.loadAsync(zipBuffer);
 
@@ -277,17 +203,7 @@ export async function generateTWTerms() {
     // Download fresh ZIP
     console.log('Downloading TW archive...');
 
-    let fetchFn;
-    if (isBrowser) {
-      fetchFn = window.fetch;
-    } else {
-      const deps = await getDeps();
-      fetchFn = deps?.fetch;
-    }
-
-    if (!fetchFn) throw new Error('Fetch not available');
-
-    const res = await fetchFn(ZIP_URL);
+    const res = await fetch(ZIP_URL);
     if (!res.ok) throw new Error(`Failed to download ZIP: ${res.status} ${res.statusText}`);
 
     zipBuffer = await res.arrayBuffer();