auklet 0.0.14 → 0.0.15

package/dist/css/core/styleProcessor.d.ts

@@ -11,6 +11,7 @@ export declare class StyleProcessor {
   appendStyleContent(target: Root, content: string, from: string): void;
   readStyleFile(stylePath: string, seen?: Set<string>): string;
   collectImportedStyleFiles(styleFiles: Array<string>): Set<string>;
+  collectStyleImportSpecifiers(styleFiles: Array<string>): Set<string>;
   private parse;
   private parseImportSpecifier;
 }

package/dist/css/core/styleProcessor.js

@@ -78,6 +78,18 @@ export class StyleProcessor {
     }
     return imported;
   }
+  collectStyleImportSpecifiers(styleFiles) {
+    const specifiers = new Set();
+    for (const styleFile of styleFiles) {
+      const css = fs.readFileSync(styleFile, 'utf8');
+      const root = this.parse(css, styleFile);
+      root.walkAtRules('import', (rule) => {
+        const specifier = this.parseImportSpecifier(rule.params);
+        if (specifier) specifiers.add(specifier);
+      });
+    }
+    return specifiers;
+  }
   parse(code, from) {
     // Keep parsing behind one method so future style languages can transform
     // to CSS before PostCSS reads the final stylesheet.

package/dist/css/production/format/componentWriter.js

@@ -21,8 +21,16 @@ export class ComponentStyleEntryWriter {
         this.config.output.styleDir,
       );
       const target = path.join(styleDir, this.config.output.indexStyleFile);
+      const ownImports = this.styleProcessor.collectStyleImportSpecifiers(
+        entry.ownStyleFiles,
+      );
       const sourceStyleSpecifiers = [
-        ...this.getModuleStyleSpecifiers(entry.moduleStyleImports, styleDir),
+        ...this.getModuleStyleSpecifiers(
+          entry.moduleStyleImports.filter(
+            (specifier) => !ownImports.has(specifier),
+          ),
+          styleDir,
+        ),
         ...this.getOwnStyleSpecifiers(entry.ownStyleFiles, styleDir, outRoot),
       ];
       const root = this.styleProcessor.createRoot();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auklet",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "type": "module",
   "author": "chentao.arthur",
   "packageManager": "pnpm@10.27.0",