Jmt update (#166)

* update jmt

* update jmt

* update workflow

* pass on code cov

* fix errors

* arghh, copy-n-paste

* use separate action for docs

Author: jverzani

.github/workflows/ci-nightly.yml

@@ -19,16 +19,16 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-#          - windows-latest
+          #- windows-latest
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         env:
           cache-name: cache-artifacts
         with:
@@ -39,4 +39,4 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-runtest@v1

.github/workflows/ci.yml

@@ -7,6 +7,13 @@ on:
     branches:
       - master
     tags: '*'
+
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -15,22 +22,22 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0' # lowest supports, possible errors
-          - '1.6' # lowest supported version; no errors
+          - '1.0' # lowest supported version; though possibly with errors
+          - '1.6' # LTS support
           - '1'   # last released version
         os:
           - ubuntu-latest
           - macos-latest
-#          - windows-latest
+          #- windows-latest
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         env:
           cache-name: cache-artifacts
         with:
@@ -42,29 +49,3 @@ jobs:
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
-        with:
-          file: lcov.info
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1'
-      - run: |
-          julia --project=docs -e '
-            using Pkg
-            Pkg.develop(PackageSpec(path=pwd()))
-            Pkg.instantiate()'
-      - run: |
-          julia --project=docs -e '
-            using Documenter: doctest
-            using Mustache
-            doctest(Mustache)'
-      - run: julia --project=docs docs/make.jl
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/documentation.yml

@@ -0,0 +1,37 @@
+name: Documentation
+
+on:
+  push:
+    branches:
+      - master # update to match your development branch (master, main, dev, trunk, ...)
+    tags: '*'
+  pull_request:
+
+jobs:
+  build:
+    # These permissions are needed to:
+    # - Deploy the documentation: https://documenter.juliadocs.org/stable/man/hosting/#Permissions
+    # - Delete old caches: https://github.com/julia-actions/cache#usage
+    permissions:
+      actions: write
+      contents: write
+      pull-requests: read
+      statuses: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: '1'
+      - uses: julia-actions/cache@v2
+      - name: Install dependencies
+        shell: julia --color=yes --project=docs {0}
+        run: |
+          using Pkg
+          Pkg.develop(PackageSpec(path=pwd()))
+          Pkg.instantiate()
+      - name: Build and deploy
+        run: julia --color=yes --project=docs docs/make.jl
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token
+          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key

Project.toml

@@ -1,6 +1,6 @@
 name = "Mustache"
 uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
-version = "1.0.20"
+version = "1.0.21"
 
 [deps]
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

src/parse.jl

@@ -163,7 +163,7 @@ end
 
 String macro that interpolates values escaped by dollar signs, then parses strings.
 
-Note: modified from a macro in [HypertextLiteral](https://github.com/clarkevans/HypertextLiteral.jl/blob/master/src/macros.jl).
+Note: very lightly modified from a macro in [HypertextLiteral](https://github.com/JuliaPluto/HypertextLiteral.jl/blob/master/src/macro.jl).
 
 Example:
 
@@ -177,21 +177,26 @@ macro jmt_str(expr::String)
     # Essentially this is an ad-hoc scanner of the string, splitting
     # it by `$` to find interpolated parts and delegating the hard work
     # to `Meta.parse`, treating everything else as a literal string.
-
     args = Any[]
     start = idx = 1
-    strlen = length(expr)
+    strlen = lastindex(expr)
     while true
         idx = findnext(isequal('$'), expr, start)
         if idx == nothing
+           chunk = expr[start:strlen]
            push!(args, expr[start:strlen])
            break
         end
-        push!(args, expr[start:idx-1])
-        start = idx + 1
+        push!(args, expr[start:prevind(expr, idx)])
+        start = nextind(expr, idx)
+        if length(expr) >= start && expr[start] == '$'
+            push!(args, "\$")
+            start += 1
+            continue
+        end
         (nest, tail) = Meta.parse(expr, start; greedy=false)
         if nest == nothing
-            throw("missing interpolation expression")
+            throw("missing expression at $idx: $(expr[start:end])")
         end
         if !(expr[start] == '(' || nest isa Symbol)
             throw(DomainError(nest,
@@ -208,7 +213,6 @@ macro jmt_str(expr::String)
         push!(args, nest)
         start = tail
     end
-
     quote
         Mustache.parse(string($(map(esc, args)...)))
     end