auklet 0.0.16 → 0.0.17

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

@@ -2,283 +2,202 @@ import path from 'node:path';
 import { mergeLoadResults } from '#auklet/css/vite/moduleGraph/loadResult';
 import { parsePackageStyleId } from '#auklet/css/vite/moduleGraph/styleId';
 import { toDevDependencyImportSpecifier } from '#auklet/css/vite/moduleGraph/devDependency';
-import {
-  EXTERNAL_ENTRY,
-  MODULE_ENTRY,
-  STYLE_ENTRY,
-  THEMES_ENTRY_PREFIX,
-} from '#auklet/css/constants';
-import {
-  createComponentStyleEntryPlan,
-  createExternalEntryParts,
-  createStyleEntryParts,
-  createThemeEntryParts,
-} from '#auklet/css/core/style/entries';
-import {
-  createImportCode,
-  parsePackageStyleSpecifier,
-  removeStyleExtension,
-} from '#auklet/css/core/style/specifier';
+import { EXTERNAL_ENTRY, MODULE_ENTRY, STYLE_ENTRY, THEMES_ENTRY_PREFIX, } from '#auklet/css/constants';
+import { createComponentStyleEntryPlan, createExternalEntryParts, createStyleEntryParts, createThemeEntryParts, } from '#auklet/css/core/style/entries';
+import { createImportCode, parsePackageStyleSpecifier, removeStyleExtension, } from '#auklet/css/core/style/specifier';
 import { toFsSpecifier, toPosixPath } from '#auklet/utils';
 // 生成 Vite/dev 虚拟 CSS；production writer 共享入口语义，但写入真实文件。
 export class StyleCodeFactory {
-  config;
-  constructor(config) {
-    this.config = config;
-  }
-  async createPackageStyleCode(parsed, cache) {
-    const context = await cache.getContext(parsed);
-    if (!context) {
-      return {
-        code: '',
-        watchFiles: [],
-      };
+    config;
+    constructor(config) {
+        this.config = config;
     }
-    if (parsed.stylePath === STYLE_ENTRY) {
-      return this.createStyleCode(context, cache);
-    }
-    if (parsed.stylePath === EXTERNAL_ENTRY) {
-      return this.createExternalStyleCode(context, cache);
+    async createPackageStyleCode(parsed, cache) {
+        const context = await cache.getContext(parsed);
+        if (!context) {
+            return {
+                code: '',
+                watchFiles: [],
+            };
+        }
+        if (parsed.stylePath === STYLE_ENTRY) {
+            return this.createStyleCode(context, cache);
+        }
+        if (parsed.stylePath === EXTERNAL_ENTRY) {
+            return this.createExternalStyleCode(context, cache);
+        }
+        if (parsed.stylePath === MODULE_ENTRY) {
+            return this.createModuleStyleCode(context);
+        }
+        if (parsed.stylePath.startsWith(THEMES_ENTRY_PREFIX)) {
+            return this.createThemeStyleCode(context, cache, [
+                removeStyleExtension(parsed.stylePath.slice(THEMES_ENTRY_PREFIX.length)),
+            ]);
+        }
+        return this.createSourceModuleStyleCode(context, cache, parsed.stylePath);
     }
-    if (parsed.stylePath === MODULE_ENTRY) {
-      return this.createModuleStyleCode(context);
+    async createStyleCode(context, cache) {
+        const results = [];
+        for (const part of createStyleEntryParts(context.normalizedConfig)) {
+            if (part.type === 'dependencies') {
+                results.push(await this.createDependencyStyleCode(context, cache, part.specifiers));
+                continue;
+            }
+            if (part.type === 'themes') {
+                results.push(await this.createThemeStyleCode(context, cache, part.themeNames, false));
+                continue;
+            }
+            results.push(this.createModuleStyleCode(context));
+        }
+        return mergeLoadResults(...results);
     }
-    if (parsed.stylePath.startsWith(THEMES_ENTRY_PREFIX)) {
-      return this.createThemeStyleCode(context, cache, [
-        removeStyleExtension(
-          parsed.stylePath.slice(THEMES_ENTRY_PREFIX.length),
-        ),
-      ]);
+    async createDependencyStyleCode(context, cache, specifiers, mapSpecifier = (specifier) => specifier) {
+        const results = [];
+        const imports = [];
+        const watchFiles = [context.configPath];
+        for (const specifier of specifiers) {
+            const outputSpecifier = mapSpecifier(specifier);
+            const parsed = this.parsePackageStyleIdInRequest(outputSpecifier, cache);
+            if (parsed) {
+                results.push(await this.createPackageStyleCode(parsed, cache));
+                continue;
+            }
+            const resolvedSpecifier = toDevDependencyImportSpecifier(context, outputSpecifier);
+            imports.push(resolvedSpecifier.specifier);
+            if (resolvedSpecifier.watchFile) {
+                watchFiles.push(resolvedSpecifier.watchFile);
+            }
+        }
+        return mergeLoadResults({
+            code: createImportCode(imports),
+            watchFiles,
+        }, ...results);
     }
-    return this.createSourceModuleStyleCode(context, cache, parsed.stylePath);
-  }
-  async createStyleCode(context, cache) {
-    const results = [];
-    for (const part of createStyleEntryParts(context.normalizedConfig)) {
-      if (part.type === 'dependencies') {
-        results.push(
-          await this.createDependencyStyleCode(context, cache, part.specifiers),
-        );
-        continue;
-      }
-      if (part.type === 'themes') {
-        results.push(
-          await this.createThemeStyleCode(
-            context,
-            cache,
-            part.themeNames,
-            false,
-          ),
-        );
-        continue;
-      }
-      results.push(this.createModuleStyleCode(context));
+    async createExternalStyleCode(context, cache) {
+        const results = [];
+        for (const part of createExternalEntryParts(context.normalizedConfig)) {
+            results.push(await this.createDependencyStyleCode(context, cache, part.specifiers, (specifier) => this.toDevExternalStyleSpecifier(specifier, cache)));
+        }
+        return mergeLoadResults(...results);
     }
-    return mergeLoadResults(...results);
-  }
-  async createDependencyStyleCode(
-    context,
-    cache,
-    specifiers,
-    mapSpecifier = (specifier) => specifier,
-  ) {
-    const results = [];
-    const imports = [];
-    const watchFiles = [context.configPath];
-    for (const specifier of specifiers) {
-      const outputSpecifier = mapSpecifier(specifier);
-      const parsed = this.parsePackageStyleIdInRequest(outputSpecifier, cache);
-      if (parsed) {
-        results.push(await this.createPackageStyleCode(parsed, cache));
-        continue;
-      }
-      const resolvedSpecifier = toDevDependencyImportSpecifier(
-        context,
-        outputSpecifier,
-      );
-      imports.push(resolvedSpecifier.specifier);
-      if (resolvedSpecifier.watchFile) {
-        watchFiles.push(resolvedSpecifier.watchFile);
-      }
+    async createThemeStyleCode(context, cache, themeNames, includeDependencies = true) {
+        const { themeFiles } = context.packageContext;
+        const targetThemeNames = themeNames ?? context.packageContext.themeNames;
+        const root = context.styleProcessor.createRoot();
+        const watchFiles = [context.configPath, ...themeFiles.values()];
+        const dependencyResults = [];
+        for (const themeName of targetThemeNames) {
+            for (const part of createThemeEntryParts(context.normalizedConfig, themeName, {
+                includeDependencies,
+            })) {
+                if (part.type === 'dependencies') {
+                    dependencyResults.push(await this.createDependencyStyleCode(context, cache, part.specifiers));
+                    continue;
+                }
+                const themeFile = themeFiles.get(part.themeName);
+                if (!themeFile)
+                    continue;
+                const content = context.styleProcessor.readStyleFile(themeFile);
+                if (content.trim()) {
+                    context.styleProcessor.appendStyleContent(root, content, themeFile);
+                }
+            }
+        }
+        return mergeLoadResults({
+            code: '',
+            watchFiles,
+        }, ...dependencyResults, {
+            code: root.nodes?.length ? context.styleProcessor.stringify(root) : '',
+            watchFiles: [],
+        });
     }
-    return mergeLoadResults(
-      {
-        code: createImportCode(imports),
-        watchFiles,
-      },
-      ...results,
-    );
-  }
-  async createExternalStyleCode(context, cache) {
-    const results = [];
-    for (const part of createExternalEntryParts(context.normalizedConfig)) {
-      results.push(
-        await this.createDependencyStyleCode(
-          context,
-          cache,
-          part.specifiers,
-          (specifier) => this.toDevExternalStyleSpecifier(specifier, cache),
-        ),
-      );
+    createModuleStyleCode(context) {
+        const { styleFiles } = context.packageContext;
+        const root = context.styleProcessor.createRoot();
+        const seen = new Set();
+        for (const styleFile of styleFiles) {
+            const content = context.styleProcessor.readStyleFile(styleFile, seen);
+            if (content.trim()) {
+                context.styleProcessor.appendStyleContent(root, content, styleFile);
+            }
+        }
+        return {
+            code: root.nodes?.length ? context.styleProcessor.stringify(root) : '',
+            watchFiles: [context.configPath, ...styleFiles],
+        };
     }
-    return mergeLoadResults(...results);
-  }
-  async createThemeStyleCode(
-    context,
-    cache,
-    themeNames,
-    includeDependencies = true,
-  ) {
-    const { themeFiles } = context.packageContext;
-    const targetThemeNames = themeNames ?? context.packageContext.themeNames;
-    const root = context.styleProcessor.createRoot();
-    const watchFiles = [context.configPath, ...themeFiles.values()];
-    const dependencyResults = [];
-    for (const themeName of targetThemeNames) {
-      for (const part of createThemeEntryParts(
-        context.normalizedConfig,
-        themeName,
-        {
-          includeDependencies,
-        },
-      )) {
-        if (part.type === 'dependencies') {
-          dependencyResults.push(
-            await this.createDependencyStyleCode(
-              context,
-              cache,
-              part.specifiers,
-            ),
-          );
-          continue;
+    async createSourceModuleStyleCode(context, cache, stylePath) {
+        const sourceModuleDir = removeStyleExtension(stylePath);
+        const { styleFiles, sourceFiles } = context.packageContext;
+        const entry = createComponentStyleEntryPlan(context.packageContext, sourceModuleDir);
+        const sourceStyleDir = path.join(context.sourceRoot, sourceModuleDir, this.config.output.styleDir);
+        const moduleStyleResults = [];
+        const moduleStyleSpecifiers = [];
+        const moduleStyleWatchFiles = [];
+        for (const specifier of entry.moduleStyleImports) {
+            const result = this.toDevModuleImportSpecifier(context, cache, sourceStyleDir, specifier);
+            const parsed = this.parsePackageStyleIdInRequest(result, cache);
+            if (parsed) {
+                moduleStyleResults.push(await this.createPackageStyleCode(parsed, cache));
+                continue;
+            }
+            const resolvedSpecifier = toDevDependencyImportSpecifier(context, result);
+            moduleStyleSpecifiers.push(resolvedSpecifier.specifier);
+            if (resolvedSpecifier.watchFile) {
+                moduleStyleWatchFiles.push(resolvedSpecifier.watchFile);
+            }
         }
-        const themeFile = themeFiles.get(part.themeName);
-        if (!themeFile) continue;
-        const content = context.styleProcessor.readStyleFile(themeFile);
-        if (content.trim()) {
-          context.styleProcessor.appendStyleContent(root, content, themeFile);
+        const root = context.styleProcessor.createRoot();
+        const seen = new Set();
+        for (const ownStyleFile of entry.ownStyleFiles) {
+            const content = context.styleProcessor.readStyleFile(ownStyleFile, seen);
+            if (content.trim()) {
+                context.styleProcessor.appendStyleContent(root, content, ownStyleFile);
+            }
         }
-      }
-    }
-    return mergeLoadResults(
-      {
-        code: '',
-        watchFiles,
-      },
-      ...dependencyResults,
-      {
-        code: root.nodes?.length ? context.styleProcessor.stringify(root) : '',
-        watchFiles: [],
-      },
-    );
-  }
-  createModuleStyleCode(context) {
-    const { styleFiles } = context.packageContext;
-    const root = context.styleProcessor.createRoot();
-    const seen = new Set();
-    for (const styleFile of styleFiles) {
-      const content = context.styleProcessor.readStyleFile(styleFile, seen);
-      if (content.trim()) {
-        context.styleProcessor.appendStyleContent(root, content, styleFile);
-      }
-    }
-    return {
-      code: root.nodes?.length ? context.styleProcessor.stringify(root) : '',
-      watchFiles: [context.configPath, ...styleFiles],
-    };
-  }
-  async createSourceModuleStyleCode(context, cache, stylePath) {
-    const sourceModuleDir = removeStyleExtension(stylePath);
-    const { styleFiles, sourceFiles } = context.packageContext;
-    const entry = createComponentStyleEntryPlan(
-      context.packageContext,
-      sourceModuleDir,
-    );
-    const sourceStyleDir = path.join(
-      context.sourceRoot,
-      sourceModuleDir,
-      this.config.output.styleDir,
-    );
-    const moduleStyleResults = [];
-    const moduleStyleSpecifiers = [];
-    const moduleStyleWatchFiles = [];
-    for (const specifier of entry.moduleStyleImports) {
-      const result = this.toDevModuleImportSpecifier(
-        context,
-        cache,
-        sourceStyleDir,
-        specifier,
-      );
-      const parsed = this.parsePackageStyleIdInRequest(result, cache);
-      if (parsed) {
-        moduleStyleResults.push(
-          await this.createPackageStyleCode(parsed, cache),
-        );
-        continue;
-      }
-      const resolvedSpecifier = toDevDependencyImportSpecifier(context, result);
-      moduleStyleSpecifiers.push(resolvedSpecifier.specifier);
-      if (resolvedSpecifier.watchFile) {
-        moduleStyleWatchFiles.push(resolvedSpecifier.watchFile);
-      }
+        const ownStyleCode = root.nodes?.length
+            ? context.styleProcessor.stringify(root)
+            : '';
+        return mergeLoadResults(...moduleStyleResults, {
+            code: [createImportCode(moduleStyleSpecifiers), ownStyleCode]
+                .filter((code) => code.trim())
+                .join('\n'),
+            watchFiles: [
+                context.configPath,
+                ...styleFiles,
+                ...moduleStyleWatchFiles,
+                ...sourceFiles.filter((file) => /\.(ts|tsx)$/.test(file)),
+            ],
+        });
     }
-    const root = context.styleProcessor.createRoot();
-    const seen = new Set();
-    for (const ownStyleFile of entry.ownStyleFiles) {
-      const content = context.styleProcessor.readStyleFile(ownStyleFile, seen);
-      if (content.trim()) {
-        context.styleProcessor.appendStyleContent(root, content, ownStyleFile);
-      }
-    }
-    const ownStyleCode = root.nodes?.length
-      ? context.styleProcessor.stringify(root)
-      : '';
-    return mergeLoadResults(...moduleStyleResults, {
-      code: [createImportCode(moduleStyleSpecifiers), ownStyleCode]
-        .filter((code) => code.trim())
-        .join('\n'),
-      watchFiles: [
-        context.configPath,
-        ...styleFiles,
-        ...moduleStyleWatchFiles,
-        ...sourceFiles.filter((file) => /\.(ts|tsx)$/.test(file)),
-      ],
-    });
-  }
-  toDevModuleImportSpecifier(context, cache, sourceStyleDir, specifier) {
-    if (!specifier.startsWith('.')) {
-      return this.toDevExternalStyleSpecifier(specifier, cache);
+    toDevModuleImportSpecifier(context, cache, sourceStyleDir, specifier) {
+        if (!specifier.startsWith('.')) {
+            return this.toDevExternalStyleSpecifier(specifier, cache);
+        }
+        const outputStyleEntry = path.resolve(sourceStyleDir, specifier);
+        const styleEntrySuffix = `${path.sep}${this.config.output.styleDir}${path.sep}${this.config.output.indexStyleFile}`;
+        if (!outputStyleEntry.endsWith(styleEntrySuffix)) {
+            return toFsSpecifier(outputStyleEntry);
+        }
+        const sourceModuleDir = path.relative(context.sourceRoot, outputStyleEntry.slice(0, -styleEntrySuffix.length));
+        return `${context.packageName}/${toPosixPath(sourceModuleDir)}.css`;
     }
-    const outputStyleEntry = path.resolve(sourceStyleDir, specifier);
-    const styleEntrySuffix = `${path.sep}${this.config.output.styleDir}${path.sep}${this.config.output.indexStyleFile}`;
-    if (!outputStyleEntry.endsWith(styleEntrySuffix)) {
-      return toFsSpecifier(outputStyleEntry);
+    toDevExternalStyleSpecifier(specifier, cache) {
+        const parsed = parsePackageStyleSpecifier(specifier);
+        if (!parsed)
+            return specifier;
+        if (cache.isKnownPackageName(parsed.packageName)) {
+            if (parsed.stylePath === STYLE_ENTRY) {
+                return `${parsed.packageName}/${EXTERNAL_ENTRY}`;
+            }
+            if (parsed.stylePath ===
+                [this.config.output.styleDir, this.config.output.indexStyleFile].join('/')) {
+                return `${parsed.packageName}/${EXTERNAL_ENTRY}`;
+            }
+        }
+        return specifier;
     }
-    const sourceModuleDir = path.relative(
-      context.sourceRoot,
-      outputStyleEntry.slice(0, -styleEntrySuffix.length),
-    );
-    return `${context.packageName}/${toPosixPath(sourceModuleDir)}.css`;
-  }
-  toDevExternalStyleSpecifier(specifier, cache) {
-    const parsed = parsePackageStyleSpecifier(specifier);
-    if (!parsed) return specifier;
-    if (cache.isKnownPackageName(parsed.packageName)) {
-      if (parsed.stylePath === STYLE_ENTRY) {
-        return `${parsed.packageName}/${EXTERNAL_ENTRY}`;
-      }
-      if (
-        parsed.stylePath ===
-        [this.config.output.styleDir, this.config.output.indexStyleFile].join(
-          '/',
-        )
-      ) {
-        return `${parsed.packageName}/${EXTERNAL_ENTRY}`;
-      }
+    parsePackageStyleIdInRequest(id, cache) {
+        return parsePackageStyleId(id, cache.getPackageNames());
     }
-    return specifier;
-  }
-  parsePackageStyleIdInRequest(id, cache) {
-    return parsePackageStyleId(id, cache.getPackageNames());
-  }
 }

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

@@ -1,7 +1,4 @@
-export declare function parsePackageStyleId(
-  id: string,
-  packageNames: Array<string>,
-): {
-  packageName: string;
-  stylePath: string;
+export declare function parsePackageStyleId(id: string, packageNames: Array<string>): {
+    packageName: string;
+    stylePath: string;
 } | null;

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

@@ -1,14 +1,15 @@
 // 根据已知 workspace 包名解析 package CSS id，并优先匹配最长包名。
 export function parsePackageStyleId(id, packageNames) {
-  if (!id.endsWith('.css')) {
-    return null;
-  }
-  const packageName = [...packageNames]
-    .sort((left, right) => right.length - left.length)
-    .find((name) => id.startsWith(`${name}/`));
-  if (!packageName) return null;
-  return {
-    packageName,
-    stylePath: id.slice(packageName.length + 1),
-  };
+    if (!id.endsWith('.css')) {
+        return null;
+    }
+    const packageName = [...packageNames]
+        .sort((left, right) => right.length - left.length)
+        .find((name) => id.startsWith(`${name}/`));
+    if (!packageName)
+        return null;
+    return {
+        packageName,
+        stylePath: id.slice(packageName.length + 1),
+    };
 }

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

@@ -1,22 +1,19 @@
 import type { AukletConfig, ModuleStyleBuildConfig } from '#auklet/types';
 export interface ModuleStyleGraphOptions {
-  workspaceRoot: string;
-  packagesDir?: string;
-  mode?: 'monorepo' | 'package';
-  config?: ModuleStyleBuildConfig;
-  loadAukletConfig?: LoadAukletConfig;
+    workspaceRoot: string;
+    packagesDir?: string;
+    mode?: 'monorepo' | 'package';
+    config?: ModuleStyleBuildConfig;
+    loadAukletConfig?: LoadAukletConfig;
 }
 export type PackageStyleId = {
-  packageName: string;
-  stylePath: string;
+    packageName: string;
+    stylePath: string;
 };
 export type PackageStyleLoadResult = {
-  code: string;
-  watchFiles: Array<string>;
+    code: string;
+    watchFiles: Array<string>;
 };
-export type LoadAukletConfig = (
-  packageRoot: string,
-  options?: {
+export type LoadAukletConfig = (packageRoot: string, options?: {
     cacheBust?: boolean;
-  },
-) => Promise<AukletConfig>;
+}) => Promise<AukletConfig>;

package/dist/css/vite/vitePlugin.d.ts

@@ -1,24 +1,20 @@
 import type { HotUpdateOptions, ViteDevServer } from 'vite';
 import type { ModuleStyleGraphOptions } from '#auklet/css/vite/moduleGraph/types';
-export type AukletStylePluginOptions = Partial<
-  Pick<ModuleStyleGraphOptions, 'workspaceRoot' | 'mode'>
-> &
-  Omit<ModuleStyleGraphOptions, 'workspaceRoot'>;
+export type AukletStylePluginOptions = Partial<Pick<ModuleStyleGraphOptions, 'workspaceRoot' | 'mode'>> & Omit<ModuleStyleGraphOptions, 'workspaceRoot'>;
 export declare function aukletStylePlugin(options?: AukletStylePluginOptions): {
-  name: string;
-  apply: 'serve';
-  enforce: 'pre';
-  configResolved(config: { root: string }): void;
-  resolveId(id: string): string | null;
-  load(
-    this: {
-      addWatchFile?: (file: string) => void;
-    },
-    id: string,
-  ): Promise<string | null>;
-  configureServer(server: ViteDevServer): void;
-  hotUpdate: {
-    order: 'pre';
-    handler(context: HotUpdateOptions): never[] | undefined;
-  };
+    name: string;
+    apply: "serve";
+    enforce: "pre";
+    configResolved(config: {
+        root: string;
+    }): void;
+    resolveId(id: string): string | null;
+    load(this: {
+        addWatchFile?: (file: string) => void;
+    }, id: string): Promise<string | null>;
+    configureServer(server: ViteDevServer): void;
+    hotUpdate: {
+        order: "pre";
+        handler(context: HotUpdateOptions): never[] | undefined;
+    };
 };