Fix constant lookup

Author: SleeplessByte

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.5.3
+
+- Fix `resistor-color` constant lookup, when name doesn't match "probably"
+- Fix `resistor-color-duo` constant lookup, when name doesn't match "probably"
+- Add message to `resistor-color-duo` for `param.shift()`
+
+## 0.5.2
+
+- Cleanup imports and exports
+
 ## 0.5.1
 
 - Fix `resistor-color-duo` helper code (with `resistor-color` rewrite changed)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exercism/javascript-analyzer",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Exercism analyzer for javascript",
   "repository": "https://github.com/exercism/javascript-analyzer",
   "author": "Derk-Jan Karrenbeld <derk-jan+github@karrenbeld.info>",

src/analyzers/resistor-color-duo/ResistorColorDuoSolution.ts

@@ -47,11 +47,16 @@ export class HelperCallNotFound {
   constructor(public readonly callRoot: Expression | undefined) {}
 }
 
+export class UnexpectedCallFound {
+  constructor(public readonly unexpected: string, public readonly expected: string) {}
+}
+
 type Issue = undefined
 | MissingExpectedCall
 | HelperNotOptimal
 | MethodNotFound
 | HelperCallNotFound
+| UnexpectedCallFound
 
 class Constant {
   public readonly name: string
@@ -651,6 +656,12 @@ class Entry {
         && isLiteral(innerLeft, 10)
     }
 
+    if (findFirst(argument, (node) => isIdentifier(param) && isCallExpression(node, param.name, 'shift'))) {
+      logger.log('~> should not be shifting')
+      this.lastIssue_ = new UnexpectedCallFound('.shift()', `${parameterName(param)}[<index>]\` or \`[destruc, turing]`)
+      return false
+    }
+
     logger.log('~> body of expected math solution is not math')
     return false
   }
@@ -769,7 +780,7 @@ export class ResistorColorDuoSolution {
 
     const expectedConstant = this.fileConstants.find((constant) => isIdentifier(constant.id, PROBABLE_CONSTANT)) ||
       // Or find the first array or object assignment
-      this.fileConstants.find((constant) => constant.init && [AST_NODE_TYPES.ArrayExpression, AST_NODE_TYPES.ObjectExpression].indexOf(constant.init.type))
+      this.fileConstants.find((constant) => constant.init && [AST_NODE_TYPES.ArrayExpression, AST_NODE_TYPES.ObjectExpression].indexOf(constant.init.type) !== -1)
 
     this.mainConstant = expectedConstant && new Constant(expectedConstant, this.source) || undefined
   }

src/analyzers/resistor-color-duo/index.ts

@@ -5,7 +5,7 @@ import { NoExportError } from "~src/errors/NoExportError";
 import { NoMethodError } from "~src/errors/NoMethodError";
 import { AstParser } from "~src/parsers/AstParser";
 import { IsolatedAnalyzerImpl } from "../IsolatedAnalyzerImpl";
-import { HelperCallNotFound, HelperNotOptimal, MethodNotFound, MissingExpectedCall, ResistorColorDuoSolution } from "./ResistorColorDuoSolution";
+import { HelperCallNotFound, HelperNotOptimal, MethodNotFound, MissingExpectedCall, UnexpectedCallFound, ResistorColorDuoSolution } from "./ResistorColorDuoSolution";
 
 const TIP_EXPORT_INLINE = factory<'method.signature'>`
 Did you know that you can export functions, classes and constants directly
@@ -84,6 +84,10 @@ const ISSUE_EXPECTED_CALL = factory<'method.name' | 'expected.reason'>`
 that reasoning applies, mentor the student to add this call.
 `('javascript.resistor-color-duo.must_add_missing_call')
 
+const ISSUE_UNEXPECTED_CALL = factory<'unexpected' | 'expected'>`
+📕 Found \`${'unexpected'}\`, expected \`${'expected'}\`.
+`('javascript.resistor-color-duo.expected_different_call')
+
 type Program = TSESTree.Program
 
 const Parser: AstParser = new AstParser(undefined, 1)
@@ -201,6 +205,9 @@ export class ResistorColorDuoAnalyzer extends IsolatedAnalyzerImpl {
     } else if (lastIssue instanceof MethodNotFound) {
       // output.add(BETA_COMMENTARY_PREFIX())
       output.disapprove(ISSUE_METHOD_NOT_FOUND({ 'method.name': lastIssue.methodName }))
+    } else if (lastIssue instanceof UnexpectedCallFound) {
+      output.add(ISSUE_UNEXPECTED_CALL({ 'unexpected': lastIssue.unexpected, 'expected': lastIssue.expected }))
+
     } else if (lastIssue instanceof MissingExpectedCall) {
       // output.add(BETA_COMMENTARY_PREFIX())
       output.add(ISSUE_EXPECTED_CALL({ 'method.name': lastIssue.methodName, 'expected.reason': lastIssue.reason }))

src/analyzers/resistor-color/ResistorColorSolution.ts

@@ -345,7 +345,7 @@ export class ResistorColorSolution {
     // Find expected name
     const expectedConstant = this.fileConstants.find((constant) => isIdentifier(constant.id, EXPECTED_CONSTANT)) ||
       // Or find the first array or object assignment
-      this.fileConstants.find((constant) => constant.init && [AST_NODE_TYPES.ArrayExpression, AST_NODE_TYPES.ObjectExpression].indexOf(constant.init.type))
+      this.fileConstants.find((constant) => constant.init && [AST_NODE_TYPES.ArrayExpression, AST_NODE_TYPES.ObjectExpression].indexOf(constant.init.type) === -1)
 
     this.mainConstant = expectedConstant && new Constant(expectedConstant, this.source) || undefined
   }