feature(dingus) nicer tabs, now displays TemplateMark AST

Signed-off-by: Jerome Simeon <[email protected]>
jeromesimeon · Aug 6, 2020 · e86c42c · e86c42c
1 parent 7c345b6
commit e86c42c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "version": "0.12.2",
   "private": true,
   "scripts": {
-    "dingus": "lerna exec --scope dingus -- npm run demo",
+    "dingus": "lerna exec --scope dingus -- npm run dingus",
     "build": "lerna run build",
     "postinstall": "npm run models:get && lerna bootstrap",
     "models:get": "node ./scripts/external/getExternalModels.js",

diff --git a/packages/dingus/lib/index.js b/packages/dingus/lib/index.js
@@ -4,6 +4,7 @@
 /*global $, _*/
 
 const markdownit = require('markdown-it');
+const tokensToUntypedTemplateMark = require('@accordproject/markdown-template').templatemarkutil.tokensToUntypedTemplateMark;
 
 var mdurl = require('mdurl');
 
@@ -72,7 +73,7 @@ var defaults = {
   // options below are for demo only
   _highlight: true,
   _strict: false,
-  _view: 'html'               // html / src / debug
+  _view: 'html'               // html / src / debug / ast
 };
 
 defaults.highlight = function (str, lang) {
@@ -117,6 +118,7 @@ function setResultView(val) {
   $('body').removeClass('result-as-html');
   $('body').removeClass('result-as-src');
   $('body').removeClass('result-as-debug');
+  $('body').removeClass('result-as-ast');
   $('body').addClass('result-as-' + val);
   defaults._view = val;
 }
@@ -172,7 +174,7 @@ function updateResult() {
   var source = $('.source').val();
 
   // Update only active view to avoid slowdowns
-  // (debug & src view with highlighting are a bit slow)
+  // (debug & ast & src view with highlighting are a bit slow)
   if (defaults._view === 'src') {
     setHighlightedlContent('.result-src-content', mdSrc.render(source), 'html');
 
@@ -183,6 +185,13 @@ function updateResult() {
       'json'
     );
 
+  } else if (defaults._view === 'ast') {
+    setHighlightedlContent(
+      '.result-ast-content',
+      JSON.stringify(tokensToUntypedTemplateMark(mdSrc.parse(source, { references: {} }),'contract'), null, 2),
+      'json'
+    );
+
   } else { /*defaults._view === 'html'*/
     $('.result-html').html(mdHtml.render(source));
   }
@@ -377,7 +386,7 @@ function loadPermalink() {
   });
 
   // sanitize for sure
-  if ([ 'html', 'src', 'debug' ].indexOf(defaults._view) === -1) {
+  if ([ 'html', 'src', 'debug', 'ast' ].indexOf(defaults._view) === -1) {
     defaults._view = 'html';
   }
 }

diff --git a/packages/dingus/lib/index.pug b/packages/dingus/lib/index.pug
@@ -48,11 +48,14 @@ html
           textarea.source.full-height= s.source
         section.col-xs-6.full-height
           .demo-control
-            a(href='#' data-result-as='html') html
-            a(href='#' data-result-as='src') source
-            a(href='#' data-result-as='debug') debug
+            a(href='#' data-result-as='html') preview
+            a(href='#' data-result-as='src') html
+            a(href='#' data-result-as='debug') tokens
+            a(href='#' data-result-as='ast') ast
           .result-html.full-height
           pre.hljs.result-src.full-height
             code.result-src-content.full-height
           pre.hljs.result-debug.full-height
             code.result-debug-content.full-height
+          pre.hljs.result-ast.full-height
+            code.result-ast-content.full-height
diff --git a/packages/dingus/lib/index.styl b/packages/dingus/lib/index.styl
@@ -37,29 +37,41 @@ body
 
 .result-src
 .result-debug
+.result-ast
   display none
 
 .result-src-content
 .result-debug-content
+.result-ast-content
   white-space pre
 
 .result-as-html
   .result-html
     display block
   .result-src
   .result-debug
+  .result-ast
     display none
 .result-as-src
   .result-src
     display block
   .result-html
   .result-debug
+  .result-ast
     display none
 .result-as-debug
   .result-debug
     display block
   .result-html
   .result-src
+  .result-ast
+    display none
+.result-as-ast
+  .result-ast
+    display block
+  .result-html
+  .result-src
+  .result-debug
     display none
 
 .demo-control

diff --git a/packages/dingus/package.json b/packages/dingus/package.json
@@ -11,12 +11,13 @@
   "repository": "accordproject/markdown-transform",
   "license": "Apache-2.0",
   "scripts": {
-    "demo": "node scripts/build_demo.js"
+    "dingus": "node scripts/build_dingus.js"
   },
   "files": [],
   "dependencies": {},
   "devDependencies": {
     "@accordproject/markdown-it-template": "0.12.2",
+    "@accordproject/markdown-template": "0.12.2",
     "autoprefixer-stylus": "^0.14.0",
     "browserify": "^16.3.0",
     "highlight.js": "^10.0.3",

diff --git a/packages/dingus/scripts/build_demo.js → packages/dingus/scripts/build_dingus.js b/packages/dingus/scripts/build_demo.js → packages/dingus/scripts/build_dingus.js
diff --git a/packages/markdown-template/index.js b/packages/markdown-template/index.js
@@ -20,6 +20,7 @@
  */
 
 module.exports.util = require('./lib/util');
+module.exports.templatemarkutil = require('./lib/templatemarkutil');
 module.exports.datetimeutil = require('./lib/datetimeutil');
 module.exports.normalizeNLs = require('./lib/normalize').normalizeNLs;
 module.exports.ParserManager = require('./lib/parsermanager');