Merge pull request #104 from npavlov/combine-imported-styles

feat: combine classes from imported styles

Author: Quramy

src/file-system-loader.ts

@@ -68,8 +68,25 @@ export default class FileSystemLoader {
     }
 
     const { injectableSource, exportTokens } = await this.core.load(source, rootRelativePath, trace, this.fetch.bind(this));
+
+    const re = new RegExp(/@import\s'(\D+?.css)';/, 'gm');
+
+    let importTokens: Core.ExportTokens = {};
+
+    let result;
+
+    while (result = re.exec(injectableSource)) {
+      const importFile = result?.[1];
+
+      if  (importFile)  {
+        const localTokens = await this.fetch(importFile, rootRelativePath, undefined, initialContents);
+
+        Object.assign(importTokens, localTokens);
+      }
+    }
+
     this.sources[trace] = injectableSource;
     this.tokensByFile[fileRelativePath] = exportTokens;
-    return exportTokens;
+    return {...exportTokens, ...importTokens};
   }
 }

test/combined/combined.css

@@ -0,0 +1,6 @@
+@import './imported.css';
+@import '../composee.css';
+
+.block {
+    display: block;
+}

test/combined/imported.css

@@ -0,0 +1,3 @@
+.myClass {
+    display: block;
+}

test/dts-creator.spec.ts

@@ -51,6 +51,15 @@ describe('DtsCreator', () => {
           done();
         });
     });
+    it('returns DtsContent instance combined css', done => {
+      creator.create('test/combined/combined.css').then(content => {
+          assert.equal(content.contents.length, 3);
+          assert.equal(content.contents[0], 'readonly "block": string;');
+          assert.equal(content.contents[1], 'readonly "myClass": string;');
+          assert.equal(content.contents[2], 'readonly "box": string;');
+          done();
+      });
+    });
   });
 
   describe('#modify path', () => {