feat(comments): improve comments handling with latest larix

jest.config.js

@@ -14,7 +14,6 @@ module.exports = {
   modulePathIgnorePatterns: ['<rootDir>/build/'],
 
   testMatch: [
-    '<rootDir>/**/*.test.js',
     '<rootDir>/**/*.test.fnk'
   ],
   testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/build/'],
@@ -27,7 +26,6 @@ module.exports = {
 
   collectCoverage: true,
   collectCoverageFrom: [
-    '<rootDir>/src/**/*.js',
     '<rootDir>/src/**/*.fnk'
   ],
   coveragePathIgnorePatterns: [

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@fink/loxia",
+  "name": "@fink/loxia-dev",
   "version": "0.0.0-semantically-released",
   "license": "MIT",
   "engines": {
@@ -21,7 +21,8 @@
     "build": "run build:*",
     "build:dir": "mkdir -p ./build/pkg/",
     "build:fnk": "fnk --src ./src --out-dir ./build/pkg --ignore '**/*.test.fnk'",
-    "build:files": "cp ./package.json ./README.md ./LICENSE ./build/pkg/",
+    "build:files": "cp ./README.md ./LICENSE ./build/pkg/",
+    "build:pkg": "./scripts/build-pkg-json",
     "test": "run test:build-helpers jest",
     "test:build-helpers": "fnk --src ./src/testing --out-dir build/test-helpers",
     "jest": "jest --verbose --runInBand --no-cache ",
@@ -36,16 +37,17 @@
   "devDependencies": {
     "@fink/cli": "^2.3.0",
     "@fink/jest": "^1.1.0",
-    "@fink/larix": "^4.8.1",
-    "commitizen": "^4.0.3",
+    "@fink/larix": "^4.9.0",
+    "@fink/loxia": "^4.8.2",
+    "commitizen": "^4.0.4",
     "cz-conventional-changelog": "^3.1.0",
-    "jest-cli": "^25.2.4",
+    "jest-cli": "^25.3.0",
     "npx-run": "^2.1.2",
     "semantic-release": "^17.0.4"
   },
   "dependencies": {
-    "@babel/generator": "^7.8.6",
-    "@babel/traverse": "^7.8.6",
-    "@babel/types": "^7.8.6"
+    "@babel/generator": "^7.9.5",
+    "@babel/traverse": "^7.9.5",
+    "@babel/types": "^7.9.5"
   }
 }

scripts/build-pkg-json

@@ -0,0 +1 @@
+sed 's/loxia-dev/loxia/' package.json > build/pkg/package.json

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

@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`await compiles 1`] = `
-"const task1 = async foo => -(await foo);
+"const task1 = async (foo) => -(await foo);
 
-const task2 = async foo => await (foo + 4);
+const task2 = async (foo) => await (foo + 4);
 
-const task3 = async foo => {
+const task3 = async (foo) => {
   const bar = await foo();
   return bar + 123;
 };

src/lang/call/call.test.fnk.snap

@@ -4,7 +4,7 @@ exports[`call compiles 1`] = `
 "const call1 = a(ni, x = 123, ...x);
 const call2 = a(ni);
 const call3 = a();
-const call4 = a(x => x * 2);
+const call4 = a((x) => x * 2);
 Object.assign(module.exports, {
   call1,
   call2,

src/lang/comments/index.fnk

@@ -1,10 +1,22 @@
 
-get_comments = fn {comment=null}:
-  match comment:
-    null: {}
-    else:
-      {value, loc} = comment
-      {leadingComments: [{type: 'CommentBlock', value: `${value} `, loc}]}
+transform_comment = fn {op, value, loc, ...rest}:
+  match op:
+    '---': {type: 'CommentBlock', value, loc}
+    else: {type: 'CommentLine', value, loc}
+
+
+transform_comments = fn comments:
+  pipe comments:
+    map comment: transform_comment:: comment
+
+
+get_comments = fn {comments={}}:
+  {leading=[], trailing=[]} = comments
+
+  {
+    leadingComments: [...transform_comments:: leading],
+    trailingComments: [...transform_comments:: trailing]
+  }
 
 
 wrap_with_comment_loc = fn js_node, larix_node:

src/lang/comments/index.test.fnk

@@ -13,7 +13,9 @@ describe:: 'comment', fn:
       Shrub ni.
       ---
       bar = fn:
+        --- single line block ---
         spam
 
+      # trailing module
     `) eq snapshot
 

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

@@ -1,16 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`comment compiles 1`] = `
-"/* leading expression */
+"// leading expression
 const spam = ni;
 
 /*
 Shrub ni.
 */
-const bar = () => spam;
+const bar = () =>
+/* single line block */
+spam;
 
 Object.assign(module.exports, {
   spam,
   bar
-});"
+});
+// trailing module"
 `;