dirac-lang 0.1.30 → 0.1.32

package/dist/{chunk-BSQV77YM.js → chunk-JIWLKB5O.js}

@@ -107,7 +107,9 @@ function createSession(config = {}) {
     isReturn: false,
     isBreak: false,
     skipSubroutineRegistration: false,
-    debug: config.debug || false
+    debug: config.debug || false,
+    currentFile: config.filePath
+    // Set current file from config for proper relative import resolution
   };
 }
 function setVariable(session, name, value, visible = false) {
@@ -151,11 +153,12 @@ function cleanToBoundary(session) {
   session.variables = kept;
   session.varBoundary = kept.length;
 }
-function registerSubroutine(session, name, element, description, parameters, meta) {
+function registerSubroutine(session, name, element, description, parameters, meta, visible) {
   session.subroutines.push({
     name,
     element,
     boundary: session.subBoundary,
+    visible,
     description,
     parameters,
     meta
@@ -193,8 +196,13 @@ function setSubroutineBoundary(session) {
 function popSubroutinesToBoundary(session) {
   session.subroutines = session.subroutines.slice(0, session.subBoundary);
 }
-function cleanSubroutinesToBoundary(session) {
-  popSubroutinesToBoundary(session);
+function cleanSubroutinesToBoundary(session, callerSubroutine) {
+  const keepNested = callerSubroutine?.attributes.visible === "subroutine" || callerSubroutine?.attributes.visible === "both";
+  if (keepNested) {
+    session.subBoundary = session.subroutines.length;
+  } else {
+    session.subroutines = session.subroutines.slice(0, session.subBoundary);
+  }
 }
 function substituteVariables(session, text) {
   return text.replace(/&#10;/g, "\n").replace(/&#13;/g, "\r").replace(/&#9;/g, "	").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");

package/dist/{chunk-LXF5PGUX.js → chunk-JMUUPZZA.js}

@@ -1,6 +1,6 @@
 import {
   registerSubroutine
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 
 // src/tags/subroutine.ts
 function executeSubroutine(session, element) {
@@ -12,6 +12,7 @@ function executeSubroutine(session, element) {
     throw new Error("<subroutine> requires name attribute");
   }
   const description = element.attributes.description;
+  const visible = element.attributes.visible === "subroutine" || element.attributes.visible === "both";
   const parameters = [];
   const meta = {};
   function parseMetaField(metaString) {
@@ -56,7 +57,8 @@ function executeSubroutine(session, element) {
     subroutine,
     description,
     parameters.length > 0 ? parameters : void 0,
-    Object.keys(meta).length > 0 ? meta : void 0
+    Object.keys(meta).length > 0 ? meta : void 0,
+    visible
   );
 }
 

package/dist/{chunk-QPYWRBBT.js → chunk-UYDP4ZFS.js}

@@ -1,6 +1,6 @@
 import {
   integrate
-} from "./chunk-Y57EPVOA.js";
+} from "./chunk-YRJ3SODI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
@@ -8,7 +8,7 @@ import {
   createSession,
   getAvailableSubroutines,
   getOutput
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 
 // src/utils/llm-adapter.ts
 function createLLMAdapter(session) {

package/dist/{chunk-Y57EPVOA.js → chunk-YRJ3SODI.js}

@@ -3,8 +3,9 @@ import {
 } from "./chunk-HRHAMPOB.js";
 import {
   executeSubroutine
-} from "./chunk-LXF5PGUX.js";
+} from "./chunk-JMUUPZZA.js";
 import {
+  cleanSubroutinesToBoundary,
   cleanToBoundary,
   emit,
   flushCurrentException,
@@ -18,12 +19,13 @@ import {
   pushParameters,
   setBoundary,
   setExceptionBoundary,
+  setSubroutineBoundary,
   setVariable,
   substituteAttribute,
   substituteVariables,
   throwException,
   unsetExceptionBoundary
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 
 // src/tags/parameters.ts
 async function executeParameters(session, element) {
@@ -255,7 +257,7 @@ async function executeCall(session, element) {
   }
 }
 async function registerExtendChain(session, subroutine, currentName) {
-  const { executeSubroutine: executeSubroutine2 } = await import("./subroutine-GG66UT4D.js");
+  const { executeSubroutine: executeSubroutine2 } = await import("./subroutine-I5XXJMFL.js");
   const extendsAttr = subroutine.attributes.extends;
   let parentName;
   if (extendsAttr) {
@@ -289,6 +291,7 @@ async function registerExtendChain(session, subroutine, currentName) {
 }
 async function executeCallInternal(session, subroutine, callElement, isExtendExecution = false) {
   const oldBoundary = setBoundary(session);
+  const oldSubBoundary = setSubroutineBoundary(session);
   const wasReturn = session.isReturn;
   session.isReturn = false;
   const oldSubroutineName = session.currentSubroutineName;
@@ -334,7 +337,9 @@ async function executeCallInternal(session, subroutine, callElement, isExtendExe
     session.skipSubroutineRegistration = oldSkipFlag;
     popParameters(session);
     cleanToBoundary(session);
+    cleanSubroutinesToBoundary(session, subroutine);
     session.varBoundary = oldBoundary;
+    session.subBoundary = oldSubBoundary;
     session.isReturn = wasReturn;
   }
 }
@@ -420,12 +425,12 @@ async function executeIf(session, element) {
   const condition = await evaluatePredicate(session, conditionElement);
   if (condition) {
     if (thenElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NNPKC43F.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
       await integrateChildren2(session, thenElement);
     }
   } else {
     if (elseElement) {
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NNPKC43F.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
       await integrateChildren2(session, elseElement);
     }
   }
@@ -438,7 +443,7 @@ async function evaluatePredicate(session, predicateElement) {
     return await evaluateCondition(session, predicateElement);
   }
   const outputLengthBefore = session.output.length;
-  const { integrate: integrate2 } = await import("./interpreter-NNPKC43F.js");
+  const { integrate: integrate2 } = await import("./interpreter-WP3KMLST.js");
   await integrate2(session, predicateElement);
   const newOutputChunks = session.output.slice(outputLengthBefore);
   const result = newOutputChunks.join("").trim();
@@ -461,11 +466,11 @@ async function evaluateCondition(session, condElement) {
   }
   const outputLengthBefore = session.output.length;
   const args = [];
-  const { integrate: integrate2 } = await import("./interpreter-NNPKC43F.js");
+  const { integrate: integrate2 } = await import("./interpreter-WP3KMLST.js");
   for (const child of condElement.children) {
     if (child.tag.toLowerCase() === "arg") {
       const argOutputStart = session.output.length;
-      const { integrateChildren: integrateChildren2 } = await import("./interpreter-NNPKC43F.js");
+      const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
       await integrateChildren2(session, child);
       const newChunks = session.output.slice(argOutputStart);
       const argValue = newChunks.join("");
@@ -574,7 +579,7 @@ async function executeLLM(session, element) {
       console.error("[LLM] Full prompt sent to LLM (noextra):\n" + prompt + "\n");
     }
   } else {
-    const { getAvailableSubroutines } = await import("./session-QXKZY7G2.js");
+    const { getAvailableSubroutines } = await import("./session-UIWHLPTR.js");
     const subroutines = getAvailableSubroutines(session);
     if (session.debug) {
       console.error(
@@ -701,7 +706,7 @@ ${result}
           const parser = new DiracParser();
           let dynamicAST = parser.parse(diracCode);
           if (validateTags) {
-            const { validateDiracCode, applyCorrectedTags } = await import("./tag-validator-ANTK7UTG.js");
+            const { validateDiracCode, applyCorrectedTags } = await import("./tag-validator-QX47WU2J.js");
             let validation = await validateDiracCode(session, dynamicAST, { autocorrect });
             let retryCount = 0;
             while (!validation.valid && retryCount < maxRetries) {
@@ -982,10 +987,11 @@ function resolveImportPath(src, currentDir) {
   return resolved.endsWith(".di") ? resolved : resolved + ".di";
 }
 async function executeImport(session, element) {
-  const src = element.attributes.src;
-  if (!src) {
+  const srcAttr = element.attributes.src;
+  if (!srcAttr) {
     throw new Error("<import> requires src attribute");
   }
+  const src = substituteAttribute(session, srcAttr);
   const currentDir = session.currentFile ? dirname2(session.currentFile) : process.cwd();
   const importPath = resolveImportPath(src, currentDir);
   if (session.debug) {
@@ -1231,7 +1237,7 @@ async function getBestTagMatch(candidate, allowed) {
   return { tag: allowed[bestIdx], score: bestScore };
 }
 async function executeTagCheck(session, element) {
-  const { getAvailableSubroutines } = await import("./session-QXKZY7G2.js");
+  const { getAvailableSubroutines } = await import("./session-UIWHLPTR.js");
   const subroutines = getAvailableSubroutines(session);
   const allowed = new Set(subroutines.map((s) => s.name));
   console.error("[tag-check] Allowed subroutines:", Array.from(allowed));
@@ -1324,7 +1330,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-NNPKC43F.js");
+      const { integrate: integrate2 } = await import("./interpreter-WP3KMLST.js");
       await integrate2(session, elementToExecute);
     }
   }
@@ -1333,7 +1339,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-NNPKC43F.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
   const exceptionDom = {
     tag: "exception-content",
     attributes: { name: exceptionName },
@@ -1346,7 +1352,7 @@ async function executeThrow(session, element) {
 // src/tags/try.ts
 async function executeTry(session, element) {
   setExceptionBoundary(session);
-  const { integrateChildren: integrateChildren2 } = await import("./interpreter-NNPKC43F.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
   await integrateChildren2(session, element);
   unsetExceptionBoundary(session);
 }
@@ -1356,7 +1362,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-NNPKC43F.js");
+    const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
     await integrateChildren2(session, element);
   }
   flushCurrentException(session);
@@ -1365,7 +1371,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-NNPKC43F.js");
+  const { integrateChildren: integrateChildren2 } = await import("./interpreter-WP3KMLST.js");
   for (const exceptionDom of exceptions) {
     await integrateChildren2(session, exceptionDom);
   }
@@ -1454,7 +1460,7 @@ function evaluateCondition2(session, test) {
 // src/tags/available-subroutines.ts
 async function executeAvailableSubroutines(session, element) {
   const availableSubroutines = /* @__PURE__ */ new Map();
-  const currentSubroutineName = session.subBoundary < session.subroutines.length ? session.subroutines[session.subBoundary].name : null;
+  const currentSubroutineName = session.subBoundary > 0 && session.subBoundary <= session.subroutines.length ? session.subroutines[session.subBoundary - 1].name : null;
   for (let i = session.subroutines.length - 1; i >= session.subBoundary; i--) {
     const sub = session.subroutines[i];
     if (sub.name === currentSubroutineName) {
@@ -1505,7 +1511,7 @@ async function executeForeach(session, element) {
     const parser2 = new DiracParser2();
     try {
       const fromElement = parser2.parse(fromAttr);
-      const { integrate: integrate2 } = await import("./interpreter-NNPKC43F.js");
+      const { integrate: integrate2 } = await import("./interpreter-WP3KMLST.js");
       await integrate2(session, fromElement);
     } catch (e) {
       session.output = savedOutput;

package/dist/cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   execute
-} from "./chunk-QPYWRBBT.js";
-import "./chunk-Y57EPVOA.js";
+} from "./chunk-UYDP4ZFS.js";
+import "./chunk-YRJ3SODI.js";
 import "./chunk-HRHAMPOB.js";
-import "./chunk-LXF5PGUX.js";
-import "./chunk-BSQV77YM.js";
+import "./chunk-JMUUPZZA.js";
+import "./chunk-JIWLKB5O.js";
 
 // src/cli.ts
 import "dotenv/config";
@@ -13,7 +13,7 @@ import "dotenv/config";
 // package.json
 var package_default = {
   name: "dirac-lang",
-  version: "0.1.29",
+  version: "0.1.32",
   description: "LLM-Augmented Declarative Execution",
   type: "module",
   main: "dist/index.js",

package/dist/index.d.ts

@@ -53,6 +53,7 @@ interface Subroutine {
     element: DiracElement;
     boundary: number;
     extends?: string;
+    visible?: boolean;
     description?: string;
     parameters?: ParameterMetadata[];
     meta?: Record<string, string>;

package/dist/index.js

@@ -2,19 +2,19 @@ import {
   createLLMAdapter,
   execute,
   executeUserCommand
-} from "./chunk-QPYWRBBT.js";
+} from "./chunk-UYDP4ZFS.js";
 import {
   integrate
-} from "./chunk-Y57EPVOA.js";
+} from "./chunk-YRJ3SODI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
-import "./chunk-LXF5PGUX.js";
+import "./chunk-JMUUPZZA.js";
 import {
   createSession,
   getAvailableSubroutines,
   getOutput
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 export {
   DiracParser,
   createLLMAdapter,

package/dist/{interpreter-NNPKC43F.js → interpreter-WP3KMLST.js}

@@ -1,10 +1,10 @@
 import {
   integrate,
   integrateChildren
-} from "./chunk-Y57EPVOA.js";
+} from "./chunk-YRJ3SODI.js";
 import "./chunk-HRHAMPOB.js";
-import "./chunk-LXF5PGUX.js";
-import "./chunk-BSQV77YM.js";
+import "./chunk-JMUUPZZA.js";
+import "./chunk-JIWLKB5O.js";
 export {
   integrate,
   integrateChildren

package/dist/{session-QXKZY7G2.js → session-UIWHLPTR.js}

@@ -26,7 +26,7 @@ import {
   substituteVariables,
   throwException,
   unsetExceptionBoundary
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 export {
   cleanSubroutinesToBoundary,
   cleanToBoundary,

package/dist/{subroutine-GG66UT4D.js → subroutine-I5XXJMFL.js}

@@ -1,7 +1,7 @@
 import {
   executeSubroutine
-} from "./chunk-LXF5PGUX.js";
-import "./chunk-BSQV77YM.js";
+} from "./chunk-JMUUPZZA.js";
+import "./chunk-JIWLKB5O.js";
 export {
   executeSubroutine
 };

package/dist/{tag-validator-ANTK7UTG.js → tag-validator-QX47WU2J.js}

@@ -49,7 +49,7 @@ async function getBestTagMatch(candidate, allowed) {
 }
 async function validateTag(session, element, options = {}) {
   const { autocorrect = false, similarityCutoff = SIMILARITY_CUTOFF } = options;
-  const { getAvailableSubroutines } = await import("./session-QXKZY7G2.js");
+  const { getAvailableSubroutines } = await import("./session-UIWHLPTR.js");
   const subroutines = getAvailableSubroutines(session);
   const allowed = new Set(subroutines.map((s) => s.name));
   const tagName = element.tag;

package/dist/test-runner.js

@@ -1,14 +1,14 @@
 import {
   integrate
-} from "./chunk-Y57EPVOA.js";
+} from "./chunk-YRJ3SODI.js";
 import {
   DiracParser
 } from "./chunk-HRHAMPOB.js";
-import "./chunk-LXF5PGUX.js";
+import "./chunk-JMUUPZZA.js";
 import {
   createSession,
   getOutput
-} from "./chunk-BSQV77YM.js";
+} from "./chunk-JIWLKB5O.js";
 
 // src/test-runner.ts
 import fs from "fs";

package/package.json

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