forgecss 0.1.3 → 0.1.5

package/cli.js

@@ -31,7 +31,7 @@ async function runForgeCSS(lookAtPath = null) {
     // The very first run
     config = await loadConfig(options.config);
     if (options.watch) {
-      const watcher = chokidar.watch([config.styles.sourceDir, config.ui.sourceDir], {
+      const watcher = chokidar.watch(config.source, {
         persistent: true,
         ignoreInitial: true,
         ignored: (p, stats) => {
@@ -52,7 +52,11 @@ async function runForgeCSS(lookAtPath = null) {
       }
     }
   }
-  ForgeCSS(config).parse(lookAtPath);
+  ForgeCSS(config).parse(lookAtPath).then(() => {
+    if (options.verbose) {
+      console.log(`forgecss: CSS generation at ${config.output} completed.`);
+    }
+  });
 }
 
 runForgeCSS();

package/index.d.ts

@@ -1,13 +1,8 @@
 export type ForgeCSSOptions = {
-  styles: {
-    sourceDir: string;
-    match?: string[];
-  };
-  ui: {
-    sourceDir: string;
-    match?: string[];
-    attributes?: string[];
-  };
+  source: string;
+  stylesMatch?: string[];
+  declarationsMatch?: string[];
+  declarationsMatchAttributes?: string[];
   mapping: {
     queries: {
       [key: string]: {
@@ -15,7 +10,7 @@ export type ForgeCSSOptions = {
       };
     };
   };
-  output: string
+  output: string;
 };
 
 export default function forgecss(options?: ForgeCSSOptions): {

package/index.js

@@ -1,18 +1,13 @@
 import getAllFiles from "./lib/getAllFiles.js";
 import { extractStyles } from "./lib/styles.js";
-import { deleteDeclarations, extractDeclarations, getDeclarations } from "./lib/processFile.js";
+import { deleteDeclarations, extractDeclarations } from "./lib/processFile.js";
 import { generateOutputCSS } from "./lib/generator.js";
 
 const DEFAULT_OPTIONS = {
-  styles: {
-    sourceDir: null,
-    match: ['css']
-  },
-  ui: {
-    sourceDir: null,
-    match: ["html", "jsx", "tsx"],
-    attribute: ['class', 'className']
-  },
+  source: null,
+  stylesMatch: ['css', 'less', 'scss'],
+  declarationsMatch: ['html', 'jsx', 'tsx'],
+  declarationsMatchAttributes: ['class', 'className'],
   mapping: {
     queries: {}
   },
@@ -22,16 +17,11 @@ const DEFAULT_OPTIONS = {
 export default function forgecss(options = { styles: {}, ui: {}, mapping: {}, output: null }) {
   const config = { ...DEFAULT_OPTIONS };
 
-  config.styles = Object.assign({}, DEFAULT_OPTIONS.styles, options.styles || {});
-  config.ui = Object.assign({}, DEFAULT_OPTIONS.ui, options.ui || {});
   config.mapping = Object.assign({}, DEFAULT_OPTIONS.mapping, options.mapping || {});
   config.output = options.output || DEFAULT_OPTIONS.output;
 
-  if (!config.styles.sourceDir) {
-    throw new Error('forgecss: "styles.sourceDir" option is required.');
-  }
-  if (!config.ui.sourceDir) {
-    throw new Error('forgecss: "ui.sourceDir" option is required.');
+  if (!config.source) {
+    throw new Error('forgecss: "source" option is required.');
   }
   if (!config.output) {
     throw new Error('forgecss: "output" option is required.');
@@ -42,11 +32,11 @@ export default function forgecss(options = { styles: {}, ui: {}, mapping: {}, ou
       // fetching the styles
       try {
         if (lookAtPath) {
-          if (config.styles.match.includes(lookAtPath.split('.').pop().toLowerCase())) {
+          if (config.stylesMatch.includes(lookAtPath.split(".").pop().toLowerCase())) {
             await extractStyles(lookAtPath);
           }
         } else {
-          let files = await getAllFiles(config.styles.sourceDir, config.styles.match);
+          let files = await getAllFiles(config.source, config.stylesMatch);
           for (let file of files) {
             await extractStyles(file);
           }
@@ -57,12 +47,12 @@ export default function forgecss(options = { styles: {}, ui: {}, mapping: {}, ou
       // fetching the declarations
       try {
         if (lookAtPath) {
-          if (config.ui.match.includes(lookAtPath.split('.').pop().toLowerCase())) {
+          if (config.declarationsMatch.includes(lookAtPath.split('.').pop().toLowerCase())) {
             deleteDeclarations(lookAtPath);
             await extractDeclarations(lookAtPath);
           }
         } else {
-          let files = await getAllFiles(config.ui.sourceDir, config.ui.match);
+          let files = await getAllFiles(config.source, config.declarationsMatch);
           for (let file of files) {
             await extractDeclarations(file);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgecss",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "description": "ForgeCSS turns strings into fully generated responsive CSS using a custom DSL.",
   "author": "Krasimir Tsonev",