CI JS

.github/workflows/ci.yml

@@ -3,12 +3,13 @@ on: [push, pull_request]
 
 jobs:
   build:
-    if: !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]')
+    if: |
+      !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]')
 
     strategy:
       fail-fast: false
       matrix:
-        branch: [version-1-0, version-1-2, version-1-4, devel]
+        branch: ["1.0.0", "1.2.0", "1.4.0", "devel"]
         target:
           - os: linux
             cpu: amd64
@@ -33,6 +34,7 @@ jobs:
     name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (${{ matrix.branch }})'
     runs-on: ${{ matrix.builder }}
     steps:
+      - uses: actions/setup-node@v2
       - name: Checkout fusion
         uses: actions/checkout@v2
         with:
@@ -129,17 +131,3 @@ jobs:
           target_branch: gh-pages
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Cache choosenim
-        id: cache-choosenim
-        uses: actions/cache@v1
-        with:
-          path: ~/.choosenim
-          key: ${{ runner.os }}-choosenim-devel-latest
-
-      - name: Cache nimble
-        id: cache-nimble
-        uses: actions/cache@v1
-        with:
-          path: ~/.nimble
-          key: ${{ runner.os }}-nimble-devel-latest

fusion.nimble

@@ -11,6 +11,8 @@ srcDir        = "src"
 requires "nim >= 1.0.0"
 
 task docs, "":
-  # can customize, e.g.:
-  # exec "nim r src/fusion/docutils " & srcDir & " --outdir:htmldocs2 -d:foo"
+  # JavaScript
+  when (NimMajor, NimMinor) >= (1, 4):
+    exec "nim c -r -d:fusionDocJs src/fusion/docutils " & srcDir & " -d:js -d:fusionDocJs"
+  # C
   exec "nim c -r src/fusion/docutils " & srcDir

src/fusion/docutils.nim

@@ -1,13 +1,18 @@
-import std/[os, strformat, sugar, osproc]
+import std/[os, sugar, strutils, osproc]
 import std/private/globs
 
 
-const blockList =
-  when not defined(js): ["nimcache", "htmldocs", "js"]
-  else: ["nimcache", "htmldocs"]
+const
+  blockList = ["nimcache", "htmldocs"] # Folders to explicitly ignore.
+  baseCmd = " doc --project --docroot --outdir:htmldocs --styleCheck:hint " # nim doc command part that never changes
+  jsDocOpts =  # nim doc command part that changes for JS compat.
+    when defined(fusionDocJs): "-b:js "
+    else: ""
+  docComand = baseCmd & jsDocOpts
+
 
 iterator findNimSrcFiles*(dir: string): string =
-  proc follow(a: PathEntry): bool =
+  func follow(a: PathEntry): bool =
     a.path.lastPathPart notin blockList
 
   for entry in walkDirRecFilter(dir, follow = follow):
@@ -17,18 +22,24 @@ iterator findNimSrcFiles*(dir: string): string =
 
 proc genCodeImportAll*(dir: string): string =
   result = "{.warning[UnusedImport]: off.}\n"
-  for a in findNimSrcFiles(dir):
-    let s = "".dup(addQuoted(a))
-    result.add &"import {s}\n"
+  var name, prefix: string
+  for nimfile in findNimSrcFiles(dir):
+    name = nimfile.extractFilename
+    prefix =
+      if name.startsWith "js":
+        "when defined(js): import "
+      else:
+        "when not defined(js): import "
+    result.add prefix & "".dup(addQuoted(nimfile)) & "\n"
 
 
 proc genDocs(dir: string, nim = "", args: seq[string]) =
   let code = genCodeImportAll(dir)
   let extra = quoteShellCommand(args)
   let nim = if nim.len == 0: getCurrentCompilerExe() else: nim
-  let ret = execCmdEx(fmt"{nim} doc -r --project --docroot --outdir:htmldocs {extra} -", input = code)
+  let ret = execCmdEx(nim & docComand & extra & " - ", input = code)
   if ret.exitCode != 0:
-    doAssert false, ret.output & "\n" & code
+    doAssert false, ret.output & '\n' & code
 
 
 when isMainModule:

src/fusion/matching.nim

@@ -2154,7 +2154,7 @@ macro match*(n: untyped): untyped =
       # `mixinList`
       `pos`
       let expr {.inject.} = `head`
-      let pos {.inject.}: int = 0
+      let pos {.inject, used.}: int = 0
       `matchcase`
 
   # echo result.repr

tests/config.nims

@@ -1 +1,2 @@
 switch("path", "$projectDir/../src")
+switch("styleCheck", "hint")

tests/tmatching.nim

@@ -1,8 +1,11 @@
 import std/[strutils, sequtils, strformat, sugar,
-            macros, options, tables, json, algorithm]
+            macros, options, tables, json]
 
 import fusion/matching
 {.experimental: "caseStmtMacros".}
+{.push hint[XDeclaredButNotUsed]: off.}
+{.push hint[ConvFromXtoItselfNotNeeded]:off.}
+{.push hint[CondTrue]:off.}
 
 import unittest
 
@@ -60,7 +63,7 @@ suite "Matching":
          of eN12:
            f2: float
 
-    let val = Obj1()
+    let val {.used.} = Obj1()
 
   test "Pattern parser tests":
     macro main(): untyped =
@@ -161,7 +164,9 @@ suite "Matching":
               doAssert head is NimNode
               doAssert body is NimNode
 
-    main()
+    when (NimMajor, NimMinor, NimPatch) >= (1, 2, 0):
+      # https://github.com/nim-lang/fusion/pull/64/checks?check_run_id=1640671490#step:8:251
+      main()  # Fails on 1.0.0 only.
 
   test "Pattern parser broken brackets":
     block: JArray[@a, @b] := %*[1, 3]
@@ -875,44 +880,44 @@ suite "Matching":
 
 
   multitestSince "Tree builder custom type", (1, 4, 0):
+    when (NimMajor, NimMinor, NimPatch) >= (1, 5, 1):
+      discard makeTree(HtmlNode, Base())
+      discard makeTree(HtmlNode, base())
+      discard makeTree(HtmlNode, base([link()]))
+      discard makeTree(HtmlNode):
+        base:
+          link(text: "hello")
 
-    discard makeTree(HtmlNode, Base())
-    discard makeTree(HtmlNode, base())
-    discard makeTree(HtmlNode, base([link()]))
-    discard makeTree(HtmlNode):
-      base:
-        link(text: "hello")
-
-    template wrapper1(body: untyped): untyped =
-      makeTree(HtmlNode):
-        body
-
-    template wrapper2(body: untyped): untyped =
-      makeTree(HtmlNode, body)
+      template wrapper1(body: untyped): untyped =
+        makeTree(HtmlNode):
+          body
 
-    let tmp1 = wrapper1:
-      base: link()
-      base: link()
+      template wrapper2(body: untyped): untyped =
+        makeTree(HtmlNode, body)
 
-    doAssert tmp1 is seq[HtmlNode]
+      let tmp1 = wrapper1:
+        base: link()  # Repro on 1.4.0 only, not 1.4.2 or newer.
+        base: link()  # https://github.com/nim-lang/fusion/pull/64/checks?check_run_id=1640367574#step:8:67
+                      # https://github.com/nim-lang/fusion/pull/64/checks?check_run_id=1640605058#step:8:67
+      doAssert tmp1 is seq[HtmlNode]
 
 
-    let tmp3 = wrapper1:
-      base:
-        base: link()
-        base: link()
+      let tmp3 = wrapper1:
+        base:
+          base: link()
+          base: link()
 
-    doAssert tmp3 is HtmlNode
+      doAssert tmp3 is HtmlNode
 
-    let tmp2 = wrapper1:
-      base:
-        link()
+      let tmp2 = wrapper1:
+        base:
+          link()
 
-    doAssert tmp2 is HtmlNode
+      doAssert tmp2 is HtmlNode
 
-    discard wrapper2:
-      base:
-        link()
+      discard wrapper2:
+        base:
+          link()
 
 
   multitest "Tree construction sequence operators":