auklet 0.2.6 → 0.2.7

package/dist/css/vite/moduleGraph/styleCodeFactory.d.ts

@@ -16,4 +16,7 @@ export declare class StyleCodeFactory {
     private toDevExternalStyleSpecifier;
     private parsePackageStyleIdInRequest;
     private withDependencyPackage;
+    private normalizeTopLevelImports;
+    private isTopLevelImportRule;
+    private isImportPreludeNode;
 }

package/dist/css/vite/moduleGraph/styleCodeFactory.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import postcss from 'postcss';
 import { mergeLoadResults } from '#auklet/css/vite/moduleGraph/loadResult';
 import { parsePackageStyleId } from '#auklet/css/vite/moduleGraph/styleId';
 import { toDevDependencyImportSpecifier } from '#auklet/css/vite/moduleGraph/devDependency';
@@ -12,7 +13,7 @@ export class StyleCodeFactory {
         this.config = config;
     }
     async createPackageStyleCode(parsed, cache) {
-        return cache.getLoadResult(parsed, () => this.createUncachedPackageStyleCode(parsed, cache));
+        return cache.getLoadResult(parsed, async () => this.normalizeTopLevelImports(await this.createUncachedPackageStyleCode(parsed, cache)));
     }
     async createUncachedPackageStyleCode(parsed, cache) {
         const context = await cache.getContext(parsed);
@@ -43,7 +44,7 @@ export class StyleCodeFactory {
         else {
             result = await this.createSourceModuleStyleCode(context, cache, parsed.stylePath);
         }
-        return cache.writePersistentLoadResult(parsed, context, result);
+        return cache.writePersistentLoadResult(parsed, context, this.normalizeTopLevelImports(result));
     }
     async createStyleCode(context, cache) {
         const results = [];
@@ -214,4 +215,65 @@ export class StyleCodeFactory {
             dependencyPackages: Array.from(new Set([packageName, ...(result.dependencyPackages ?? [])])),
         };
     }
+    normalizeTopLevelImports(result) {
+        if (!result.code.includes('@import'))
+            return result;
+        const lateImports = [];
+        const removedImports = [];
+        const seenImportParams = new Set();
+        const root = postcss.parse(result.code);
+        let hasChanges = false;
+        let hasSeenStyleNode = false;
+        for (const node of root.nodes ?? []) {
+            if (this.isImportPreludeNode(node))
+                continue;
+            if (this.isTopLevelImportRule(node)) {
+                if (seenImportParams.has(node.params)) {
+                    hasChanges = true;
+                    removedImports.push(node);
+                    continue;
+                }
+                seenImportParams.add(node.params);
+                if (hasSeenStyleNode) {
+                    hasChanges = true;
+                    lateImports.push(node.clone());
+                    removedImports.push(node);
+                }
+                continue;
+            }
+            hasSeenStyleNode = true;
+        }
+        if (!hasChanges)
+            return result;
+        for (const node of removedImports) {
+            node.remove();
+        }
+        const firstStyleNode = root.nodes?.find((node) => !this.isImportPreludeNode(node) && !this.isTopLevelImportRule(node));
+        if (firstStyleNode) {
+            for (const rule of lateImports) {
+                firstStyleNode.before(rule);
+            }
+        }
+        else {
+            for (const rule of lateImports) {
+                root.append(rule);
+            }
+        }
+        return {
+            ...result,
+            code: root.toString(),
+        };
+    }
+    isTopLevelImportRule(node) {
+        return node.type === 'atrule' && node.name === 'import';
+    }
+    isImportPreludeNode(node) {
+        if (node.type === 'comment')
+            return true;
+        if (node.type !== 'atrule')
+            return false;
+        if (node.name === 'charset')
+            return true;
+        return node.name === 'layer' && !node.nodes?.length;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auklet",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "author": "chentao.arthur",
   "description": "Build utilities for TypeScript packages and module CSS output.",