sheetloaf 1.26.0-beta.2 → 1.26.1-beta.0

package/dist/configs.js

@@ -1,28 +1,26 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSassOptionsAsync = exports.generateSassOptions = exports.generatePostcssConfigFromUse = exports.generatePostcssConfigFromFile = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const sass_embedded_1 = require("sass-embedded");
-function generatePostcssConfigFromFile(configPath = '') {
+import path from "path";
+import fs from "fs";
+import {} from "postcss";
+import { NodePackageImporter } from "sass-embedded";
+import {} from "commander";
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+export function generatePostcssConfigFromFile(configPath = '') {
     let obj = {
         plugins: []
     };
-    let configFileLoc = path_1.default.resolve(process.cwd(), configPath, 'postcss.config.js');
+    let configFileLoc = path.resolve(process.cwd(), configPath, 'postcss.config.js');
     try {
-        fs_1.default.lstatSync(configFileLoc);
+        fs.lstatSync(configFileLoc);
         obj = require(configFileLoc);
     }
     catch (e) {
         console.log(`No postcss.config.js file found at location ${configPath}`);
+        // TODO
     }
     return obj;
 }
-exports.generatePostcssConfigFromFile = generatePostcssConfigFromFile;
-function generatePostcssConfigFromUse(useArg) {
+export function generatePostcssConfigFromUse(useArg) {
     let obj = {
         plugins: []
     };
@@ -31,26 +29,24 @@ function generatePostcssConfigFromUse(useArg) {
     });
     return obj;
 }
-exports.generatePostcssConfigFromUse = generatePostcssConfigFromUse;
-function generateSassOptions(opts) {
+export function generateSassOptions(opts) {
     return {
         style: opts.style,
         loadPaths: opts.loadPath ? opts.loadPath.split(',') : [],
         sourceMap: opts.sourceMap === false ? false : true,
         sourceMapIncludeSources: opts.sourceMap === false ? false : true,
-        importers: opts.pkgImporter === 'node' ? [new sass_embedded_1.NodePackageImporter()] : [],
+        importers: opts.pkgImporter === 'node' ? [new NodePackageImporter()] : [],
         silenceDeprecations: opts.silenceDeprecation ? opts.silenceDeprecation.split(',') : []
     };
 }
-exports.generateSassOptions = generateSassOptions;
-function generateSassOptionsAsync(opts) {
+export function generateSassOptionsAsync(opts) {
     return {
         style: opts.style,
         loadPaths: opts.loadPath ? opts.loadPath.split(',') : [],
         sourceMap: opts.sourceMap === false ? false : true,
         sourceMapIncludeSources: opts.sourceMap === false ? false : true,
-        importers: opts.pkgImporter === 'node' ? [new sass_embedded_1.NodePackageImporter()] : [],
+        importers: opts.pkgImporter === 'node' ? [new NodePackageImporter()] : [],
         silenceDeprecations: opts.silenceDeprecation ? opts.silenceDeprecation.split(',') : []
     };
 }
-exports.generateSassOptionsAsync = generateSassOptionsAsync;
+//# sourceMappingURL=configs.js.map

package/dist/fileFinder.js

@@ -1,18 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDestinationPath = exports.getAllFilesPathsFromSources = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const glob_1 = require("glob");
-function getAllFilesPathsFromSources(input, callback) {
+import fs from 'fs';
+import path from 'path';
+import { globSync } from 'glob';
+export function getAllFilesPathsFromSources(input, callback) {
     let sourcesCompleted = 0;
     let filePaths = [];
     for (let i = 0; i < input.length; i++) {
-        const result = (0, glob_1.globSync)(input[i], { withFileTypes: true });
-        if (result.length === 1 && result[0].isDirectory()) {
+        const result = globSync(input[i], { withFileTypes: true });
+        // If user has supplied a directory, we do an extra step and read all files from directory.
+        if (result.length === 1 && result[0] && result[0].isDirectory()) {
             try {
                 getAllFilePathsInDir(input[i], (files) => {
                     filePaths.push(...files);
@@ -29,7 +24,7 @@ function getAllFilesPathsFromSources(input, callback) {
         else {
             for (const entry of result) {
                 if (entry.isFile()) {
-                    filePaths.push(path_1.default.normalize(entry.relative()));
+                    filePaths.push(path.normalize(entry.relative()));
                 }
             }
             sourcesCompleted++;
@@ -39,17 +34,16 @@ function getAllFilesPathsFromSources(input, callback) {
         }
     }
 }
-exports.getAllFilesPathsFromSources = getAllFilesPathsFromSources;
 function getAllFilePathsInDir(dir, callback) {
     let files = [];
-    fs_1.default.readdir(dir, (err, nodes) => {
+    fs.readdir(dir, (err, nodes) => {
         if (err) {
             throw err;
         }
         else {
             nodes.forEach((file) => {
-                let fullname = path_1.default.join(dir, file);
-                if (!fs_1.default.lstatSync(fullname).isDirectory()) {
+                let fullname = path.join(dir, file);
+                if (!fs.lstatSync(fullname).isDirectory()) {
                     files.push(fullname);
                 }
             });
@@ -57,7 +51,13 @@ function getAllFilePathsInDir(dir, callback) {
         }
     });
 }
-function buildDestinationPath(fileName, outFile = '', dir = '', base = '', extension = '.css', usingStdin) {
+// TODO: returning a blank string seems super messy, this could use a refactor.
+/**
+ *
+ * @param filename
+ * @returns path, or a blank string if the combination of options provided does not give a valid path.
+ */
+export function buildDestinationPath(fileName, outFile = '', dir = '', base = '', extension = '.css', usingStdin) {
     let destination = '';
     let mirror = '';
     if (usingStdin === true) {
@@ -71,9 +71,9 @@ function buildDestinationPath(fileName, outFile = '', dir = '', base = '', exten
     else {
         if (dir.length > 0) {
             if (base.length > 0) {
-                mirror = path_1.default.dirname(fileName.replace(path_1.default.join(base, '/'), ''));
+                mirror = path.dirname(fileName.replace(path.join(base, '/'), ''));
             }
-            destination = path_1.default.join(dir, mirror, path_1.default.basename(fileName, path_1.default.extname(fileName)) + extension);
+            destination = path.join(dir, mirror, path.basename(fileName, path.extname(fileName)) + extension);
         }
         else if (outFile.length > 0) {
             destination = outFile;
@@ -84,4 +84,4 @@ function buildDestinationPath(fileName, outFile = '', dir = '', base = '', exten
     }
     return destination;
 }
-exports.buildDestinationPath = buildDestinationPath;
+//# sourceMappingURL=fileFinder.js.map

package/dist/index.js

@@ -1,310 +1,279 @@
 #!/usr/bin/env node
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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 });
-const commander_1 = require("commander");
-const chokidar_1 = __importDefault(require("chokidar"));
-const picocolors_1 = __importDefault(require("picocolors"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const sass_embedded_1 = require("sass-embedded");
-const postcss_1 = __importDefault(require("postcss"));
-const configs = __importStar(require("./configs"));
-const fileFinder = __importStar(require("./fileFinder"));
-const sources = __importStar(require("./sources"));
-const glob_1 = require("glob");
-const sheetloaf = new commander_1.Command();
-sheetloaf.version("1.26.0", '-v, --version', 'Print the version of Sheetloaf.');
-let usingStdin = false;
+import chokidar from 'chokidar';
+import color from 'picocolors';
+import { Command } from 'commander';
+import fs from 'fs';
+import { globSync } from 'glob';
+import postcss from 'postcss';
+import path from 'path';
+import { initCompiler, initAsyncCompiler } from 'sass-embedded';
+import * as configs from "./configs.js";
+import * as fileFinder from "./fileFinder.js";
+import * as sources from "./sources.js";
+const sheetloaf = new Command();
+sheetloaf.version("1.26.1", '-v, --version', 'Print the version of Sheetloaf.');
 let postcssConfig = {
     plugins: []
 };
-let sassCompiler;
-let sassAsyncCompiler;
-sheetloaf
-    .arguments('[sources...]')
-    .description('📃🍞 Compile Sass to CSS and transform the output using PostCSS, all in one command.')
-    .action((source) => __awaiter(void 0, void 0, void 0, function* () {
-    if (sheetloaf.opts().use) {
-        postcssConfig = configs.generatePostcssConfigFromUse(sheetloaf.opts().use);
-    }
-    else {
-        postcssConfig = configs.generatePostcssConfigFromFile(sheetloaf.opts().config);
-    }
-    if (sheetloaf.opts().async === true) {
-        sassAsyncCompiler = yield (0, sass_embedded_1.initAsyncCompiler)();
+class CompWrapper {
+    initialized = false;
+    usingStdin = false;
+    source;
+    entries;
+    options;
+    compiler = {};
+    init(options, source = "") {
+        this.options = options;
+        this.source = source;
+        return new Promise((resolve, reject) => {
+            if (this.source.length > 0) {
+                fileFinder.getAllFilesPathsFromSources(this.source.split(','), (entries) => {
+                    this.entries = entries;
+                    if (this.entries.length > 0 && this.entries[0]) {
+                        this.usingStdin = false;
+                    }
+                    else {
+                        this.usingStdin = true;
+                    }
+                    if (this.options.async === true) {
+                        initAsyncCompiler().then((compiler) => {
+                            this.compiler.async = compiler;
+                            this.initialized = true;
+                            resolve("Compiler initialized.");
+                        }).catch((e) => {
+                            reject(e);
+                        });
+                    }
+                    else {
+                        this.compiler.sync = initCompiler();
+                        this.initialized = true;
+                        resolve("Compiler initialized.");
+                    }
+                });
+            }
+        });
     }
-    else {
-        sassCompiler = (0, sass_embedded_1.initCompiler)();
+    dispose() {
+        if (this.initialized) {
+            this.compiler.async?.dispose();
+            this.compiler.sync?.dispose();
+        }
+        else {
+            throw 'Compiler not initialized, therefore could not dispose.';
+        }
     }
-    if (source.length > 0) {
-        renderAllFiles(source);
-        watch(source);
+    watch() {
+        if (this.source.length > 0) {
+            const toWatch = globSync(this.source.split(','));
+            chokidar
+                .watch(toWatch, {
+                usePolling: this.options.poll !== undefined,
+                interval: typeof this.options.poll === 'number' ? this.options.poll : 100,
+                ignoreInitial: true,
+                awaitWriteFinish: {
+                    stabilityThreshold: 1500,
+                    pollInterval: 100
+                }
+            })
+                .on('change', (changed) => {
+                console.log(`File changed: ${changed}`);
+                this.getFilesToRender(changed).then((filesToRender) => {
+                    filesToRender.forEach((fileName) => {
+                        this.render(fileName);
+                    });
+                });
+            })
+                .on('add', (added) => {
+                console.log(`File added: ${added}`);
+                // Clear out old info.
+                sources.clearSourcesChecker();
+                this.renderAll();
+            });
+        }
     }
-    else if (!process.stdin.isTTY) {
-        let stdin = '';
-        process.stdin.on('readable', () => {
-            var chunk = process.stdin.read();
-            if (chunk !== null) {
-                stdin += chunk;
+    render(fileNameOrString = '') {
+        return new Promise((resolve, reject) => {
+            if (this.usingStdin === false) {
+                console.log(`Rendering ${fileNameOrString}...`);
             }
-        });
-        process.stdin.on('end', () => {
-            usingStdin = true;
-            renderSassFromStdin(stdin);
+            const destination = fileFinder.buildDestinationPath(fileNameOrString, this.options.output, this.options.dir, this.options.base, this.options.ext, this.usingStdin);
+            this.renderSass(fileNameOrString).then((sassResult) => {
+                this.renderPost(fileNameOrString, destination, sassResult).then((postedResult) => {
+                    this.writeOut(postedResult, destination).then(() => {
+                        resolve("File rendered and written successfully.");
+                    });
+                }).catch((err) => {
+                    if (destination !== '') {
+                        console.log(color.red(err));
+                    }
+                    else {
+                        process.stderr.write(err);
+                    }
+                    resolve("Error in file.");
+                });
+            }).catch((e) => {
+                this.sassErrorOut(e, destination);
+                resolve("Error in file.");
+            });
         });
     }
-}));
-sheetloaf
-    .option('-o, --output <LOCATION>', 'Output file.')
-    .option('--dir <LOCATION>', 'Output directory.')
-    .option('--base <DIR>', 'Mirror the directory structure relative to this path in the output directory, for use with --dir.', '')
-    .option('--ext <EXTENSION>', 'Override the output file extension; for use with --dir', '.css')
-    .option('-s, --style <NAME>', 'Output style. ["expanded", "compressed"]', 'expanded')
-    .option('--source-map', 'Generate a source map (this is the default option).')
-    .option('--no-source-map', 'Do not generate a source map.')
-    .option('--embed-source-map', 'Embed the contents of the source map file in the generated CSS, rather than creating a separate file and linking to it from the CSS.')
-    .option('--embed-sources', 'Embed the entire contents of the Sass files that contributed to the generated CSS in the source map.')
-    .option('--source-map-urls <TYPE>', 'Controls how the source maps that Sass generates link back to the Sass files that contributed to the generated CSS. ["relative", "absolute"]', 'relative')
-    .option('--error-css', 'Emit a CSS file when an error occurs during compilation (this is the default option).')
-    .option('--no-error-css', 'Do not emit a CSS file when an error occurs during compilation.')
-    .option('--silence-deprecation <TYPE>', 'This option tells Sass to silence a particular type of deprecation.')
-    .option('-I, --load-path <PATHS>', 'Adds an additional load path for Sass to look for stylesheets.')
-    .option('-p, --pkg-importer <TYPE>', `Built-in importer(s) to use for pkg: URLs.\n[node] - Load files like Node.js package resolution.`)
-    .option('-w, --watch', 'Watch stylesheets and recompile when they change.')
-    .option('--config <LOCATION>', 'Set a custom directory to look for a postcss config file.')
-    .option('--poll [DURATION]', 'Use polling for file watching. Can optionally pass polling interval; default 100 ms')
-    .option('-u, --use <PLUGINS>', 'List of postcss plugins to use. Will cause sheetloaf to ignore any config files.')
-    .option('--async', `Use sass' asynchronous API. This may be slower.`);
-sheetloaf.parse(process.argv);
-function renderAllFiles(source) {
-    fileFinder.getAllFilesPathsFromSources(source[0].split(','), function (entries) {
-        entries.forEach(function (fileName) {
-            if (path_1.default.basename(fileName).charAt(0) !== '_') {
-                renderSass(fileName);
-            }
+    renderAll() {
+        return new Promise((resolve, reject) => {
+            const filesToRender = this.entries.filter((fileName) => path.basename(fileName).charAt(0) !== '_');
+            let rendered = 0;
+            filesToRender.forEach((fileName) => {
+                this.render(fileName).then(() => {
+                    rendered++;
+                    if (rendered == filesToRender.length) {
+                        resolve("All files rendered");
+                    }
+                });
+            });
         });
-    });
-}
-function renderPartially(source, fileName) {
-    if (path_1.default.basename(fileName).charAt(0) !== '_') {
-        renderSass(fileName);
     }
-    else {
-        let partialExistsInSassSources = false;
-        let ind = 0;
-        while (ind < sources.getChecker().length) {
-            const toCheck = sources.getChecker()[ind];
-            if (toCheck.containsPartial(fileName)) {
-                partialExistsInSassSources = true;
-                renderSass(toCheck.getMain());
+    renderSass(fileNameOrString) {
+        return new Promise((resolve, reject) => {
+            if (this.compiler.async) {
+                const options = configs.generateSassOptionsAsync(this.options);
+                if (this.usingStdin === false) {
+                    this.compiler.async.compileAsync(fileNameOrString, options).then((result) => {
+                        sources.addResultToSourcesChecker(fileNameOrString, result);
+                        resolve(result);
+                    }).catch((err) => {
+                        reject(err);
+                    });
+                }
+                else {
+                    this.compiler.async.compileStringAsync(fileNameOrString, options).then((result) => {
+                        resolve(result);
+                    }).catch((err) => {
+                        reject(err);
+                    });
+                }
             }
-            ind = ind + 1;
-        }
-        if (partialExistsInSassSources === false) {
-            sources.clearSourcesChecker();
-            renderAllFiles(source);
-        }
-    }
-}
-function watch(source) {
-    if (sheetloaf.opts().watch === true) {
-        const toWatch = (0, glob_1.globSync)(source[0].split(','));
-        chokidar_1.default
-            .watch(toWatch, {
-            usePolling: sheetloaf.opts().poll !== undefined,
-            interval: typeof sheetloaf.opts().poll === 'number' ? sheetloaf.opts().poll : 100,
-            ignoreInitial: true,
-            awaitWriteFinish: {
-                stabilityThreshold: 1500,
-                pollInterval: 100
+            else if (this.compiler.sync) {
+                try {
+                    const options = configs.generateSassOptions(this.options);
+                    if (this.usingStdin === false) {
+                        const result = this.compiler.sync.compile(fileNameOrString, options);
+                        sources.addResultToSourcesChecker(fileNameOrString, result);
+                        resolve(result);
+                    }
+                    else {
+                        const result = this.compiler.sync.compile(fileNameOrString, options);
+                        resolve(result);
+                    }
+                }
+                catch (err) {
+                    reject(err);
+                }
             }
-        })
-            .on('change', (changed) => {
-            console.log(`File changed: ${changed}`);
-            renderPartially(source, changed);
-        })
-            .on('add', (added) => {
-            console.log(`File added: ${added}`);
-            sources.clearSourcesChecker();
-            renderAllFiles(source);
         });
     }
-}
-function renderSass(fileName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log(`Rendering ${fileName}...`);
-        const destination = fileFinder.buildDestinationPath(fileName, sheetloaf.opts().output, sheetloaf.opts().dir, sheetloaf.opts().base, sheetloaf.opts().ext, usingStdin);
-        try {
-            if (sheetloaf.opts().async === true) {
-                const options = configs.generateSassOptionsAsync(sheetloaf.opts());
-                const result = yield sassAsyncCompiler.compileAsync(fileName, options);
-                renderPost(fileName, destination, result);
-                sources.addResultToSourcesChecker(fileName, result);
-            }
-            else {
-                const options = configs.generateSassOptions(sheetloaf.opts());
-                const result = sassCompiler.compile(fileName, options);
-                renderPost(fileName, destination, result);
-                sources.addResultToSourcesChecker(fileName, result);
+    renderPost(fileNameOrString, destination, sassResult) {
+        return new Promise((resolve, reject) => {
+            let postcssMapOptions = {
+                annotation: true,
+                prev: sassResult.sourceMap,
+                inline: this.options.embedSourceMap === true ? true : false,
+                absolute: this.options.sourceMapUrls === 'absolute' ? true : false,
+                sourcesContent: this.options.embedSources === true ? true : false,
+            };
+            if (this.usingStdin === true || this.options.sourceMap === false) {
+                postcssMapOptions = false;
             }
-        }
-        catch (e) {
-            sassErrorCatcher(e, destination);
-        }
-    });
-}
-function renderSassFromStdin(text) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const destination = fileFinder.buildDestinationPath('', sheetloaf.opts().output, sheetloaf.opts().dir, sheetloaf.opts().base, sheetloaf.opts().ext, usingStdin);
-        try {
-            if (sheetloaf.opts().async === true) {
-                const options = configs.generateSassOptionsAsync(sheetloaf.opts());
-                const result = yield sassAsyncCompiler.compileStringAsync(text, options);
-                renderPost('', destination, result);
+            postcss(postcssConfig.plugins)
+                .process(sassResult.css.toString(), {
+                from: fileNameOrString,
+                to: destination,
+                map: postcssMapOptions
+            })
+                .then((postedResult) => {
+                resolve(postedResult);
+            })
+                .catch((err) => {
+                reject(err);
+            });
+        });
+    }
+    getFilesToRender(fileChanged) {
+        return new Promise((resolve, reject) => {
+            let filesToRender = [];
+            if (path.basename(fileChanged).charAt(0) !== '_') {
+                filesToRender.push(fileChanged);
+                resolve(filesToRender);
             }
             else {
-                const options = configs.generateSassOptions(sheetloaf.opts());
-                const result = sassCompiler.compileString(text, options);
-                renderPost('', destination, result);
+                let partialExistsInSassSources = false;
+                let ind = 0;
+                while (ind < sources.getChecker().length) {
+                    const toCheck = sources.getChecker()[ind];
+                    if (toCheck?.containsPartial(fileChanged)) {
+                        partialExistsInSassSources = true;
+                        filesToRender.push(toCheck.getMain());
+                    }
+                    ind = ind + 1;
+                }
+                if (partialExistsInSassSources === false) {
+                    // SassSources are built with sass's CompileResult object when
+                    // sheetloaf initially runs. However, if compilation fails, the 
+                    // SassSource will not be generated for that particular file.
+                    // That means if a partial is later fixed to not error out and
+                    // it will not render at all.
+                    // We therefore check for this condition and rebuild everything
+                    // if it doesn't exist.
+                    sources.clearSourcesChecker();
+                    fileFinder.getAllFilesPathsFromSources(this.source.split(','), (entries) => {
+                        entries.forEach((entry) => {
+                            filesToRender.push(entry);
+                            resolve(filesToRender);
+                        });
+                    });
+                }
+                else {
+                    resolve(filesToRender);
+                }
             }
-        }
-        catch (e) {
-            sassErrorCatcher(e, destination);
-        }
-    });
-}
-function renderPost(fileName, destination, sassResult) {
-    let postcssMapOptions = {
-        annotation: true,
-        prev: sassResult.sourceMap,
-        inline: sheetloaf.opts().embedSourceMap === true ? true : false,
-        absolute: sheetloaf.opts().sourceMapUrls === 'absolute' ? true : false,
-        sourcesContent: sheetloaf.opts().embedSources === true ? true : false,
-    };
-    if (usingStdin === true || sheetloaf.opts().sourceMap === false) {
-        postcssMapOptions = false;
-    }
-    (0, postcss_1.default)(postcssConfig.plugins)
-        .process(sassResult.css.toString(), {
-        from: fileName,
-        to: destination,
-        map: postcssMapOptions
-    })
-        .then((postedResult) => {
-        postedResult.warnings().forEach((warn) => {
-            process.stderr.write(warn.toString());
         });
+    }
+    sassErrorOut(e, destination) {
         if (destination !== '') {
+            console.log(e.message);
             try {
-                fs_1.default.mkdirSync(path_1.default.dirname(destination), {
+                fs.mkdirSync(path.dirname(destination), {
                     recursive: true
                 });
             }
-            catch (err) {
-                if (err.code !== 'EEXIST' || err.code !== 'EISDIR')
-                    throw err;
+            catch (mkDirErr) {
+                if (mkDirErr.code !== 'EEXIST' || mkDirErr.code !== 'EISDIR')
+                    throw mkDirErr;
             }
-            fs_1.default.writeFile(destination, postedResult.css, (err) => {
-                if (err) {
-                    console.log(err);
-                }
-                else {
-                    console.log(picocolors_1.default.green(`Successfully written to ${destination}`));
-                }
-            });
-            if (postedResult.map) {
-                fs_1.default.writeFile(destination + '.map', postedResult.map.toString(), (err) => {
-                    if (err)
-                        throw err;
+            if (this.options.errorCss !== false) {
+                fs.writeFile(destination, this.emitSassError(e), (writeFileErr) => {
+                    // throws an error, you could also catch it here
+                    if (writeFileErr)
+                        throw writeFileErr;
+                    // success case, the file was saved
+                    console.log(color.yellow(`Emitted error to ${destination}`));
                 });
             }
         }
         else {
-            process.stdout.write(postedResult.css);
-            if (!sheetloaf.opts().watch) {
-                process.exit();
-            }
-        }
-    })
-        .catch((err) => {
-        if (destination !== '') {
-            console.log(picocolors_1.default.red(err));
-        }
-        else {
-            process.stderr.write(err);
-        }
-        if (!sheetloaf.opts().watch) {
-            process.exit();
-        }
-    });
-}
-function sassErrorCatcher(e, destination) {
-    if (destination !== '') {
-        console.log(e.message);
-        try {
-            fs_1.default.mkdirSync(path_1.default.dirname(destination), {
-                recursive: true
-            });
+            process.stderr.write(e.message);
         }
-        catch (mkDirErr) {
-            if (mkDirErr.code !== 'EEXIST' || mkDirErr.code !== 'EISDIR')
-                throw mkDirErr;
+        if (this.options.watch && (process.exitCode == null || process.exitCode === 0)) {
+            process.exitCode = 1;
         }
-        if (sheetloaf.opts().errorCss !== false) {
-            fs_1.default.writeFile(destination, emitSassError(e), (writeFileErr) => {
-                if (writeFileErr)
-                    throw writeFileErr;
-                console.log(picocolors_1.default.yellow(`Emitted error to ${destination}`));
-            });
-        }
-    }
-    else {
-        process.stderr.write(e.message);
-    }
-    if (!sheetloaf.opts().watch && (process.exitCode == null || process.exitCode === 0)) {
-        process.exitCode = 1;
-        process.exit();
     }
-}
-function emitSassError(err) {
-    const message = err.sassMessage.toString().replace(/"/g, "'").replace(/\n/g, " ");
-    const context = err.span.context.toString().replace(/"/g, "'").replace(/\n/g, " ");
-    let css = `
+    /**
+     * Build a new CSS file that contains the error and puts its content in the body.
+     * @param {*} err
+     */
+    emitSassError(err) {
+        // Sanitize message so that it fits in a content attribute.
+        const message = err.sassMessage.toString().replace(/"/g, "'").replace(/\n/g, " ");
+        const context = err.span.context.toString().replace(/"/g, "'").replace(/\n/g, " ");
+        let css = `
         body:before { 
             content: "Error at line ${err.span.start.line} in ${err.span.url.pathname}";
             display: table;
@@ -327,5 +296,115 @@ function emitSassError(err) {
         }
         body * { display: none; }
     `;
-    return css;
+        return css;
+    }
+    writeOut(postedResult, destination) {
+        return new Promise((resolve, reject) => {
+            postedResult.warnings().forEach((warn) => {
+                process.stderr.write(warn.toString());
+            });
+            if (destination !== '') {
+                try {
+                    fs.mkdirSync(path.dirname(destination), {
+                        recursive: true
+                    });
+                }
+                catch (err) {
+                    if (err.code !== 'EEXIST' || err.code !== 'EISDIR')
+                        throw err;
+                }
+                fs.writeFile(destination, postedResult.css, (err) => {
+                    if (err) {
+                        console.log(err);
+                    }
+                    else {
+                        // success case, the file was saved
+                        console.log(color.green(`Successfully written to ${destination}`));
+                        resolve("Written to file.");
+                    }
+                });
+                if (postedResult.map) {
+                    fs.writeFile(destination + '.map', postedResult.map.toString(), (err) => {
+                        if (err) {
+                            throw err;
+                        }
+                        else {
+                            resolve("Written to file.");
+                        }
+                        ;
+                    });
+                }
+            }
+            else {
+                process.stdout.write(postedResult.css);
+                resolve("Written to file.");
+            }
+        });
+    }
 }
+sheetloaf
+    .arguments('[sources...]')
+    .description('📃🍞 Compile Sass to CSS and transform the output using PostCSS, all in one command.')
+    .action((source) => {
+    //If user specifies --use, we ignore postcss config files.
+    if (sheetloaf.opts().use) {
+        postcssConfig = configs.generatePostcssConfigFromUse(sheetloaf.opts().use);
+    }
+    else {
+        postcssConfig = configs.generatePostcssConfigFromFile(sheetloaf.opts().config);
+    }
+    const compiler = new CompWrapper();
+    // If source is provided, we ignore pipes.
+    if (source.length > 0 && source[0]) {
+        compiler.init(sheetloaf.opts(), source[0]).then(() => {
+            compiler.renderAll().then(() => {
+                if (sheetloaf.opts().watch) {
+                    compiler.watch();
+                }
+                else {
+                    compiler.dispose();
+                }
+            });
+        });
+    }
+    else if (!process.stdin.isTTY) {
+        compiler.init(sheetloaf.opts).then(() => {
+            //see github.com/tj/commander.js/issues/137
+            let stdin = '';
+            process.stdin.on('readable', () => {
+                var chunk = process.stdin.read();
+                if (chunk !== null) {
+                    stdin += chunk;
+                }
+            });
+            process.stdin.on('end', () => {
+                compiler.render(stdin).then(() => {
+                    compiler.dispose();
+                });
+            });
+        });
+    }
+});
+sheetloaf
+    .option('-o, --output <LOCATION>', 'Output file.')
+    .option('--dir <LOCATION>', 'Output directory.')
+    .option('--base <DIR>', 'Mirror the directory structure relative to this path in the output directory, for use with --dir.', '')
+    .option('--ext <EXTENSION>', 'Override the output file extension; for use with --dir', '.css')
+    .option('-s, --style <NAME>', 'Output style. ["expanded", "compressed"]', 'expanded')
+    .option('--source-map', 'Generate a source map (this is the default option).')
+    .option('--no-source-map', 'Do not generate a source map.')
+    .option('--embed-source-map', 'Embed the contents of the source map file in the generated CSS, rather than creating a separate file and linking to it from the CSS.')
+    .option('--embed-sources', 'Embed the entire contents of the Sass files that contributed to the generated CSS in the source map.')
+    .option('--source-map-urls <TYPE>', 'Controls how the source maps that Sass generates link back to the Sass files that contributed to the generated CSS. ["relative", "absolute"]', 'relative')
+    .option('--error-css', 'Emit a CSS file when an error occurs during compilation (this is the default option).')
+    .option('--no-error-css', 'Do not emit a CSS file when an error occurs during compilation.')
+    .option('--silence-deprecation <TYPE>', 'This option tells Sass to silence a particular type of deprecation.')
+    .option('-I, --load-path <PATHS>', 'Adds an additional load path for Sass to look for stylesheets.')
+    .option('-p, --pkg-importer <TYPE>', `Built-in importer(s) to use for pkg: URLs.\n[node] - Load files like Node.js package resolution.`)
+    .option('-w, --watch', 'Watch stylesheets and recompile when they change.')
+    .option('--config <LOCATION>', 'Set a custom directory to look for a postcss config file.')
+    .option('--poll [DURATION]', 'Use polling for file watching. Can optionally pass polling interval; default 100 ms')
+    .option('-u, --use <PLUGINS>', 'List of postcss plugins to use. Will cause sheetloaf to ignore any config files.')
+    .option('--async', `Use sass' asynchronous API. This may be slower.`);
+sheetloaf.parse(process.argv);
+//# sourceMappingURL=index.js.map

package/dist/sources.js

@@ -1,29 +1,28 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResultToSourcesChecker = exports.clearSourcesChecker = exports.getChecker = exports.SassSources = void 0;
-const path_1 = __importDefault(require("path"));
-const url_1 = require("url");
+import path from "path";
+import {} from "sass-embedded";
+import { fileURLToPath } from "url";
 let sourcesChecker = [];
-class SassSources {
+export class SassSources {
+    absoluteMain;
+    main;
+    sources = [];
     constructor(fileName, sassResult) {
-        this.sources = [];
         this.main = fileName;
-        this.absoluteMain = path_1.default.resolve(fileName);
+        this.absoluteMain = path.resolve(fileName);
         this.setSources(sassResult.loadedUrls);
     }
     setSources(urls) {
         this.sources.splice(0, this.sources.length);
         urls.forEach(url => {
-            if ((0, url_1.fileURLToPath)(url.href) !== this.absoluteMain) {
-                this.sources.push((0, url_1.fileURLToPath)(url.href));
+            if (fileURLToPath(url.href) !== this.absoluteMain) {
+                this.sources.push(fileURLToPath(url.href));
             }
         });
     }
     containsPartial(filename) {
-        if (this.sources.indexOf(path_1.default.resolve(filename)) >= 0) {
+        // FIXME: source paths are a little weird on windows which is making this check
+        // always return false.
+        if (this.sources.indexOf(path.resolve(filename)) >= 0) {
             return true;
         }
         else {
@@ -40,21 +39,18 @@ class SassSources {
         return this.main;
     }
 }
-exports.SassSources = SassSources;
-function getChecker() {
+export function getChecker() {
     return sourcesChecker;
 }
-exports.getChecker = getChecker;
-function clearSourcesChecker() {
+export function clearSourcesChecker() {
     sourcesChecker.splice(0, sourcesChecker.length);
 }
-exports.clearSourcesChecker = clearSourcesChecker;
-function addResultToSourcesChecker(fileName, result) {
+export function addResultToSourcesChecker(fileName, result) {
     let resultExistsInChecker = false;
     let ind = 0;
     while (ind < sourcesChecker.length && resultExistsInChecker === false) {
-        if (sourcesChecker[ind].getAbsoluteMain() === path_1.default.resolve(fileName)) {
-            sourcesChecker[ind].setSources(result.loadedUrls);
+        if (sourcesChecker[ind]?.getAbsoluteMain() === path.resolve(fileName)) {
+            sourcesChecker[ind]?.setSources(result.loadedUrls);
             resultExistsInChecker = true;
         }
         ind = ind + 1;
@@ -63,4 +59,4 @@ function addResultToSourcesChecker(fileName, result) {
         sourcesChecker.push(new SassSources(fileName, result));
     }
 }
-exports.addResultToSourcesChecker = addResultToSourcesChecker;
+//# sourceMappingURL=sources.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sheetloaf",
-	"version": "1.26.0-beta.2",
+	"version": "1.26.1-beta.0",
 	"description": "freshmade stylesheets for the whole family.",
 	"main": "./dist/index.js",
 	"bin": {
@@ -21,12 +21,14 @@
 	"files": [
 		"dist/*.js"
 	],
+
 	"keywords": [
 		"scss",
 		"css",
 		"sass",
 		"processor"
 	],
+	"type": "module",
 	"author": "Benjamin Richardson",
 	"license": "MIT",
 	"bugs": {
@@ -42,7 +44,7 @@
 		"postcss": "^8.5.15",
 		"postcss-custom-properties": "^13.3.10",
 		"ts-node": "^10.9.2",
-		"typescript": "^4.7.4"
+		"typescript": "^6.0.3"
 	},
 	"peerDependencies": {
 		"postcss": "^8.5.15"