nattoppet 2.0.0 → 2.1.0

package/common.ymd

@@ -7,7 +7,7 @@ switch (extname(file)) {
     case 'css':
         `<style>${content}</style>`; break
     case 'coffee':
-        `<script>${render_coffee(content)}</script>`; break
+        `<script>${render_coffee(content, { bare: true })}</script>`; break
     case 'js':
         `<script>${content}</script>`; break
     case 'md':

package/compiler.js

@@ -64,9 +64,11 @@ const interpret = (str, env, defs) => {
     if (p1 < 0 && p2 < 0) return str
 
     if (p2 < 0 || (p1 >= 0 && p1 < p2)) {
+        const head = str.substring(0, p1)
+        str = str.substring(p1+2)
         let p = str.indexOf('\n\n')
         if (p < 0) p = str.length
-        return str.substring(0, p1) + '<p>' + interpret(str.substring(p1+2, p), env, defs) + '</p>' + interpret(str.substring(p+1), env, defs)
+        return head + '<p>' + interpret(str.substring(0, p), env, defs) + '</p>' + interpret(str.substring(p+1), env, defs)
     }
 
     const name = str.match(/\[(.+?)\]/)[1]
@@ -77,9 +79,14 @@ const interpret = (str, env, defs) => {
     switch (def.type) {
         case 'fn':
             env.remaining = str.substring(p2 + name.length + 2)
-            env.interpret = str => interpret(str, env, defs) // We gaved full defs that on the call site (dynamic scoping) since it is likely to be used on text near the callsite (not text on the fn definition)
+            env.interpret = str => { // a "scoped" interpret function capable for interpreting substrings. We preserve the "remaining" property outside.
+                const remaining = env.remaining
+                const result = interpret(str, env, defs) // We gaved full defs available on the call site (dynamic scoping) as the text to be interpreted is part of the call site text.
+                env.remaining = remaining
+                return result
+            }
             const result = vm.runInContext('{' + def.content + '}', env)
-            return str.substring(0, p2) + result + env.interpret(env.remaining)
+            return str.substring(0, p2) + result + interpret(env.remaining, env, defs)
         case 'ref':
             return str.substring(0, p2) +
                 interpret(def.content, env, defs.slice(i+1)) + // However for ref we use lexical scoping. Exclude self to prevent recusion

package/native/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "nattoppet_native"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+web-view = { version = "0.7", features = ["edge"] }
+
+[target.'cfg(windows)'.build-dependencies]
+winres = "0.1"
+
+[package.metadata.winres]
+ProductName = "A nattoppet native app"

package/native/build.rs

@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+    let mut res = winres::WindowsResource::new();
+    res.set_icon("../icon.ico");
+    res.compile().unwrap();
+}
+
+#[cfg(not(windows))]
+fn main() {}

package/native/src/main.rs

@@ -0,0 +1,22 @@
+#![windows_subsystem = "windows"]
+
+use web_view::*;
+
+fn main() {
+    static HTML_CONTENT: &str = include_str!("../target/bundle.html");
+
+    web_view::builder()
+        .title("Nattoppet Native")
+        .content(Content::Html(HTML_CONTENT))
+        .size(600, 480)
+        .resizable(false)
+        .debug(cfg!(debug_assertions))
+        .user_data(())
+        .invoke_handler(handler)
+        .run()
+        .unwrap();
+}
+
+fn handler(webview: &mut WebView<()>, arg: &str) -> WVResult {
+    Ok(())
+}

package/nattoppet-dev.js

@@ -22,7 +22,7 @@ const done = () => {
 }
 
 const start = (init=false) => {
-    const child = cp.spawn(__dirname + '/nattoppet.js', [file])
+    const child = cp.spawn(__dirname + '/nattoppet.js', [file, '--dev'])
     let buffer = ''
     child.stdout.on('data', chunk => buffer += chunk)
     child.on('close', code => {

package/nattoppet-native.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const fs = require('fs')
+const cp = require('child_process')
+const path = require('path')
+
+const init = () => {
+    fs.mkdirSync('native')
+    fs.mkdirSync('native/src')
+    fs.mkdirSync('native/target')
+    fs.copyFileSync(path.join(__dirname, 'native', 'src', 'main.rs'), 'native/src/main.rs')
+    fs.copyFileSync(path.join(__dirname, 'native', 'build.rs'), 'native/build.rs')
+    fs.copyFileSync(path.join(__dirname, 'native', 'Cargo.toml'), 'native/Cargo.toml')
+}
+
+const bundle = () => {
+    const child = cp.spawnSync(__dirname + '/nattoppet.js', [process.argv[3]])
+    if (child.stderr.length) {
+        console.error(child.stderr.toString())
+    }
+    fs.writeFileSync('native/target/bundle.html', child.stdout)
+}
+
+const build = () => {
+    bundle()
+    const child = cp.spawn('cargo', ['build', '--release'], { cwd: 'native' })
+    child.stdout.pipe(process.stdout)
+    child.stderr.pipe(process.stderr)
+    child.on('exit', (code) => {
+        if (code != 0) {
+            console.error("Cargo exit with code: " + code)
+        } else {
+            console.log("building finished. Check native/target/release/")
+        }
+    })
+}
+
+const help = () => {
+    console.log("Usage: nattoppet-native [init|bundle|build]")
+}
+
+switch (process.argv[2]) {
+    case 'init': return init()
+    case 'bundle': return bundle()
+    case 'build': return build()
+    default: return help()
+}

package/nattoppet.js

@@ -12,7 +12,8 @@ const file = process.argv[2] || 0
 const dir = file ? path.dirname(path.resolve(file)) : process.cwd()
 const str = fs.readFileSync(file, 'utf8')
 const env = { ...stdlib, base_dir: dir }
-const out = minifier.minify(compiler.compile(str, env), {
+const raw = compiler.compile(str, env)
+const out = process.argv.includes('--dev', 1) ? raw : minifier.minify(raw, {
     collapseWhitespace: true,
     removeAttributeQuotes: true,
     removeComments: true,

package/package.json

@@ -1,21 +1,20 @@
 {
   "name": "nattoppet",
   "description": "A tiny macro-based markup language for blogging",
-  "version": "2.0.0",
+  "author": "Shiwei Zhang <ylxdzsw@gmail.com>",
+  "version": "2.1.0",
   "dependencies": {
     "coffeescript": "^2.5.1",
     "html-minifier": "^4.0.0",
-    "katex": "^0.10.2",
-    "less": "^3.11.1",
-    "marked": "^0.8.0"
+    "katex": "^0.13.0",
+    "less": "^4.1.1",
+    "marked": "^2.0.1"
   },
   "bin": {
     "nattoppet": "./nattoppet.js",
-    "nattoppet-dev": "./nattoppet-dev.js"
+    "nattoppet-dev": "./nattoppet-dev.js",
+    "nattoppet-native": "./nattoppet-native.js"
   },
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ylxdzsw/nattoppet.git"
-  }
+  "repository": "https://github.com/ylxdzsw/nattoppet.git"
 }

package/ppt/ppt.less

@@ -115,7 +115,7 @@ footer {
     text-align: center;
     margin: 0;
 
-    font-family: cursive;
+    font-family: serif;
     font-size: 3rem;
     font-weight: normal;
 

package/stdlib.js

@@ -88,8 +88,8 @@ module.exports = {
         return path.basename(file)
     },
 
-    render_coffee(str) {
-        return coffee.compile(str)
+    render_coffee(str, options) {
+        return coffee.compile(str, options)
     },
 
     render_less(str) {

package/vue/vue.less

@@ -61,11 +61,14 @@ pre {
     background-color: #ebf1f5;
     padding: .8rem;
     overflow-x: auto;
+
+    code {
+        font-size: .8rem;
+    }
 }
 
 code {
     font-family: monospace;
-    font-size: .8rem;
     color: #222;
 }