dirac-lang 0.1.18 → 0.1.20

package/dist/{chunk-VZEKPMWN.js → chunk-UXTK2GC2.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");
   }
@@ -137,7 +138,7 @@ function serializeToXml(children) {
         xml += " />";
       } else {
         xml += ">";
-        if (child.text) {
+        if (child.text && child.children.length === 0) {
           xml += escapeXml(child.text);
         }
         if (child.children.length > 0) {
@@ -195,7 +196,29 @@ function executeAssign(session, element) {
 }
 
 // src/tags/output.ts
+import * as fs from "fs";
+import * as path from "path";
 async function executeOutput(session, element) {
+  const fileAttr = element.attributes?.file;
+  const filePath = fileAttr ? substituteAttribute(session, fileAttr) : null;
+  if (filePath) {
+    let content = "";
+    if (element.children && element.children.length > 0) {
+      const prevOutput = session.output;
+      session.output = [];
+      await integrateChildren(session, element);
+      content = session.output.join("");
+      session.output = prevOutput;
+    } else if (element.text) {
+      content = substituteVariables(session, element.text);
+    }
+    const dir = path.dirname(filePath);
+    if (dir !== "." && !fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.appendFileSync(filePath, content + "\n", "utf8");
+    return;
+  }
   if (element.children && element.children.length > 0) {
     await integrateChildren(session, element);
     return;
@@ -396,12 +419,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MCDR5L7R.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MCDR5L7R.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -414,7 +437,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-MCDR5L7R.js");
+  const { integrate: integrate2 } = await import("./interpreter-X7EARER5.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -437,11 +460,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-MCDR5L7R.js");
+  const { integrate: integrate2 } = await import("./interpreter-X7EARER5.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MCDR5L7R.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -856,11 +879,11 @@ ${expr}
     for (const v of session.variables) {
       context[v.name] = v.value;
     }
-    const { default: fs2 } = await import("fs");
-    const { default: path } = await import("path");
+    const { default: fs3 } = await import("fs");
+    const { default: path2 } = await import("path");
     const { fileURLToPath } = await import("url");
-    context.fs = fs2;
-    context.path = path;
+    context.fs = fs3;
+    context.path = path2;
     context.__dirname = process.cwd();
     context.getParams = () => {
       const params = session.parameterStack[session.parameterStack.length - 1];
@@ -914,13 +937,13 @@ ${diracCode}
 
 // src/tags/import.ts
 import { readFileSync } from "fs";
-import { resolve, dirname } from "path";
+import { resolve, dirname as dirname2 } from "path";
 async function executeImport(session, element) {
   const src = element.attributes.src;
   if (!src) {
     throw new Error("<import> requires src attribute");
   }
-  const currentDir = session.currentFile ? dirname(session.currentFile) : process.cwd();
+  const currentDir = session.currentFile ? dirname2(session.currentFile) : process.cwd();
   const importPath = resolve(currentDir, src);
   if (session.debug) {
     console.error(`[IMPORT] Loading: ${importPath}`);
@@ -1102,13 +1125,13 @@ async function executeRequireModule(session, element) {
 }
 
 // src/tags/tag-check.ts
-import fs from "fs";
+import fs2 from "fs";
 import yaml from "js-yaml";
 var SIMILARITY_CUTOFF = 0.75;
 function getEmbeddingServerConfig() {
   try {
     const configPath = process.env.DIRAC_CONFIG || "config.yml";
-    const config = yaml.load(fs.readFileSync(configPath, "utf8"));
+    const config = yaml.load(fs2.readFileSync(configPath, "utf8"));
     const host = config.embeddingServer?.host || "localhost";
     const port = config.embeddingServer?.port || 11434;
     const model = config.embeddingServer?.model || "embeddinggemma";
@@ -1244,7 +1267,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-MCDR5L7R.js");
+      const { integrate: integrate2 } = await import("./interpreter-X7EARER5.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1253,7 +1276,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-MCDR5L7R.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1266,7 +1289,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-MCDR5L7R.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1276,7 +1299,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-MCDR5L7R.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1285,7 +1308,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-MCDR5L7R.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-X7EARER5.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1425,7 +1448,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-MCDR5L7R.js");
+      const { integrate: integrate2 } = await import("./interpreter-X7EARER5.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;

package/dist/{chunk-E2MR7FMI.js → chunk-VA7VOLNV.js}

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

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   execute
-} from "./chunk-E2MR7FMI.js";
-import "./chunk-VZEKPMWN.js";
+} from "./chunk-VA7VOLNV.js";
+import "./chunk-UXTK2GC2.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.18",
+  version: "0.1.20",
   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-E2MR7FMI.js";
+} from "./chunk-VA7VOLNV.js";
 import {
   integrate
-} from "./chunk-VZEKPMWN.js";
+} from "./chunk-UXTK2GC2.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{interpreter-MCDR5L7R.js → interpreter-X7EARER5.js}

@@ -1,7 +1,7 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-VZEKPMWN.js";
+} from "./chunk-UXTK2GC2.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-VZEKPMWN.js";
+} from "./chunk-UXTK2GC2.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/examples/scope-test.di

@@ -18,9 +18,9 @@
   <output></output>
   
   <!-- Define variables in main scope -->
-  <defvar name="x" trim="true">value-x</defvar>
-  <defvar name="y" trim="true">value-y</defvar>
-  <defvar name="z" trim="true">value-z</defvar>
+  <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>

package/package.json

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

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');
@@ -85,12 +86,13 @@ function serializeToXml(children: DiracElement[]): string {
       } else {
         xml += '>';
         
-        // Add text content if present
-        if (child.text) {
+        // Only add text content if there are no children
+        // (if there are children, text is stored in text node children)
+        if (child.text && child.children.length === 0) {
           xml += escapeXml(child.text);
         }
         
-        // Add children
+        // Add children (which may include text nodes)
         if (child.children.length > 0) {
           xml += serializeToXml(child.children);
         }

package/src/tags/output.ts

@@ -4,17 +4,47 @@
  */
 
 import type { DiracSession, DiracElement } from '../types/index.js';
-import { emit, substituteVariables } from '../runtime/session.js';
+import { emit, substituteVariables, substituteAttribute } from '../runtime/session.js';
 import { integrateChildren } from '../runtime/interpreter.js';
+import * as fs from 'fs';
+import * as path from 'path';
 
 export async function executeOutput(session: DiracSession, element: DiracElement): Promise<void> {
-  // If has children, process them (handles mixed content)
+  const fileAttr = element.attributes?.file;
+  const filePath = fileAttr ? substituteAttribute(session, fileAttr) : null;
+  
+  // If writing to a file, collect content first
+  if (filePath) {
+    let content = '';
+    
+    if (element.children && element.children.length > 0) {
+      // Capture output from children
+      const prevOutput = session.output;
+      session.output = [];
+      await integrateChildren(session, element);
+      content = session.output.join('');
+      session.output = prevOutput;
+    } else if (element.text) {
+      content = substituteVariables(session, element.text);
+    }
+    
+    // Ensure directory exists
+    const dir = path.dirname(filePath);
+    if (dir !== '.' && !fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    
+    // Append to file
+    fs.appendFileSync(filePath, content + '\n', 'utf8');
+    return;
+  }
+  
+  // Normal output to stdout
   if (element.children && element.children.length > 0) {
     await integrateChildren(session, element);
     return;
   }
   
-  // If only text content, use it (with variable substitution)
   if (element.text) {
     const content = substituteVariables(session, element.text);
     emit(session, content);

package/tests/generate-dirac.test.di

@@ -0,0 +1,22 @@
+<!-- TEST: generate_and_execute_dirac -->
+<!-- EXPECT: Generated file executed
+Result: 42 -->
+<dirac>
+  <!-- Define a DIRAC script as literal -->
+  <defvar name="generated_script" literal="true" trim="false">
+<dirac>
+  <defvar name="value">42</defvar>
+  <output>Result: <variable name="value" /></output>
+</dirac>
+  </defvar>
+  
+  <!-- Write to file -->
+  <output file="temp-generated.di"><variable name="generated_script" /></output>
+  
+  <!-- Execute the generated script -->
+  <output>Generated file executed</output>
+  <system shell="bash">
+    node dist/cli.js temp-generated.di
+    rm temp-generated.di
+  </system>
+</dirac>

package/tests/output-file.test.di

@@ -0,0 +1,19 @@
+<!-- TEST: output_file_basic -->
+<!-- EXPECT: stdout output
+File written -->
+<dirac>
+  <!-- Write to file -->
+  <output file="output-test-temp.txt">File line 1</output>
+  <output file="output-test-temp.txt">File line 2</output>
+  
+  <!-- Output to stdout to verify test runs -->
+  <output>stdout output</output>
+  
+  <!-- Use system to verify file and clean up -->
+  <system shell="bash">
+    if [ -f output-test-temp.txt ]; then
+      echo "File written"
+      rm output-test-temp.txt
+    fi
+  </system>
+</dirac>

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

@@ -18,9 +18,9 @@ main after outer: a=x b=y c=z -->
   </subroutine>
 
   <!-- Define main scope variables -->
-  <defvar name="a" trim="true">x</defvar>
-  <defvar name="b" trim="true">y</defvar>
-  <defvar name="c" trim="true">z</defvar>
+  <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>
   

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

@@ -15,9 +15,9 @@ x=a y=b z=c -->
   </subroutine>
 
   <!-- Define main scope variables -->
-  <defvar name="x" trim="true">a</defvar>
-  <defvar name="y" trim="true">b</defvar>
-  <defvar name="z" trim="true">c</defvar>
+  <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>

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>

package/test-eval.di

@@ -1,4 +0,0 @@
-<dirac>
-  <eval name="test">"hello"</eval>
-  <output>test=$test</output>
-</dirac>