dirac-lang 0.1.17 → 0.1.19

package/dist/{chunk-OB7IXRFP.js → chunk-GR6KWGCI.js}

@@ -85,7 +85,8 @@ async function executeDefvar(session, element) {
   const valueAttr = element.attributes.value;
   const visibleAttr = element.attributes.visible || "false";
   const literal = "literal" in element.attributes;
-  const trim = "trim" in element.attributes;
+  const trimAttr = element.attributes.trim;
+  const trim = trimAttr !== "false";
   if (!name) {
     throw new Error("<defvar> requires name attribute");
   }
@@ -310,8 +311,8 @@ async function executeCallInternal(session, subroutine, callElement, isExtendExe
   } finally {
     session.skipSubroutineRegistration = oldSkipFlag;
     popParameters(session);
-    session.varBoundary = oldBoundary;
     cleanToBoundary(session);
+    session.varBoundary = oldBoundary;
     session.isReturn = wasReturn;
   }
 }
@@ -396,12 +397,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -414,7 +415,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
+  const { integrate: integrate2 } = await import("./interpreter-JTOTDC46.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -437,11 +438,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
+  const { integrate: integrate2 } = await import("./interpreter-JTOTDC46.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -1244,7 +1245,7 @@ async function executeTagCheck(session, element) {
       const executeTag = correctedTag || tagName;
       console.error(`[tag-check] Executing <${executeTag}/> as all checks passed and execute=true.`);
       const elementToExecute = correctedTag ? { ...child, tag: correctedTag } : child;
-      const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
+      const { integrate: integrate2 } = await import("./interpreter-JTOTDC46.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1253,7 +1254,7 @@ async function executeTagCheck(session, element) {
 // src/tags/throw.ts
 async function executeThrow(session, element) {
   const exceptionName = element.attributes?.name || "exception";
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1266,7 +1267,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1276,7 +1277,7 @@ async function executeCatch(session, element) {
   const exceptionName = element.attributes?.name || "exception";
   const caughtCount = lookupException(session, exceptionName);
   if (caughtCount > 0) {
-    const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1285,7 +1286,7 @@ async function executeCatch(session, element) {
 // src/tags/exception.ts
 async function executeException(session, element) {
   const exceptions = getCurrentExceptions(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-Y465JGHU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-JTOTDC46.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1425,7 +1426,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-Y465JGHU.js");
+      const { integrate: integrate2 } = await import("./interpreter-JTOTDC46.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;

package/dist/{chunk-3FECP4IA.js → chunk-QMFCOZ5D.js}

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-OB7IXRFP.js";
+} from "./chunk-GR6KWGCI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   execute
-} from "./chunk-3FECP4IA.js";
-import "./chunk-OB7IXRFP.js";
+} from "./chunk-QMFCOZ5D.js";
+import "./chunk-GR6KWGCI.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-E7PWEMZA.js";
 import "./chunk-52ED23DR.js";
@@ -13,7 +13,7 @@ import "dotenv/config";
 // package.json
 var package_default = {
   name: "dirac-lang",
-  version: "0.1.17",
+  version: "0.1.19",
   description: "LLM-Augmented Declarative Execution",
   type: "module",
   main: "dist/index.js",

package/dist/index.js

@@ -2,10 +2,10 @@ import {
   createLLMAdapter,
   execute,
   executeUserCommand
-} from "./chunk-3FECP4IA.js";
+} from "./chunk-QMFCOZ5D.js";
 import {
   integrate
-} from "./chunk-OB7IXRFP.js";
+} from "./chunk-GR6KWGCI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{interpreter-Y465JGHU.js → interpreter-JTOTDC46.js}

@@ -1,7 +1,7 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-OB7IXRFP.js";
+} from "./chunk-GR6KWGCI.js";
 import "./chunk-HRHAMPOB.js";
 import "./chunk-E7PWEMZA.js";
 import "./chunk-52ED23DR.js";

package/dist/test-runner.js

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-OB7IXRFP.js";
+} from "./chunk-GR6KWGCI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/examples/scope-test-nested.di

@@ -0,0 +1,60 @@
+<!-- Test nested subroutine calls with variable scope -->
+<dirac>
+  <output>
+============ Test: Nested Subroutine Calls with Variable Scope ============
+  </output>
+  
+  <!-- Define main scope variables -->
+  <eval name="a">return "value-a"</eval>
+  <eval name="b">return "value-b"</eval>
+  <eval name="c">return "value-c"</eval>
+  
+  <output>
+Main scope: a=<variable name="a" />, b=<variable name="b" />, c=<variable name="c" />
+  </output>
+  
+  <!-- Subroutine that calls another subroutine -->
+  <subroutine name="outer-sub" param-x="type:string:" param-y="type:string:">
+    <output>  Outer subroutine - x: <variable name="x" />, y: <variable name="y" /></output>
+    
+    <!-- Define local variable in outer sub -->
+    <eval name="outer_local">return "outer-value"</eval>
+    <output>  Outer local: <variable name="outer_local" /></output>
+    
+    <!-- Call inner subroutine -->
+    <call name="inner-sub" p="$x" q="$y"/>
+    
+    <!-- Check outer variables still exist after inner call -->
+    <output>  After inner call - x: <variable name="x" />, y: <variable name="y" />, outer_local: <variable name="outer_local" /></output>
+  </subroutine>
+  
+  <!-- Inner subroutine -->
+  <subroutine name="inner-sub" param-p="type:string:" param-q="type:string:">
+    <output>    Inner subroutine - p: <variable name="p" />, q: <variable name="q" /></output>
+    <eval name="inner_local">return "inner-value"</eval>
+    <output>    Inner local: <variable name="inner_local" /></output>
+  </subroutine>
+  
+  <output>
+Calling outer-sub with a and b...
+  </output>
+  <call name="outer-sub" x="$a" y="$b"/>
+  
+  <output>
+After outer-sub, checking main scope:
+  a=<variable name="a" />, b=<variable name="b" />, c=<variable name="c" />
+  </output>
+  
+  <!-- Call outer-sub again to ensure no cumulative scope pollution -->
+  <output>
+Calling outer-sub AGAIN with b and c...
+  </output>
+  <call name="outer-sub" x="$b" y="$c"/>
+  
+  <output>
+After second outer-sub call:
+  a=<variable name="a" />, b=<variable name="b" />, c=<variable name="c" />
+
+============ Test Complete ============
+  </output>
+</dirac>

package/examples/scope-test.di

@@ -0,0 +1,55 @@
+<dirac>
+  <!-- Test library with two simple subroutines -->
+  <subroutine name="first-sub"
+              param-x="string"
+              param-y="string">
+    <output>First subroutine - x: <variable name="x" />, y: <variable name="y" /></output>
+  </subroutine>
+
+  <subroutine name="second-sub"
+              param-x="string"
+              param-y="string"
+              param-z="string">
+    <output>Second subroutine - x: <variable name="x" />, y: <variable name="y" />, z: <variable name="z" /></output>
+  </subroutine>
+
+  <!-- Main execution -->
+  <output>============ Test: Sequential Subroutine Calls ============</output>
+  <output></output>
+  
+  <!-- Define variables in main scope -->
+  <defvar name="x">value-x</defvar>
+  <defvar name="y">value-y</defvar>
+  <defvar name="z">value-z</defvar>
+  
+  <output>Variables defined in main scope:</output>
+  <output>  x = <variable name="x" /></output>
+  <output>  y = <variable name="y" /></output>
+  <output>  z = <variable name="z" /></output>
+  <output></output>
+  
+  <!-- Call first subroutine -->
+  <output>Calling first-sub with x="$x" y="$y"</output>
+  <first-sub x="$x" y="$y" />
+  <output></output>
+  
+  <!-- Check if variables still exist after first call -->
+  <output>After first-sub, checking main scope variables:</output>
+  <output>  x = <variable name="x" /></output>
+  <output>  y = <variable name="y" /></output>
+  <output>  z = <variable name="z" /></output>
+  <output></output>
+  
+  <!-- Call second subroutine -->
+  <output>Calling second-sub with x="$x" y="$y" z="$z"</output>
+  <second-sub x="$x" y="$y" z="$z" />
+  <output></output>
+  
+  <output>After second-sub, checking main scope variables:</output>
+  <output>  x = <variable name="x" /></output>
+  <output>  y = <variable name="y" /></output>
+  <output>  z = <variable name="z" /></output>
+  <output></output>
+  
+  <output>============ Test Complete ============</output>
+</dirac>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dirac-lang",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "LLM-Augmented Declarative Execution",
   "type": "module",
   "main": "dist/index.js",

package/src/tags/call.ts

@@ -200,9 +200,9 @@ async function executeCallInternal(
     // Pop parameter stack
     popParameters(session);
 
-    // Clean up scope (keep visible variables)
-    session.varBoundary = oldBoundary;
+    // Clean up scope (keep visible variables) BEFORE restoring boundary
     cleanToBoundary(session);
+    session.varBoundary = oldBoundary;
     session.isReturn = wasReturn;
   }
 }

package/src/tags/defvar.ts

@@ -14,7 +14,8 @@ export async function executeDefvar(session: DiracSession, element: DiracElement
   const valueAttr = element.attributes.value;
   const visibleAttr = element.attributes.visible || 'false';
   const literal = 'literal' in element.attributes;
-  const trim = 'trim' in element.attributes; // Support trim attribute to remove leading/trailing whitespace
+  const trimAttr = element.attributes.trim;
+  const trim = trimAttr !== 'false'; // Trim by default unless explicitly set to false
 
   if (!name) {
     throw new Error('<defvar> requires name attribute');

package/tests/subroutine-nested-calls.test.di

@@ -0,0 +1,32 @@
+<!-- TEST: subroutine_nested_calls_preserve_scope -->
+<!-- EXPECT: main: a=x b=y c=z
+outer: p=x q=y
+inner: r=x s=y
+outer after inner: p=x q=y
+main after outer: a=x b=y c=z -->
+<dirac>
+  <!-- Inner subroutine -->
+  <subroutine name="inner" param-r="string" param-s="string">
+    <output>inner: r=<variable name="r" /> s=<variable name="s" /></output>
+  </subroutine>
+
+  <!-- Outer subroutine that calls inner -->
+  <subroutine name="outer" param-p="string" param-q="string">
+    <output>outer: p=<variable name="p" /> q=<variable name="q" /></output>
+    <inner r="$p" s="$q" />
+    <output>outer after inner: p=<variable name="p" /> q=<variable name="q" /></output>
+  </subroutine>
+
+  <!-- Define main scope variables -->
+  <defvar name="a">x</defvar>
+  <defvar name="b">y</defvar>
+  <defvar name="c">z</defvar>
+  
+  <output>main: a=<variable name="a" /> b=<variable name="b" /> c=<variable name="c" /></output>
+  
+  <!-- Call outer which calls inner -->
+  <outer p="$a" q="$b" />
+  
+  <!-- Verify main scope variables preserved -->
+  <output>main after outer: a=<variable name="a" /> b=<variable name="b" /> c=<variable name="c" /></output>
+</dirac>

package/tests/subroutine-sequential-calls.test.di

@@ -0,0 +1,36 @@
+<!-- TEST: subroutine_sequential_calls_preserve_scope -->
+<!-- EXPECT: x=a y=b z=c
+first: x=a y=b
+x=a y=b z=c
+second: x=a y=b z=c
+x=a y=b z=c -->
+<dirac>
+  <!-- Define subroutines -->
+  <subroutine name="first-sub" param-x="string" param-y="string">
+    <output>first: x=<variable name="x" /> y=<variable name="y" /></output>
+  </subroutine>
+
+  <subroutine name="second-sub" param-x="string" param-y="string" param-z="string">
+    <output>second: x=<variable name="x" /> y=<variable name="y" /> z=<variable name="z" /></output>
+  </subroutine>
+
+  <!-- Define main scope variables -->
+  <defvar name="x">a</defvar>
+  <defvar name="y">b</defvar>
+  <defvar name="z">c</defvar>
+  
+  <!-- Verify initial state -->
+  <output>x=<variable name="x" /> y=<variable name="y" /> z=<variable name="z" /></output>
+  
+  <!-- First call -->
+  <first-sub x="$x" y="$y" />
+  
+  <!-- Verify variables still exist after first call -->
+  <output>x=<variable name="x" /> y=<variable name="y" /> z=<variable name="z" /></output>
+  
+  <!-- Second call - this would fail with the bug -->
+  <second-sub x="$x" y="$y" z="$z" />
+  
+  <!-- Verify variables still exist after second call -->
+  <output>x=<variable name="x" /> y=<variable name="y" /> z=<variable name="z" /></output>
+</dirac>

package/tests/tag-check.test.di

@@ -18,7 +18,7 @@ Color changed to: red -->
   </subroutine>
 
   <!-- Test: tag-check should auto-correct similar tag names and execute -->
-  <defvar name="result" trim="true">
+  <defvar name="result">
     <tag-check execute="true" autocorrect="true">
       <background-set color="red" />
     </tag-check>