Allow templating of contact-summary.js

medic · May 10, 2018 · 1a9e539 · 1a9e539
1 parent 1a7f570
commit 1a9e539
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic-conf",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

diff --git a/src/fn/compile-app-settings.js b/src/fn/compile-app-settings.js
@@ -26,8 +26,8 @@ module.exports = (projectDir /*, couchUrl */) => {
   function compileAppSettings(projectDir) {
     const files = {
       app_settings: fs.readJson(`${projectDir}/app_settings.json`),
-      contact_summary: readJs(`${projectDir}/contact-summary.js`),
-      nools: loadNools(projectDir),
+      contact_summary: readJs(projectDir, 'contact-summary.js'),
+      nools: readJs(projectDir, 'rules.nools.js'),
       targets: fs.readJson(`${projectDir}/targets.json`),
       tasks_schedules: fs.readJson(`${projectDir}/tasks.json`),
     };
@@ -47,7 +47,10 @@ module.exports = (projectDir /*, couchUrl */) => {
 
 };
 
-const readJs = path => cleanJs(fs.read(path));
+const readJs = (projectDir, rootFile) =>
+    cleanJs(fs.read(`${projectDir}/${rootFile}`)
+	.replace(/__include_inline__\('\s*([^_]*)'\s*\);/g, (_, includedFile) =>
+	    fs.read(`${projectDir}/${includedFile}`)));
 const cleanJs = js =>
   js.split('\n')
     .map(s =>
@@ -121,11 +124,3 @@ function doFilter(target, rules) {
         });
     });
 }
-
-function loadNools(projectDir) {
-  const noolsBaseFile = `${projectDir}/rules.nools.js`;
-
-  return cleanJs(fs.read(noolsBaseFile)
-      .replace(/__include_inline__\('\s*([^_]*)'\s*\);/g, (_, filename) =>
-	  fs.read(`${projectDir}/${filename}`)));
-}
diff --git a/test/data/compile-app-settings/nools-templating/project/contact-summary.js b/test/data/compile-app-settings/nools-templating/project/contact-summary.js
diff --git a/...ols-templating/app_settings.expected.json → ...ngs/templating/app_settings.expected.json b/...ols-templating/app_settings.expected.json → ...ngs/templating/app_settings.expected.json
@@ -1,5 +1,5 @@
 {
-  "contact_summary": "",
+  "contact_summary": "function myFn() { console.log('hi'); }",
   "tasks": {
     "rules": "define Contact {}rule GenerateEvents {when {c: Contact}then {if (c.contact != null && c.contact.type === 'person') {emitTarget(c);}if (c.contact && c.contact.type === 'person') {emitTask(c);}emit('_complete', { _id: true });}}",
     "schedules": {

diff --git a/...ools-templating/project/app_settings.json → ...ings/templating/project/app_settings.json b/...ools-templating/project/app_settings.json → ...ings/templating/project/app_settings.json
diff --git a/test/data/compile-app-settings/templating/project/contact-summary.js b/test/data/compile-app-settings/templating/project/contact-summary.js
@@ -0,0 +1 @@
+__include_inline__('lib/shared-utils.js');
diff --git a/test/data/compile-app-settings/templating/project/lib/shared-utils.js b/test/data/compile-app-settings/templating/project/lib/shared-utils.js
@@ -0,0 +1 @@
+function myFn() { console.log('hi'); }
diff --git a/...templating/project/rules.contact.nools.js → ...templating/project/rules.contact.nools.js b/...templating/project/rules.contact.nools.js → ...templating/project/rules.contact.nools.js
diff --git a/...s/nools-templating/project/rules.nools.js → ...ettings/templating/project/rules.nools.js b/...s/nools-templating/project/rules.nools.js → ...ettings/templating/project/rules.nools.js
diff --git a/...ngs/nools-templating/project/targets.json → ...-settings/templating/project/targets.json b/...ngs/nools-templating/project/targets.json → ...-settings/templating/project/targets.json
diff --git a/...tings/nools-templating/project/tasks.json → ...pp-settings/templating/project/tasks.json b/...tings/nools-templating/project/tasks.json → ...pp-settings/templating/project/tasks.json
diff --git a/test/fn/compile-app-settings.spec.js b/test/fn/compile-app-settings.spec.js
@@ -10,8 +10,8 @@ describe('compile-app-settings', () => {
   it('should handle derivative app-settings definitions', () =>
     test('derivative/child'));
 
-  it('should handle nools templating', () =>
-    test('nools-templating/project'));
+  it('should handle nools & contact-summary templating', () =>
+    test('templating/project'));
 
 });