Merge pull request #27 from fink-lang/fix-prop-access

fix prop access

src/js/do-expression.fnk

@@ -23,7 +23,6 @@ last_expressions = fn path:
 
     path.isLabeledStatement():
       body = path.get('body')
-      # console.log:: body.node
 
       items = []
       body.traverse(
@@ -57,7 +56,7 @@ consume_all = fold item, acc=null: null
 replace_with_return = fn path:
   pipe last_expressions(path):
     map expr:
-      TODO = match true:
+      match true:
         expr.node.expression.operator == 'throw':
           # no return throw ...
           expr.replaceWith(

src/js/types.fnk

@@ -25,10 +25,10 @@ expr_block = fn ...exprs:
       ...pipe exprs:
         map node:
           match true:
-                (node.type.endsWith('Expression') || isIdentifier(node)):
-                  expressionStatement(node)
-                else:
-                  node
+            (node.type.endsWith('Expression') || isIdentifier(node)):
+              expressionStatement(node)
+            else:
+              node
     ])
   )
 
@@ -75,9 +75,14 @@ not_nullish = fn value:
 
 ident = fn name:
   match name:
-    # TODO: typeof name == 'string': identifier(escape_ident(name))
+    # TODO: typeof name == 'string': identifier(escape_ident(name)) or
     {constructor: String}: identifier(escape_ident(name))
-    else: name
+    else:
+      # {type: 'Identifier'}
+      # {type: 'ObjectPattern'}
+      # {type: 'ArrayPattern'}
+      # {type: 'AssignmentPattern'}
+      name
 
 
 consts = fn id, init:
@@ -112,12 +117,6 @@ yield_or_stop = fn expr, unique_ident, delegate:
 
   [
     consts(result, expr),
-    # iff(eq(result, ident('stop')))(
-    #   returns()
-    # ),
-    # iff(neq(result, ident('skip')))(
-    #   yields(result, delegate)
-    # )
     yields(result, delegate)
   ]
 

src/lang/block/index.fnk

@@ -12,9 +12,7 @@ block_statement = fn {transform}: fn expr:
       decl = variableDeclaration(
         'const', [variableDeclarator(st.left, st.right)]
       )
-      # TODO: do without assign
-      Object.assign(decl, {leadingComments: st.leadingComments})
-      decl
+      {...decl, leadingComments: st.leadingComments}
     else:
       # TODO: check if (isExpression(st)) ...
       expressionStatement(st)

src/lang/conditionals/match.test.fnk

@@ -31,6 +31,7 @@ describe:: 'logical', fn:
         123: spam
     `) eq snapshot
 
+
   it:: 'compiles nested match', fn:
     fink2js(`
       test = fn:

src/lang/literals/object.fnk

@@ -19,7 +19,7 @@ get_key = fn {key}, ctx:
 
 
 transform_prop = fn node, ctx:
-  prop = match true:
+  match true:
     node.key.type == 'spread':
       ctx.transform(node.key)
     else:
@@ -36,5 +36,5 @@ transform_prop = fn node, ctx:
           value
 
       objectProperty(key, final_value, computed, shorthand)
-  prop
+
 

src/lang/prop-access/index.fnk

@@ -1,12 +1,13 @@
-{memberExpression} = import '@babel/types'
+{memberExpression, identifier} = import '@babel/types'
 {add, any} = import '../context'
 
 
 transform_member = fn node, ctx:
   left = ctx.transform(node.left)
 
-  # TODO: right hand side can be an identifier that should not be escaped
-  right = ctx.transform(node.right)
+  right = match node.right:
+    {type: 'ident'}: identifier(node.right.value)
+    else: ctx.transform(node.right)
 
   computed = (
     node.right.type == 'string'

src/lang/prop-access/index.test.fnk

@@ -9,5 +9,6 @@ describe:: 'member', fn:
       foo = spam.shrub
       computed_member = item.'bar spam'
       computed_member2 = item.(Symbol.iterator)
+      reserved_prop = item.arguments
     `) eq snapshot
 

src/lang/prop-access/index.test.fnk.snap

@@ -4,9 +4,11 @@ exports[`member compiles 1`] = `
 "const foo = spam.shrub;
 const computed_member = item[\`bar spam\`];
 const computed_member2 = item[Symbol.iterator];
+const reserved_prop = item.arguments;
 Object.assign(module.exports, {
   foo,
   computed_member,
-  computed_member2
+  computed_member2,
+  reserved_prop
 });"
 `;