fix(util) pass template concept

Signed-off-by: Dan Selman <danscode@selman.org>
accordproject · Jun 6, 2023 · a2cab30 · a2cab30
1 parent 5deb491
commit a2cab30
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/markdown-template/src/TemplateMarkTransformer.js b/packages/markdown-template/src/TemplateMarkTransformer.js
@@ -43,15 +43,16 @@ class TemplateMarkTransformer {
      * @param {string} templateKind - either 'clause' or 'contract'
      * @param {object} [options] configuration options
      * @param {boolean} [options.verbose] verbose output
-     * @returns {object} the result of parsing
+     * @param {string} [conceptFullyQualifiedName] - the fully qualified name of the template concept
+    * @returns {object} the result of parsing
      */
-    tokensToMarkdownTemplate(tokenStream, modelManager, templateKind, options) {
+    tokensToMarkdownTemplate(tokenStream, modelManager, templateKind, options, conceptFullyQualifiedName) {
         const template = tokensToUntypedTemplateMark(tokenStream, templateKind);
         if (options && options.verbose) {
             console.log('===== Untyped TemplateMark ');
             console.log(JSON.stringify(template,null,2));
         }
-        const typedTemplate = templateMarkTyping(template, modelManager, templateKind);
+        const typedTemplate = templateMarkTyping(template, modelManager, templateKind, conceptFullyQualifiedName);
         if (options && options.verbose) {
             console.log('===== TemplateMark ');
             console.log(JSON.stringify(typedTemplate,null,2));
@@ -66,9 +67,10 @@ class TemplateMarkTransformer {
      * @param {string} templateKind - either 'clause' or 'contract'
      * @param {object} [options] configuration options
      * @param {boolean} [options.verbose] verbose output
+     * @param {string} [conceptFullyQualifiedName] - the fully qualified name of the template concept
      * @returns {object} the result of parsing
      */
-    fromMarkdownTemplate(templateInput, modelManager, templateKind, options) {
+    fromMarkdownTemplate(templateInput, modelManager, templateKind, options, conceptFullyQualifiedName) {
         if (!modelManager) {
             throw new Error('Cannot parse without template model');
         }
@@ -78,7 +80,7 @@ class TemplateMarkTransformer {
             console.log('===== MarkdownIt Tokens ');
             console.log(JSON.stringify(tokenStream,null,2));
         }
-        return this.tokensToMarkdownTemplate(tokenStream, modelManager, templateKind, options);
+        return this.tokensToMarkdownTemplate(tokenStream, modelManager, templateKind, options, conceptFullyQualifiedName);
     }
 
     /**

diff --git a/packages/markdown-template/src/templatemarkutil.js b/packages/markdown-template/src/templatemarkutil.js
@@ -56,11 +56,12 @@ const templateMarkManager = mkTemplateMarkManager();
 /**
  * Returns the concept for the template
  * @param {object} introspector - the model introspector for this template
+ * @param {string} templateKind - either 'clause' or 'contract'
  * @param {string} [conceptFullyQualifiedName] - the fully qualified name of the template concept
  * @throws {Error} if no template model is found, or multiple template models are found
  * @returns {ClassDeclaration} the concept for the template
  */
-function findTemplateConcept(introspector, conceptFullyQualifiedName) {
+function findTemplateConcept(introspector, templateKind, conceptFullyQualifiedName) {
     if(conceptFullyQualifiedName) {
         return introspector.getClassDeclaration();
     }
@@ -123,11 +124,12 @@ function templateMarkTypingGen(template,introspector,model,templateKind,options)
  * @param {object} template the TemplateMark DOM
  * @param {object} modelManager - the modelManager for this template
  * @param {string} templateKind - either 'clause' or 'contract'
+ * @param {string} [conceptFullyQualifiedName] - the fully qualified name of the template concept
  * @returns {object} the typed TemplateMark DOM
  */
-function templateMarkTyping(template,modelManager,templateKind) {
+function templateMarkTyping(template,modelManager,templateKind,conceptFullyQualifiedName) {
     const introspector = new Introspector(modelManager);
-    const model = findTemplateConcept(introspector, templateKind);
+    const model = findTemplateConcept(introspector, templateKind,conceptFullyQualifiedName);
     return templateMarkTypingGen(template,introspector,model,templateKind);
 }
 

diff --git a/packages/markdown-transform/src/builtinTransforms.js b/packages/markdown-transform/src/builtinTransforms.js
@@ -39,7 +39,7 @@ const transformationGraph = {
         templatemark: async (input, parameters, options) => {
             const t = new TemplateMarkTransformer();
             const modelManager = await ModelLoader.loadModelManager(parameters.model, options);
-            return t.tokensToMarkdownTemplate(input, modelManager, parameters.templateKind, options);
+            return t.tokensToMarkdownTemplate(input, modelManager, parameters.templateKind, options, parameters.conceptFullyQualifiedName);
         },
     },
     templatemark: {