@ispriter/cli 2.0.1 → 2.0.2

package/dist/index.js

@@ -7,16 +7,26 @@ import { parseConfig } from "@ispriter/core";
 import { readFile, writeFile, mkdir, glob } from "fs/promises";
 import path from "path";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
+var require2 = createRequire(import.meta.url);
+var pkg = require2("../package.json");
 var program = new Command();
-program.name("ispriter").description("CSS sprite generator").version("2.0.0-alpha.1");
+program.name("ispriter").description("CSS sprite generator").version(pkg.version);
 function createRunAction() {
   return async (opts) => {
     try {
       const config = await resolveConfig(opts);
-      await runSpriter(config);
-      if (opts.watch) {
-        await startWatch(config);
+      if (opts.dryRun && opts.watch) {
+        console.warn("\u26A0\uFE0F --dry-run and --watch are mutually exclusive. Running dry-run only.");
+      }
+      if (opts.dryRun) {
+        await runSpriterDry(config);
+      } else {
+        await runSpriter(config);
+        if (opts.watch) {
+          await startWatch(config);
+        }
       }
     } catch (e) {
       if (e.name === "IspriterError") {
@@ -27,8 +37,7 @@ function createRunAction() {
     }
   };
 }
-program.command("run").description("Generate sprites from CSS files").option("-c, --config <path>", "config file path (JSON)").option("-f, --files <paths>", "CSS files (comma separated)").option("-o, --output <path>", "CSS output directory").option("--watch", "watch mode (not yet implemented)").action(createRunAction());
-program.option("-c, --config <path>", "config file path (JSON)").option("-f, --files <paths>", "CSS files (comma separated)").option("-o, --output <path>", "CSS output directory").option("--watch", "watch for file changes and regenerate").action(createRunAction());
+program.command("run", { isDefault: true }).description("Generate sprites from CSS files").option("-c, --config <path>", "config file path (JSON)").option("-f, --files <paths>", "CSS files (comma separated)").option("-o, --output <path>", "CSS output directory").option("--watch", "watch for file changes and regenerate").option("--dry-run", "preview what would be sprited without writing files").action(createRunAction());
 async function resolveConfig(opts) {
   if (opts.config) {
     const configPath = path.resolve(opts.config);
@@ -46,9 +55,10 @@ async function resolveConfig(opts) {
       output: { cssDist: opts.output || "./sprite/css/" }
     };
   }
-  throw new Error("Either --config or --files is required");
+  program.help();
+  return {};
 }
-async function runSpriter(config) {
+async function collectInputs(config) {
   const resolved = parseConfig(config);
   const workspace = path.resolve(resolved.workspace);
   const cssSource = Array.isArray(resolved.input.cssSource) ? resolved.input.cssSource : [resolved.input.cssSource];
@@ -64,7 +74,7 @@ async function runSpriter(config) {
   }
   if (cssFiles.size === 0) {
     console.warn("\u26A0\uFE0F No CSS files found");
-    return;
+    return null;
   }
   const images = /* @__PURE__ */ new Map();
   const allUrls = [];
@@ -91,11 +101,29 @@ async function runSpriter(config) {
       }
     }
   }
+  return { resolved, workspace, cssFiles, images };
+}
+async function runSpriter(config) {
+  const inputs = await collectInputs(config);
+  if (!inputs) return;
+  const { resolved, workspace, cssFiles, images } = inputs;
   console.log(`\u{1F4E6} Processing ${cssFiles.size} CSS files with ${images.size} images...`);
   const spriter = new Spriter(config);
   const result = await spriter.run({ css: cssFiles, images, cssBaseDir: workspace });
   const cssDist = path.resolve(workspace, resolved.output.cssDist);
+  if (!cssDist.startsWith(workspace)) {
+    console.error(
+      `\u274C output.cssDist must be inside workspace: "${resolved.output.cssDist}" resolves outside`
+    );
+    process.exit(1);
+  }
   const imgDist = path.resolve(cssDist, resolved.output.imageDist);
+  if (!imgDist.startsWith(workspace)) {
+    console.error(
+      `\u274C output.imageDist must be inside workspace: "${resolved.output.imageDist}" resolves outside`
+    );
+    process.exit(1);
+  }
   await mkdir(imgDist, { recursive: true });
   for (const [name, buf] of result.spriteImages) {
     await writeFile(path.join(imgDist, name), buf);
@@ -104,9 +132,24 @@ async function runSpriter(config) {
     const outName = path.basename(name);
     await writeFile(path.join(cssDist, outName), content);
   }
-  console.log(`\u2705 Generated ${result.spriteImages.size} sprite(s), updated ${result.cssFiles.size} CSS file(s)`);
+  console.log(
+    `\u2705 Generated ${result.spriteImages.size} sprite(s), updated ${result.cssFiles.size} CSS file(s)`
+  );
   if (result.skippedImages.length > 0) {
-    console.warn(`\u26A0\uFE0F Skipped ${result.skippedImages.length} image(s): ${result.skippedImages.join(", ")}`);
+    console.warn(
+      `\u26A0\uFE0F Skipped ${result.skippedImages.length} image(s): ${result.skippedImages.join(", ")}`
+    );
+  }
+}
+async function runSpriterDry(config) {
+  const inputs = await collectInputs(config);
+  if (!inputs) return;
+  const { workspace, cssFiles, images } = inputs;
+  console.log(`\u{1F4E6} Dry-run: analyzing ${cssFiles.size} CSS files with ${images.size} images...`);
+  const spriter = new Spriter(config);
+  const result = await spriter.run({ css: cssFiles, images, cssBaseDir: workspace, dryRun: true });
+  if (result.dryRunReport) {
+    console.log(result.dryRunReport);
   }
 }
 async function startWatch(config) {
@@ -115,9 +158,12 @@ async function startWatch(config) {
   const workspace = path.resolve(resolved.workspace);
   console.log("\u{1F440} Watching for changes...");
   const cssPatterns = Array.isArray(resolved.input.cssSource) ? resolved.input.cssSource : [resolved.input.cssSource];
-  const watcher = watch(cssPatterns.map((p) => path.resolve(workspace, p)), {
-    ignoreInitial: true
-  });
+  const watcher = watch(
+    cssPatterns.map((p) => path.resolve(workspace, p)),
+    {
+      ignoreInitial: true
+    }
+  );
   watcher.on("change", async (file) => {
     console.log(`\u{1F4DD} ${file} changed, regenerating...`);
     try {

package/package.json

@@ -1,17 +1,21 @@
 {
   "name": "@ispriter/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "bin": {
     "ispriter": "./dist/index.js"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch"
+  },
   "dependencies": {
+    "@ispriter/core": "workspace:*",
+    "@ispriter/shared": "workspace:*",
     "chokidar": "^5.0.0",
-    "commander": "^12.1.0",
-    "@ispriter/core": "2.0.1",
-    "@ispriter/shared": "2.0.1"
+    "commander": "^12.1.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",
@@ -27,9 +31,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 iazrael.
-
-Permission is hereby granted,  free of charge,  to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to  use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.