Merge pull request #8 from Cirru/more-errors

exposing more errors

.github/workflows/npm-publish.yaml

@@ -0,0 +1,21 @@
+name: npm publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+
+      - run: yarn && yarn compile
+
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/upload.yaml

@@ -0,0 +1,45 @@
+name: Upload Assets
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+jobs:
+  upload-assets:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn && yarn release
+        name: Build web assets
+
+      - name: Deploy to server
+        id: deploy
+        uses: Pendect/[email protected]
+        env:
+          DEPLOY_KEY: ${{secrets.rsync_private_key}}
+        with:
+          flags: "-avzr --progress"
+          options: ""
+          ssh_options: ""
+          src: "dist/*"
+          dest: "[email protected]:/web-assets/repo/${{ github.repository }}"
+
+      - name: Display status from deploy
+        run: echo "${{ steps.deploy.outputs.status }}"

css/style.css

@@ -81,6 +81,7 @@ body {
     margin: 0px 6px;
     border-radius: 3px;
     font-family: Source Code Pro, Menlo, Consolas, monospace;
+    white-space: pre;
 }
 
 .test .button {

example/cirru/if.cirru

@@ -1,4 +1,4 @@
 
 @if (@ switcher)
   div $ = right
-  div $ = wrong
+  div $ = wrong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cirru-html",
-  "version": "0.2.2",
+  "version": "0.2.3-a1",
   "description": "Template engine that converts Cirru to HTML",
   "main": "js/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "author": "jiyinyiyong",
   "license": "MIT",
   "dependencies": {
-    "cirru-parser": "^0.10.7"
+    "cirru-parser": "^0.10.8-a1"
   },
   "repository": {
     "type": "git",

src/abstract.coffee

@@ -21,6 +21,7 @@ exports.makeAbstract = (syntaxTree) ->
   args = syntaxTree[1..]
 
   unless func? and func.length > 0 and typeof func is 'string'
+    console.error("evaluation tree:", JSON.stringify(syntaxTree))
     throw new Error "(#{stringify func}) is not valid as func"
 
   if func[0] is '@'

src/expression/methods.coffee

@@ -1,6 +1,7 @@
 
 exports.Expression = class
   constructor: (tree) ->
+    @tree = tree
     @func = tree[0][1..]
     @args = tree[1..]
 
@@ -9,4 +10,7 @@ exports.Expression = class
 
   render: (data) ->
     list = @args.map (item) -> data[item]
+    if not data[@func]?
+      console.error "Evaludatiing tree", JSON.stringify(@tree)
+      throw new Error('Unknown method')
     data[@func] list...

src/main.coffee

@@ -13,8 +13,11 @@ document.body.onclick = (event) ->
     parent = event.target.parentElement
     file = parent.querySelector('.file').value
     data = parent.querySelector('.data').value
-    html = render file, (eval "(#{data})")
-    parent.querySelector('.result').value = html
+    try
+      html = render file, (eval "(#{data})")
+      parent.querySelector('.result').value = html
+    catch err
+      parent.querySelector('.result').value = err.stack
 
 buttons = document.querySelectorAll('.button')
 for button in buttons

src/tag/common.coffee

@@ -45,6 +45,9 @@ exports.Tag = class CommonTag
         continue
 
       func = item[0]
+      if not func?
+        console.error 'args:', @args, 'func:', @func
+        throw new Error("Empty in args")
       matchAttr = func.match /^:([\w-]+)/
       if matchAttr?
         prop = item[1..]