images2atlas 1.0.0 → 1.0.2

package/dist/index.js

@@ -1,24 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.images2atlas = images2atlas;
 const chokidar_1 = require("chokidar");
-const path_1 = __importDefault(require("path"));
+const debounce_1 = __importDefault(require("debounce"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
 const spritesheet_templates_1 = __importDefault(require("spritesheet-templates"));
 const spritesmith_1 = __importDefault(require("spritesmith"));
-const debounce_1 = __importDefault(require("debounce"));
 const web_build_utils_1 = require("web-build-utils");
 // Supported output template formats for spritesheet-templates.
 const formatTypes = ['css', 'json', 'less', 'sass', 'scss', 'styl'];
@@ -44,13 +35,23 @@ class Images2atlas {
         if (path_1.default.extname(options.dest)) {
             throw new Error('The options.dest must be a directory.');
         }
-        this._options = Object.assign({ exclude: () => false, include: () => true, suffix: '-atlas', delay: 500, silent: true, watch: false, spritesmithOptions: {
+        this._options = {
+            exclude: () => false,
+            include: () => true,
+            suffix: '-atlas',
+            delay: 500,
+            silent: true,
+            watch: false,
+            spritesmithOptions: {
                 padding: 2,
                 exportOpts: {
                     format: 'png',
                     quality: 100,
                 },
-            }, templatesOptions: {} }, options);
+            },
+            templatesOptions: {},
+            ...options,
+        };
     }
     /**
      * Logs messages using console if not silent.
@@ -98,39 +99,37 @@ class Images2atlas {
      * @param src Source directory
      * @param dest Destination directory
      */
-    pack(src, dest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.log('pack', src);
-            const { exclude, include } = this._options;
-            const fullNames = yield fs_extra_1.default.readdir(src);
-            const pngPaths = [];
-            yield Promise.all(fullNames.map((fullName) => __awaiter(this, void 0, void 0, function* () {
-                const srcPath = path_1.default.join(src, fullName);
-                const info = path_1.default.parse(srcPath);
-                if (!(0, web_build_utils_1.isSafeFilename)(srcPath, true) || exclude(info, srcPath)) {
-                    return;
-                }
-                const destPath = path_1.default.join(dest, info.base);
-                if (info.ext) {
-                    // File
-                    if (info.ext === '.png' && include(info, srcPath)) {
-                        // Collect PNGs for atlas generation later.
-                        pngPaths.push(srcPath);
-                    }
-                    else {
-                        // Copy single file
-                        yield fs_extra_1.default.outputFile(destPath, yield fs_extra_1.default.readFile(srcPath));
-                    }
+    async pack(src, dest) {
+        this.log('pack', src);
+        const { exclude, include } = this._options;
+        const fullNames = await fs_extra_1.default.readdir(src);
+        const pngPaths = [];
+        await Promise.all(fullNames.map(async (fullName) => {
+            const srcPath = path_1.default.join(src, fullName);
+            const info = path_1.default.parse(srcPath);
+            if (!(0, web_build_utils_1.isSafeFilename)(srcPath, true) || exclude(info, srcPath)) {
+                return;
+            }
+            const destPath = path_1.default.join(dest, info.base);
+            if (info.ext) {
+                // File
+                if (info.ext === '.png' && include(info, srcPath)) {
+                    // Collect PNGs for atlas generation later.
+                    pngPaths.push(srcPath);
                 }
                 else {
-                    // Dir
-                    yield this.pack(srcPath, destPath);
+                    // Copy single file
+                    await fs_extra_1.default.outputFile(destPath, await fs_extra_1.default.readFile(srcPath));
                 }
-            })));
-            // Generate atlas and template outputs for collected PNGs.
-            yield this.packSpriteSheet(pngPaths, dest);
-            this.log('packed', dest);
-        });
+            }
+            else {
+                // Dir
+                await this.pack(srcPath, destPath);
+            }
+        }));
+        // Generate atlas and template outputs for collected PNGs.
+        await this.packSpriteSheet(pngPaths, dest);
+        this.log('packed', dest);
     }
     /**
      * Generates the spritesheet and style/template files from collected PNG paths.
@@ -138,38 +137,45 @@ class Images2atlas {
      * @param pngPaths Array of PNG image paths
      * @param dest Destination directory
      */
-    packSpriteSheet(pngPaths, dest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (pngPaths.length === 0) {
-                return;
-            }
-            const { suffix, spritesmithOptions, templatesOptions } = this._options;
-            const format = templatesOptions.format || 'css';
-            yield new Promise((resolve, reject) => {
-                spritesmith_1.default.run(Object.assign(Object.assign({}, spritesmithOptions), { src: pngPaths }), (err, result) => __awaiter(this, void 0, void 0, function* () {
-                    if (err) {
-                        return reject(err);
-                    }
-                    // Map image coordinates to sprite objects
-                    const sprites = Object.keys(result.coordinates).map((imgPath) => {
-                        const info = path_1.default.parse(imgPath);
-                        return Object.assign(Object.assign({}, result.coordinates[imgPath]), { name: info.name });
-                    });
-                    // Spritesheet properties and output image path
-                    const spritesheet = Object.assign(Object.assign({}, result.properties), { image: `${path_1.default.basename(dest) + suffix}.png` });
-                    // Generate template/style file
-                    const temp = (0, spritesheet_templates_1.default)({
-                        sprites,
-                        spritesheet,
-                    }, templatesOptions);
-                    // Determine output file extension
-                    const ext = formatTypes.find((type) => format.startsWith(type)) || format;
-                    yield Promise.all([
-                        fs_extra_1.default.outputFile(dest + suffix + '.' + ext, temp),
-                        fs_extra_1.default.outputFile(dest + suffix + '.png', result.image),
-                    ]);
-                    resolve();
-                }));
+    async packSpriteSheet(pngPaths, dest) {
+        if (pngPaths.length === 0) {
+            return;
+        }
+        const { suffix, spritesmithOptions, templatesOptions } = this._options;
+        const format = templatesOptions.format || 'css';
+        await new Promise((resolve, reject) => {
+            spritesmith_1.default.run({
+                ...spritesmithOptions,
+                src: pngPaths,
+            }, async (err, result) => {
+                if (err) {
+                    return reject(err);
+                }
+                // Map image coordinates to sprite objects
+                const sprites = Object.keys(result.coordinates).map((imgPath) => {
+                    const info = path_1.default.parse(imgPath);
+                    return {
+                        ...result.coordinates[imgPath],
+                        name: info.name,
+                    };
+                });
+                // Spritesheet properties and output image path
+                const spritesheet = {
+                    ...result.properties,
+                    image: `${path_1.default.basename(dest) + suffix}.png`,
+                };
+                // Generate template/style file
+                const temp = (0, spritesheet_templates_1.default)({
+                    sprites,
+                    spritesheet,
+                }, templatesOptions);
+                // Determine output file extension
+                const ext = formatTypes.find((type) => format.startsWith(type)) || format;
+                await Promise.all([
+                    fs_extra_1.default.outputFile(dest + suffix + '.' + ext, temp),
+                    fs_extra_1.default.outputFile(dest + suffix + '.png', result.image),
+                ]);
+                resolve();
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "images2atlas",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Plugin that converts set of images into a spritesheet by its directory and SASS/LESS/Stylus mixins",
   "author": "Porky Ke",
   "homepage": "https://github.com/porky-prince/web-build-tools/packages/images2atlas#readme",
@@ -27,12 +27,9 @@
     "fs-extra": "^11.3.2",
     "spritesheet-templates": "^10.5.2",
     "spritesmith": "^3.5.1",
-    "web-build-utils": "^0.0.4"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.6.2"
+    "web-build-utils": "^0.0.6"
   },
+  "devDependencies": {},
   "keywords": [
     "icons",
     "images",