feat(list,records): add support for list, rec, rec:kv types

build(deps): update dependencies, prep for esm

jest.config.js

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

package.json

@@ -20,7 +20,7 @@
     "clean": "rimraf ./build",
     "build": "run build:*",
     "build:dir": "mkdir -p ./build/pkg/",
-    "build:fnk": "fnk --src ./src --out-dir ./build/pkg --ignore '**/*.test.fnk'",
+    "build:fnk": "fnk --module-type cjs --src ./src --out-dir ./build/pkg --ignore '**/*.test.fnk'",
     "build:files": "cp package.json ./README.md ./LICENSE ./build/pkg/",
     "test": "run jest",
     "jest": "jest --verbose --runInBand --no-cache ",
@@ -36,22 +36,22 @@
     }
   },
   "devDependencies": {
-    "@fink/cli": "^6.2.1",
-    "@fink/jest": "^5.4.0",
+    "@fink/cli": "^7.0.0",
+    "@fink/jest": "^6.0.0",
     "@fink/larix": "^12.3.0",
-    "@fink/loxia": "^12.4.0",
+    "@fink/loxia": "^13.0.1",
     "commitizen": "^4.1.2",
     "cz-conventional-changelog": "^3.1.0",
-    "jest-cli": "^26.1.0",
+    "jest-cli": "^26.5.2",
     "npx-run": "^2.1.2",
     "semantic-release": "^17.1.2"
   },
   "dependencies": {
     "@babel/core": "^7.10.5",
     "@babel/traverse": "^7.10.5",
     "@babel/types": "^7.10.5",
-    "@fink/js-interop": "^1.1.1",
-    "@fink/std-lib": "^4.0.1",
-    "@fink/snippet": "^1.0.0"
+    "@fink/js-interop": "^2.0.0",
+    "@fink/std-lib": "^5.0.0",
+    "@fink/snippet": "^2.0.0"
   }
 }

src/index.fnk

@@ -1,12 +1,12 @@
 {default: traverse} = import '@babel/traverse'
 {transformFromAstSync} = import '@babel/core'
-{is_empty} = import '@fink/std-lib/iter'
+{is_empty} = import '@fink/std-lib/iter.fnk'
 
-{transform_ast} = import './lang'
+{transform_ast} = import './lang/index.fnk'
 
-{transform_do_expr} = import './js/do-expression'
-{transform_async} = import './js/async'
-{module_transforms} = import './js/module'
+{transform_do_expr} = import './js/do-expression.fnk'
+{transform_async} = import './js/async.fnk'
+{module_transforms} = import './js/module.fnk'
 
 
 

src/index.test.fnk

@@ -1,8 +1,9 @@
-{describe, it, expect, to_equal, to_match_snapshot} = import '@fink/jest'
-{slice} = import '@fink/std-lib/str'
+{describe, it, expect, to_equal, to_match_snapshot} = import '@fink/jest/test.fnk'
+{slice} = import '@fink/std-lib/str.fnk'
+
+{generate} = import './index.fnk'
+{fink2js} = import './testing/index.fnk'
 
-{generate} = import '.'
-{fink2js} = import './testing'
 
 
 describe 'module types', fn:

src/js/async.fnk

@@ -1,5 +1,5 @@
 {isArrowFunctionExpression, isFunctionExpression, isForOfStatement} = import '@babel/types'
-{set_props} = import '@fink/js-interop/reflect'
+{set_props} = import '@fink/js-interop/reflect.fnk'
 
 
 [no_result] = []

src/js/do-expression.fnk

@@ -4,21 +4,23 @@
   isVariableDeclarator, isArrowFunctionExpression, isExpressionStatement
   isReturnStatement, arrowFunctionExpression, callExpression
 } = import '@babel/types'
-{set_props} = import '@fink/js-interop/reflect'
-{undefined} = import '@fink/js-interop/nullish'
-{is_empty} = import '@fink/std-lib/iter'
-{wrap_with_comment_loc} = import '../lang/comments'
+{set_props} = import '@fink/js-interop/reflect.fnk'
+{undefined} = import '@fink/js-interop/nullish.fnk'
+{is_empty} = import '@fink/std-lib/iter.fnk'
+{wrap_with_comment_loc} = import '../lang/comments/index.fnk'
 
+{lets, assign, undef} = import './types.fnk'
 
-{lets, assign, undef} = import './types'
 
 get_body = fn path: path.get 'body'
 
 
+
 # TODO: suport _ or nothing instead of having to use item
 consume_all = fold item: undefined
 
 
+
 simple = fn body, sl=false:
   match body:
     isBlockStatement ?:
@@ -41,6 +43,7 @@ simple = fn body, sl=false:
       body.node
 
 
+
 last_expressions = fn path:
   match path:
     isDoExpression ?:
@@ -90,6 +93,7 @@ last_expressions = fn path:
         ...last_expressions body
 
 
+
 replace_with_return = fn path:
   pipe last_expressions path:
     map expr:
@@ -115,6 +119,7 @@ replace_with_return = fn path:
     consume_all
 
 
+
 replace_with_assign = fn target, path:
   id = path.parentPath.scope.generateUidIdentifier 'do_result'
   #TODO: don't mutate
@@ -135,6 +140,7 @@ replace_with_assign = fn target, path:
     consume_all
 
 
+
 transform_do_expr = fn path:
   {parentPath: parent} = path
 

src/js/identifier.fnk

@@ -1,8 +1,8 @@
-{char_code, slice} = import '@fink/std-lib/str'
-{rx , matches} = import '@fink/std-lib/regex'
+{char_code, slice} = import '@fink/std-lib/str.fnk'
+{rx , matches} = import '@fink/std-lib/regex.fnk'
+{length} = import '@fink/std-lib/iter.fnk'
+{base_n} = import '@fink/std-lib/num.fnk'
 
-{length} = import '@fink/std-lib/iter'
-{base_n} = import '@fink/std-lib/num'
 
 
 check_ident = rx'
@@ -15,11 +15,13 @@ check_ident = rx'
   [_$\p{L}][_$\p{L}\p{N}]*$'
 
 
+
 var_prefix = 'ˆ'
 
 str_36 = base_n ?, 36
 
 
+
 replace_chars = fn name, idx=0:
   prefixed_name = '${var_prefix}${name}'
 
@@ -36,6 +38,7 @@ replace_chars = fn name, idx=0:
       replace_chars new_name, idx + length char_replacement
 
 
+
 escape_ident = fn name:
   match name:
     matches ?, check_ident:

src/js/types.fnk

@@ -6,10 +6,10 @@
   logicalExpression, binaryExpression, unaryExpression
   doExpression, assignmentExpression, isIdentifier
 } = import'@babel/types'
-{is_empty} = import '@fink/std-lib/iter'
+{is_empty} = import '@fink/std-lib/iter.fnk'
 
 
-{escape_ident} = import'./identifier'
+{escape_ident} = import'./identifier.fnk'
 
 
 wrap = fn larix_node, js_node:

src/lang/arithmitic/index.fnk

@@ -1,5 +1,5 @@
 {binaryExpression, unaryExpression} = import '@babel/types'
-{add, any} = import '../context'
+{add, any} = import '../context.fnk'
 
 
 transform_op = dict:

src/lang/arithmitic/index.test.fnk

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

src/lang/assignment/index.fnk

@@ -4,13 +4,13 @@
   memberExpression, identifier, expressionStatement, arrayPattern, restElement
   numericLiteral
 } = import '@babel/types'
-{length, is_empty} = import '@fink/std-lib/iter'
-{wrap_with_comment_loc} = import '../comments'
+{length, is_empty} = import '@fink/std-lib/iter.fnk'
+{wrap_with_comment_loc} = import '../comments/index.fnk'
 
 
-{transform_left} = import '../../js/left'
-{add, any} = import '../context'
-{transform_value} = import '../partial'
+{transform_left} = import '../../js/left.fnk'
+{add, any} = import '../context.fnk'
+{transform_value} = import '../partial/index.fnk'
 
 
 # TODO: std-lib
@@ -20,7 +20,7 @@ find_index = fn iterable, func:
 
 has_spread_not_last = fn {left}:
   match left:
-    {type: 'array', exprs: 1 < length ?}:
+    {type: ? in ['array', 'list'], exprs: 1 < length ?}:
       idx = find_index left.exprs, fn expr:
         match expr:
           {type: 'spread'}: true
@@ -50,10 +50,10 @@ transform_spread_left = fn {left}, {transform}:
   exprs = match before:
     is_empty ?:
       # TODO missing loc
-      [middle, {type: 'array', exprs: end}]
+      [middle, {type: 'list', exprs: end}]
     else:
       # TODO missing loc
-      [{type: 'array', exprs: before}, middle, {type: 'array', exprs: end}]
+      [{type: 'list', exprs: before}, middle, {type: 'list', 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 '@fink/jest'
+{fink2js} = import '../../testing/index.fnk'
+{describe, it, expect, to_match_snapshot} = import '@fink/jest/test.fnk'
 
 
 describe 'assignment', fn:

src/lang/async/index.fnk

@@ -1,5 +1,5 @@
 {awaitExpression} = import '@babel/types'
-{add, any} = import '../context'
+{add, any} = import '../context.fnk'
 
 
 transform_await = fn node, {transform}:

src/lang/async/index.test.fnk

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

src/lang/block/index.fnk

@@ -2,10 +2,10 @@
   doExpression, blockStatement, isAssignmentExpression, expressionStatement
   variableDeclaration, variableDeclarator
 } = import '@babel/types'
-{length} = import '@fink/std-lib/iter'
+{length} = import '@fink/std-lib/iter.fnk'
 
-{add, any} = import '../context'
-{wrap_with_comment_loc} = import '../comments'
+{add, any} = import '../context.fnk'
+{wrap_with_comment_loc} = import '../comments/index.fnk'
 
 
 block_statement = fn expr, {transform}:

src/lang/call/call.fnk

@@ -1,5 +1,5 @@
 {callExpression, identifier} = import '@babel/types'
-{is_empty, length} = import '@fink/std-lib/iter'
+{is_empty, length} = import '@fink/std-lib/iter.fnk'
 
 
 transform_args = fn args, {transform}:

src/lang/call/call.test.fnk

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

src/lang/call/index.fnk

@@ -1,6 +1,6 @@
-{add, any} = import '../context'
-{transform_call} = import './call'
-{transform_pipe} = import './pipe'
+{add, any} = import '../context.fnk'
+{transform_call} = import './call.fnk'
+{transform_pipe} = import './pipe.fnk'
 
 
 add_call = fn ctx:

src/lang/call/pipe.fnk

@@ -1,9 +1,10 @@
 {callExpression} = import'@babel/types'
 {is_empty} = import'@fink/std-lib/iter'
 
-{assign, lets, expr_block, undef} = import '../../js/types'
-{transform_value} = import '../partial'
-{wrap_with_comment_loc} = import '../comments'
+{assign, lets, expr_block, undef} = import '../../js/types.fnk'
+{transform_value} = import '../partial/index.fnk'
+{wrap_with_comment_loc} = import '../comments/index.fnk'
+
 
 
 transform_pipe = fn node, ctx:

src/lang/call/pipe.test.fnk

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

src/lang/comments/index.test.fnk

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

src/lang/comparison/index.fnk

@@ -1,13 +1,15 @@
 {binaryExpression, logicalExpression} = import '@babel/types'
 
-{add, any} = import '../context'
+{add, any} = import '../context.fnk'
+
 
 
 transform_op = dict:
   '==': '==='
   '!=': '!=='
 
 
+
 transform_comp = fn {op, left, right}, {transform}:
   {(op): operator=op} = transform_op
 
@@ -26,6 +28,7 @@ transform_comp = fn {op, left, right}, {transform}:
       binaryExpression operator, bin_left, bin_right
 
 
+
 add_comparison = fn ctx:
   pipe ctx:
     add 'comp', any, transform_comp

src/lang/comparison/index.test.fnk

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

src/lang/conditionals/index.fnk

@@ -1,5 +1,6 @@
-{add, any} = import '../context'
-{transform_match} = import './match'
+{add, any} = import '../context.fnk'
+{transform_match} = import './match.fnk'
+
 
 
 add_conditionals = fn ctx: