fix(template) Allow format attribute for {{this}} variable

Signed-off-by: jeromesimeon <[email protected]>

Author: jeromesimeon

packages/markdown-it-template/lib/template_inline.js

@@ -119,6 +119,9 @@ function template_inline(state, silent) {
                 token         = state.push('this', 'this', 0);
                 token.content = content;
                 token.attrs = [ ];
+                if (format) {
+                    token.attrs.push([ 'format', format ]);
+                }
             } else {
                 token         = state.push('variable', 'variable', 0);
                 token.content = content;

packages/markdown-template/lib/templaterules.js

@@ -43,7 +43,7 @@ const thisRule = { // 'this' is a special variable for the current data in scope
     enter: (node,token,callback) => {
         const format = getAttr(token.attrs,'format',null);
         if (format) {
-            node.$class = NS_PREFIX_TemplateMarkModel + 'VariableDefinition';
+            node.$class = NS_PREFIX_TemplateMarkModel + 'FormattedVariableDefinition';
             node.format = format;
         }
         node.name = 'this';

packages/markdown-template/test/TemplateMarkTransformer.js

@@ -97,6 +97,7 @@ const successes = [
     {name:'testOptionalElse',kind:'clause'},
     {name:'testOptionalThisSome',kind:'clause'},
     {name:'testOptionalThisNone',kind:'clause'},
+    {name:'testOptionalThisFormat',kind:'contract'},
     {name:'testUnderscore',kind:'clause'},
     {name:'testIfEnd',kind:'clause'},
     {name:'alltypes',kind:'clause'},

packages/markdown-template/test/data/testOptionalThisFormat/@models.accordproject.org.accordproject.contract.cto

@@ -0,0 +1,32 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+concerto version ">= 1.0.0"
+
+namespace org.accordproject.contract
+
+/**
+ * Contract Data
+ * -- Describes the structure of contracts and clauses
+ */
+
+/* A contract is a asset -- This contains the contract data */
+abstract asset Contract identified by contractId {
+  o String contractId
+}
+
+/* A clause is an asset -- This contains the clause data */
+abstract asset Clause identified by clauseId {
+  o String clauseId
+}

packages/markdown-template/test/data/testOptionalThisFormat/data.json

@@ -0,0 +1 @@
+{"$class":"org.test.EmptyContract","name":"Fred","dueDate":"2020-12-17T00:00:00.000Z","contractId":"fc0d87a2-33f7-4858-9d4a-941b89c7aed0","$identifier":"fc0d87a2-33f7-4858-9d4a-941b89c7aed0"}

packages/markdown-template/test/data/testOptionalThisFormat/grammar.json

@@ -0,0 +1 @@
+{"$class":"org.accordproject.commonmark.Document","xmlns":"http://commonmark.org/xml/1.0","nodes":[{"$class":"org.accordproject.templatemark.ContractDefinition","name":"top","elementType":"org.test.EmptyContract","nodes":[{"$class":"org.accordproject.commonmark.Paragraph","nodes":[{"$class":"org.accordproject.commonmark.Text","text":"Name: "},{"$class":"org.accordproject.templatemark.VariableDefinition","name":"name","elementType":"String"},{"$class":"org.accordproject.commonmark.Softbreak"},{"$class":"org.accordproject.commonmark.Text","text":"Payment due by "},{"$class":"org.accordproject.templatemark.FormattedVariableDefinition","format":"DD MMMM YYYY","name":"dueDate","elementType":"DateTime"},{"$class":"org.accordproject.commonmark.Softbreak"},{"$class":"org.accordproject.templatemark.OptionalDefinition","whenSome":[{"$class":"org.accordproject.commonmark.Text","text":"Payment due by "},{"$class":"org.accordproject.templatemark.FormattedVariableDefinition","format":"DD MMMM YYYY","name":"this","elementType":"DateTime"}],"whenNone":[],"name":"dueDate","elementType":"DateTime"}]}]}]}

packages/markdown-template/test/data/testOptionalThisFormat/grammar.tem.md

@@ -0,0 +1,3 @@
+Name: {{name}} 
+Payment due by {{dueDate as "DD MMMM YYYY"}}
+{{#optional dueDate}}Payment due by {{this as "DD MMMM YYYY"}}{{/optional}}

packages/markdown-template/test/data/testOptionalThisFormat/model.cto

@@ -0,0 +1,8 @@
+namespace org.test
+
+import org.accordproject.contract.* from https://models.accordproject.org/accordproject/contract.cto
+
+asset EmptyContract extends Contract {
+    o String name
+    o DateTime dueDate optional
+}

packages/markdown-template/test/data/testOptionalThisFormat/sample.md

@@ -0,0 +1,3 @@
+Name: "Fred"
+Payment due by 17 December 2020
+Payment due by 17 December 2020