dirac-lang 0.1.22 → 0.1.24

package/dist/{chunk-XGR3IHWY.js → chunk-7OUYWIZV.js}

@@ -419,12 +419,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WUPTTWCU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WUPTTWCU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -437,7 +437,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-WUPTTWCU.js");
+  const { integrate: integrate2 } = await import("./interpreter-MTIIHIIQ.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -460,11 +460,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-WUPTTWCU.js");
+  const { integrate: integrate2 } = await import("./interpreter-MTIIHIIQ.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WUPTTWCU.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -937,15 +937,56 @@ ${diracCode}
 }
 
 // src/tags/import.ts
-import { readFileSync } from "fs";
-import { resolve, dirname as dirname2 } from "path";
+import { readFileSync, existsSync as existsSync2 } from "fs";
+import { resolve, dirname as dirname2, join } from "path";
+function resolveImportPath(src, currentDir) {
+  if (src.startsWith("./") || src.startsWith("../") || src.startsWith("/")) {
+    const resolved2 = resolve(currentDir, src);
+    return resolved2.endsWith(".di") ? resolved2 : resolved2 + ".di";
+  }
+  let searchDir = currentDir;
+  while (true) {
+    const nodeModulesPath = join(searchDir, "node_modules", src);
+    if (existsSync2(nodeModulesPath)) {
+      const packageJsonPath = join(nodeModulesPath, "package.json");
+      if (existsSync2(packageJsonPath)) {
+        try {
+          const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+          const mainFile = packageJson.main || "lib/index.di";
+          const entryPath = join(nodeModulesPath, mainFile);
+          if (existsSync2(entryPath)) {
+            return entryPath;
+          }
+        } catch (err) {
+        }
+      }
+      const fallbacks = [
+        join(nodeModulesPath, "lib", "index.di"),
+        join(nodeModulesPath, "index.di")
+      ];
+      for (const fallback of fallbacks) {
+        if (existsSync2(fallback)) {
+          return fallback;
+        }
+      }
+      throw new Error(`Package "${src}" found but no entry point (.di file) available`);
+    }
+    const parentDir = dirname2(searchDir);
+    if (parentDir === searchDir) {
+      break;
+    }
+    searchDir = parentDir;
+  }
+  const resolved = resolve(currentDir, src);
+  return resolved.endsWith(".di") ? resolved : resolved + ".di";
+}
 async function executeImport(session, element) {
   const src = element.attributes.src;
   if (!src) {
     throw new Error("<import> requires src attribute");
   }
   const currentDir = session.currentFile ? dirname2(session.currentFile) : process.cwd();
-  const importPath = resolve(currentDir, src);
+  const importPath = resolveImportPath(src, currentDir);
   if (session.debug) {
     console.error(`[IMPORT] Loading: ${importPath}`);
   }
@@ -1282,7 +1323,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-WUPTTWCU.js");
+      const { integrate: integrate2 } = await import("./interpreter-MTIIHIIQ.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1291,7 +1332,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-WUPTTWCU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1304,7 +1345,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-WUPTTWCU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1314,7 +1355,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-WUPTTWCU.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1323,7 +1364,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-WUPTTWCU.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-MTIIHIIQ.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1463,7 +1504,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-WUPTTWCU.js");
+      const { integrate: integrate2 } = await import("./interpreter-MTIIHIIQ.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;
@@ -1644,17 +1685,31 @@ async function executeInput(session, element) {
   emit(session, value);
 }
 async function readAllStdin() {
+  process.stdin.removeAllListeners("data");
+  process.stdin.removeAllListeners("end");
+  process.stdin.removeAllListeners("error");
   return new Promise((resolve2, reject) => {
     const chunks = [];
-    process.stdin.on("data", (chunk) => {
+    const onData = (chunk) => {
       chunks.push(chunk);
-    });
-    process.stdin.on("end", () => {
-      resolve2(Buffer.concat(chunks).toString("utf-8"));
-    });
-    process.stdin.on("error", (err) => {
+    };
+    const onEnd = () => {
+      const result = Buffer.concat(chunks).toString("utf-8");
+      process.stdin.removeListener("data", onData);
+      process.stdin.removeListener("end", onEnd);
+      process.stdin.removeListener("error", onError);
+      resolve2(result);
+    };
+    const onError = (err) => {
+      process.stdin.removeListener("data", onData);
+      process.stdin.removeListener("end", onEnd);
+      process.stdin.removeListener("error", onError);
       reject(err);
-    });
+    };
+    process.stdin.on("data", onData);
+    process.stdin.on("end", onEnd);
+    process.stdin.on("error", onError);
+    process.stdin.resume();
   });
 }
 var stdinReader = null;

package/dist/{chunk-7X5JYLMO.js → chunk-OUMUIBK3.js}

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-XGR3IHWY.js";
+} from "./chunk-7OUYWIZV.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   execute
-} from "./chunk-7X5JYLMO.js";
-import "./chunk-XGR3IHWY.js";
+} from "./chunk-OUMUIBK3.js";
+import "./chunk-7OUYWIZV.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.22",
+  version: "0.1.23",
   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-7X5JYLMO.js";
+} from "./chunk-OUMUIBK3.js";
 import {
   integrate
-} from "./chunk-XGR3IHWY.js";
+} from "./chunk-7OUYWIZV.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";

package/dist/{interpreter-WUPTTWCU.js → interpreter-MTIIHIIQ.js}

@@ -1,7 +1,7 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-XGR3IHWY.js";
+} from "./chunk-7OUYWIZV.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-XGR3IHWY.js";
+} from "./chunk-7OUYWIZV.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
@@ -55,17 +55,75 @@ var TestRunner = class {
       passed: false
     };
     try {
-      const parser = new DiracParser();
-      const ast = parser.parse(cleanContent);
-      const session = createSession({ ...this.config, filePath });
-      await integrate(session, ast);
-      const output = getOutput(session);
-      result.actualOutput = output;
+      const stdinFile = filePath.replace(".test.di", ".txt");
+      let stdinData;
+      if (fs.existsSync(stdinFile)) {
+        stdinData = fs.readFileSync(stdinFile, "utf-8");
+      }
+      if (stdinData !== void 0) {
+        const originalOn = process.stdin.on.bind(process.stdin);
+        const originalResume = process.stdin.resume.bind(process.stdin);
+        const originalRemoveAllListeners = process.stdin.removeAllListeners.bind(process.stdin);
+        const originalRemoveListener = process.stdin.removeListener.bind(process.stdin);
+        const listeners = {};
+        process.stdin.on = function(event, callback) {
+          if (!listeners[event]) listeners[event] = [];
+          listeners[event].push(callback);
+          return this;
+        };
+        process.stdin.removeAllListeners = function(event) {
+          if (event) {
+            delete listeners[event];
+          } else {
+            Object.keys(listeners).forEach((k) => delete listeners[k]);
+          }
+          return this;
+        };
+        process.stdin.removeListener = function(event, callback) {
+          if (listeners[event]) {
+            listeners[event] = listeners[event].filter((fn) => fn !== callback);
+          }
+          return this;
+        };
+        process.stdin.resume = function() {
+          setImmediate(() => {
+            if (listeners["data"]) {
+              listeners["data"].forEach((fn) => fn(Buffer.from(stdinData, "utf-8")));
+            }
+            setImmediate(() => {
+              if (listeners["end"]) {
+                listeners["end"].forEach((fn) => fn());
+              }
+            });
+          });
+          return this;
+        };
+        try {
+          const parser = new DiracParser();
+          const ast = parser.parse(cleanContent);
+          const session = createSession({ ...this.config, filePath });
+          await integrate(session, ast);
+          const output = getOutput(session);
+          result.actualOutput = output;
+        } finally {
+          process.stdin.on = originalOn;
+          process.stdin.resume = originalResume;
+          process.stdin.removeAllListeners = originalRemoveAllListeners;
+          process.stdin.removeListener = originalRemoveListener;
+        }
+      } else {
+        const parser = new DiracParser();
+        const ast = parser.parse(cleanContent);
+        const session = createSession({ ...this.config, filePath });
+        await integrate(session, ast);
+        const output = getOutput(session);
+        result.actualOutput = output;
+      }
       if (metadata.expectError) {
         result.passed = false;
-        result.error = `Expected error but test succeeded. Output: ${output}`;
+        result.error = `Expected error but test succeeded. Output: ${result.actualOutput}`;
       } else if (metadata.expected !== void 0) {
-        const normalizedActual = output.replace(/\s+/g, " ").trim();
+        const normalizedActual = result.actualOutput.replace(/\s+/g, " ").trim();
         const normalizedExpected = metadata.expected.replace(/\s+/g, " ").trim();
         if (normalizedActual === normalizedExpected) {
           result.passed = true;

package/package.json

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

package/src/tags/import.ts

@@ -4,11 +4,80 @@
  */
 
 import type { DiracSession, DiracElement } from '../types/index.js';
-import { readFileSync } from 'fs';
-import { resolve, dirname } from 'path';
+import { readFileSync, existsSync } from 'fs';
+import { resolve, dirname, join } from 'path';
 import { DiracParser } from '../runtime/parser.js';
 import { integrate } from '../runtime/interpreter.js';
 
+/**
+ * Resolve import path - supports relative paths and node_modules packages
+ * @param src - The import source (e.g., "./file.di" or "package-name")
+ * @param currentDir - Current directory context
+ * @returns Resolved absolute path
+ */
+function resolveImportPath(src: string, currentDir: string): string {
+  // If it starts with ./ or ../ or /, it's a relative/absolute path
+  if (src.startsWith('./') || src.startsWith('../') || src.startsWith('/')) {
+    const resolved = resolve(currentDir, src);
+    // Add .di extension if not present
+    return resolved.endsWith('.di') ? resolved : resolved + '.di';
+  }
+  
+  // Otherwise, try to resolve as a package from node_modules
+  // Walk up the directory tree looking for node_modules
+  let searchDir = currentDir;
+  
+  while (true) {
+    const nodeModulesPath = join(searchDir, 'node_modules', src);
+    
+    if (existsSync(nodeModulesPath)) {
+      // Found the package, now find the entry point
+      // Try to read package.json to get the "main" field
+      const packageJsonPath = join(nodeModulesPath, 'package.json');
+      
+      if (existsSync(packageJsonPath)) {
+        try {
+          const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+          const mainFile = packageJson.main || 'lib/index.di';
+          const entryPath = join(nodeModulesPath, mainFile);
+          
+          if (existsSync(entryPath)) {
+            return entryPath;
+          }
+        } catch (err) {
+          // If package.json parse fails, fall through to default
+        }
+      }
+      
+      // Fallback: try common entry points
+      const fallbacks = [
+        join(nodeModulesPath, 'lib', 'index.di'),
+        join(nodeModulesPath, 'index.di'),
+      ];
+      
+      for (const fallback of fallbacks) {
+        if (existsSync(fallback)) {
+          return fallback;
+        }
+      }
+      
+      throw new Error(`Package "${src}" found but no entry point (.di file) available`);
+    }
+    
+    // Move up one directory
+    const parentDir = dirname(searchDir);
+    if (parentDir === searchDir) {
+      // Reached root, package not found
+      break;
+    }
+    searchDir = parentDir;
+  }
+  
+  // Package not found in node_modules, treat as relative path with .di extension
+  const resolved = resolve(currentDir, src);
+  return resolved.endsWith('.di') ? resolved : resolved + '.di';
+}
+
 export async function executeImport(session: DiracSession, element: DiracElement): Promise<void> {
   const src = element.attributes.src;
   
@@ -19,8 +88,8 @@ export async function executeImport(session: DiracSession, element: DiracElement
   // Get the current file's directory (if available in session)
   const currentDir = session.currentFile ? dirname(session.currentFile) : process.cwd();
   
-  // Resolve the import path
-  const importPath = resolve(currentDir, src);
+  // Resolve the import path (handles both relative paths and node_modules packages)
+  const importPath = resolveImportPath(src, currentDir);
   
   if (session.debug) {
     console.error(`[IMPORT] Loading: ${importPath}`);

package/src/tags/input.ts

@@ -65,20 +65,43 @@ export async function executeInput(session: DiracSession, element: DiracElement)
  * Read all stdin content at once
  */
 async function readAllStdin(): Promise<string> {
+  // Remove any existing listeners to avoid conflicts
+  process.stdin.removeAllListeners('data');
+  process.stdin.removeAllListeners('end');
+  process.stdin.removeAllListeners('error');
+  
   return new Promise((resolve, reject) => {
     const chunks: Buffer[] = [];
     
-    process.stdin.on('data', (chunk) => {
+    const onData = (chunk: Buffer) => {
       chunks.push(chunk);
-    });
+    };
     
-    process.stdin.on('end', () => {
-      resolve(Buffer.concat(chunks).toString('utf-8'));
-    });
+    const onEnd = () => {
+      const result = Buffer.concat(chunks).toString('utf-8');
+      
+      // Clean up listeners
+      process.stdin.removeListener('data', onData);
+      process.stdin.removeListener('end', onEnd);
+      process.stdin.removeListener('error', onError);
+      
+      resolve(result);
+    };
     
-    process.stdin.on('error', (err) => {
+    const onError = (err: Error) => {
+      // Clean up listeners
+      process.stdin.removeListener('data', onData);
+      process.stdin.removeListener('end', onEnd);
+      process.stdin.removeListener('error', onError);
+      
       reject(err);
-    });
+    };
+    
+    process.stdin.on('data', onData);
+    process.stdin.on('end', onEnd);
+    process.stdin.on('error', onError);
+    
+    process.stdin.resume();
   });
 }
 

package/src/test-runner.ts

@@ -81,22 +81,96 @@ export class TestRunner {
     };
 
     try {
-      const parser = new DiracParser();
-      const ast = parser.parse(cleanContent);
-      const session = createSession({ ...this.config, filePath });
-      await integrate(session, ast);
-      const output = getOutput(session);
-      
-      result.actualOutput = output;
+      // Check if there's a stdin input file for this test
+      const stdinFile = filePath.replace('.test.di', '.txt');
+      let stdinData: string | undefined;
+      if (fs.existsSync(stdinFile)) {
+        stdinData = fs.readFileSync(stdinFile, 'utf-8');
+      }
+
+      // If stdin data exists, we need to mock stdin
+      // Since we can't replace process.stdin directly, we'll use a workaround:
+      // temporarily store data in a place the input tag can access it
+      if (stdinData !== undefined) {
+        // Save original methods
+        const originalOn = process.stdin.on.bind(process.stdin);
+        const originalResume = process.stdin.resume.bind(process.stdin);
+        const originalRemoveAllListeners = process.stdin.removeAllListeners.bind(process.stdin);
+        const originalRemoveListener = process.stdin.removeListener.bind(process.stdin);
+        
+        // Mock stdin methods
+        const listeners: { [key: string]: Function[] } = {};
+        
+        (process.stdin as any).on = function(event: string, callback: Function) {
+          if (!listeners[event]) listeners[event] = [];
+          listeners[event].push(callback);
+          return this;
+        };
+        
+        (process.stdin as any).removeAllListeners = function(event?: string) {
+          if (event) {
+            delete listeners[event];
+          } else {
+            Object.keys(listeners).forEach(k => delete listeners[k]);
+          }
+          return this;
+        };
+        
+        (process.stdin as any).removeListener = function(event: string, callback: Function) {
+          if (listeners[event]) {
+            listeners[event] = listeners[event].filter(fn => fn !== callback);
+          }
+          return this;
+        };
+        
+        (process.stdin as any).resume = function() {
+          // Simulate data event
+          setImmediate(() => {
+            if (listeners['data']) {
+              listeners['data'].forEach(fn => fn(Buffer.from(stdinData!, 'utf-8')));
+            }
+            // Simulate end event
+            setImmediate(() => {
+              if (listeners['end']) {
+                listeners['end'].forEach(fn => fn());
+              }
+            });
+          });
+          return this;
+        };
+        
+        try {
+          const parser = new DiracParser();
+          const ast = parser.parse(cleanContent);
+          const session = createSession({ ...this.config, filePath });
+          await integrate(session, ast);
+          const output = getOutput(session);
+          result.actualOutput = output;
+        } finally {
+          // Restore original methods
+          (process.stdin as any).on = originalOn;
+          (process.stdin as any).resume = originalResume;
+          (process.stdin as any).removeAllListeners = originalRemoveAllListeners;
+          (process.stdin as any).removeListener = originalRemoveListener;
+        }
+      } else {
+        // Normal test without stdin
+        const parser = new DiracParser();
+        const ast = parser.parse(cleanContent);
+        const session = createSession({ ...this.config, filePath });
+        await integrate(session, ast);
+        const output = getOutput(session);
+        result.actualOutput = output;
+      }
 
       if (metadata.expectError) {
         // Expected an error but got success
         result.passed = false;
-        result.error = `Expected error but test succeeded. Output: ${output}`;
+        result.error = `Expected error but test succeeded. Output: ${result.actualOutput}`;
       } else if (metadata.expected !== undefined) {
         // Check if output matches expected
         // Normalize whitespace for comparison (collapse multiple spaces/newlines)
-        const normalizedActual = output.replace(/\s+/g, ' ').trim();
+        const normalizedActual = result.actualOutput!.replace(/\s+/g, ' ').trim();
         const normalizedExpected = metadata.expected.replace(/\s+/g, ' ').trim();
         
         if (normalizedActual === normalizedExpected) {

package/tests/input-stdin-all.test.di

@@ -0,0 +1,8 @@
+<!-- TEST: input_stdin_all -->
+<!-- EXPECT: hello from stdin -->
+<dirac>
+  <defvar name="data">
+    <input source="stdin" mode="all"/>
+  </defvar>
+  <output><variable name="data"/></output>
+</dirac>

package/tests/input-stdin-all.txt

@@ -0,0 +1 @@
+hello from stdin