@svgforge/svgforge-cli 2.0.0 → 2.0.2-unstable.202609132246.c961c8e

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
 Copyright (c) 2026 Felix Müller
-Based on svg-sprite — Copyright © 2018 Joschi Kuphal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -3,15 +3,13 @@
 /**
  Svgforge is a Node.js module for creating SVG sprites
 
- Based on the command line interface originally written for svg-sprite
+ Some code based on the command line interface originally written for svg-sprite
  by Joschi Kuphal — this is a standalone fork/package of that CLI.
 
- @see https://github.com/joeda1/svgforge-cli
- @author Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)
- @author Felix Müller
- @copyright © 2018 Joschi Kuphal
+ @see https://github.com/svgforge/svgforge-cli
+ @author Felix Müller (https://github.com/joeda1)
  @copyright © 2026 Felix Müller
- @license MIT https://github.com/joeda1/svgforge-cli/blob/main/LICENSE
+ @license MIT https://github.com/svgforge/svgforge-cli/blob/main/LICENSE
  */
 
 import fs from 'node:fs';
@@ -471,6 +469,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
 
@@ -493,19 +525,41 @@ async function main() {
   loadVariables(config);
 
   const spriter = new SVGSpriter(config);
-  const files = argv._.flatMap(filePattern => fs.globSync(filePattern).toSorted((a, b) => b.localeCompare(a)));
 
-  for (const filePattern of files) {
-    // 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('../');
+  // Glob (>= 9, incl. fs.globSync) returns paths without the "./" segment, so
+  // the base directory marker has to be detected on the original pattern. A
+  // literal "/./" segment marks the directory from which shape ID traversal
+  // should start (e.g. "assets/./**/*.svg" yields "path--to--source" instead
+  // of "assets--path--to--source").
+  const matchedFiles = argv._.flatMap(pattern => {
+    const marker = pattern.lastIndexOf('./');
+    const baseDepth = marker === -1 ? 0 : pattern.slice(0, marker).split('/').filter(Boolean).length;
+    return fs.globSync(pattern)
+      .toSorted((a, b) => b.localeCompare(a))
+      .map(file => ({baseDepth, file}));
+  });
+  const excludedInputRoots = getExcludedInputRoots(config);
+
+  for (const {baseDepth, file: filePattern} of matchedFiles) {
     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;
+    }
+
+    // Detect relative patterns to preserve directory structure in the shape
+    // identifiers (e.g. "nested/leaf.svg" -> "nested--leaf")
+    const isRelative = !path.isAbsolute(filePattern) && !filePattern.startsWith('../');
     const stat = fs.lstatSync(file);
     let basename;
 
     if (stat.isSymbolicLink()) {
       basename = path.basename(fs.readlinkSync(file));
+    } else if (baseDepth > 0) {
+      // Strip the base directory marked by "/./" from the shape identifier
+      basename = filePattern.split('/').filter(Boolean).slice(baseDepth).join('/');
     } else {
       basename = isRelative ? filePattern : path.basename(file);
     }

package/package.json

@@ -1,10 +1,7 @@
 {
   "name": "@svgforge/svgforge-cli",
-  "version": "2.0.0",
+  "version": "2.0.2-unstable.202609132246.c961c8e",
   "author": "Felix Müller (https://github.com/joeda1)",
-  "contributors": [
-    "Joschi Kuphal <joschi@kuphal.net> (https://github.com/jkphl)"
-  ],
   "description": "Command line interface for svgforge — create SVG sprites & stacks with stylesheet resources (CSS, Sass, etc.)",
   "homepage": "https://github.com/svgforge/svgforge-cli",
   "repository": {
@@ -33,20 +30,22 @@
   "files": [
     "bin"
   ],
+  "scripts": {
+    "prepare": "husky",
+    "lint": "xo",
+    "fix": "xo --fix",
+    "test": "node --test test/*.test.js",
+    "test:coverage": "mkdir -p coverage && node --test --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=coverage/lcov.info"
+  },
   "dependencies": {
+    "@svgforge/svgforge": "^2.0.2-unstable.0",
     "js-yaml": "^5.4.1",
-    "@svgforge/svgforge": "^2.0.0",
     "vinyl": "^3.0.1",
     "yargs": "^18.1.0"
   },
   "devDependencies": {
     "eslint-plugin-jsdoc": "^64.3.2",
+    "husky": "^9.1.7",
     "xo": "^4.0.0"
-  },
-  "scripts": {
-    "lint": "xo",
-    "fix": "xo --fix",
-    "test": "node --test test/*.test.js",
-    "test:coverage": "mkdir -p coverage && node --test --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=coverage/lcov.info"
   }
-}
+}