@nowline/embed 0.0.0-dev.20261025020025.gc2cc722 → 0.0.0-dev.20261026035511.g8612a42

package/dist/meta.json

@@ -5135,17 +5135,17 @@
       "format": "esm"
     },
     "../core/dist/i18n/codes.js": {
-      "bytes": 2642,
+      "bytes": 2770,
       "imports": [],
       "format": "esm"
     },
     "../core/dist/i18n/messages.en.js": {
-      "bytes": 20818,
+      "bytes": 23135,
       "imports": [],
       "format": "esm"
     },
     "../core/dist/i18n/messages.fr.js": {
-      "bytes": 24547,
+      "bytes": 27177,
       "imports": [],
       "format": "esm"
     },
@@ -5186,7 +5186,7 @@
       "format": "esm"
     },
     "../core/dist/util/posix-path.js": {
-      "bytes": 3360,
+      "bytes": 4409,
       "imports": [],
       "format": "esm"
     },
@@ -5274,7 +5274,7 @@
       "format": "esm"
     },
     "../core/dist/language/include-waves.js": {
-      "bytes": 12694,
+      "bytes": 12647,
       "imports": [
         {
           "path": "../../node_modules/.pnpm/langium@4.4.0/node_modules/langium/lib/index.js",
@@ -5372,7 +5372,7 @@
       "format": "esm"
     },
     "../core/dist/language/include-resolver.js": {
-      "bytes": 23037,
+      "bytes": 25389,
       "imports": [
         {
           "path": "../../node_modules/.pnpm/langium@4.4.0/node_modules/langium/lib/index.js",
@@ -5389,6 +5389,11 @@
           "kind": "import-statement",
           "original": "../generated/ast.js"
         },
+        {
+          "path": "../core/dist/i18n/index.js",
+          "kind": "import-statement",
+          "original": "../i18n/index.js"
+        },
         {
           "path": "../core/dist/util/posix-path.js",
           "kind": "import-statement",
@@ -5414,6 +5419,11 @@
           "kind": "import-statement",
           "original": "./waves.js"
         },
+        {
+          "path": "stub-node-read-file:../util/node-read-file.js",
+          "kind": "dynamic-import",
+          "original": "../util/node-read-file.js"
+        },
         {
           "path": "stub-node-read-file:../util/node-read-file.js",
           "kind": "dynamic-import",
@@ -5835,7 +5845,7 @@
       "format": "esm"
     },
     "../core/dist/index.js": {
-      "bytes": 1352,
+      "bytes": 1371,
       "imports": [
         {
           "path": "../core/dist/convert/parse-json.js",
@@ -10077,7 +10087,7 @@
       "format": "esm"
     },
     "../renderer/dist/stage.js": {
-      "bytes": 3853,
+      "bytes": 4072,
       "imports": [
         {
           "path": "../core/dist/index.js",
@@ -10661,7 +10671,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3710244
+      "bytes": 3725877
     },
     "dist/nowline.min.js": {
       "imports": [],
@@ -11530,10 +11540,10 @@
           "bytesInOutput": 182
         },
         "../core/dist/i18n/messages.en.js": {
-          "bytesInOutput": 15721
+          "bytesInOutput": 17491
         },
         "../core/dist/i18n/messages.fr.js": {
-          "bytesInOutput": 19755
+          "bytesInOutput": 21876
         },
         "../core/dist/i18n/messages.fr-CA.js": {
           "bytesInOutput": 10
@@ -11545,7 +11555,7 @@
           "bytesInOutput": 460
         },
         "../core/dist/util/posix-path.js": {
-          "bytesInOutput": 924
+          "bytesInOutput": 1356
         },
         "../core/dist/util/single-line.js": {
           "bytesInOutput": 79
@@ -11560,7 +11570,7 @@
           "bytesInOutput": 9621
         },
         "../core/dist/language/include-waves.js": {
-          "bytesInOutput": 3941
+          "bytesInOutput": 3936
         },
         "../core/dist/language/references.js": {
           "bytesInOutput": 281
@@ -11569,7 +11579,7 @@
           "bytesInOutput": 375
         },
         "../core/dist/language/include-resolver.js": {
-          "bytesInOutput": 7670
+          "bytesInOutput": 8116
         },
         "../core/dist/language/validator/support.js": {
           "bytesInOutput": 580
@@ -11803,7 +11813,7 @@
           "bytesInOutput": 777
         },
         "../renderer/dist/stage.js": {
-          "bytesInOutput": 1220
+          "bytesInOutput": 1294
         },
         "../renderer/dist/index.js": {
           "bytesInOutput": 0
@@ -11881,7 +11891,7 @@
           "bytesInOutput": 257
         }
       },
-      "bytes": 674209
+      "bytes": 679047
     }
   }
 }

package/dist/nowline.esm.js

@@ -1,4 +1,4 @@
-/*! @nowline/embed 0.0.0-dev.20261025020025.gc2cc722 sha=c2cc722 built=2026-10-25T01:54:49Z */
+/*! @nowline/embed 0.0.0-dev.20261026035511.g8612a42 sha=8612a42 built=2026-10-26T03:49:20Z */
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -15082,7 +15082,7 @@ var UriUtils;
     return a?.toString() === b?.toString();
   }
   UriUtils2.equals = equals;
-  function relative(from, to) {
+  function relative2(from, to) {
     const fromPath = typeof from === "string" ? URI.parse(from).path : from.path;
     const toPath = typeof to === "string" ? URI.parse(to).path : to.path;
     const fromParts = fromPath.split("/").filter((e) => e.length > 0);
@@ -15109,7 +15109,7 @@ var UriUtils;
     const toPart = toParts.slice(i2).join("/");
     return backPart + toPart;
   }
-  UriUtils2.relative = relative;
+  UriUtils2.relative = relative2;
   function normalize3(uri) {
     return URI.parse(uri.toString()).toString();
   }
@@ -26425,6 +26425,44 @@ var messages = {
         return `Wave "${a.id}" in "${a.path}" ${floorClause(a.childFloor)}, but this file's wave "${a.id}" ${floorClause(a.parentFloor)}. A wave must have the same start floor in every included roadmap.`;
     }
   },
+  "NL.E0203": (a) => {
+    switch (a.reason) {
+      case "not-found":
+        return `Cannot read include "${a.path}": file not found.`;
+      case "is-directory":
+        return `Cannot read include "${a.path}": it is a directory.`;
+      case "permission-denied":
+        return `Cannot read include "${a.path}": permission denied.`;
+      case "not-nowline":
+        return `Cannot read include "${a.path}": only .nowline files can be included.`;
+      case "unreadable":
+        return a.detail ? `Cannot read include "${a.path}": ${a.detail}` : `Cannot read include "${a.path}".`;
+    }
+  },
+  "NL.E0204": (a) => `Circular include: "${a.path}" is already being included (${a.chain}).`,
+  "NL.E0205": (a) => `Duplicate include "${a.path}". Include each file once.`,
+  "NL.E0206": (a) => `Cannot isolate "${a.path}": it has no roadmap declaration.`,
+  "NL.E0207": (a) => {
+    if (a.parentStart && a.childStart) {
+      return `Included "${a.path}" declares start:${a.childStart}, which doesn't match this file's start:${a.parentStart}. Both files must declare the same start date, or neither should.`;
+    }
+    if (a.parentStart) {
+      return `Included "${a.path}" has no start:, but this file declares start:${a.parentStart}. Both files must declare the same start date, or neither should.`;
+    }
+    return `Included "${a.path}" declares start:${a.childStart}, but this file has no start:. Both files must declare the same start date, or neither should.`;
+  },
+  "NL.E0208": (a) => {
+    switch (a.reason) {
+      case "absolute":
+        return `Include "${a.path}" is an absolute path. With an include root, an include must be a relative path inside it.`;
+      case "parent":
+        return `Include "${a.path}" resolves outside the include root.`;
+      case "symlink":
+        return `Include "${a.path}" resolves outside the include root through a symbolic link.`;
+    }
+  },
+  "NL.E0209": (a) => `Includes are not supported in this context: "${a.path}" was not read.`,
+  "NL.E0210": (a) => `Include "${a.path}" is more than ${a.max} includes deep. Flatten the include chain.`,
   // Identifier
   "NL.E0300": (a) => `Duplicate identifier "${a.name}". First declared at ${a.location}.`,
   "NL.E0301": (a) => `${a.type} must have an identifier, a title, or both.`,
@@ -26687,6 +26725,44 @@ var messages2 = {
         return `La vague ${q(a.id)} dans ${q(a.path)} ${floorText(a.childFloor)}, mais la vague ${q(a.id)} de ce fichier ${floorText(a.parentFloor)}. Une vague doit avoir la m\xEAme borne de d\xE9part dans chaque roadmap incluse.`;
     }
   },
+  "NL.E0203": (a) => {
+    switch (a.reason) {
+      case "not-found":
+        return `Impossible de lire l'include ${q(a.path)}\xA0: fichier introuvable.`;
+      case "is-directory":
+        return `Impossible de lire l'include ${q(a.path)}\xA0: c'est un r\xE9pertoire.`;
+      case "permission-denied":
+        return `Impossible de lire l'include ${q(a.path)}\xA0: permission refus\xE9e.`;
+      case "not-nowline":
+        return `Impossible de lire l'include ${q(a.path)}\xA0: seuls les fichiers .nowline peuvent \xEAtre inclus.`;
+      case "unreadable":
+        return a.detail ? `Impossible de lire l'include ${q(a.path)}\xA0: ${a.detail}` : `Impossible de lire l'include ${q(a.path)}.`;
+    }
+  },
+  "NL.E0204": (a) => `Include circulaire\xA0: ${q(a.path)} est d\xE9j\xE0 en cours d'inclusion (${a.chain}).`,
+  "NL.E0205": (a) => `Include ${q(a.path)} en double. Incluez chaque fichier une seule fois.`,
+  "NL.E0206": (a) => `Impossible d'isoler ${q(a.path)}\xA0: il ne d\xE9clare aucune roadmap.`,
+  "NL.E0207": (a) => {
+    if (a.parentStart && a.childStart) {
+      return `L'include ${q(a.path)} d\xE9clare start:${a.childStart}, qui ne correspond pas au start:${a.parentStart} de ce fichier. Les deux fichiers doivent d\xE9clarer la m\xEAme date de d\xE9but, ou aucun des deux.`;
+    }
+    if (a.parentStart) {
+      return `L'include ${q(a.path)} n'a pas de start:, mais ce fichier d\xE9clare start:${a.parentStart}. Les deux fichiers doivent d\xE9clarer la m\xEAme date de d\xE9but, ou aucun des deux.`;
+    }
+    return `L'include ${q(a.path)} d\xE9clare start:${a.childStart}, mais ce fichier n'a pas de start:. Les deux fichiers doivent d\xE9clarer la m\xEAme date de d\xE9but, ou aucun des deux.`;
+  },
+  "NL.E0208": (a) => {
+    switch (a.reason) {
+      case "absolute":
+        return `L'include ${q(a.path)} est un chemin absolu. Avec une racine d'include, un include doit \xEAtre un chemin relatif \xE0 l'int\xE9rieur de celle-ci.`;
+      case "parent":
+        return `L'include ${q(a.path)} se r\xE9sout hors de la racine d'include.`;
+      case "symlink":
+        return `L'include ${q(a.path)} se r\xE9sout hors de la racine d'include par un lien symbolique.`;
+    }
+  },
+  "NL.E0209": (a) => `Les includes ne sont pas pris en charge dans ce contexte\xA0: ${q(a.path)} n'a pas \xE9t\xE9 lu.`,
+  "NL.E0210": (a) => `L'include ${q(a.path)} d\xE9passe ${a.max} niveaux d'inclusion. Aplatissez la cha\xEEne d'includes.`,
   // Identifiant
   "NL.E0300": (a) => `Identifiant en double \xAB\xA0${a.name}\xA0\xBB. Premi\xE8re d\xE9claration \xE0 ${a.location}.`,
   "NL.E0301": (a) => `${a.type} doit comporter un identifiant, un titre, ou les deux.`,
@@ -26942,6 +27018,27 @@ function normalize2(p, sep) {
   }
   return prefix + segments.join(sep);
 }
+function segmentsOf(p) {
+  const normalized = resolve("", p).replace(/\\/g, "/");
+  const drive = /^[A-Za-z]:/.test(normalized) ? normalized.slice(0, 2).toLowerCase() : "";
+  const body = drive ? normalized.slice(2) : normalized;
+  return [drive, ...body.split("/").filter((s) => s !== "")];
+}
+function isWithin(dir, p) {
+  const d = segmentsOf(dir);
+  const t = segmentsOf(p);
+  return d.length <= t.length && d.every((seg, i2) => seg === t[i2]);
+}
+function relative(from, to) {
+  const f = segmentsOf(from);
+  const t = segmentsOf(to);
+  if (f[0] !== t[0])
+    return to;
+  let i2 = 0;
+  while (i2 < f.length && i2 < t.length && f[i2] === t[i2])
+    i2++;
+  return [...f.slice(i2).map(() => ".."), ...t.slice(i2)].join("/") || ".";
+}
 
 // ../core/dist/util/single-line.js
 function singleLine(text) {
@@ -28158,8 +28255,8 @@ function hasParseErrors(file) {
   const result = file.$document?.parseResult;
   return !!result && (result.lexerErrors.length > 0 || result.parserErrors.length > 0);
 }
-function participates(childFile, childContent, isStub) {
-  if (isStub || hasParseErrors(childFile))
+function participates(childFile, childContent) {
+  if (hasParseErrors(childFile))
     return false;
   return !!childFile.roadmapDecl || childContent.swimlanes.size > 0 || ownWaves(childFile).length > 0;
 }
@@ -28464,15 +28561,6 @@ function readStartProp(decl) {
     return void 0;
   return prop.value;
 }
-function formatStartMismatch(childRelPath, parentStart, childStart) {
-  if (parentStart && childStart) {
-    return `Included "${childRelPath}" declares start:${childStart}, which doesn't match this file's start:${parentStart}. Both files must declare the same start date, or neither should.`;
-  }
-  if (parentStart) {
-    return `Included "${childRelPath}" has no start:, but this file declares start:${parentStart}. Both files must declare the same start date, or neither should.`;
-  }
-  return `Included "${childRelPath}" declares start:${childStart}, but this file has no start:. Both files must declare the same start date, or neither should.`;
-}
 function isRoutedResolveDiagnostic(d) {
   return d.code !== void 0 || d.rule === "wave" || d.syntax !== void 0;
 }
@@ -28498,22 +28586,30 @@ function emptyContent() {
     isolatedRegions: []
   };
 }
+var MAX_INCLUDE_DEPTH = 16;
 async function resolveIncludes(file, filePath, options) {
   const readFile = options.readFile ?? (async (p) => {
     const { nodeReadFile: nodeReadFile2 } = await Promise.resolve().then(() => (init_node_read_file(), node_read_file_exports));
     return nodeReadFile2(p);
   });
+  const policy = options.includePolicy;
+  const realPath = (policy?.kind === "rooted" ? policy.realPath : void 0) ?? (async (p) => {
+    const { nodeRealPath } = await Promise.resolve().then(() => (init_node_read_file(), node_read_file_exports));
+    return nodeRealPath(p);
+  });
   const absPath = resolve("", filePath);
   const ctx = {
     services: options.services,
     rootAbs: absPath,
+    policy,
+    realPath,
+    displayBase: policy?.kind === "rooted" ? policy.root : dirname(absPath),
     diagnostics: [],
     resolving: [],
     processed: /* @__PURE__ */ new Map(),
     readFile,
     files: /* @__PURE__ */ new Map(),
     edges: /* @__PURE__ */ new Map(),
-    stubs: /* @__PURE__ */ new Set(),
     failedWaves: /* @__PURE__ */ new Set()
   };
   const { config: config2, content } = await resolveFile(file, absPath, ctx);
@@ -28537,17 +28633,6 @@ async function resolveFile(file, absPath, ctx) {
   if (ctx.processed.has(absPath)) {
     return ctx.processed.get(absPath);
   }
-  if (ctx.resolving.includes(absPath)) {
-    ctx.diagnostics.push({
-      severity: "error",
-      message: `Circular include detected: ${[...ctx.resolving, absPath].join(" \u2192 ")}`,
-      sourcePath: absPath
-    });
-    const empty = { config: emptyConfig(), content: emptyContent() };
-    ctx.stubs.add(empty.content);
-    ctx.processed.set(absPath, empty);
-    return empty;
-  }
   if (absPath !== ctx.rootAbs)
     ctx.diagnostics.push(...syntaxDiagnostics(file, absPath));
   ctx.resolving.push(absPath);
@@ -28565,17 +28650,42 @@ async function resolveFile(file, absPath, ctx) {
   const seenIncludes = /* @__PURE__ */ new Set();
   for (const inc of file.includes) {
     const childRelPath = inc.path;
-    const childAbsPath = resolve(dirname(absPath), childRelPath);
+    const fail = (code, ...args) => {
+      ctx.diagnostics.push(includeError(absPath, inc, code, ...args));
+    };
+    if (ctx.policy?.kind === "disabled") {
+      fail("NL.E0209", { path: childRelPath });
+      continue;
+    }
+    const located = await locateInclude(absPath, childRelPath, ctx);
+    if ("refused" in located) {
+      fail("NL.E0208", located.refused);
+      continue;
+    }
+    if ("unreadable" in located) {
+      fail("NL.E0203", located.unreadable);
+      continue;
+    }
+    const childAbsPath = located.absPath;
     if (seenIncludes.has(childAbsPath)) {
-      ctx.diagnostics.push({
-        severity: "error",
-        message: `Duplicate include "${childRelPath}" in ${basename(absPath)}.`,
-        sourcePath: absPath,
-        line: inc.$cstNode?.range.start.line
-      });
+      fail("NL.E0205", { path: childRelPath });
       continue;
     }
     seenIncludes.add(childAbsPath);
+    const cycleStart = ctx.resolving.indexOf(childAbsPath);
+    if (cycleStart >= 0) {
+      const chain = [...ctx.resolving.slice(cycleStart), childAbsPath].map((p) => relative(ctx.displayBase, p)).join(" \u2192 ");
+      fail("NL.E0204", { path: childRelPath, chain });
+      continue;
+    }
+    if (ctx.resolving.length > MAX_INCLUDE_DEPTH) {
+      fail("NL.E0210", { path: childRelPath, max: MAX_INCLUDE_DEPTH });
+      continue;
+    }
+    if (!childAbsPath.endsWith(".nowline")) {
+      fail("NL.E0203", { reason: "not-nowline", path: childRelPath });
+      continue;
+    }
     const configMode = getIncludeMode(inc, "config") ?? "merge";
     const roadmapMode = getIncludeMode(inc, "roadmap") ?? "merge";
     let childFile;
@@ -28583,12 +28693,7 @@ async function resolveFile(file, absPath, ctx) {
       const text = await ctx.readFile(childAbsPath);
       childFile = await parseString(ctx.services, text, childAbsPath);
     } catch (err) {
-      ctx.diagnostics.push({
-        severity: "error",
-        message: `Could not read include "${childRelPath}": ${err.message}`,
-        sourcePath: absPath,
-        line: inc.$cstNode?.range.start.line
-      });
+      fail("NL.E0203", unreadableArgs(childRelPath, err));
       continue;
     }
     const { config: childConfig, content: childContent } = await resolveFile(childFile, childAbsPath, ctx);
@@ -28600,28 +28705,22 @@ async function resolveFile(file, absPath, ctx) {
       mode: roadmapMode,
       childFile,
       childContent,
-      participates: participates(childFile, childContent, ctx.stubs.has(childContent))
+      participates: participates(childFile, childContent)
     });
     applyConfigMode(config2, childConfig, configMode, childAbsPath, ctx.diagnostics);
     applyRoadmapMode(content, childContent, childConfig, roadmapMode, childAbsPath, childRelPath, ctx.diagnostics);
     const isParsed = !hasParseErrors(childFile);
     if (isParsed && roadmapMode === "isolate" && !childContent.roadmap) {
-      ctx.diagnostics.push({
-        severity: "error",
-        message: `Cannot isolate "${childRelPath}": it has no roadmap declaration.`,
-        sourcePath: absPath,
-        line: inc.$cstNode?.range.start.line
-      });
+      fail("NL.E0206", { path: childRelPath });
     }
     if (isParsed && roadmapMode !== "ignore" && childFile.roadmapDecl) {
       const parentStart = readStartProp(file.roadmapDecl);
       const childStart = readStartProp(childFile.roadmapDecl);
       if (parentStart !== childStart) {
-        ctx.diagnostics.push({
-          severity: "error",
-          message: formatStartMismatch(childRelPath, parentStart, childStart),
-          sourcePath: absPath,
-          line: inc.$cstNode?.range.start.line
+        fail("NL.E0207", {
+          path: childRelPath,
+          ...parentStart ? { parentStart } : {},
+          ...childStart ? { childStart } : {}
         });
       }
     }
@@ -28639,6 +28738,49 @@ async function resolveFile(file, absPath, ctx) {
   ctx.processed.set(absPath, result);
   return result;
 }
+function includeError(sourcePath, inc, code, ...args) {
+  return {
+    severity: "error",
+    message: tr("en-US", code, ...args),
+    sourcePath,
+    ...nodeLocation(inc, "path"),
+    code,
+    args
+  };
+}
+async function locateInclude(parentAbs, path, ctx) {
+  const policy = ctx.policy;
+  if (policy?.kind !== "rooted")
+    return { absPath: resolve(dirname(parentAbs), path) };
+  if (isAbsolute(path))
+    return { refused: { reason: "absolute", path } };
+  const lexical = resolve(dirname(parentAbs), path);
+  if (!isWithin(policy.root, lexical))
+    return { refused: { reason: "parent", path } };
+  let real;
+  try {
+    real = await ctx.realPath(lexical);
+  } catch (err) {
+    return { unreadable: unreadableArgs(path, err) };
+  }
+  if (!isWithin(policy.root, real))
+    return { refused: { reason: "symlink", path } };
+  return { absPath: real };
+}
+function unreadableArgs(path, err) {
+  switch (err?.code) {
+    case "ENOENT":
+    case "ENOTDIR":
+      return { reason: "not-found", path };
+    case "EISDIR":
+      return { reason: "is-directory", path };
+    case "EACCES":
+    case "EPERM":
+      return { reason: "permission-denied", path };
+  }
+  const detail = err instanceof Error ? err.message : void 0;
+  return { reason: "unreadable", path, ...detail ? { detail } : {} };
+}
 function syntaxDiagnostics(file, absPath) {
   const doc = file.$document;
   if (!doc)
@@ -38071,11 +38213,13 @@ async function stageRoadmap(inputs) {
   const ast = document2.parseResult.value;
   const resolved = await resolveIncludes(ast, inputs.sourcePath, {
     services: inputs.services.Nowline,
-    readFile: inputs.readSource
+    readFile: inputs.readSource,
+    includePolicy: inputs.includePolicy
   });
   const isTolerated = inputs.isToleratedIncludeError ?? (() => false);
-  const errors = resolved.diagnostics.filter((d) => d.severity === "error" && !isTolerated(d));
-  const routed = resolved.diagnostics.filter(isRoutedResolveDiagnostic);
+  const isCounted = (d) => d.severity !== "error" || !isTolerated(d);
+  const errors = resolved.diagnostics.filter((d) => d.severity === "error" && isCounted(d));
+  const routed = resolved.diagnostics.filter((d) => isRoutedResolveDiagnostic(d) && isCounted(d));
   const legacy = errors.find((d) => !isRoutedResolveDiagnostic(d));
   if (legacy) {
     return { kind: "include-error", document: document2, legacy, routed: [], resolved };
@@ -40879,8 +41023,8 @@ function effectiveTheme(theme, systemTheme) {
 }
 
 // src/index.ts
-var version = true ? "0.0.0-dev.20261025020025.gc2cc722" : "0.0.0";
-var sha = true ? "c2cc722" : "unknown";
+var version = true ? "0.0.0-dev.20261026035511.g8612a42" : "0.0.0";
+var sha = true ? "8612a42" : "unknown";
 var DEFAULT_SELECTOR = "pre code.language-nowline, code.language-nowline";
 var initialConfig = {
   theme: "auto",