auklet 0.0.13 → 0.0.15

package/dist/build/tsdown/dependencies.js

@@ -1,4 +1,4 @@
-import { parseModuleId } from 'conditional-export';
+import { parseModuleId } from '#auklet/build/tsdown/parseModuleId';
 const getExternal = (names) => {
   const external = new Set();
   for (const name of names) {

package/dist/build/tsdown/parseModuleId.d.ts

@@ -0,0 +1,6 @@
+export declare function parseModuleId(moduleId: string): {
+  name: string;
+  path: string;
+  version: string;
+  raw: string;
+};

package/dist/build/tsdown/parseModuleId.js

@@ -0,0 +1,85 @@
+export function parseModuleId(moduleId) {
+  let name = '';
+  let path = '';
+  let version = '';
+  let buf = '';
+  let slash = 0;
+  let isScope = false;
+  const set = (type) => {
+    if (type === 'path') path = buf;
+    if (type === 'name') name = buf;
+    if (type === 'version') version = buf;
+    buf = '';
+  };
+  const setValueBySlash = (char) => {
+    if (!name) {
+      set('name');
+    } else if (!version) {
+      set('version');
+    } else {
+      buf += char;
+    }
+  };
+  for (let i = 0, l = moduleId.length; i < l; i++) {
+    const char = moduleId[i];
+    if (char === '@') {
+      if (i === 0) {
+        buf += char;
+        isScope = true;
+      } else if (!name) {
+        if (isScope) {
+          if (slash === 1 && buf[buf.length - 1] !== '/') {
+            set('name');
+          } else {
+            buf += char;
+          }
+        } else {
+          set('name');
+        }
+      } else {
+        buf += char;
+      }
+    } else if (char === '/') {
+      if (slash === 0) {
+        if (!isScope) {
+          setValueBySlash(char);
+        }
+        buf += char;
+      } else if (slash === 1) {
+        if (isScope) {
+          setValueBySlash(char);
+        }
+        buf += char;
+      } else {
+        buf += char;
+      }
+      slash++;
+    } else {
+      buf += char;
+    }
+  }
+  if (!name) {
+    set('name');
+  } else if (!version) {
+    moduleId[name.length] === '@' ? set('version') : set('path');
+  } else if (!path) {
+    set('path');
+  }
+  if (path) {
+    path = `.${path}`;
+  }
+  // `@vue` -> ''
+  // `@vue/` -> ''
+  // `@vue//` -> ''
+  if (isScope && (slash === 0 || name[name.length - 1] === '/')) {
+    name = '';
+    path = '';
+    version = '';
+  }
+  return {
+    name,
+    path,
+    version,
+    raw: moduleId,
+  };
+}

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.13",
+  "version": "0.0.15",
   "type": "module",
   "author": "chentao.arthur",
   "packageManager": "pnpm@10.27.0",