auklet 0.2.5 → 0.2.7

package/README.md

@@ -96,6 +96,7 @@ Inspect flags:
 | -------------------- | ----------------- | ------------------------------------------------------------ |
 | publish flags        | `inspect publish` | Uses the same selection/version/auth flags as `auk publish`. |
 | `--filter <pattern>` | `inspect pack`    | Select workspace packages by package name.                   |
+| `--workspace`        | `inspect pack`    | Alias for `--filter '*'`.                                    |
 | build/dev flags      | `inspect css`     | Uses the same build override flags as `auk build`.           |
 
 ### Owner
@@ -125,6 +126,8 @@ Owner flags:
 - `--filter` is a package-name filter, not pnpm's full filter syntax.
   Supported patterns are `*`, exact package names, and scoped globs such as
   `@scope/*`.
+- Workspace publish, inspect pack, and owner filters skip the workspace root
+  package and private packages.
 - String and boolean CLI values can reference loaded environment variables with
   `env:NAME`, for example `auk build --source env:AUKLET_SOURCE` or
   `auk publish --token env:NODE_AUTH_TOKEN`.

package/dist/cli/help.js

@@ -46,6 +46,7 @@ export const inspectPublishOptions = [
 ];
 export const inspectPackOptions = [
     ['--filter <pattern>', 'Select workspace packages by package name'],
+    ['--workspace', "Alias for --filter '*'"],
 ];
 export const inspectCssOptions = [
     ['--source <dir>', 'CSS inspect source directory'],

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/dist/publish/inspectPack.js

@@ -14,7 +14,6 @@ export async function runInspectPackCli(args) {
         cwd: options.cwd,
         filters: options.filters,
         dryRun: true,
-        version: undefined,
     }, { envContext }, logger));
     const checks = inspectPackageFiles(plan.targets);
     new PackInspectReporter(options.cwd, plan.targets, checks).report();
@@ -37,11 +36,18 @@ const resolveInspectPackOptions = (args) => {
             filters.push(arg.slice('--filter='.length));
             continue;
         }
+        if (arg === '--workspace') {
+            filters.push('*');
+            continue;
+        }
+        if (arg.startsWith('--workspace=')) {
+            throw new Error('[inspect] --workspace does not accept a value.');
+        }
         throw new Error(`[inspect] unknown inspect pack argument: ${arg}`);
     }
     return {
         cwd: process.cwd(),
-        filters,
+        filters: [...new Set(filters)],
     };
 };
 export function inspectPackageFiles(targets) {

package/dist/publish/targetResolver.js

@@ -19,6 +19,7 @@ export async function resolveOwnerPackageNames(options) {
     if (options.filters.length) {
         const root = requireWorkspaceRoot(options.cwd);
         const packages = await resolveWorkspacePackageInfos(root, options.filters, {
+            excludeRoot: true,
             scope: 'publish',
             readErrorMessage: publishWorkspaceReadErrorMessage,
         });
@@ -74,6 +75,7 @@ const resolveMonorepoPublishPlan = async (options, runtime, logger) => {
         filters: options.filters,
         getDependencies: getWorkspaceDependencies,
         emptyTargetMessage: '[publish] no publishable package found.',
+        excludeRoot: true,
         includePrivate: false,
         createTarget: (item, packageJson) => createPublishTarget({
             packageRoot: item.path,

package/dist/workspace/targets.d.ts

@@ -22,6 +22,7 @@ type ResolveWorkspaceTargetsOptions<T, TTarget> = {
     }) => void;
 };
 export declare function resolveWorkspacePackageInfos(cwd: string, filters: Array<string>, options: {
+    excludeRoot?: boolean;
     env?: Record<string, string | undefined>;
     scope: string;
     readErrorMessage?: string;

package/dist/workspace/targets.js

@@ -4,7 +4,7 @@ import { findWorkspaceRoot } from '#auklet/workspace/root';
 import { readPnpmWorkspacePackageInfo } from '#auklet/workspace/packages';
 export async function resolveWorkspacePackageInfos(cwd, filters, options) {
     const root = requireWorkspaceRoot(cwd, options.scope);
-    const packages = await readWorkspacePackageInfo(root, options);
+    const packages = filterWorkspaceRootPackage(await readWorkspacePackageInfo(root, options), root, options);
     return filterWorkspacePackages(packages, filters, options.scope);
 }
 export async function resolveWorkspaceTargets(options) {

package/package.json

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