@lokascript/framework 3.1.0 → 3.2.0

package/dist/index.cjs

@@ -1953,7 +1953,7 @@ var StringLiteralExtractor = class {
   }
   canExtract(input, position) {
     const char = input[position];
-    if (char === "'" && position > 0 && /[\p{L}\p{N}_)\]]/u.test(input[position - 1])) {
+    if (char === "'" && position > 0 && /[\p{L}\p{M}\p{N}_)\]]/u.test(input[position - 1])) {
       return false;
     }
     return char === '"' || char === "'" || char === "`" || char === "\u201C" || // Chinese double quote open "
@@ -2498,11 +2498,18 @@ function convertRepeat(node) {
     roles.condition = convertValue(node.whileCondition);
   } else if (typeof node.untilEvent === "string") {
     variant = "until";
-    roles.condition = (0, import_intent.createLiteral)(node.untilEvent);
+    roles.loopType = (0, import_intent.createLiteral)("until-event");
+    roles.event = (0, import_intent.createLiteral)(node.untilEvent);
+    if (node.untilEventTarget && typeof node.untilEventTarget === "object") {
+      roles.source = convertValue(node.untilEventTarget);
+    }
   } else {
     variant = "forever";
   }
-  return (0, import_intent.createLoopNode)("repeat", roles, variant, body);
+  return (0, import_intent.createLoopNode)("repeat", roles, variant, body, void 0, indexNameOf(node));
+}
+function indexNameOf(node) {
+  return typeof node.indexName === "string" ? node.indexName : void 0;
 }
 function convertForEach(node) {
   const bodyNodes = Array.isArray(node.body) ? node.body : [];
@@ -2512,8 +2519,7 @@ function convertForEach(node) {
     roles.source = convertValue(node.collection);
   }
   const itemName = typeof node.itemName === "string" ? node.itemName : void 0;
-  const indexName = typeof node.indexName === "string" ? node.indexName : void 0;
-  return (0, import_intent.createLoopNode)("repeat", roles, "for", body, itemName, indexName);
+  return (0, import_intent.createLoopNode)("repeat", roles, "for", body, itemName, indexNameOf(node));
 }
 function convertWhile(node) {
   const bodyNodes = Array.isArray(node.body) ? node.body : [];
@@ -2522,7 +2528,7 @@ function convertWhile(node) {
   if (node.condition && typeof node.condition === "object") {
     roles.condition = convertValue(node.condition);
   }
-  return (0, import_intent.createLoopNode)("repeat", roles, "while", body);
+  return (0, import_intent.createLoopNode)("repeat", roles, "while", body, void 0, indexNameOf(node));
 }
 function convertValue(node) {
   switch (node.type) {
@@ -2849,28 +2855,64 @@ function convertCommand2(node) {
     roles
   };
 }
+function block(nodes) {
+  return { type: "block", commands: (nodes ?? []).map(semanticNodeToRuntimeAST) };
+}
 function convertConditional(node) {
+  const name = node.action === "unless" ? "unless" : "if";
   const conditionValue = node.roles.get("condition");
+  if (!conditionValue) return { type: "command", name, args: [] };
   return {
     type: "command",
-    name: "if",
-    args: conditionValue ? [semanticValueToAST(conditionValue)] : [],
-    condition: conditionValue ? semanticValueToAST(conditionValue) : void 0,
-    thenBranch: (node.thenBranch ?? []).map(semanticNodeToRuntimeAST),
-    elseBranch: (node.elseBranch ?? []).map(semanticNodeToRuntimeAST)
+    name,
+    args: [
+      semanticValueToAST(conditionValue),
+      block(node.thenBranch),
+      ...node.elseBranch && node.elseBranch.length > 0 ? [block(node.elseBranch)] : []
+    ]
   };
 }
+var LOOP_FORMS = /* @__PURE__ */ new Set(["for", "times", "while", "until", "until-event", "forever"]);
+function valueText(value) {
+  if (!value) return void 0;
+  if (value.type === "literal") return String(value.value);
+  if (value.type === "expression") return value.raw;
+  if (value.type === "reference" || value.type === "selector") return value.value;
+  return void 0;
+}
 function convertLoop(node) {
-  const countValue = node.roles.get("patient") || node.roles.get("count");
-  return {
-    type: "command",
-    name: "repeat",
-    args: countValue ? [semanticValueToAST(countValue)] : [],
-    loopVariant: node.loopVariant ?? "forever",
-    body: (node.body ?? []).map(semanticNodeToRuntimeAST),
-    loopVariable: node.loopVariable,
-    indexVariable: node.indexVariable
+  const text = (value) => ({ type: "string", value });
+  const operand = (role) => {
+    const value = node.roles.get(role);
+    return value ? semanticValueToAST(value) : void 0;
   };
+  const declared = valueText(node.roles.get("loopType"));
+  const form = node.action === "for" ? "for" : declared && LOOP_FORMS.has(declared) ? declared : node.loopVariant ?? "forever";
+  const modifiers = { loopType: text(form) };
+  const slot = (name, value) => {
+    if (value) modifiers[name] = value;
+  };
+  switch (form) {
+    case "for":
+      if (node.loopVariable) slot("for", text(node.loopVariable));
+      slot("in", operand("source"));
+      break;
+    case "times":
+      slot("times", operand("quantity") ?? operand("patient") ?? operand("count"));
+      break;
+    case "while":
+    case "until":
+      slot(form, operand("condition"));
+      break;
+    case "until-event": {
+      const event = valueText(node.roles.get("event"));
+      if (event) slot("event", text(event));
+      slot("from", operand("source"));
+      break;
+    }
+  }
+  if (node.indexVariable) slot("index", text(node.indexVariable));
+  return { type: "command", name: "repeat", args: [block(node.body)], modifiers };
 }
 function semanticValueToAST(value) {
   switch (value.type) {
@@ -6629,7 +6671,7 @@ function accumulateIndented(statements, config) {
       const top = stack[stack.length - 1];
       if (top.indent >= targetIndent) {
         stack.pop();
-        const block = {
+        const block2 = {
           type: top.type,
           ...top.name != null && { name: top.name },
           statements: top.stmts,
@@ -6638,9 +6680,9 @@ function accumulateIndented(statements, config) {
           indent: top.indent
         };
         if (stack.length > 0) {
-          stack[stack.length - 1].children.push(block);
+          stack[stack.length - 1].children.push(block2);
         } else {
-          rootBlocks.push(block);
+          rootBlocks.push(block2);
         }
       } else {
         break;