node-sword-interface 1.0.4 → 1.0.6

package/API.md

@@ -35,7 +35,7 @@ This is the main class of node-sword-interface and it provides a set of static f
     * [.updateRepositoryConfig(progressCB)](#NodeSwordInterface+updateRepositoryConfig) ⇒ <code>Promise</code>
     * [.getRepoNames()](#NodeSwordInterface+getRepoNames) ⇒ <code>Array.&lt;String&gt;</code>
     * [.getRepoLanguages(repositoryName, moduleType)](#NodeSwordInterface+getRepoLanguages) ⇒ <code>Array.&lt;String&gt;</code>
-    * [.getAllRepoModules(repositoryName, moduleType)](#NodeSwordInterface+getAllRepoModules) ⇒ <code>Array.&lt;String&gt;</code>
+    * [.getAllRepoModules(repositoryName, moduleType)](#NodeSwordInterface+getAllRepoModules) ⇒ [<code>Array.&lt;ModuleObject&gt;</code>](#ModuleObject)
     * [.getRepoModulesByLang(repositoryName, language, moduleType, headersFilter, strongsFilter, hebrewStrongsKeys, greekStrongsKeys)](#NodeSwordInterface+getRepoModulesByLang) ⇒ [<code>Array.&lt;ModuleObject&gt;</code>](#ModuleObject)
     * [.getUpdatedRepoModules(repositoryName, includeBeta)](#NodeSwordInterface+getUpdatedRepoModules) ⇒ [<code>Array.&lt;ModuleObject&gt;</code>](#ModuleObject)
     * [.getRepoModule(moduleCode)](#NodeSwordInterface+getRepoModule) ⇒ [<code>ModuleObject</code>](#ModuleObject)
@@ -125,11 +125,11 @@ Note that the languages are returned as language codes.
 
 <a name="NodeSwordInterface+getAllRepoModules"></a>
 
-### nodeSwordInterface.getAllRepoModules(repositoryName, moduleType) ⇒ <code>Array.&lt;String&gt;</code>
+### nodeSwordInterface.getAllRepoModules(repositoryName, moduleType) ⇒ [<code>Array.&lt;ModuleObject&gt;</code>](#ModuleObject)
 Returns all modules for the given repository (default: Bible modules).
 
 **Kind**: instance method of [<code>NodeSwordInterface</code>](#NodeSwordInterface)  
-**Returns**: <code>Array.&lt;String&gt;</code> - An array of strings with the module codes for the Bible modules of the given repository.  
+**Returns**: [<code>Array.&lt;ModuleObject&gt;</code>](#ModuleObject) - An array of strings with the module codes for the Bible modules of the given repository.  
 
 | Param | Type | Default | Description |
 | --- | --- | --- | --- |

package/index.js

@@ -148,7 +148,7 @@ class NodeSwordInterface {
    *
    * @param {String} repositoryName - The name of the given repository.
    * @param {String} moduleType - A filter parameter that defines the moduleType (Options: BIBLE, DICT)
-   * @return {String[]} An array of strings with the module codes for the Bible modules of the given repository.
+   * @return {ModuleObject[]} An array of strings with the module codes for the Bible modules of the given repository.
    */
   getAllRepoModules(repositoryName, moduleType="BIBLE") {
     return this.nativeInterface.getAllRepoModules(repositoryName, moduleType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",
@@ -16,11 +16,13 @@
     "clean": "node-gyp clean",
     "doc": "jsdoc2md index.js > API.md",
     "pub": "rm -rf build node_modules sword sword_build test && npm publish ./",
-    "deploy": "scripts/deploy_local.sh"
+    "deploy": "scripts/deploy_local.sh",
+    "postinstall": "node scripts/postinstall.js"
   },
   "author": "Tobias Klein",
   "license": "GPL-2.0+",
   "dependencies": {
+    "glob": "^8.0.3",
     "node-addon-api": "^4.2.0"
   },
   "repository": {

package/scripts/postinstall.js

@@ -0,0 +1,37 @@
+/* This file is part of node-sword-interface.
+
+   Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
+
+   node-sword-interface is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
+
+   node-sword-interface is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+   See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with node-sword-interface. See the file COPYING.
+   If not, see <http://www.gnu.org/licenses/>. */
+
+const glob = require('glob');
+const path = require('path');
+const fs = require('fs');
+
+function postInstall() {
+  if (process.platform.indexOf("win") != -1) {
+    console.log("Copying build dependencies to build output folder.");
+
+    glob('build/sword-build-win32/lib/*.*', null, function (er, files) {
+      files.forEach((srcPath) => {
+        let fileName = path.basename(srcPath);
+        let destPath = path.join('build/Release', fileName);
+        fs.copyFileSync(srcPath, destPath);
+      });
+    });
+  }
+}
+
+postInstall();

package/src/node_sword_cli.cpp

@@ -88,8 +88,8 @@ void get_repo_module(RepositoryInterface& repoInterface)
 
 void get_updated_repo_modules(RepositoryInterface& repoInterface)
 {
-    //ModuleStore moduleStore;
-    //ModuleHelper moduleHelper(moduleStore);
+    ModuleStore moduleStore;
+    ModuleHelper moduleHelper(moduleStore);
 
     vector<SWModule*> updatedModules = repoInterface.getUpdatedRepoModules();
 

package/src/sword_backend/module_search.cpp

@@ -131,6 +131,8 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
         }
 
         bool hasStrongs = this->_moduleHelper.moduleHasGlobalOption(module, "Strongs");
+        bool moduleMarkupIsBroken = this->_moduleHelper.isBrokenMarkupModule(moduleName);
+        bool hasInconsistentClosingEndDivs = this->_moduleHelper.isInconsistentClosingEndDivModule(moduleName);
 
         if (searchType == SearchType::strongsNumber) {
             if (!hasStrongs) {
@@ -163,7 +165,11 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
         while (!listKey.popError()) {
             module->setKey(listKey.getElement());
 
-            string verseText = this->_textProcessor.getCurrentVerseText(module, hasStrongs);
+            string verseText = this->_textProcessor.getCurrentVerseText(module,
+                                                                        hasStrongs,
+                                                                        hasInconsistentClosingEndDivs,
+                                                                        moduleMarkupIsBroken);
+
             string currentReference = module->getKey()->getShortText();
 
             if (std::find(searchResultReferences.begin(),