@timeax/scaffold 0.0.13 → 0.1.1

package/dist/cli.mjs

@@ -640,7 +640,7 @@ function stripInlineComment(content) {
   }
   return content.slice(0, cutIndex).trimEnd();
 }
-function parseLine(line, lineNo) {
+function parseLine(line, lineNo, fileName) {
   const match = line.match(/^(\s*)(.*)$/);
   if (!match) return null;
   const indentSpaces = match[1].length;
@@ -658,7 +658,7 @@ function parseLine(line, lineNo) {
   const pathToken = parts[0];
   if (pathToken.includes(":")) {
     throw new Error(
-      `structure.txt: ":" is reserved for annotations (@stub:, @include:, etc). Invalid path "${pathToken}" on line ${lineNo}.`
+      `${fileName}: ":" is reserved for annotations (@stub:, @include:, etc). Invalid path "${pathToken}" on line ${lineNo}.`
     );
   }
   let stub;
@@ -692,12 +692,12 @@ function parseLine(line, lineNo) {
     exclude: exclude.length ? exclude : void 0
   };
 }
-function parseStructureText(text, indentStep = 2) {
+function parseStructureText(fileName, text, indentStep = 2) {
   const lines = text.split(/\r?\n/);
   const parsed = [];
   for (let i = 0; i < lines.length; i++) {
     const lineNo = i + 1;
-    const p = parseLine(lines[i], lineNo);
+    const p = parseLine(lines[i], lineNo, fileName);
     if (p) parsed.push(p);
   }
   const rootEntries = [];
@@ -706,14 +706,14 @@ function parseStructureText(text, indentStep = 2) {
     const { indentSpaces, lineNo } = p;
     if (indentSpaces % indentStep !== 0) {
       throw new Error(
-        `structure.txt: Invalid indent on line ${lineNo}. Indent must be multiples of ${indentStep} spaces.`
+        `${fileName}: Invalid indent on line ${lineNo}. Indent must be multiples of ${indentStep} spaces.`
       );
     }
     const level = indentSpaces / indentStep;
     if (level > stack.length) {
       if (level !== stack.length + 1) {
         throw new Error(
-          `structure.txt: Invalid indentation on line ${lineNo}. You cannot jump more than one level at a time. Previous depth: ${stack.length}, this line depth: ${level}.`
+          `${fileName}: Invalid indentation on line ${lineNo}. You cannot jump more than one level at a time. Previous depth: ${stack.length}, this line depth: ${level}.`
         );
       }
     }
@@ -721,12 +721,12 @@ function parseStructureText(text, indentStep = 2) {
       const parent2 = stack[level - 1];
       if (!parent2) {
         throw new Error(
-          `structure.txt: Indented entry without a parent on line ${lineNo}.`
+          `${fileName}: Indented entry without a parent on line ${lineNo}.`
         );
       }
       if (!parent2.isDir) {
         throw new Error(
-          `structure.txt: Cannot indent under a file on line ${lineNo}. Files cannot have children. Parent: "${parent2.entry.path}".`
+          `${fileName}: Cannot indent under a file on line ${lineNo}. Files cannot have children. Parent: "${parent2.entry.path}".`
         );
       }
     }
@@ -777,7 +777,7 @@ function parseStructureText(text, indentStep = 2) {
 
 // src/core/resolve-structure.ts
 var logger2 = defaultLogger.child("[structure]");
-function resolveGroupStructure(scaffoldDir, group) {
+function resolveGroupStructure(scaffoldDir, group, config) {
   if (group.structure && group.structure.length) {
     logger2.debug(`Using inline structure for group "${group.name}"`);
     return group.structure;
@@ -791,7 +791,7 @@ function resolveGroupStructure(scaffoldDir, group) {
   }
   logger2.debug(`Reading structure for group "${group.name}" from ${filePath}`);
   const raw = fs8.readFileSync(filePath, "utf8");
-  return parseStructureText(raw);
+  return parseStructureText(fileName, raw, config.indentStep);
 }
 function resolveSingleStructure(scaffoldDir, config) {
   if (config.structure && config.structure.length) {
@@ -807,7 +807,7 @@ function resolveSingleStructure(scaffoldDir, config) {
   }
   logger2.debug(`Reading single structure from ${filePath}`);
   const raw = fs8.readFileSync(filePath, "utf8");
-  return parseStructureText(raw);
+  return parseStructureText(fileName, raw, config.indentStep);
 }
 var logger3 = defaultLogger.child("[cache]");
 var DEFAULT_CACHE = {
@@ -1276,7 +1276,7 @@ async function runOnce(cwd, options = {}) {
   if (config.groups && config.groups.length > 0) {
     for (const group of config.groups) {
       const groupRootAbs = path2.resolve(projectRoot, group.root);
-      const structure = resolveGroupStructure(scaffoldDir, group);
+      const structure = resolveGroupStructure(scaffoldDir, group, config);
       const groupLogger = logger6.child(`[group:${group.name}]`);
       await applyStructure({
         config,