fix: add SoakedProtoMemberAccessOp to both code paths (#136)

src/mappers/mapValue.ts

@@ -1,8 +1,8 @@
 import { SourceType } from 'coffee-lex';
-import SourceToken from 'coffee-lex/dist/SourceToken';
+import SourceTokenListIndex from 'coffee-lex/dist/SourceTokenListIndex';
 import { Access, Literal, LocationData, Value } from 'decaffeinate-coffeescript/lib/coffee-script/nodes';
 import { inspect } from 'util';
-import { Identifier, MemberAccessOp, Node, ProtoMemberAccessOp } from '../nodes';
+import { Identifier, MemberAccessOp, Node, ProtoMemberAccessOp, SoakedMemberAccessOp, SoakedProtoMemberAccessOp } from '../nodes';
 import ParseContext from '../util/ParseContext';
 import mapAny from './mapAny';
 import { UnsupportedNodeError } from './mapAnyWithFallback';
@@ -11,14 +11,24 @@ export default function mapValue(context: ParseContext, node: Value): Node {
   let result = mapAny(context, node.base);
 
   for (let property of node.properties) {
-    if (property instanceof Access && !property.soak) {
+    if (property instanceof Access) {
       let name = property.name;
 
       if (!(name instanceof Literal)) {
         throw new Error(`unexpected non-Literal property access name: ${inspect(name)}`);
       }
 
-      let startToken = tokenAtLocation(context, property.locationData);
+      let startTokenIndex = tokenIndexAtLocation(context, property.locationData);
+      let startToken = startTokenIndex && context.sourceTokens.tokenAtIndex(startTokenIndex);
+
+      if (startToken && property.soak) {
+        if (startToken.type !== SourceType.EXISTENCE) {
+          throw new Error(`expected EXISTENCE token ('?') but got ${SourceType[startToken.type]}: ${inspect(startToken)}`);
+        }
+
+        startTokenIndex = startTokenIndex && startTokenIndex.next();
+        startToken = startTokenIndex && context.sourceTokens.tokenAtIndex(startTokenIndex);
+      }
 
       if (!startToken) {
         throw new Error(`cannot find token at start of property: ${inspect(property)}`);
@@ -32,7 +42,9 @@ export default function mapValue(context: ParseContext, node: Value): Node {
       let isPrototypeAccess = startToken.type === SourceType.PROTO;
 
       if (isPrototypeAccess) {
-        result = new ProtoMemberAccessOp(
+        let AccessOp = property.soak ? SoakedProtoMemberAccessOp : ProtoMemberAccessOp;
+
+        result = new AccessOp(
           result.line,
           result.column,
           result.start,
@@ -48,7 +60,9 @@ export default function mapValue(context: ParseContext, node: Value): Node {
           throw new Error(`unexpected non-Identifier access member: ${inspect(member)}`);
         }
 
-        result = new MemberAccessOp(
+        let AccessOp = property.soak ? SoakedMemberAccessOp : MemberAccessOp;
+
+        result = new AccessOp(
           result.line,
           result.column,
           result.start,
@@ -67,7 +81,7 @@ export default function mapValue(context: ParseContext, node: Value): Node {
   return result;
 }
 
-function tokenAtLocation(context: ParseContext, location: LocationData): SourceToken | null {
+function tokenIndexAtLocation(context: ParseContext, location: LocationData): SourceTokenListIndex | null {
   let start = context.linesAndColumns.indexForLocation({
     line: location.first_line,
     column: location.first_column
@@ -77,11 +91,5 @@ function tokenAtLocation(context: ParseContext, location: LocationData): SourceT
     return null;
   }
 
-  let startTokenIndex = context.sourceTokens.indexOfTokenContainingSourceIndex(start);
-
-  if (startTokenIndex === null) {
-    return null;
-  }
-
-  return context.sourceTokens.tokenAtIndex(startTokenIndex);
+  return context.sourceTokens.indexOfTokenContainingSourceIndex(start);
 }

src/nodes.ts

@@ -202,6 +202,38 @@ export class ProtoMemberAccessOp extends AccessOp {
   }
 }
 
+export class SoakedMemberAccessOp extends AccessOp {
+  readonly member: Identifier;
+
+  constructor(
+    line: number,
+    column: number,
+    start: number,
+    end: number,
+    raw: string,
+    virtual: boolean,
+    expression: Node,
+    member: Identifier
+  ) {
+    super('SoakedMemberAccessOp', line, column, start, end, raw, virtual, expression);
+    this.member = member;
+  }
+}
+
+export class SoakedProtoMemberAccessOp extends AccessOp {
+  constructor(
+    line: number,
+    column: number,
+    start: number,
+    end: number,
+    raw: string,
+    virtual: boolean,
+    expression: Node
+  ) {
+    super('SoakedProtoMemberAccessOp', line, column, start, end, raw, virtual, expression);
+  }
+}
+
 export class Quasi extends Node {
   readonly data: string;
 

src/parser.js

@@ -976,11 +976,27 @@ function convert(context) {
      */
     function accessOpForProperty(expression, prop, loc) {
       switch (type(prop)) {
-        case 'Access':
+        case 'Access': {
+          let member = convertChild(prop.name);
+          let accessTokenIndex = context.sourceTokens.indexOfTokenStartingAtSourceIndex(member.range[0]);
+          let accessToken = accessTokenIndex && context.sourceTokens.tokenAtIndex(accessTokenIndex);
+
+          if (prop.soak && accessToken && accessToken.type === SourceType.EXISTENCE) {
+            accessTokenIndex = accessTokenIndex.next();
+            accessToken = accessTokenIndex && context.sourceTokens.tokenAtIndex(accessTokenIndex);
+          }
+
+          if (accessToken && accessToken.type === SourceType.PROTO) {
+            return makeNode(context, prop.soak ? 'SoakedProtoMemberAccessOp' : 'ProtoMemberAccessOp', mergeLocations(loc, prop.locationData), {
+              expression
+            });
+          }
+
           return makeNode(context, prop.soak ? 'SoakedMemberAccessOp' : 'MemberAccessOp', mergeLocations(loc, prop.locationData), {
             expression,
-            member: convertChild(prop.name)
+            member
           });
+        }
 
         case 'Index':
           return makeNode(context, prop.soak ? 'SoakedDynamicMemberAccessOp' : 'DynamicMemberAccessOp', mergeLocations(loc, prop.locationData), {

test/examples/dangling-prototype-access-of-call/input.coffee

@@ -0,0 +1 @@
+a()::

test/examples/dangling-prototype-access-of-call/output.json

@@ -0,0 +1,54 @@
+{
+  "type": "Program",
+  "line": 1,
+  "column": 1,
+  "range": [
+    0,
+    6
+  ],
+  "raw": "a()::\n",
+  "body": {
+    "type": "Block",
+    "line": 1,
+    "column": 1,
+    "range": [
+      0,
+      5
+    ],
+    "statements": [
+      {
+        "type": "ProtoMemberAccessOp",
+        "line": 1,
+        "column": 1,
+        "range": [
+          0,
+          5
+        ],
+        "expression": {
+          "type": "FunctionApplication",
+          "line": 1,
+          "column": 1,
+          "range": [
+            0,
+            3
+          ],
+          "function": {
+            "type": "Identifier",
+            "line": 1,
+            "column": 1,
+            "range": [
+              0,
+              1
+            ],
+            "raw": "a",
+            "data": "a"
+          },
+          "arguments": [],
+          "raw": "a()"
+        },
+        "raw": "a()::"
+      }
+    ],
+    "raw": "a()::"
+  }
+}

test/examples/soaked-prototype-access/input.coffee

@@ -0,0 +1 @@
+a?::b

test/examples/soaked-prototype-access/output.json

@@ -0,0 +1,64 @@
+{
+  "type": "Program",
+  "line": 1,
+  "column": 1,
+  "range": [
+    0,
+    6
+  ],
+  "raw": "a?::b\n",
+  "body": {
+    "type": "Block",
+    "line": 1,
+    "column": 1,
+    "range": [
+      0,
+      5
+    ],
+    "statements": [
+      {
+        "type": "MemberAccessOp",
+        "line": 1,
+        "column": 1,
+        "range": [
+          0,
+          5
+        ],
+        "expression": {
+          "type": "SoakedProtoMemberAccessOp",
+          "line": 1,
+          "column": 1,
+          "range": [
+            0,
+            4
+          ],
+          "expression": {
+            "type": "Identifier",
+            "line": 1,
+            "column": 1,
+            "range": [
+              0,
+              1
+            ],
+            "raw": "a",
+            "data": "a"
+          },
+          "raw": "a?::"
+        },
+        "member": {
+          "type": "Identifier",
+          "line": 1,
+          "column": 5,
+          "range": [
+            4,
+            5
+          ],
+          "raw": "b",
+          "data": "b"
+        },
+        "raw": "a?::b"
+      }
+    ],
+    "raw": "a?::b"
+  }
+}