@komaci/static-analyzer 242.1.6 → 242.1.8

package/build/invariantFunctions/returnStatementInvariantFunctions.js

@@ -60,12 +60,8 @@ function checkRenderFunctionReturnValues(returnStmt, moduleMetadata) {
     else if (returnStmt.argument &&
         returnStmt.argument.type == 'ConditionalExpression') {
         const conditionalExpr = returnStmt.argument;
-        const consequence = conditionalExpr.consequent;
-        const alternate = conditionalExpr.alternate;
-        const consequenceTemplateImport = moduleMetadata.importsByName.get(consequence.name);
-        const alternateTemplateImport = moduleMetadata.importsByName.get(alternate.name);
-        if (!consequenceTemplateImport.templateKomaciDoc &&
-            !alternateTemplateImport.templateKomaciDoc) {
+        const isValidCondtional = validateConditionalExpression(conditionalExpr, moduleMetadata, returnStmt);
+        if (!isValidCondtional) {
             if (returnStmt.loc) {
                 return (0, rules_1.getPrimingDiagnostic)(rules_1.diagnosticMessages.NO_RENDER_FUNCTION_RETURN_STATEMENT_NOT_RETURNING_IMPORTED_TEMPLATE, shared_1.LLSRange.fromBabelSourceLocation(returnStmt.loc), []);
             }
@@ -79,4 +75,55 @@ function checkRenderFunctionReturnValues(returnStmt, moduleMetadata) {
     return undefined;
 }
 exports.checkRenderFunctionReturnValues = checkRenderFunctionReturnValues;
+/**
+ * A recursive function that will validate conditionals and nested conditionals.
+ * @param conditionalExpr the root conditional expression
+ * @param moduleMetadata the module metadata
+ * @param returnStmt the return statement node
+ * @returns true or false if the conditonal is valid.
+ */
+function validateConditionalExpression(conditionalExpr, moduleMetadata, returnStmt) {
+    const consequence = conditionalExpr.consequent;
+    const alternate = conditionalExpr.alternate;
+    //checking the consequent condition
+    if (consequence.type === 'ConditionalExpression') {
+        const isValid = validateConditionalExpression(consequence, moduleMetadata, returnStmt);
+        if (!isValid) {
+            return false;
+        }
+    }
+    else {
+        if (consequence.type === 'Identifier') {
+            const consequenceTemplateImport = moduleMetadata.importsByName.get(consequence.name);
+            if (!consequenceTemplateImport.templateKomaciDoc) {
+                return false;
+            }
+        }
+        else {
+            //the consequent was not an identifier or another conditional.
+            return false;
+        }
+    }
+    //Checking the alternate condition
+    if (alternate.type === 'ConditionalExpression') {
+        const isValid = validateConditionalExpression(alternate, moduleMetadata, returnStmt);
+        if (!isValid) {
+            return false;
+        }
+    }
+    else {
+        if (alternate.type === 'Identifier') {
+            const alternateTemplateImport = moduleMetadata.importsByName.get(alternate.name);
+            if (!alternateTemplateImport.templateKomaciDoc) {
+                return false;
+            }
+        }
+        else {
+            //the alternate was not an identifier or another conditional.
+            return false;
+        }
+    }
+    //the condtional will return a valid template.
+    return true;
+}
 //# sourceMappingURL=returnStatementInvariantFunctions.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/static-analyzer",
-    "version": "242.1.6",
+    "version": "242.1.8",
     "description": "Komaci Diagnostics API",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -28,12 +28,14 @@
         "!**/RULES.todo.md"
     ],
     "dependencies": {
-        "@komaci/common-shared": "242.1.6",
-        "@lwc/metadata": "2.22.0-0",
-        "@lwc/sfdc-compiler-utils": "2.22.0-0"
+        "@komaci/common-shared": "242.1.8"
     },
     "devDependencies": {
         "@babel/types": "^7.9.0",
-        "@komaci/types": "242.1.6"
+        "@komaci/types": "242.1.8"
+    },
+    "peerDependencies": {
+        "@lwc/metadata": "2.22.0-0",
+        "@lwc/sfdc-compiler-utils": "2.22.0-0"
     }
 }