Break out xsl-path config so it can be separate for each cht version

medic · Jan 5, 2024 · ced2627 · ced2627
1 parent fded776
commit ced2627
Show file tree

Hide file tree

Showing 30 changed files with 1,897 additions and 23,817 deletions.
diff --git a/build.sh b/build.sh
@@ -34,13 +34,12 @@ for version in "${versions[@]}"; do
   # 210 patch to disable db-object-widget
   (cd build/"$version" && patch -f webapp/src/js/enketo/widgets.js < ../../patches/210-disable-db-object-widgets.patch)
   (cd build/"$version" && npm run build-cht-form)
-done
 
-# TODO update this to split out xsl by cht version
-mkdir -p ext/xsl
-mkdir -p ext/enketo-transformer/xsl
-cp ./build/cht-core-4-6/api/src/xsl/openrosa2html5form.xsl ext/xsl
-cp ./build/cht-core-4-6/api/src/enketo-transformer/xsl/* ext/enketo-transformer/xsl
+  mkdir -p dist/"$version"/xsl
+  mkdir -p dist/"$version"/enketo-transformer/xsl
+  cp ./build/cht-core-4-6/api/src/xsl/openrosa2html5form.xsl dist/"$version"/xsl
+  cp ./build/cht-core-4-6/api/src/enketo-transformer/xsl/* dist/"$version"/enketo-transformer/xsl
+done
 
 npx webpack --config webpack.config.cht-core.js --env.cht='cht-core-4-6'
 

diff --git a/cht-bundles/cht-core-4-6/bundle.js b/cht-bundles/cht-core-4-6/bundle.js
@@ -0,0 +1,12 @@
+const path = require('path');
+module.exports = {
+  ddocs: require('../../build/cht-core-4-6-ddocs.json'),
+  RegistrationUtils: require('../../build/cht-core-4-6/shared-libs/registration-utils'),
+  CalendarInterval: require('../../build/cht-core-4-6/shared-libs/calendar-interval'),
+  RulesEngineCore: require('../../build/cht-core-4-6/shared-libs/rules-engine'),
+  RulesEmitter: require('../../build/cht-core-4-6/shared-libs/rules-engine/src/rules-emitter'),
+  nootils: require('../../build/cht-core-4-6/node_modules/cht-nootils'),
+  Lineage: require('../../build/cht-core-4-6/shared-libs/lineage'),
+  ChtScriptApi: require('../../build/cht-core-4-6/shared-libs/cht-script-api'),
+  convertFormXmlToXFormModel: require('../../build/cht-core-4-6/api/src/services/generate-xform.js').generate,
+};
diff --git a/cht-bundles/cht-core-4-6/xsl-paths.js b/cht-bundles/cht-core-4-6/xsl-paths.js
@@ -0,0 +1,6 @@
+const path = require('path');
+
+module.exports = {
+  FORM_STYLESHEET: path.join(__dirname, '../dist/cht-core-4-6/xsl/openrosa2html5form.xsl'),
+  MODEL_STYLESHEET: path.join(__dirname, '../dist/cht-core-4-6/enketo-transformer/xsl/openrosa2xmlmodel.xsl'),
+};
diff --git a/cht-core-4-6.js b/cht-core-4-6.js
diff --git a/dist/all-chts-bundle.dev.js b/dist/all-chts-bundle.dev.js
diff --git a/dist/all-chts-bundle.dev.js.map b/dist/all-chts-bundle.dev.js.map
diff --git a/dist/cht-core-4-6/cht-core-bundle.dev.js b/dist/cht-core-4-6/cht-core-bundle.dev.js
diff --git a/dist/cht-core-4-6/cht-core-bundle.dev.js.map b/dist/cht-core-4-6/cht-core-bundle.dev.js.map
diff --git a/...to-transformer/xsl/openrosa2html5form.xsl → ...to-transformer/xsl/openrosa2html5form.xsl b/...to-transformer/xsl/openrosa2html5form.xsl → ...to-transformer/xsl/openrosa2html5form.xsl
diff --git a/...eto-transformer/xsl/openrosa2xmlmodel.xsl → ...eto-transformer/xsl/openrosa2xmlmodel.xsl b/...eto-transformer/xsl/openrosa2xmlmodel.xsl → ...eto-transformer/xsl/openrosa2xmlmodel.xsl
diff --git a/ext/xsl/openrosa2html5form.xsl → dist/cht-core-4-6/xsl/openrosa2html5form.xsl b/ext/xsl/openrosa2html5form.xsl → dist/cht-core-4-6/xsl/openrosa2html5form.xsl
diff --git a/docs/Harness.html b/docs/Harness.html
@@ -4826,7 +4826,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/core-adapter.js.html b/docs/core-adapter.js.html
@@ -264,7 +264,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/dev-mode_mock.cht-conf.contact-summary-lib.js.html b/docs/dev-mode_mock.cht-conf.contact-summary-lib.js.html
@@ -73,7 +73,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/dev-mode_mock.cht-conf.nools-lib.js.html b/docs/dev-mode_mock.cht-conf.nools-lib.js.html
@@ -76,7 +76,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/dev-mode_mock.rules-engine.rules-emitter.js.html b/docs/dev-mode_mock.rules-engine.rules-emitter.js.html
@@ -175,7 +175,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/form-host_form-filler.js.html b/docs/form-host_form-filler.js.html
@@ -358,7 +358,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/global.html b/docs/global.html
@@ -1880,7 +1880,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/harness.js.html b/docs/harness.js.html
@@ -870,7 +870,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/index.html b/docs/index.html
@@ -141,7 +141,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/jsdocs.js.html b/docs/jsdocs.js.html
@@ -156,7 +156,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/mock.cht-conf.module_contact-summary-lib.html b/docs/mock.cht-conf.module_contact-summary-lib.html
@@ -123,7 +123,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/mock.cht-conf.module_nools-lib.html b/docs/mock.cht-conf.module_nools-lib.html
@@ -123,7 +123,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/mock.rules-engine.module_rules-emitter.html b/docs/mock.rules-engine.module_rules-emitter.html
@@ -628,7 +628,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/module-core-adapter.html b/docs/module-core-adapter.html
@@ -76,7 +76,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="mock.cht-
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 15:09:31 GMT-0600 (Central Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a> on Fri Jan 05 2024 16:44:32 GMT-0600 (Central Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>