Use more explicit names than Access and Lookup

packages/parse-mapping-lookup/src/ast.ts

@@ -49,7 +49,7 @@ export interface Pointer {
   path: Step[];
 }
 
-export type Step = Access | Lookup;
+export type Step = IndexAccess | MemberLookup;
 
 export const pointer = (options: { path: Step[] }): Pointer => {
   const { path } = options;
@@ -60,35 +60,37 @@ export const pointer = (options: { path: Step[] }): Pointer => {
 };
 
 /*
- * Lookup
+ * MemberLookup
  */
 
-export interface Lookup {
-  kind: "lookup";
+export interface MemberLookup {
+  kind: "member-lookup";
   property: Identifier;
 }
 
-export const lookup = (options: { property: Identifier }): Lookup => {
+export const memberLookup = (options: {
+  property: Identifier;
+}): MemberLookup => {
   const { property } = options;
   return {
-    kind: "lookup",
+    kind: "member-lookup",
     property
   };
 };
 
 /*
- * Access
+ * IndexAccess
  */
 
-export interface Access {
-  kind: "access";
+export interface IndexAccess {
+  kind: "index-access";
   index: Literal;
 }
 
-export const access = (options: { index: Literal }): Access => {
+export const indexAccess = (options: { index: Literal }): IndexAccess => {
   const { index } = options;
   return {
-    kind: "access",
+    kind: "index-access",
     index
   };
 };

packages/parse-mapping-lookup/src/parser.spec.ts

@@ -2,8 +2,8 @@ import { parse } from "@truffle/parse-mapping-lookup/parser";
 
 import {
   expression,
-  access,
-  lookup,
+  indexAccess,
+  memberLookup,
   identifier,
   pointer,
   literal
@@ -15,7 +15,7 @@ const testCases = [
     result: expression({
       root: identifier({ name: "m" }),
       pointer: pointer({
-        path: [access({ index: literal({ value: "0" }) })]
+        path: [indexAccess({ index: literal({ value: "0" }) })]
       })
     })
   },
@@ -25,8 +25,8 @@ const testCases = [
       root: identifier({ name: "m" }),
       pointer: pointer({
         path: [
-          access({ index: literal({ value: "0" }) }),
-          access({ index: literal({ value: "1" }) })
+          indexAccess({ index: literal({ value: "0" }) }),
+          indexAccess({ index: literal({ value: "1" }) })
         ]
       })
     })
@@ -36,7 +36,7 @@ const testCases = [
     result: expression({
       root: identifier({ name: "m" }),
       pointer: pointer({
-        path: [access({ index: literal({ value: "hello" }) })]
+        path: [indexAccess({ index: literal({ value: "hello" }) })]
       })
     })
   },
@@ -45,7 +45,7 @@ const testCases = [
     result: expression({
       root: identifier({ name: "m" }),
       pointer: pointer({
-        path: [access({ index: literal({ value: '"' }) })]
+        path: [indexAccess({ index: literal({ value: '"' }) })]
       })
     })
   },
@@ -55,8 +55,8 @@ const testCases = [
       root: identifier({ name: "s" }),
       pointer: pointer({
         path: [
-          lookup({ property: identifier({ name: "m" }) }),
-          access({ index: literal({ value: "0" }) })
+          memberLookup({ property: identifier({ name: "m" }) }),
+          indexAccess({ index: literal({ value: "0" }) })
         ]
       })
     })
@@ -67,9 +67,9 @@ const testCases = [
       root: identifier({ name: "m$" }),
       pointer: pointer({
         path: [
-          access({ index: literal({ value: "0" }) }),
-          lookup({ property: identifier({ name: "_k" }) }),
-          access({ index: literal({ value: "1" }) })
+          indexAccess({ index: literal({ value: "0" }) }),
+          memberLookup({ property: identifier({ name: "_k" }) }),
+          indexAccess({ index: literal({ value: "1" }) })
         ]
       })
     })

packages/parse-mapping-lookup/src/parser.ts

@@ -21,11 +21,11 @@ import {
 } from "parjs/combinators";
 
 import {
-  access,
+  indexAccess,
   expression,
   identifier,
   literal,
-  lookup,
+  memberLookup,
   pointer
 } from "./ast";
 
@@ -91,28 +91,28 @@ const literalP = numberP.pipe(
 );
 
 /*
- * Lookup
+ * MemberLookup
  */
 
-const lookupP = string(".").pipe(
+const memberLookupP = string(".").pipe(
   then(identifierP),
-  map(([_, property]) => lookup({ property }))
+  map(([_, property]) => memberLookup({ property }))
 );
 
 /*
- * Access
+ * IndexAccess
  */
 
-const accessP = literalP.pipe(
+const indexAccessP = literalP.pipe(
   between(string("["), string("]")),
-  map(index => access({ index }))
+  map(index => indexAccess({ index }))
 );
 
 /*
  * Pointer
  */
 
-const stepP = lookupP.pipe(or(accessP));
+const stepP = memberLookupP.pipe(or(indexAccessP));
 
 const pointerP = stepP.pipe(
   then(stepP.pipe(many())),