Merge pull request #63 from rwjblue/loosen-if-statement-parent-condition

Cleanup / fix some svelte related functionality.

Author: rwjblue

fixtures/development-svelte-builds/expectation6.js

@@ -11,6 +11,12 @@ if (DEPRECATED_PARTIALS) {
   };
 }
 
+if (DEPRECATED_PARTIALS && someOtherThing()) {
+  throw new Error('You indicated you don\'t have any deprecations, however you are relying on DEPRECATED_PARTIALS.');
+
+  doStuff();
+}
+
 export let ObjectController;
 if (DEPRECATED_CONTROLLERS) {
   ObjectController = class {

fixtures/development-svelte-builds/expectation7.js

@@ -11,6 +11,11 @@ if (DEPRECATED_PARTIALS) {
   };
 }
 
+if (DEPRECATED_PARTIALS && someOtherThing()) {
+  throw new Error("You indicated you don't have any deprecations, however you are relying on DEPRECATED_PARTIALS.");
+  doStuff();
+}
+
 export let ObjectController;
 
 if (DEPRECATED_CONTROLLERS) {

fixtures/development-svelte-builds/sample.js

@@ -9,6 +9,10 @@ if (DEPRECATED_PARTIALS) {
   };
 }
 
+if (DEPRECATED_PARTIALS && someOtherThing()) {
+  doStuff();
+}
+
 export let ObjectController;
 if (DEPRECATED_CONTROLLERS) {
   ObjectController = class {

fixtures/production-svelte-builds/expectation6.js

@@ -9,6 +9,10 @@ if (false) {
   };
 }
 
+if (false && someOtherThing()) {
+  doStuff();
+}
+
 export let ObjectController;
 if (true) {
   ObjectController = class {

fixtures/production-svelte-builds/expectation7.js

@@ -9,6 +9,10 @@ if (false) {
   };
 }
 
+if (false && someOtherThing()) {
+  doStuff();
+}
+
 export let ObjectController;
 
 if (true) {

fixtures/production-svelte-builds/sample.js

@@ -9,6 +9,10 @@ if (DEPRECATED_PARTIALS) {
   };
 }
 
+if (DEPRECATED_PARTIALS && someOtherThing()) {
+  doStuff();
+}
+
 export let ObjectController;
 if (DEPRECATED_CONTROLLERS) {
   ObjectController = class {
@@ -22,4 +26,4 @@ export default class TheThingToReplaceControllers {
   constructor() {
     this.isNew = true;
   }
-}
+}

src/utils/macros.js

@@ -98,12 +98,12 @@ module.exports = class Macros {
         if (binding !== undefined) {
           binding.referencePaths.forEach(p => {
             let t = builder.t;
-            if (envFlags.DEBUG) {
-              if (svelteMap[source][flag] === false) {
-                if (!p.parentPath.isIfStatement()) {
-                  return;
-                }
-                let consequent = p.parentPath.get('consequent');
+            // in debug builds add an error after a conditional (to ensure if the
+            // specific branch is taken, an error is thrown)
+            if (envFlags.DEBUG && svelteMap[source][flag] === false) {
+              let parentIfStatement = p.find(p => p.isIfStatement());
+              if (parentIfStatement) {
+                let consequent = parentIfStatement.get('consequent');
                 consequent.unshiftContainer(
                   'body',
                   t.throwStatement(
@@ -115,10 +115,8 @@ module.exports = class Macros {
                   )
                 );
               }
-            } else {
-              if (p.parentPath.isIfStatement()) {
-                p.replaceWith(t.booleanLiteral(svelteMap[source][flag]));
-              }
+            } else if (envFlags.DEBUG === false) {
+              p.replaceWith(t.booleanLiteral(svelteMap[source][flag]));
             }
           });