twl-generator 1.1.5 → 1.2.1

package/README.md

@@ -134,7 +134,7 @@ All standard Bible book abbreviations are supported:
 The generated TSV contains these columns:
 
 - **Reference**: Chapter:verse (e.g., "1:1")
-- **ID**: Unique 4-character hex identifier
+- **ID**: Unique 4-character identifier
 - **Tags**: Article category ("keyterm", "name", or empty)
 - **OrigWords**: The matched text from the source
 - **Occurrence**: Occurrence number for this term in this verse
@@ -144,7 +144,7 @@ The generated TSV contains these columns:
 
 ## Requirements
 
-- **Node.js**: >=16.0.0
+- **Node.js**: >=18.0.0 (for native fetch support)
 - **Browser**: Modern browser with ES6 modules support
 - **React.js**: >=16.8.0 (for React usage)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twl-generator",
-  "version": "1.1.5",
+  "version": "1.2.1",
   "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": {
@@ -43,11 +43,10 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "dependencies": {
-    "jszip": "^3.10.1",
-    "node-fetch": "^3.3.2"
+    "jszip": "^3.10.1"
   },
   "peerDependencies": {
     "react": ">=16.8.0"
@@ -57,4 +56,4 @@
       "optional": true
     }
   }
-}
+}

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

@@ -7,10 +7,7 @@ const isNode = typeof window === 'undefined' && typeof process !== 'undefined' &
 
 // Get appropriate fetch implementation
 async function getFetch() {
-  if (isNode) {
-    const nodeFetch = await import('node-fetch');
-    return nodeFetch.default;
-  }
+  // 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,29 +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
-    if (isNode) {
-      const nodeModule = await import('node-fetch');
-      deps.fetch = nodeModule.default;
-    }
-
-    return deps;
-  } catch (error) {
-    console.error('Failed to load dependencies:', error);
-    return null;
-  }
-}
-
 async function getCachedZip() {
   if (isBrowser) {
     // Browser: Use localStorage for ZIP cache
@@ -135,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;
@@ -183,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);
-    }
   }
 }
 
@@ -206,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);
 
@@ -268,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();