Merge pull request #1 from larsgson/larsg-test-uwj-format

Larsg test uwj format
Proskomma · Aug 9, 2024 · cc81446 · cc81446
2 parents 10f22b2 + 30bf7e3
commit cc81446
Show file tree

Hide file tree

Showing 26 changed files with 16,743 additions and 11,258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .idea/
 build/
+temp/
 
 # Logs
 logs
@@ -68,8 +69,10 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
-# Yarn Integrity file
+# Yarn 
 .yarn-integrity
+.yarn
+.yarnrc.yml
 
 # dotenv environment variables file
 .env

diff --git a/package.json b/package.json
@@ -6,21 +6,21 @@
   "dependencies": {
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
-    "@monaco-editor/react": "^4.4.5",
-    "@mui/icons-material": "^5.8.4",
-    "@mui/material": "^5.9.2",
+    "@monaco-editor/react": "^4.6.0",
+    "@mui/icons-material": "^5.16.5",
+    "@mui/material": "^5.16.5",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.2.1",
     "axios": "^0.27.2",
     "deep-copy-all": "^1.3.4",
     "deep-sort-object": "^1.0.2",
-    "diff": "^5.1.0",
+    "diff": "^5.2.0",
     "form-data": "^4.0.0",
     "proskomma": "^0.7.13",
-    "proskomma-json-tools": "^0.5.6",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "proskomma-json-tools": "^0.8.16",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-json-view": "^1.21.3",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.0",

diff --git a/pipelines/demoPipeline.json b/pipelines/demoPipeline.json
@@ -12,7 +12,7 @@
     "title": "Selectors",
     "type": "Source",
     "sourceLocation": "local",
-    "localValue": "{\"org\": \"dcs\", \"lang\": \"en\", \"abbr\": \"ust\"}",
+    "localValue": "{\"lang\": \"eng\", \"abbr\": \"ust\"}",
     "outputType": "json"
   },
   {

diff --git a/pipelines/justTheBiblePipeline.json b/pipelines/justTheBiblePipeline.json
@@ -0,0 +1,40 @@
+[
+  {
+    "id": 0,
+    "type": "Inputs",
+    "inputs": {
+      "perf": "json"
+    }
+  },
+  {
+    "id": 1,
+    "title": "Simplify Input PERF",
+    "name": "justTheBible",
+    "transformName": "justTheBible",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Input perf"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      }
+    ]
+  },
+  {
+    "id": 999,
+    "type": "Outputs",
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 1 perf"
+      }
+    ]
+  }
+]
diff --git a/pipelines/mergeAlignmentPipeline.json b/pipelines/mergeAlignmentPipeline.json
@@ -0,0 +1,103 @@
+[
+  {
+    "id": 0,
+    "type": "Inputs",
+    "inputs": {
+      "perf": "json",
+      "strippedAlignment": "json"
+    }
+  },
+  {
+    "id": 1,
+    "title": "Count stripped perf words",
+    "name": "verseWords",
+    "transformName": "verseWords",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Input perf"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "verseWords",
+        "type": "json"
+      }
+    ],
+    "description": "PERF=>JSON: Counts words occurrences"
+  },
+  {
+    "id": 2,
+    "title": "Merge Back Into Stripped (roundtrip)",
+    "name": "mergeAlignment",
+    "transformName": "mergeAlignment",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Input perf"
+      },
+      {
+        "name": "strippedAlignment",
+        "type": "json",
+        "source": "Input strippedAlignment"
+      },
+      {
+        "name": "verseWords",
+        "type": "json",
+        "source": "Transform 1 verseWords"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      },
+      {
+        "name": "unalignedWords",
+        "type": "json"
+      }
+    ],
+    "description": "PERF=>PERF adds report to verses"
+  },
+  {
+    "id": 3,
+    "title": "Merge Merged PERF Text",
+    "name": "mergePerfText",
+    "transformName": "mergePerfText",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 2 perf"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      }
+    ],
+    "description": "PERF=>PERF: Merge consecutive text strings"
+  },
+  {
+    "id": 999,
+    "type": "Outputs",
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 3 perf"
+      },
+      {
+        "name": "unalignedWords",
+        "type": "json",
+        "source": "Transform 2 unalignedWords"
+      }
+    ]
+  }
+]
diff --git a/pipelines/mergeUwAlignmentPipeline.json b/pipelines/mergeUwAlignmentPipeline.json
@@ -0,0 +1,100 @@
+[
+  {
+    "id": 0,
+    "type": "Inputs",
+    "inputs": {
+      "perf": "json",
+      "usfmJs": "json"
+    }
+  },
+  {
+    "id": 1,
+    "title": "Strip uW alignment",
+    "name": "stripUwAlignment",
+    "transformName": "stripUwAlignment",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Input perf"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      }
+    ]
+  },
+  {
+    "id": 2,
+    "title": "Merge uW alignment",
+    "name": "mergeUwAlignment",
+    "transformName": "mergeUwAlignment",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 1 perf"
+      },
+      {
+        "name": "usfmJs",
+        "type": "json",
+        "source": "Input usfmJs"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      },
+      {
+        "name": "occurrences",
+        "type": "json"
+      }
+    ]
+  },
+  {
+    "id": 3,
+    "title": "Add occurrences",
+    "name": "addUwAlignmentOccurrences",
+    "transformName": "addUwAlignmentOccurrences",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 2 perf"
+      },
+      {
+        "name": "occurrences",
+        "type": "json",
+        "source": "Transform 2 occurrences"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json"
+      }
+    ]
+  },
+  {
+    "id": 999,
+    "type": "Outputs",
+    "outputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Transform 3 perf"
+      },
+      {
+        "name": "occurrences",
+        "type": "json",
+        "source": "Transform 2 perf"
+      }
+    ]
+  }
+]
diff --git a/pipelines/perfToUsfmJsPipeline.json b/pipelines/perfToUsfmJsPipeline.json
@@ -0,0 +1,40 @@
+[
+  {
+    "id": 0,
+    "type": "Inputs",
+    "inputs": {
+      "perf": "json"
+    }
+  },
+  {
+    "id": 1,
+    "title": "PERF to USFMJS",
+    "name": "perfToUsfmJs",
+    "type": "Transform",
+    "inputs": [
+      {
+        "name": "perf",
+        "type": "json",
+        "source": "Input perf"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "usfmJs",
+        "type": "json"
+      }
+    ],
+    "description": "USFM=>PERF: Conversion via Proskomma"
+  },
+  {
+    "id": 999,
+    "type": "Outputs",
+    "outputs": [
+      {
+        "name": "usfmJs",
+        "type": "json",
+        "source": "Transform 1 usfmJs"
+      }
+    ]
+  }
+]