auklet 0.1.7 → 0.1.8

package/dist/cli/workspaceScripts.js

@@ -9,11 +9,11 @@ export async function resolveWorkspaceScriptTargets(cwd, filters, envContext, op
         excludeRoot: true,
         env: envContext.normalizedValues,
         scope: options.scope ?? 'workspace',
-        emptyTargetMessage: options.emptyTargetMessage ?? '[workspace] no workspace package found.',
         includePrivate: options.includePrivate,
         readPackageJson: readWorkspaceScriptPackageJson,
         getDependencies: getWorkspaceScriptDependencies,
         includeDependencies: options.includeDependencies,
+        emptyTargetMessage: options.emptyTargetMessage ?? '[workspace] no workspace package found.',
         createTarget: (item, packageJson) => ({
             packageRoot: item.path,
             packageName: item.name,

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

@@ -1,8 +1,8 @@
 import type { StylePackageContext } from '#auklet/css/core/stylePackageContext';
 export type ModuleStyleEntryPlan = {
     sourceDir: string;
-    moduleStyleImports: Array<string>;
     ownStyleFiles: Array<string>;
+    moduleStyleImports: Array<string>;
 };
 export declare class StyleModuleEntryPlanner {
     private readonly packageContext;
@@ -23,4 +23,7 @@ export declare class StyleModuleEntryPlanner {
     private getSourceModuleDirs;
     private getOwnStyleDirs;
     private getOwnStyleFiles;
+    private rejectCrossModuleStyleImports;
+    private getStyleFileModuleDir;
+    private toRelativeSourceFile;
 }

package/dist/css/core/styleModuleEntryPlanner.js

@@ -11,6 +11,7 @@ export class StyleModuleEntryPlanner {
         this.styleFilesByDir = groupStyleFilesByDir(this.packageContext.sourceRoot, this.packageContext.styleFiles);
         this.importedStyleFiles =
             this.packageContext.styleProcessor.collectImportedStyleFiles(this.packageContext.styleFiles);
+        this.rejectCrossModuleStyleImports();
     }
     createEntries(moduleStyleImports) {
         return this.getSourceDirs(moduleStyleImports).map((sourceDir) => this.createEntry(sourceDir, moduleStyleImports));
@@ -47,4 +48,38 @@ export class StyleModuleEntryPlanner {
     getOwnStyleFiles(sourceDir) {
         return (this.styleFilesByDir.get(sourceDir) ?? []).filter((styleFile) => !this.importedStyleFiles.has(path.resolve(styleFile)));
     }
+    rejectCrossModuleStyleImports() {
+        if (!this.packageContext.normalizedConfig.modules)
+            return;
+        const styleFileKeys = new Set(this.packageContext.styleFiles.map((file) => path.resolve(file)));
+        const imports = this.packageContext.styleProcessor.collectImportedStyleFileReferences(this.packageContext.styleFiles);
+        for (const item of imports) {
+            if (!styleFileKeys.has(item.imported))
+                continue;
+            const importerModuleDir = this.getStyleFileModuleDir(item.importer);
+            const importedModuleDir = this.getStyleFileModuleDir(item.imported);
+            if (!importerModuleDir ||
+                !importedModuleDir ||
+                importerModuleDir === importedModuleDir) {
+                continue;
+            }
+            const importer = this.toRelativeSourceFile(item.importer);
+            const imported = this.toRelativeSourceFile(item.imported);
+            throw new Error(`[css] cross-component CSS import detected: ${importer} imports ${imported}. ` +
+                'Use TSX imports to express component dependencies so auklet can ' +
+                'generate module CSS entries correctly.');
+        }
+    }
+    getStyleFileModuleDir(file) {
+        const sourceRelative = toPosixPath(path.relative(this.packageContext.sourceRoot, file));
+        const parts = sourceRelative.split('/');
+        if (parts.length < 2)
+            return null;
+        if (parts.length === 2)
+            return getSourceModuleDir(sourceRelative);
+        return parts.slice(0, 2).join('/');
+    }
+    toRelativeSourceFile(file) {
+        return toPosixPath(path.relative(this.packageContext.sourceRoot, file));
+    }
 }

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

@@ -1,6 +1,10 @@
 import postcss, { type Root } from 'postcss';
 import type { ModuleStyleBuildConfig } from '#auklet/types';
 import type { WorkspaceStyleResolver } from '#auklet/css/core/workspaceStyleResolver';
+export type StyleFileImportReference = {
+    importer: string;
+    imported: string;
+};
 export declare class StyleProcessor {
     private readonly config;
     private readonly resolver;
@@ -11,6 +15,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>;
+    collectImportedStyleFileReferences(styleFiles: Array<string>): StyleFileImportReference[];
     collectStyleImportSpecifiers(styleFiles: Array<string>): Set<string>;
     private parse;
     private parseImportSpecifier;

package/dist/css/core/styleProcessor.js

@@ -62,7 +62,10 @@ export class StyleProcessor {
         return root.toString();
     }
     collectImportedStyleFiles(styleFiles) {
-        const imported = new Set();
+        return new Set(this.collectImportedStyleFileReferences(styleFiles).map((item) => item.imported));
+    }
+    collectImportedStyleFileReferences(styleFiles) {
+        const imports = [];
         for (const styleFile of styleFiles) {
             const css = fs.readFileSync(styleFile, 'utf8');
             const root = this.parse(css, styleFile);
@@ -72,10 +75,13 @@ export class StyleProcessor {
                     !this.config.styleExtensions.includes(path.extname(specifier))) {
                     return;
                 }
-                imported.add(path.resolve(path.dirname(styleFile), specifier));
+                imports.push({
+                    importer: path.resolve(styleFile),
+                    imported: path.resolve(path.dirname(styleFile), specifier),
+                });
             });
         }
-        return imported;
+        return imports;
     }
     collectStyleImportSpecifiers(styleFiles) {
         const specifiers = new Set();

package/package.json

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