@svgforge/svgforge-cli 2.0.0 → 2.0.1

package/README.md

@@ -103,6 +103,7 @@ The test suite spawns the CLI as a child process against fixtures in `test/fixtu
 ## License
 
 [MIT](LICENSE) © Felix Müller
+
 [npm-url]: https://www.npmjs.com/package/@svgforge/svgforge-cli
 
 [npm-image]: https://img.shields.io/npm/v/@svgforge/svgforge-cli?logo=npm&logoColor=fff

package/bin/svgforge.js

@@ -471,6 +471,40 @@ function loadVariables(cfg) {
   }
 }
 
+/**
+ Resolve the output directories that must not be re-ingested as source files
+
+ Generated artifacts (sprites, stylesheets, examples) live inside the configured
+ destination tree. When an input glob covers that tree (e.g. a recursive
+ SVG glob), a sprite written by a previous run would otherwise be fed back
+ in as a shape with an id derived from its output path (e.g.
+ "assets--OUT--stack--svg--sprite").
+
+ @param {SpriterConfig} cfg Spriter configuration
+ @returns {string[]} Absolute output root directories to exclude from the input
+ */
+function getExcludedInputRoots(cfg) {
+  const destRoot = path.resolve(cfg.dest || '.');
+  const roots = new Set([destRoot]);
+
+  // When the destination defaults to the current directory every glob would
+  // land inside it, so restrict the exclusion to the mode specific output
+  // directories instead.
+  if (destRoot === process.cwd()) {
+    roots.clear();
+
+    for (const mode of MODES) {
+      const modeDest = cfg.mode?.[mode]?.dest;
+
+      if (modeDest) {
+        roots.add(path.resolve(destRoot, modeDest));
+      }
+    }
+  }
+
+  return [...roots];
+}
+
 /**
  Run the command line interface
 
@@ -494,13 +528,21 @@ async function main() {
 
   const spriter = new SVGSpriter(config);
   const files = argv._.flatMap(filePattern => fs.globSync(filePattern).toSorted((a, b) => b.localeCompare(a)));
+  const excludedInputRoots = getExcludedInputRoots(config);
 
   for (const filePattern of files) {
+    const file = path.resolve(filePattern);
+
+    // Skip files inside the output tree so previously generated artifacts are
+    // not processed as source shapes again
+    if (excludedInputRoots.some(root => file === root || file.startsWith(root + path.sep))) {
+      continue;
+    }
+
     // Glob >= 9 returns paths without the "./" prefix, so detect relative
     // patterns from the original glob result to preserve directory structure
     // in the shape identifiers (e.g. "nested/leaf.svg" -> "nested--leaf")
     const isRelative = !path.isAbsolute(filePattern) && !filePattern.startsWith('../');
-    const file = path.resolve(filePattern);
     const stat = fs.lstatSync(file);
     let basename;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svgforge/svgforge-cli",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Felix Müller (https://github.com/joeda1)",
   "contributors": [
     "Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)"
@@ -34,8 +34,8 @@
     "bin"
   ],
   "dependencies": {
-    "js-yaml": "^5.4.1",
     "@svgforge/svgforge": "^2.0.0",
+    "js-yaml": "^5.4.1",
     "vinyl": "^3.0.1",
     "yargs": "^18.1.0"
   },