usfm-grammar-web 3.0.0-alpha.9 → 3.0.0-beta.15

package/README.md

@@ -15,7 +15,7 @@ npm install usfm-grammar-web
 
 ```javascript
 import React, { useState, useEffect } from 'react';
-import { USFMParser } from 'usfm-grammar-web';
+import { USFMParser, Filter, Validator } from 'usfm-grammar-web';
 
 function App() {
   const [result, setResult] = useState(null);
@@ -23,8 +23,11 @@ function App() {
 
   useEffect(() => {
     const initParser = async () => {
-      await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-alpha.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-alpha.1/tree-sitter.wasm");
+      await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter.wasm");
+      await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter.wasm");
+
     };
     initParser();
   }, []);
@@ -53,15 +56,17 @@ function App() {
 export default App;
 ```
 
-It can be used directly in the HTML script tag too.
+It can be used directly in the HTML script tag too. Please ensure its dependencies are also included(xmldom, ajv, xpath).
 
 ```html
 <script type="module">
-  import { USFMParser } from 'https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-alpha.2/dist/bundle.mjs';
+  import { USFMParser, Filter, Validator } from 'https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/dist/bundle.mjs';
   console.log('Hello world');
   (async () => {
-  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-alpha.2/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-alpha.2/tree-sitter.wasm");
+  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter.wasm");
+  await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.0.0-beta.15/tree-sitter.wasm");
   const usfmParser = new USFMParser('\\id GEN\n\\c 1\n\\p\n\\v 1 In the begining..\\v 2 more text')
   const output = usfmParser.toUSJ()
   console.log({ output })
@@ -73,30 +78,137 @@ It can be used directly in the HTML script tag too.
 </script>
 ```
 
+## API Documentation
 
-If using from react, please refer the instructions for it [here](../docs/react-usage.md).
 
-## API Documentation
+### Parsing USFM, checking errors
+
+```javascript
+const USFM = '\\id GEN\n\\c 1\n\\p\n\\v 1 In the begining..\\v 2 some more text'
+const usfmParser = new USFMParser(USFM);
+console.log(usfmParser.errors)
+```
+
+### USJ 
+Here's how you can use USFM Grammar in your JavaScript projects to work with the JSON format, USJ:
+
+```javascript
+const USFM = '\\id GEN\n\\c 1\n\\p\n\\v 1 In the begining..\\v 2 some more text'
+const usfmParser = new USFMParser(USFM);
+
+const USJ = usfmParser.toUSJ() // USFM to USJ
+console.log(JSON.stringify(USJ, null, 2));
+
+const usfmParser2 = new USFMParser(usfmString=null, fromUsj=USJ) // USJ to USFM
+const usfmGen = usfmParser2.usfm;
+console.log(usfmGen);
+```
+Working with USJ, also gives options like filtering selected markers, to edit the original USFM content. To understand more about how `exclude_markers`, `include_markers`, `combine_texts`  and `Filter` works refer the section on [filtering on USJ](#filtering-on-usj)
+
+### USX
+
+To work with the XML format, USX:
+```javascript
+import { DOMImplementation, XMLSerializer } from 'xmldom';
+
+const USFM = '\\id GEN\n\\c 1\n\\p\n\\v 1 In the begining..\\v 2 some more text'
+const usfmParser = new USFMParser(USFM);
+
+const usxElem = usfmParser.toUSX() // USFM to USX
+const usxSerializer = new XMLSerializer();
+const usx = usxSerializer.serializeToString(usxElem);
+
+console.log(usx);
+
+const usfmParser2 = new USFMParser(usfmString=null, fromUsj=null, fromUsx=usxElem) // USX to USFM
+const usfmGen = usfmParser2.usfm;
+console.log(usfmGen);
+```
+
+### Autofix and Validation
+Experimental Validation and Autofix feature for USFM:
+```javascript
+import {Validator} from "usfm-grammar";
+
+const wrongUSFM="\\id GEN\n\\c 1\n\\v 1 test verse"
+const checker = new Validator();
+const resp = checker.isValidUSFM(wrongUSFM); // true or false
+console.log(checker.message) // List of errors if present
+
+const editedUSFM = checker.autoFixUSFM(wrongUSFM);
+console.log(checker.message); // Report on autofix attempt 
+
+```
+
+Validation of USJ format:
+```javascript
+const {Validator} = require("usfm-grammar");
+const simpleUSJ = {
+  type: 'USJ',
+  version: '0.3.0',
+  content: [
+    { type: 'book', marker: 'id', code: 'GEN', content: [] },
+    { type: 'chapter', marker: 'c', number: '1', sid: 'GEN 1' },
+    { type: 'para', marker: 'p', content: [
+        {type: 'verse', marker: 'v', number: 1 },
+        "In the begining..",
+        {type: 'verse', marker: 'v', number: 2 }
+      ] }
+  ]
+}
+const checker = new Validator();
+console.log(checker.isValidUSJ(simpleUSJ));
+console.log(checker.message);
+```
+
+### Filtering on USJ
+The filtering on USJ, the JSON output, is a feature incorporated to allow data extraction, markup cleaning etc. The arguments `exclude_markers` and `include_markers` in the methods `USFMParser.toUSJ()` makes this possible. Also the  `USFMParser.toList()`, can accept these inputs and perform similar operations. There is CLI versions also for these arguments to replicate the filtering feature there.
+
+- *excludeMarkers*
+
+  The first  input parameter to `toUSJ()` and `toList` of `USFMParser` class. Defaults to `null`. When proivded, all markers except those listed will be included in the output.
+
+- *includeMarkers*
+
+  The second input parameter to `toUSJ()` and `toList` of `USFMParser` class. Defaults to `null`. When proivded, only those markers listed will be included in the output. `includeMarkers` is applied before applying `excludeMarkers`. 
+
 
-### `USFMParser.init()`
-Initializes the USFMParser. This function must be called before creating instances of `USFMParser`. And can take the grammar and the tree-sitter  files (in wasm format) as arguments, that is included in the package.
+- *combineTexts*
 
-### `USFMParser.toUSJ(usfmString: string): Object`
-Converts a USFM string to a USJ object.
+   Fourth input parameter to `toUSJ()` and `toList` of `USFMParser` class. Defaults to `true`. After filtering out makers like paragraphs and characters, we are left with texts from within them, if 'text-in-excluded-parent' is also not excluded. These text snippets may come as separate components in the contents list. When this option is `True`, the consequetive text snippets will be concatinated together. The text concatination is done in a puctuation and space aware manner. If users need more control over the space handling or for any other reason, would prefer the texts snippets as different components in the output, this can be set to `False`.
 
-- `usfmString`: The input USFM string.
+- *usfm_grammar.Filter*
 
-Returns: A JSON-like object representing the USJ.
+  This Class provides a set of enums that would be useful in providing in the `excludeMarkers` and `includeMarkers` inputs rather than users listing out individual markers. The class has following options
+  ```
+    BOOK_HEADERS : identification and introduction markers
+    TITLES : section headings and associated markers
+    COMMENTS : comment markers like \rem
+    PARAGRAPHS : paragraph markers like \p, poetry markers, list table markers
+    CHARACTERS : all character level markups like \em, \w, \wj etc and their nested versions with +
+    NOTES : foot note, cross-reference and their content markers
+    STUDY_BIBLE : \esb and \cat
+    BCV : \id, \c and \v
+    TEXT : 'text-in-excluded-parent'
+    ```
+    To inspect which are the markers in each of these options, it could be just printed out, `print(Filter.TITLES)`. These could be used individually or concatinated to get the desired filtering of markers and data:
+    ```javascript
+    output = usfmParser.toUSJ(null, include_markers=Filter.BCV)
+    output = usfmParser.toUSJ(null, include_markers=Filter.BCV+Filter.TEXT)
+    output = usfmParser.toUSJ(exclude_markers=Filter.PARAGRAPHS+Filter.CHARACTERS)
+    ``` 
+- Inner contents of excluded markers
 
-### `new USFMParser(null, usjObject: Object)`
-Initialize a parser object from USJ and also converts it to USFM.
+  For markers like `\p` `\q` etc, by excluding them, we only remove them from the heirachy and retain the inner contents like `\v`, text etc that would be coming inside it. But for certain other markers like `\f`, `\x`, `\esb`  etc, if they are excluded their inner contents are also excluded. Following is the set of all markers, who inner contents are discarded if they are mentioned in `excludeMarkers` or not included in `includeMarkers`.
+  ```
+  BOOK_HEADERS, TITLES, COMMENTS, NOTES, STUDY_BIBLE
+  ```
+  :warning: Generally, it is recommended to NOT use both `exclude_markers` and `includeMarkers` together as it could lead to unexpected behavours and data loss. For instance if `include_makers` has `\fk` and `excludeMarkers` has `\f`, the output will not contain `\fk` as all inner contents of `\f` will be discarded.
 
-- `usjObject`: The input USJ object.
 
-Returns: The parser object. To obtain the USFM generated from USJ use `parserObject.usfm`.
 
 ## Contributing
-Contributions are welcome! If you find any issues or have suggestions for improvements, feel free to open an issue or create a pull request on [GitHub](https://github.com/your-username/usfm-grammar).
+Contributions are welcome! If you find any issues or have suggestions for improvements, feel free to open an issue or create a pull request on [GitHub](https://github.com/Bridgeconn/usfm-grammar).
 
 ## License
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.