Use term "array index" in error message and add detail for other numbers

source-academy · Jul 10, 2019 · 81f5705 · 81f5705
1 parent a862bf1
commit 81f5705
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/src/utils/__tests__/__snapshots__/rttc.ts.snap b/src/utils/__tests__/__snapshots__/rttc.ts.snap
@@ -8317,8 +8317,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 54`] = `
 Object {
-  "elaborate": "Expected integer as prop, got boolean.",
-  "explain": "Expected integer as prop, got boolean.",
+  "elaborate": "Expected array index as prop, got boolean.",
+  "explain": "Expected array index as prop, got boolean.",
   "left": Array [
     2,
   ],
@@ -8328,8 +8328,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 55`] = `
 Object {
-  "elaborate": "Expected integer as prop, got string.",
-  "explain": "Expected integer as prop, got string.",
+  "elaborate": "Expected array index as prop, got string.",
+  "explain": "Expected array index as prop, got string.",
   "left": Array [
     2,
   ],
@@ -8339,8 +8339,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 56`] = `
 Object {
-  "elaborate": "Expected integer as prop, got function.",
-  "explain": "Expected integer as prop, got function.",
+  "elaborate": "Expected array index as prop, got function.",
+  "explain": "Expected array index as prop, got function.",
   "left": Array [
     2,
   ],
@@ -8350,8 +8350,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 57`] = `
 Object {
-  "elaborate": "Expected integer as prop, got function.",
-  "explain": "Expected integer as prop, got function.",
+  "elaborate": "Expected array index as prop, got function.",
+  "explain": "Expected array index as prop, got function.",
   "left": Array [
     2,
   ],
@@ -8361,8 +8361,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 58`] = `
 Object {
-  "elaborate": "Expected integer as prop, got object.",
-  "explain": "Expected integer as prop, got object.",
+  "elaborate": "Expected array index as prop, got object.",
+  "explain": "Expected array index as prop, got object.",
   "left": Array [
     2,
   ],
@@ -8374,8 +8374,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 59`] = `
 Object {
-  "elaborate": "Expected integer as prop, got array.",
-  "explain": "Expected integer as prop, got array.",
+  "elaborate": "Expected array index as prop, got array.",
+  "explain": "Expected array index as prop, got array.",
   "left": Array [
     2,
   ],
@@ -8387,8 +8387,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 60`] = `
 Object {
-  "elaborate": "Expected integer as prop, got undefined.",
-  "explain": "Expected integer as prop, got undefined.",
+  "elaborate": "Expected array index as prop, got undefined.",
+  "explain": "Expected array index as prop, got undefined.",
   "left": Array [
     2,
   ],
@@ -8398,8 +8398,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 61`] = `
 Object {
-  "elaborate": "Expected integer as prop, got null.",
-  "explain": "Expected integer as prop, got null.",
+  "elaborate": "Expected array index as prop, got null.",
+  "explain": "Expected array index as prop, got null.",
   "left": Array [
     2,
   ],
@@ -8579,8 +8579,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 80`] = `
 Object {
-  "elaborate": "Expected integer as prop, got number.",
-  "explain": "Expected integer as prop, got number.",
+  "elaborate": "Expected array index as prop, got other number.",
+  "explain": "Expected array index as prop, got other number.",
   "left": Array [
     2,
   ],
@@ -8590,8 +8590,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 81`] = `
 Object {
-  "elaborate": "Expected integer as prop, got number.",
-  "explain": "Expected integer as prop, got number.",
+  "elaborate": "Expected array index as prop, got other number.",
+  "explain": "Expected array index as prop, got other number.",
   "left": Array [
     2,
   ],
@@ -8601,8 +8601,8 @@ Object {
 
 exports[`Member expression type combinations: Invalid type combinations return TypeError 82`] = `
 Object {
-  "elaborate": "Expected integer as prop, got number.",
-  "explain": "Expected integer as prop, got number.",
+  "elaborate": "Expected array index as prop, got other number.",
+  "explain": "Expected array index as prop, got other number.",
   "left": Array [
     2,
   ],

diff --git a/src/utils/rttc.ts b/src/utils/rttc.ts
@@ -99,7 +99,11 @@ export const checkMemberAccess = (node: es.Node, obj: Value, prop: Value) => {
   if (isObject(obj)) {
     return isString(prop) ? undefined : new TypeError(node, ' as prop', 'string', typeOf(prop))
   } else if (isArray(obj)) {
-    return isArrayIndex(prop) ? undefined : new TypeError(node, ' as prop', 'integer', typeOf(prop))
+    return isArrayIndex(prop)
+      ? undefined
+      : isNumber(prop)
+        ? new TypeError(node, ' as prop', 'array index', 'other number')
+        : new TypeError(node, ' as prop', 'array index', typeOf(prop))
   } else {
     return new TypeError(node, '', 'object or array', typeOf(obj))
   }