@timeax/scaffold 0.0.2 → 0.0.3

package/dist/cli.cjs

@@ -21,6 +21,9 @@ var os__default = /*#__PURE__*/_interopDefault(os);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var chokidar__default = /*#__PURE__*/_interopDefault(chokidar);
 
+// src/schema/index.ts
+var SCAFFOLD_ROOT_DIR = ".scaffold";
+
 // src/util/logger.ts
 var supportsColor = typeof process !== "undefined" && process.stdout && process.stdout.isTTY && process.env.NO_COLOR !== "1";
 function wrap(code) {
@@ -144,14 +147,14 @@ function toProjectRelativePath(projectRoot, absolutePath) {
 var logger = defaultLogger.child("[config]");
 async function loadScaffoldConfig(cwd, options = {}) {
   const absCwd = path2__default.default.resolve(cwd);
-  const initialScaffoldDir = options.scaffoldDir ? path2__default.default.resolve(absCwd, options.scaffoldDir) : path2__default.default.join(absCwd, "scaffold");
+  const initialScaffoldDir = options.scaffoldDir ? path2__default.default.resolve(absCwd, options.scaffoldDir) : path2__default.default.join(absCwd, SCAFFOLD_ROOT_DIR);
   const configPath = options.configPath ?? resolveConfigPath(initialScaffoldDir);
   const config = await importConfig(configPath);
   let configRoot = absCwd;
   if (config.root) {
     configRoot = path2__default.default.resolve(absCwd, config.root);
   }
-  const scaffoldDir = options.scaffoldDir ? path2__default.default.resolve(absCwd, options.scaffoldDir) : path2__default.default.join(configRoot, "scaffold");
+  const scaffoldDir = options.scaffoldDir ? path2__default.default.resolve(absCwd, options.scaffoldDir) : path2__default.default.join(configRoot, SCAFFOLD_ROOT_DIR);
   const baseRoot = config.base ? path2__default.default.resolve(configRoot, config.base) : configRoot;
   logger.debug(
     `Loaded config: configRoot=${configRoot}, baseRoot=${baseRoot}, scaffoldDir=${scaffoldDir}`
@@ -216,14 +219,50 @@ async function importTsConfig(configPath) {
 }
 
 // src/core/structure-txt.ts
+function stripInlineComment(content) {
+  let cutIndex = -1;
+  const len = content.length;
+  for (let i = 0; i < len; i++) {
+    const ch = content[i];
+    const prev = i > 0 ? content[i - 1] : "";
+    if (ch === "#") {
+      if (i === 0) continue;
+      if (prev === " " || prev === "	") {
+        cutIndex = i;
+        break;
+      }
+    }
+    if (ch === "/" && i + 1 < len && content[i + 1] === "/" && (prev === " " || prev === "	")) {
+      cutIndex = i;
+      break;
+    }
+  }
+  if (cutIndex === -1) {
+    return content.trimEnd();
+  }
+  return content.slice(0, cutIndex).trimEnd();
+}
 function parseLine(line, lineNo) {
-  const match = line.match(/^(\s*)(.+)$/);
+  const match = line.match(/^(\s*)(.*)$/);
   if (!match) return null;
   const indentSpaces = match[1].length;
-  const rest = match[2].trim();
-  if (!rest || rest.startsWith("#")) return null;
-  const parts = rest.split(/\s+/);
+  let rest = match[2];
+  if (!rest.trim()) return null;
+  const trimmedRest = rest.trimStart();
+  if (trimmedRest.startsWith("#") || trimmedRest.startsWith("//")) {
+    return null;
+  }
+  const stripped = stripInlineComment(rest);
+  const trimmed = stripped.trim();
+  if (!trimmed) return null;
+  const parts = trimmed.split(/\s+/);
+  if (!parts.length) return null;
   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}.`
+    );
+  }
   let stub;
   const include = [];
   const exclude = [];
@@ -255,7 +294,7 @@ function parseLine(line, lineNo) {
     exclude: exclude.length ? exclude : void 0
   };
 }
-function parseStructureText(text) {
+function parseStructureText(text, indentStep = 2) {
   const lines = text.split(/\r?\n/);
   const parsed = [];
   for (let i = 0; i < lines.length; i++) {
@@ -265,15 +304,14 @@ function parseStructureText(text) {
   }
   const rootEntries = [];
   const stack = [];
-  const INDENT_STEP = 2;
   for (const p of parsed) {
     const { indentSpaces, lineNo } = p;
-    if (indentSpaces % INDENT_STEP !== 0) {
+    if (indentSpaces % indentStep !== 0) {
       throw new Error(
-        `structure.txt: Invalid indent on line ${lineNo}. Indent must be multiples of ${INDENT_STEP} spaces.`
+        `structure.txt: Invalid indent on line ${lineNo}. Indent must be multiples of ${indentStep} spaces.`
       );
     }
-    const level = indentSpaces / INDENT_STEP;
+    const level = indentSpaces / indentStep;
     if (level > stack.length) {
       if (level !== stack.length + 1) {
         throw new Error(
@@ -896,7 +934,10 @@ const config: ScaffoldConfig = {
   //   base: 'src',        // apply to <root>/src
   //   base: '..',         // apply to parent of <root>
   // base: '.',
-
+  
+  // Number of spaces per indent level in structure files (default: 2).
+  // indentStep: 2,
+  
   // Cache file path, relative to base.
   // cacheFile: '.scaffold-cache.json',
 
@@ -928,7 +969,7 @@ const config: ScaffoldConfig = {
 
 export default config;
 `;
-var DEFAULT_STRUCTURE_TXT = `# scaffold/structure.txt
+var DEFAULT_STRUCTURE_TXT = `# ${SCAFFOLD_ROOT_DIR}/structure.txt
 # Example structure definition.
 # - Indent with 2 spaces per level
 # - Directories must end with "/"
@@ -940,7 +981,7 @@ var DEFAULT_STRUCTURE_TXT = `# scaffold/structure.txt
 #   index.ts
 `;
 async function initScaffold(cwd, options = {}) {
-  const scaffoldDirRel = options.scaffoldDir ?? "scaffold";
+  const scaffoldDirRel = options.scaffoldDir ?? SCAFFOLD_ROOT_DIR;
   const scaffoldDirAbs = path2__default.default.resolve(cwd, scaffoldDirRel);
   const configFileName = options.configFileName ?? "config.ts";
   const structureFileName = options.structureFileName ?? "structure.txt";