Update nools templating to use __include_inline__()

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

Hide file tree

Showing 4 changed files with 8 additions and 17 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.14.2",
+  "version": "1.15.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
@@ -123,18 +123,9 @@ function doFilter(target, rules) {
 }
 
 function loadNools(projectDir) {
-  const simpleNoolsFile = `${projectDir}/rules.nools.js`;
-  const noolsTemplateFile = `${projectDir}/rules.nools.template`;
-
-  if(fs.exists(simpleNoolsFile)) {
-    return readJs(simpleNoolsFile);
-  } else if(fs.exists(noolsTemplateFile)) {
-    return cleanJs(fs.read(noolsTemplateFile)
-        .replace(/___TEMPLATE:([^_]*)___/g, (_, filename) =>
-            fs.read(`${projectDir}/${filename}`)));
-  } else {
-    throw new Error(`No nools definition file found.  Please create at one of:
-	* ${simpleNoolsFile}
-	* ${noolsTemplateFile}`);
-  }
+  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/...s-templating/project/rules.nools.template → ...s/nools-templating/project/rules.nools.js b/...s-templating/project/rules.nools.template → ...s/nools-templating/project/rules.nools.js
@@ -9,6 +9,6 @@ rule GenerateEvents {
     c: Contact
   }
   then {
-    ___TEMPLATE:rules.contact.nools.js___
+    __include_inline__('rules.contact.nools.js');
   }
 }