Merge pull request #41 from fink-lang/upgrade

upgrade to latest larix

package.json

@@ -35,19 +35,19 @@
     }
   },
   "devDependencies": {
-    "@fink/cli": "^3.0.0",
+    "@fink/cli": "^3.1.0",
     "@fink/jest": "^2.0.0",
-    "@fink/larix": "^6.0.4",
+    "@fink/larix": "^7.0.0",
     "@fink/loxia": "^5.0.0",
-    "commitizen": "^4.0.4",
+    "commitizen": "^4.0.5",
     "cz-conventional-changelog": "^3.1.0",
-    "jest-cli": "^25.3.0",
+    "jest-cli": "^25.5.3",
     "npx-run": "^2.1.2",
     "semantic-release": "^17.0.7"
   },
   "dependencies": {
-    "@babel/generator": "^7.9.5",
-    "@babel/traverse": "^7.9.5",
-    "@babel/types": "^7.9.5"
+    "@babel/generator": "^7.9.6",
+    "@babel/traverse": "^7.9.6",
+    "@babel/types": "^7.9.6"
   }
 }

src/lang/arithmitic/index.fnk

@@ -6,6 +6,6 @@
 add_arithmitic = fn ctx:
   pipe ctx:
     add:: 'arithm', any, transform_binary
-    add:: 'arithm_right', any, transform_binary
-    add:: 'arithm_prefix', any, transform_unary
+    add:: 'arithm:right', any, transform_binary
+    add:: 'arithm:prefix', any, transform_unary
 

src/lang/conditionals/match.fnk

@@ -41,10 +41,10 @@ match_props = fn props, emit_result, ctx, cond:
   [{id, prop}, ...rest] = props
 
   value = match prop:
-    {key: {type: 'spread'}}:
-      prop.key
+    {left: {type: 'spread'}}:
+      prop.left
     else:
-      prop.value
+      prop.right
 
   emit = match props:
     {length: 1}: emit_result
@@ -63,7 +63,7 @@ match_obj = fn value, obj, emit_result, ctx, cond:
     ... pipe id_props:
       map {id, prop}:
         match prop:
-          {key: {type: 'spread'}}:
+          {left: {type: 'spread'}}:
             restElement:: id
           else:
             [computed, key] = get_key:: prop, ctx
@@ -184,7 +184,7 @@ match_all = fn value, matches, emit, ctx:
       [condition, result] = split_condition:: expr
 
       js_expr = match condition:
-        {value: 'else'}:
+        {type: 'literal', value: 'else'}:
           js_expr = emit:: result
           wrap_with_comment_loc:: js_expr, condition
         else:

src/lang/generic/unary.fnk

@@ -1,6 +1,6 @@
 {unaryExpression} = import '@babel/types'
 
 
-transform_unary= fn node, {transform}:
+transform_unary = fn node, {transform}:
   right = transform:: node.right
   unaryExpression:: node.op, right

src/lang/iterable/index.fnk

@@ -1,7 +1,7 @@
 {add, any} = import '../context'
 {transform_fold} = import './fold'
 {transform_unfold} = import './unfold'
-{transform_map, transform_flat_map} = import './map'
+{transform_map} = import './map'
 {transform_filter} = import './filter'
 {transform_while} = import './while'
 {transform_find} = import './find'
@@ -12,7 +12,6 @@ add_iterables = fn ctx:
     add:: any, 'fold', transform_fold
     add:: any, 'unfold', transform_unfold
     add:: any, 'map', transform_map
-    add:: any, 'flat_map', transform_flat_map
     add:: any, 'filter', transform_filter
     add:: any, 'while', transform_while
     add:: any, 'find', transform_find

src/lang/iterable/map.fnk

@@ -5,7 +5,7 @@
 
 
 
-transform_any = fn flatten: fn node, ctx:
+transform_map = fn node, ctx:
   {transform, unique_ident} = ctx
 
   item = unique_ident:: 'item'
@@ -31,10 +31,4 @@ transform_any = fn flatten: fn node, ctx:
 
       yields::
         transform:: yield_value
-        flatten || last_is_spread
-
-
-transform_map = transform_any:: false
-
-
-transform_flat_map = transform_any:: true
+        last_is_spread

src/lang/iterable/map.test.fnk

@@ -66,16 +66,6 @@ describe:: 'map', fn:
       `
       to_match_snapshot
 
-describe:: 'flat_map', fn:
-  it:: 'compiles', fn:
-    expect::
-      fink2js`
-        flat_map item: [spam + item]
-
-        flat_map item: [spam]
-      `
-      to_match_snapshot
-
 
 
 

src/lang/iterable/map.test.fnk.snap

@@ -1,23 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`flat_map compiles 1`] = `
-"(function* map(ˆitems_2) {
-  for (const ˆitem_1 of ˆitems_2) {
-    const item = ˆitem_1;
-    yield* [spam + item];
-  }
-});
-
-(function* map(ˆitems_4) {
-  for (const ˆitem_3 of ˆitems_4) {
-    const item = ˆitem_3;
-    yield* [spam];
-  }
-});
-
-Object.assign(module.exports, {});"
-`;
-
 exports[`map compiles as flat map 1`] = `
 "(function* map(ˆitems_2) {
   for (const ˆitem_1 of ˆitems_2) {

src/lang/literals/index.fnk

@@ -5,6 +5,8 @@
 {transform_regex} = import './regex'
 {transform_array} = import './array'
 {transform_object, transform_prop} = import './object'
+{transform_keyword} = import './keywords'
+
 
 
 add_literals = fn ctx:
@@ -14,4 +16,5 @@ add_literals = fn ctx:
     add:: 'regex', any, transform_regex
     add:: 'array', any, transform_array
     add:: 'object', any, transform_object
-    add:: 'prop', any, transform_prop
+    add:: 'object:prop', any, transform_prop
+    add:: 'literal', any, transform_keyword

src/lang/literals/keywords.fnk

@@ -0,0 +1,8 @@
+{booleanLiteral, nullLiteral} = import '@babel/types'
+
+
+transform_keyword = fn node:
+  match node:
+    {'value': 'true'}: booleanLiteral:: true
+    {'value': 'false'}: booleanLiteral:: false
+    {'value': 'null'}: nullLiteral()

src/lang/literals/keywords.test.fnk

@@ -0,0 +1,13 @@
+{fink2js} = import '../../testing'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest'
+
+
+describe:: 'keywords', fn:
+  it:: 'transforms literals', fn:
+    expect::
+      fink2js`
+        x = false
+        y = true
+        z = null
+      `
+      to_match_snapshot

src/lang/literals/keywords.test.fnk.snap

@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`keywords transforms literals 1`] = `
+"const x = false;
+const y = true;
+const z = null;
+Object.assign(module.exports, {
+  x,
+  y,
+  z
+});"
+`;

src/lang/literals/object.fnk

@@ -13,7 +13,7 @@ str_key = fn {value, loc}:
   {...str, loc}
 
 
-get_key = fn {key}, ctx:
+get_key = fn {left: key}, ctx:
   match key:
     {type: 'group'}:
       [true, ctx.transform:: key]
@@ -25,16 +25,16 @@ get_key = fn {key}, ctx:
 
 transform_prop = fn node, ctx:
   match node:
-    {key: {type: 'spread'}}:
-      ctx.transform:: node.key
+    {left: {type: 'spread'}}:
+      ctx.transform:: node.left
     else:
       [computed, key] = get_key:: node, ctx
-      value = ctx.transform:: node.value
+      value = ctx.transform:: node.right
 
-      shorthand = node.key == node.value
+      shorthand = node.left == node.right
 
       final_value = match node:
-        {value: {type: 'assign'}}:
+        {right: {type: 'assign'}}:
           assignmentPattern:: value.left, value.right
         else:
           value

src/lang/literals/regex.fnk

@@ -2,6 +2,6 @@
 
 
 transform_regex = fn node:
-  pattern = node.pattern.replace:: rx/(\#.*\n)|[\n\s]/gm, ''
+  pattern = node.value.replace:: rx/(\#.*\n)|[\n\s]/gm, ''
 
   regExpLiteral:: pattern, node.flags

src/lang/literals/string.fnk

@@ -2,16 +2,18 @@
 
 
 transform_string = fn node, {transform}:
-  [...quasies] = pipe node.parts.filter:: fn part, idx: idx % 2 == 0:
-    map part: templateElement::
-      {raw: part.value.replace(rx/\\([\s\S])|(`)/g, '\\$1$2')}
+  {exprs: parts, tag=null} = node
 
+  [...quasies] = pipe parts:
+    filter part: part.type == 'string:text'
+    map part:
+      templateElement:: {raw: part.value.replace(rx/\\([\s\S])|(`)/g, '\\$1$2')}
 
-  [...expressions] = pipe node.parts.filter:: fn part, idx: idx % 2 == 1:
-    map part:transform:: part
+  [...expressions] = pipe parts:
+    filter part: part.type != 'string:text'
+    map part: transform:: part
 
   templ_str = templateLiteral:: quasies, expressions
-  {tag=null} = node
 
   match tag:
     null: templ_str

src/lang/logical/index.fnk

@@ -1,18 +1,39 @@
-{logicalExpression} = import '@babel/types'
+{logicalExpression, unaryExpression} = import '@babel/types'
 {add, any} = import '../context'
-{transform_unary} = import '../generic/unary'
+
+
+transform_op = {
+  '&&': '&&'
+  '||': '||'
+  '!': '!'
+  'and': '&&'
+  'or': '||'
+  'not': '!'
+}
+
+
+transform_not = fn node, {transform}:
+  {(node.op): op} = transform_op
+  right = transform:: node.right
+
+  unaryExpression:: op, right
 
 
 transform_logical = fn node, {transform}:
+  {(node.op): op} = transform_op
   left = transform:: node.left
   right = transform:: node.right
-  logicalExpression:: node.op, left, right
 
+  logicalExpression:: op, left, right
 
 
 add_logical = fn ctx:
   pipe ctx:
     add:: any, '&&', transform_logical
     add:: any, '||', transform_logical
-    add:: any, '!', transform_unary
+    add:: any, '!', transform_not
+
+    add:: any, 'and', transform_logical
+    add:: any, 'or', transform_logical
+    add:: any, 'not', transform_not
 

src/lang/logical/index.test.fnk

@@ -3,13 +3,20 @@
 
 
 describe:: 'logical', fn:
-  it:: 'compiles operators', fn:
+  it:: 'compiles', fn:
 
     expect::
       fink2js`
-        logical = a || b || c && d < 1 <= s
+        foo = a || b || c
+        bar = a && b && c
+        spam = !a
       `
       to_match_snapshot
 
-
-
+    expect::
+      fink2js`
+        foo = a or b or c
+        bar = a and b and c
+        spam = not a
+      `
+      to_match_snapshot

src/lang/logical/index.test.fnk.snap

@@ -1,8 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`logical compiles operators 1`] = `
-"const logical = a || b || c && d < 1 <= s;
+exports[`logical compiles 1`] = `
+"const foo = a || b || c;
+const bar = a && b && c;
+const spam = !a;
 Object.assign(module.exports, {
-  logical
+  foo,
+  bar,
+  spam
+});"
+`;
+
+exports[`logical compiles 2`] = `
+"const foo = a || b || c;
+const bar = a && b && c;
+const spam = !a;
+Object.assign(module.exports, {
+  foo,
+  bar,
+  spam
 });"
 `;