Merge pull request #39 from fink-lang/deps

lang upgrade

jest.config.js

@@ -5,7 +5,7 @@ module.exports = {
   moduleFileExtensions: ['js', 'fnk'],
   transform: {
     '^.+\\.js$': 'babel-jest',
-    '^.+\\.fnk$': ['@fink/jest']
+    '^.+\\.fnk$': ['@fink/jest/transform']
   },
   transformIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/build/'],
 

package.json

@@ -35,10 +35,10 @@
     }
   },
   "devDependencies": {
-    "@fink/cli": "^2.3.0",
-    "@fink/jest": "^1.1.0",
-    "@fink/larix": "^4.10.0",
-    "@fink/loxia": "^4.10.0",
+    "@fink/cli": "^3.0.0",
+    "@fink/jest": "^2.0.0",
+    "@fink/larix": "^6.0.3",
+    "@fink/loxia": "^4.11.0",
     "commitizen": "^4.0.4",
     "cz-conventional-changelog": "^3.1.0",
     "jest-cli": "^25.3.0",

src/index.test.fnk

@@ -1,6 +1,6 @@
 {generate} = import '.'
 {fink2js} = import './testing'
-{describe, it, expect, to_throw} = import './testing/jest'
+{describe, it, expect, to_throw} = import '@fink/jest'
 
 
 describe:: 'errors', fn:

src/js/do-expression.fnk

@@ -1,20 +1,40 @@
 {
-  assignmentExpression, returnStatement, callExpression,
-  arrowFunctionExpression, expressionStatement,
+  assignmentExpression, returnStatement, expressionStatement,
   isDoExpression, isBlockStatement, isLabeledStatement, isTryStatement,
   isVariableDeclarator, isArrowFunctionExpression, isExpressionStatement,
-  isReturnStatement, isProgram, isIfStatement
+  isReturnStatement, isIfStatement, arrowFunctionExpression, callExpression
 } = import '@babel/types'
 
 
 {lets, assign, undef} = import './types'
 
-
 get_body = fn path: path.get:: 'body'
 
 consume_all = fold item, acc=null: null
 
 
+simple = fn body, sl=false:
+  match body:
+    isBlockStatement:: ?:
+      [stmnt, ...rest] = get_body:: body
+
+      match rest:
+        {length: 0}:
+          # e.g. fn arg: match ...: ...
+          match {sl, stmnt}:
+            {sl: true, stmnt: isLabeledStatement:: ?}:
+              stmnt.node.body
+            # TODO:
+            # {sl: true, stmnt: isIfStatement:: ?}:
+            #   body.node
+            else:
+              simple:: stmnt
+        else:
+          body.node
+    else:
+      body.node
+
+
 last_expressions = fn path:
   match path:
     isDoExpression:: ?:
@@ -38,11 +58,18 @@ last_expressions = fn path:
         {
           LabeledStatement: fn nested_match:
             nested_match.skip()
-          ,
+
           BreakStatement: fn brk:
             last = brk.getSibling:: brk.key - 1
-            # TODO: don't use mutation
-            items.push:: last
+            # TODO: don't add throw expr
+            match last.node:
+              {expression: {operator: 'throw'}}:
+                last.replaceWith::
+                  expressionStatement:: last.node.expression
+                brk.remove()
+              else:
+                # TODO: don't use mutation
+                items.push:: last
             null
         }
       items
@@ -63,10 +90,8 @@ replace_with_return = fn path:
     map expr:
       match expr:
         {node: {expression: {operator:'throw'}}}:
-          # no return throw ...
           expr.replaceWith::
             expressionStatement:: expr.node.expression
-
         else:
           expr.replaceWith::
             returnStatement:: expr.node.expression
@@ -81,28 +106,6 @@ replace_with_return = fn path:
     consume_all
 
 
-simple = fn body, sl=false:
-  match body:
-    isBlockStatement:: ?:
-      [stmnt, ...rest] = get_body:: body
-
-      match rest:
-        {length: 0}:
-          # e.g. fn arg: match ...: ...
-          match {sl, stmnt}:
-            {sl: true, stmnt: isLabeledStatement:: ?}:
-              stmnt.node.body
-            # TODO:
-            # {sl: true, stmnt: isIfStatement:: ?}:
-            #   body.node
-            else:
-              simple:: stmnt
-        else:
-          body.node
-    else:
-      body.node
-
-
 replace_with_assign = fn target, path:
   id = path.parentPath.scope.generateUidIdentifier:: 'do_result'
   #TODO: don't mutate
@@ -148,16 +151,17 @@ transform_do_expr = fn path:
         simple:: body, true
 
       replace_with_return:: path
+
     else:
       # e.g.
-      # {
-      #   foo:
-      #     x = spam
-      #     x + 3
-      # }
+      # fn:
+      #   foo = match:
+      #      spam:
+      #        shrub
+      #        ni
+      #   foo
       arrow = arrowFunctionExpression:: [], path.node
       path.replaceWith::
         callExpression:: arrow, []
 
   null
-

src/js/identifier.fnk

@@ -2,7 +2,7 @@
 check_ident = rx/
   ^(?!(?:
     do|if|in|for|let|new|try|var|case|enum|void|with|break|catch|class|const|super|while|yield|delete|export|import|public|return|static|switch|
-    typeof|default|extends|finally|package|private|continue|debugger|function|
+    typeof|default|extends|finally|package|private|continue|function|
     arguments|interface|protected|implements|instanceof
   )$)
   [

src/lang/assignment/index.fnk

@@ -36,8 +36,12 @@ transform_spread_left = fn {left}, {transform}:
             else: [before, middle, [...end, expr]]
 
   exprs = match before:
-    {length: 0}: [middle, {type: 'array', exprs: end}]
-    else: [{type: 'array', exprs: before}, middle, {type: 'array', exprs: end}]
+    {length: 0}:
+      # TODO missing loc
+      [middle, {type: 'array', exprs: end}]
+    else:
+      # TODO missing loc
+      [{type: 'array', exprs: before}, middle, {type: 'array', exprs: end}]
 
   transform_left:: transform:: {...left, exprs}
 

src/lang/assignment/index.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'assignment', fn:

src/lang/async/index.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'await', fn:
@@ -18,7 +18,7 @@ describe:: 'await', fn:
         a_gen = unfold curr=0:
           match shrub:
             spam: await ni(curr)
-            else : curr + 1
+            else: curr + 1
 
         await ni
       `

src/lang/call/call.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'call', fn:
@@ -9,7 +9,7 @@ describe:: 'call', fn:
       fink2js`
         call1 = a(ni, x=123, ...x)
         call2 = a(ni)
-        call3 = a ()
+        call3 = a()
         call4 = a(fn x: x*2)
       `
       to_match_snapshot

src/lang/call/pipe.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'pipe', fn:

src/lang/comments/index.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'comment', fn:

src/lang/conditionals/attempt.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'attempt', fn:

src/lang/conditionals/match.fnk

@@ -41,9 +41,6 @@ match_props = fn props, emit_result, ctx, cond:
   [{id, prop}, ...rest] = props
 
   value = match prop:
-    {value: {type: 'block', exprs: {length: 1}}}:
-      {exprs: [expr]} = prop.value
-      expr
     {key: {type: 'spread'}}:
       prop.key
     else:
@@ -100,7 +97,8 @@ get_array_decl = fn arr, id_elems, right, ctx:
     map {id, value}:
       match value:
         # e.g. empty elems in [,, foo, bar]
-        null: null
+        {type: 'empty'}:
+          null
         # e.g. spread in [foo, ..., bar]
         {type: 'spread', right: null}:
           value
@@ -136,7 +134,7 @@ match_array = fn value, arr, emit_result, ctx, cond:
     filter {value}:
       match value:
         # empty elements need no matching
-        null: false
+        {type: 'empty'}: false
         # empty spreads need no matching
         {type: 'spread', right: null}: false
         else: true

src/lang/conditionals/match.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, only, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'match', fn:
@@ -139,3 +139,18 @@ describe:: 'match', fn:
           [is_foo(?)]: ni
       `
       to_match_snapshot
+
+
+  it:: 'compiles do-expr', fn:
+    expect::
+      fink2js`
+        foo = match bar:
+          spam:
+            ni
+            throw foobar
+          else:
+            shrub
+            throw ni
+      `
+      to_match_snapshot
+

src/lang/conditionals/match.test.fnk.snap

@@ -47,6 +47,38 @@ exports[`match compiles 1`] = `
 Object.assign(module.exports, {});"
 `;
 
+exports[`match compiles do-expr 1`] = `
+"let _do_result;
+
+ˆmatch_2: {
+  const ˆvalue_1 = bar;
+
+  if (ˆvalue_1 === spam) {
+    _do_result = (() => {
+      ni;
+      throw foobar;
+    })();
+
+    break ˆmatch_2;
+  }
+
+  {
+    _do_result = (() => {
+      shrub;
+      throw ni;
+    })();
+
+    break ˆmatch_2;
+  }
+}
+
+const foo = _do_result;
+_do_result = undefined;
+Object.assign(module.exports, {
+  foo
+});"
+`;
+
 exports[`match compiles nested match 1`] = `
 "const test = () => {
   const ˆvalue_1 = foo;

src/lang/func/index.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'func', fn:

src/lang/generic/binary.test.fnk

@@ -1,5 +1,5 @@
 {fink2js} = import '../../testing'
-{describe, it, expect, to_match_snapshot} = import '../../testing/jest'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
 
 
 describe:: 'binary', fn:

src/lang/generic/index.fnk

@@ -1,10 +1,8 @@
 {add, any} = import '../context'
-{transform_inifx} = import './infix'
 {transform_block} = import '../block'
 
 
 add_generic = fn ctx:
   pipe ctx:
-    add:: 'infix', any, transform_inifx
     add:: 'block', any, transform_block