@accordproject/template-engine 2.9.0 → 3.0.1

package/dist/index.d.ts

@@ -152,15 +152,15 @@ declare class TemplateArchiveProcessor {
      * @param {object} request - the request to send to the template logic
      * @param {object} state - the current state of the template
      * @param {[string]} currentTime - the current time, defaults to now
-     * @param {[number]} utcOffset - the UTC offer, defaults to zero
+     * @param {[number]} utcOffset - the UTC offset, defaults to zero
      * @returns {Promise} the response and any events
      */
     trigger(data: any, request: any, state?: any, currentTime?: string, utcOffset?: number): Promise<TriggerResponse>;
     /**
      * Init the logic of a template
      * @param {[string]} currentTime - the current time, defaults to now
-     * @param {[number]} utcOffset - the UTC offer, defaults to zero
-     * @returns {Promise} the response and any events
+     * @param {[number]} utcOffset - the UTC offset, defaults to zero
+     * @returns {Promise<InitResponse>} the new state
      */
     init(data: any, currentTime?: string, utcOffset?: number): Promise<InitResponse>;
 }

package/dist/index.js

@@ -714,7 +714,7 @@ function getJsonPath(rootData, currentNode, paths) {
       }
     }
   }
-  if (currentNode.name !== "this") {
+  if (currentNode.name !== "this" && currentNode.name !== "top") {
     withPath.push(`['${currentNode.name}']`);
   }
   return withPath.length > 0 ? `$${withPath.join("")}` : "$";
@@ -904,8 +904,17 @@ async function generateAgreement(modelManager, clauseLibrary, templateMark, data
         }
       } else if (CONDITIONAL_DEFINITION_RE.test(nodeClass)) {
         if (context.condition) {
-          const result = userCodeResults[this.path.join("/")];
-          context.isTrue = !!result;
+          const key = this.path.join("/");
+          const resultStr = userCodeResults[key];
+          if (resultStr === void 0 || resultStr === null) {
+            context.isTrue = false;
+          } else {
+            try {
+              context.isTrue = !!JSON.parse(resultStr);
+            } catch (err) {
+              throw new Error(`Invalid JSON boolean result for condition '${key}': ${String(err)}`);
+            }
+          }
         } else {
           const path = getJsonPath(templateMark, context, this.path);
           const variableValues = jp.query(data, path, 1);
@@ -926,16 +935,27 @@ async function generateAgreement(modelManager, clauseLibrary, templateMark, data
       } else if (CLAUSE_DEFINITION_RE.test(nodeClass)) {
         const path = getJsonPath(templateMark, context, this.path);
         const variableValues = jp.query(data, path, 1);
-        if (context.name !== "top" && (variableValues.length === 0 || variableValues[0] === void 0 || variableValues[0] === null)) {
-          delete context.nodes;
-          stopHere = true;
-        } else if (context.condition) {
+        if (context.condition) {
           checkCode(context.condition);
-          const result = !!userCodeResults[this.path.join("/")];
+          const key = this.path.join("/");
+          const resultStr = userCodeResults[key];
+          let result = false;
+          if (resultStr === void 0 || resultStr === null) {
+            result = false;
+          } else {
+            try {
+              result = !!JSON.parse(resultStr);
+            } catch (err) {
+              throw new Error(`Invalid JSON boolean result for condition '${key}': ${String(err)}`);
+            }
+          }
           if (!result) {
             delete context.nodes;
             stopHere = true;
           }
+        } else if (context.name !== "top" && (variableValues.length === 0 || variableValues[0] === void 0 || variableValues[0] === null)) {
+          delete context.nodes;
+          stopHere = true;
         }
         delete context.condition;
         delete context.functionName;
@@ -984,14 +1004,14 @@ class TemplateMarkInterpreter {
    * @throws {Error} if the templateMark document is invalid
    */
   checkTypes(templateMark) {
-    const modelManager = new concertoCore.ModelManager({ strict: true });
+    const modelManager = new concertoCore.ModelManager();
     modelManager.addCTOModel(markdownCommon.ConcertoMetaModel.MODEL, "concertometamodel.cto");
     modelManager.addCTOModel(markdownCommon.CommonMarkModel.MODEL, "commonmark.cto");
     modelManager.addCTOModel(markdownCommon.TemplateMarkModel.MODEL, "templatemark.cto");
     const factory = new concertoCore.Factory(modelManager);
-    const serializer = new concertoCore.Serializer(factory, modelManager);
+    const serializer = new concertoCore.Serializer(factory, modelManager, {});
     try {
-      serializer.fromJSON(templateMark);
+      serializer.fromJSON(templateMark, {});
     } catch (err) {
       throw new Error(`Generated invalid agreement: ${err}: ${JSON.stringify(templateMark, null, 2)}`);
     }
@@ -1063,22 +1083,22 @@ class TemplateMarkInterpreter {
     return compiler.compile(templateMark);
   }
   validateCiceroMark(ciceroMark) {
-    const modelManager = new concertoCore.ModelManager({ strict: true });
+    const modelManager = new concertoCore.ModelManager();
     modelManager.addCTOModel(markdownCommon.ConcertoMetaModel.MODEL, "concertometamodel.cto");
     modelManager.addCTOModel(markdownCommon.CommonMarkModel.MODEL, "commonmark.cto");
     modelManager.addCTOModel(markdownCommon.CiceroMarkModel.MODEL, "ciceromark.cto");
     const factory = new concertoCore.Factory(modelManager);
-    const serializer = new concertoCore.Serializer(factory, modelManager);
+    const serializer = new concertoCore.Serializer(factory, modelManager, {});
     try {
-      return serializer.fromJSON(ciceroMark);
+      return serializer.fromJSON(ciceroMark, {});
     } catch (err) {
       throw new Error(`Generated invalid agreement: ${err}: ${JSON.stringify(ciceroMark, null, 2)}`);
     }
   }
   async generate(templateMark, data, options) {
     const factory = new concertoCore.Factory(this.modelManager);
-    const serializer = new concertoCore.Serializer(factory, this.modelManager);
-    const templateData = serializer.fromJSON(data);
+    const serializer = new concertoCore.Serializer(factory, this.modelManager, {});
+    const templateData = serializer.fromJSON(data, {});
     if (templateData.getFullyQualifiedType() !== this.templateClass.getFullyQualifiedName()) {
       throw new Error(`Template data must be of type '${this.templateClass.getFullyQualifiedName()}'.`);
     }
@@ -1127,7 +1147,7 @@ class TemplateArchiveProcessor {
    * @param {object} request - the request to send to the template logic
    * @param {object} state - the current state of the template
    * @param {[string]} currentTime - the current time, defaults to now
-   * @param {[number]} utcOffset - the UTC offer, defaults to zero
+   * @param {[number]} utcOffset - the UTC offset, defaults to zero
    * @returns {Promise} the response and any events
    */
   async trigger(data, request, state, currentTime, utcOffset) {
@@ -1147,6 +1167,8 @@ class TemplateArchiveProcessor {
         const result = compiler.compile(code);
         compiledCode[tsFile.getIdentifier()] = result;
       }
+      const resolvedTime = currentTime ?? (/* @__PURE__ */ new Date()).toISOString();
+      const resolvedOffset = utcOffset ?? 0;
       const evaluator = new JavaScriptEvaluator();
       const evalResponse = await evaluator.evalDangerously({
         templateLogic: true,
@@ -1155,7 +1177,7 @@ class TemplateArchiveProcessor {
         code: compiledCode["logic/logic.ts"].code,
         // TODO DCS - how to find the code to run?
         argumentNames: ["data", "request", "state"],
-        arguments: [data, request, state, currentTime, utcOffset]
+        arguments: [data, request, state, resolvedTime, resolvedOffset]
       });
       if (evalResponse.result) {
         return evalResponse.result;
@@ -1169,8 +1191,8 @@ class TemplateArchiveProcessor {
   /**
    * Init the logic of a template
    * @param {[string]} currentTime - the current time, defaults to now
-   * @param {[number]} utcOffset - the UTC offer, defaults to zero
-   * @returns {Promise} the response and any events
+   * @param {[number]} utcOffset - the UTC offset, defaults to zero
+   * @returns {Promise<InitResponse>} the new state
    */
   async init(data, currentTime, utcOffset) {
     const logicManager = this.template.getLogicManager();
@@ -1189,6 +1211,8 @@ class TemplateArchiveProcessor {
         const result = compiler.compile(code);
         compiledCode[tsFile.getIdentifier()] = result;
       }
+      const resolvedTime = currentTime ?? (/* @__PURE__ */ new Date()).toISOString();
+      const resolvedOffset = utcOffset ?? 0;
       const evaluator = new JavaScriptEvaluator();
       const evalResponse = await evaluator.evalDangerously({
         templateLogic: true,
@@ -1197,7 +1221,7 @@ class TemplateArchiveProcessor {
         code: compiledCode["logic/logic.ts"].code,
         // TODO DCS - how to find the code to run?
         argumentNames: ["data"],
-        arguments: [data, currentTime, utcOffset]
+        arguments: [data, resolvedTime, resolvedOffset]
       });
       if (evalResponse.result) {
         return evalResponse.result;