zard-cli 1.0.0-beta.98 → 1.0.0

package/commands/init/project-kind.js

@@ -0,0 +1,166 @@
+/**
+ * Which kind of project `init` is configuring.
+ *
+ * The user answers, in the wizard's first question — the CLI does not decide for
+ * them. What the workspace reveals comes afterwards, to fill in the suggested
+ * paths for the chosen type; detection only becomes a decision on the headless
+ * path, where there is nobody to ask.
+ *
+ * The differences between the types are not cosmetic: a library has no
+ * `app.config.ts` to register providers in and no pre-existing global CSS, Nx
+ * keeps the TypeScript paths in a different file, and Analog swaps Angular's
+ * build for Vite — and with it the way Tailwind is configured. Concentrating
+ * those differences here keeps every step from rediscovering them.
+ */
+import * as path from 'node:path';
+/**
+ * The colour of each ecosystem in the menu.
+ *
+ * Angular stays the base white — it is the default case, and giving it a colour
+ * would suggest it is a special option among the others.
+ */
+const ANGULAR = '#fafafa';
+const NX = '#6aa9ff';
+const ANALOG = '#fb7185';
+/**
+ * Menu order: each ecosystem with the application before the library, from the
+ * most common to the rarest. Angular opens the list because it is the default.
+ */
+export const PROJECT_KINDS = [
+    {
+        value: 'angular',
+        label: 'Angular',
+        detail: 'Application — providers in app.config.ts, tokens in the global CSS.',
+        color: ANGULAR,
+    },
+    {
+        value: 'angular-library',
+        label: 'Angular Library',
+        detail: 'Publishable library — components ship with it, no app providers.',
+        color: ANGULAR,
+    },
+    {
+        value: 'nx',
+        label: 'Nx',
+        detail: 'Application inside an Nx workspace — paths go to tsconfig.base.json.',
+        color: NX,
+    },
+    {
+        value: 'nx-library',
+        label: 'Nx Library',
+        detail: 'Library inside an Nx workspace — lives in libs/, no app providers.',
+        color: NX,
+    },
+    {
+        value: 'analog',
+        label: 'Analog.js',
+        detail: 'Vite-powered Angular app — Tailwind is a Vite plugin, not PostCSS.',
+        color: ANALOG,
+    },
+];
+const TRAITS = {
+    angular: { isLibrary: false, workspace: 'angular', bundler: 'angular', fallbackRoot: '' },
+    analog: { isLibrary: false, workspace: 'angular', bundler: 'vite', fallbackRoot: '' },
+    nx: { isLibrary: false, workspace: 'nx', bundler: 'angular', fallbackRoot: 'apps/app' },
+    'angular-library': { isLibrary: true, workspace: 'angular', bundler: 'angular', fallbackRoot: 'projects/ui' },
+    'nx-library': { isLibrary: true, workspace: 'nx', bundler: 'angular', fallbackRoot: 'libs/ui' },
+};
+export function isLibraryKind(kind) {
+    return TRAITS[kind].isLibrary;
+}
+/** Where the TypeScript paths have to be written for the project to see them. */
+export function tsconfigFileFor(kind, projectInfo) {
+    // Nx extends a tsconfig.base.json at the root; writing into the tsconfig.json
+    // there would reach no project at all. Outside Nx the tsconfig.json itself is
+    // the target, unless the workspace already keeps a base — then that one wins.
+    if (TRAITS[kind].workspace === 'nx')
+        return 'tsconfig.base.json';
+    return projectInfo.tsconfigFile;
+}
+/** Se o Tailwind entra pelo PostCSS do Angular ou pelo plugin do Vite. */
+export function bundlerFor(kind) {
+    return TRAITS[kind].bundler;
+}
+/**
+ * The workspace projects that can receive the install.
+ *
+ * Once the type is chosen, only what matches it makes sense to offer: asking
+ * someone who chose "library" to install into an application would offer a
+ * target the following steps do not know how to configure.
+ */
+export function candidateProjects(kind, projectInfo) {
+    const wanted = TRAITS[kind].isLibrary ? 'library' : 'application';
+    return projectInfo.projects.filter(project => project.projectType === wanted);
+}
+/** Default root when the workspace declares no compatible project. */
+export function fallbackRootFor(kind) {
+    return TRAITS[kind].fallbackRoot;
+}
+/**
+ * The type the headless path assumes.
+ *
+ * With no interactive terminal nobody answers the first question, so here — and
+ * only here — the workspace decides: the manager gives the world (Nx or
+ * Angular), Analog announces itself through its own dependencies, and the
+ * absence of any application is what suggests the target is a library.
+ */
+export function detectProjectKind(projectInfo) {
+    const hasApplication = projectInfo.projects.some(project => project.projectType === 'application');
+    const hasLibrary = projectInfo.projects.some(project => project.projectType === 'library');
+    const isLibraryWorkspace = !hasApplication && hasLibrary;
+    if (projectInfo.hasNx)
+        return isLibraryWorkspace ? 'nx-library' : 'nx';
+    if (isLibraryWorkspace)
+        return 'angular-library';
+    return projectInfo.hasAnalog ? 'analog' : 'angular';
+}
+/**
+ * Where a library's code lives.
+ *
+ * `src/lib` is the convention for both `ng generate library` and
+ * `nx g @nx/angular:library`: `src/` holds the public entry point, and
+ * everything it exports sits in `src/lib`.
+ */
+export function libraryBaseUrl(libraryRoot) {
+    return `${trimSlashes(libraryRoot)}/src/lib`;
+}
+/** The theme CSS the library starts exposing to whoever consumes it. */
+export function libraryStylesPath(libraryRoot) {
+    return `${trimSlashes(libraryRoot)}/src/styles.css`;
+}
+/**
+ * The project root, derived from `baseUrl`.
+ *
+ * Both layouts end two levels below the root — `<root>/src/app` in an
+ * application, `<root>/src/lib` in a library — so going up two levels gives the
+ * directory holding that project's `project.json`, `ng-package.json` and
+ * `.postcssrc.json`. A single app at the root gives `.`.
+ */
+export function projectRootOf(baseUrl) {
+    return path.posix.normalize(path.posix.join(toPosix(baseUrl), '..', '..'));
+}
+/** The project's source directory — where `index.html` and `main.ts` sit. */
+export function sourceRootOf(baseUrl) {
+    return path.posix.dirname(toPosix(baseUrl));
+}
+/**
+ * Where to look for the project's `index.html`.
+ *
+ * In Analog it is Vite's entry page and sits at the project root, not in `src/`
+ * as in the Angular build — suggesting the wrong path made `add dark-mode` fail
+ * right after asking.
+ */
+export function indexHtmlFor(kind, baseUrl) {
+    if (kind === 'analog') {
+        const root = projectRootOf(baseUrl);
+        return root === '.' ? 'index.html' : `${root}/index.html`;
+    }
+    return `${sourceRootOf(baseUrl)}/index.html`;
+}
+function toPosix(value) {
+    return value.replace(/\\/g, '/');
+}
+function trimSlashes(value) {
+    return value.replace(/\/+$/, '');
+}
+//# sourceMappingURL=project-kind.js.map

package/commands/init/project-kind.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-kind.js","sourceRoot":"","sources":["../../../src/commands/init/project-kind.ts"],"names":[],"mappings":"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"}

package/commands/init/steps.d.ts

@@ -0,0 +1,15 @@
+import { type Config } from '../../utils/config.js';
+import { type ProjectInfo } from '../../utils/get-project-info.js';
+/**
+ * One step of initialization: the label the UI shows and the work it does.
+ *
+ * The list is built once and consumed by both the wizard and the headless path,
+ * so the two run exactly the same sequence — the UI only decides how to present it.
+ */
+export interface InitStep {
+    readonly label: string;
+    readonly note: string;
+    run(): Promise<void>;
+}
+export declare function buildInitSteps(cwd: string, config: Config, projectInfo: ProjectInfo, isReInitializing: boolean): InitStep[];
+//# sourceMappingURL=steps.d.ts.map

package/commands/init/steps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"steps.d.ts","sourceRoot":"","sources":["../../../src/commands/init/steps.ts"],"names":[],"mappings":"AAQA,OAAO,EAAsB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAOlE;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,OAAO,GACxB,QAAQ,EAAE,CA6DZ"}

package/commands/init/steps.js

@@ -0,0 +1,154 @@
+import { installComponent } from '../../commands/add/component-installer.js';
+import { installDependencies } from '../../commands/init/dependencies.js';
+import { bundlerFor, isLibraryKind, projectRootOf, tsconfigFileFor } from '../../commands/init/project-kind.js';
+import { applyThemeToStyles, createPostCssConfig } from '../../commands/init/tailwind-setup.js';
+import { updateTsConfig } from '../../commands/init/tsconfig-updater.js';
+import { updateAngularConfig } from '../../commands/init/update-angular-config.js';
+import { setupVitePlugin } from '../../commands/init/vite-setup.js';
+import { iconFamily } from '../../core/icons/index.js';
+import { resolveConfigPaths } from '../../utils/config.js';
+import { iconCatalog } from '../../utils/icon-catalog.js';
+import { logger } from '../../utils/logger.js';
+import { existsSync } from 'node:fs';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import * as path from 'node:path';
+export function buildInitSteps(cwd, config, projectInfo, isReInitializing) {
+    const kind = config.projectType;
+    const isLibrary = isLibraryKind(kind);
+    const projectRoot = projectRootOf(config.baseUrl);
+    const tsconfigFile = tsconfigFileFor(kind, projectInfo);
+    const steps = [
+        {
+            label: 'components.json',
+            note: 'component & utils aliases',
+            run: async () => {
+                await writeFile(path.resolve(cwd, 'components.json'), JSON.stringify(config, null, 2), 'utf8');
+            },
+        },
+        {
+            label: 'dependencies',
+            note: `CDK, CVA, tailwind-merge, ng-icons (${iconFamily(config.icons, iconCatalog())?.label ?? config.icons})`,
+            run: () => installDependencies(cwd, config, projectInfo),
+        },
+    ];
+    // Application providers do not belong to the library: the app consuming it
+    // registers them, and a library has no app.config.ts to write into.
+    if (!isLibrary) {
+        steps.push({
+            label: config.appConfigFile,
+            note: 'zard/ui providers',
+            run: () => updateAngularConfig(cwd, config),
+        });
+        steps.push(tailwindPipelineStep(cwd, projectRoot, kind, projectInfo, isReInitializing));
+    }
+    steps.push({
+        label: config.tailwind.css,
+        note: `theme tokens (${config.tailwind.baseColor})`,
+        run: () => applyThemeToStyles(cwd, config),
+    });
+    if (isLibrary) {
+        steps.push({
+            label: 'ng-package.json',
+            note: 'ship the theme with the library',
+            run: () => registerStylesAsset(cwd, config),
+        });
+    }
+    steps.push({
+        label: tsconfigFile,
+        note: 'import path aliases',
+        run: () => updateTsConfig(cwd, config, tsconfigFile),
+    }, {
+        label: 'core & utils',
+        note: 'shared helpers used by every component',
+        run: () => installCoreDependencies(cwd, config),
+    });
+    return steps;
+}
+/**
+ * How Tailwind enters the application build.
+ *
+ * In Analog it is Vite that compiles, and Tailwind is one of its plugins — a
+ * `.postcssrc.json` there would be read by nobody. Everywhere else the Angular
+ * build loads PostCSS, and the file goes to the project root: in a workspace
+ * with several apps, writing it at the repository root would configure all of
+ * them at once.
+ */
+function tailwindPipelineStep(cwd, projectRoot, kind, projectInfo, isReInitializing) {
+    if (bundlerFor(kind) === 'vite') {
+        return {
+            label: 'vite.config.ts',
+            note: 'Tailwind Vite plugin',
+            run: () => setupVitePlugin(cwd),
+        };
+    }
+    const relative = projectRoot === '.' ? '.postcssrc.json' : `${projectRoot}/.postcssrc.json`;
+    return {
+        label: relative,
+        note: 'Tailwind PostCSS plugin',
+        // Re-initializing rewrites the file on purpose: it is the chance to correct a
+        // `.postcssrc.json` left over from an earlier setup.
+        run: () => !projectInfo.hasTailwind || isReInitializing || !existsSync(path.resolve(cwd, relative))
+            ? createPostCssConfig(cwd, projectRoot)
+            : Promise.resolve(),
+    };
+}
+/**
+ * Declares the theme CSS as a library asset.
+ *
+ * ng-packagr only publishes what the entry point reaches; a loose `.css` in
+ * `src/` stays out of the package. Without this entry, the file the previous
+ * step wrote would exist only in the repository and never reach whoever
+ * installs the library.
+ *
+ * The asset is declared with `output: '/'` so it lands at the package root.
+ * Listing it as a plain path preserves the source folder, and the consumer would
+ * end up importing `<lib>/src/styles.css` — a `src/` that is a detail of the
+ * library's repository, not something whoever installs it should know.
+ */
+async function registerStylesAsset(cwd, config) {
+    const libraryRoot = path.resolve(cwd, projectRootOf(config.baseUrl));
+    const ngPackagePath = path.join(libraryRoot, 'ng-package.json');
+    if (!existsSync(ngPackagePath)) {
+        // An Nx library only gets an ng-package.json when it is publishable; in the
+        // others there is no package to assemble and the CSS is consumed straight
+        // from the source.
+        logger.warn(`ng-package.json not found in ${path.relative(cwd, libraryRoot)}; skipping the theme asset.`);
+        return;
+    }
+    const relative = path.relative(libraryRoot, path.resolve(cwd, config.tailwind.css)).split(path.sep).join('/');
+    const input = path.posix.dirname(relative);
+    const glob = path.posix.basename(relative);
+    const entry = { glob, input, output: '/' };
+    const ngPackage = JSON.parse(await readFile(ngPackagePath, 'utf8'));
+    const assets = Array.isArray(ngPackage.assets) ? ngPackage.assets : [];
+    // Old entries pointing at the same file are replaced, not accumulated: a
+    // repeated init would otherwise publish the CSS twice, in two places.
+    const others = assets.filter(asset => !describesSameFile(asset, relative, entry));
+    const alreadyCorrect = assets.length === others.length + 1 && hasEntry(assets, entry);
+    if (alreadyCorrect)
+        return;
+    ngPackage.assets = [...others, entry];
+    await writeFile(ngPackagePath, `${JSON.stringify(ngPackage, null, 2)}\n`, 'utf8');
+}
+/** Whether an already-declared asset publishes exactly the same file. */
+function describesSameFile(asset, relative, entry) {
+    if (typeof asset === 'string')
+        return asset.replace(/^\.\//, '') === relative;
+    const declared = asset;
+    return declared?.glob === entry.glob && declared?.input === entry.input;
+}
+function hasEntry(assets, entry) {
+    return assets.some(asset => typeof asset === 'object' &&
+        asset !== null &&
+        asset.glob === entry.glob &&
+        asset.input === entry.input &&
+        asset.output === entry.output);
+}
+async function installCoreDependencies(cwd, config) {
+    const resolvedConfig = await resolveConfigPaths(cwd, config);
+    await mkdir(resolvedConfig.resolvedPaths.core, { recursive: true });
+    await mkdir(resolvedConfig.resolvedPaths.utils, { recursive: true });
+    await installComponent('core', resolvedConfig.resolvedPaths.core, resolvedConfig);
+    await installComponent('utils', resolvedConfig.resolvedPaths.utils, resolvedConfig);
+}
+//# sourceMappingURL=steps.js.map

package/commands/init/steps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../src/commands/init/steps.ts"],"names":[],"mappings":"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"}

package/commands/init/tailwind-setup.d.ts

@@ -1,5 +1,12 @@
 import { type Config } from '../../utils/config.js';
-export declare function setupTailwind(cwd: string, config: Config): Promise<void>;
-export declare function createPostCssConfig(cwd: string): Promise<void>;
+/**
+ * Writes `.postcssrc.json` at the root of the project that will use it.
+ *
+ * The Angular build looks for the file starting from the CSS it is processing
+ * and walks up to the workspace root, so the project is the most specific place
+ * that works — and in a monorepo with several apps it is the only one that does
+ * not configure all of them at once. `projectRoot` is `.` for a single app.
+ */
+export declare function createPostCssConfig(cwd: string, projectRoot?: string): Promise<void>;
 export declare function applyThemeToStyles(cwd: string, config: Config): Promise<void>;
 //# sourceMappingURL=tailwind-setup.d.ts.map

package/commands/init/tailwind-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tailwind-setup.d.ts","sourceRoot":"","sources":["../../../src/commands/init/tailwind-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAYnD,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASnF"}
+{"version":3,"file":"tailwind-setup.d.ts","sourceRoot":"","sources":["../../../src/commands/init/tailwind-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAYvE;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,SAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKvF;AAqBD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQnF"}

package/commands/init/tailwind-setup.js

@@ -1,5 +1,6 @@
+import { resolveAliasToPath } from '../../utils/config.js';
 import { getThemeContent } from '../../utils/theme-selector.js';
-import { writeFile } from 'node:fs/promises';
+import { mkdir, writeFile } from 'node:fs/promises';
 import * as path from 'path';
 const POSTCSS_CONFIG = `{
   "plugins": {
@@ -7,21 +8,41 @@ const POSTCSS_CONFIG = `{
   }
 }
 `;
-export async function setupTailwind(cwd, config) {
-    await createPostCssConfig(cwd);
-    await applyThemeToStyles(cwd, config);
+/**
+ * Writes `.postcssrc.json` at the root of the project that will use it.
+ *
+ * The Angular build looks for the file starting from the CSS it is processing
+ * and walks up to the workspace root, so the project is the most specific place
+ * that works — and in a monorepo with several apps it is the only one that does
+ * not configure all of them at once. `projectRoot` is `.` for a single app.
+ */
+export async function createPostCssConfig(cwd, projectRoot = '.') {
+    const targetDir = path.resolve(cwd, projectRoot);
+    await mkdir(targetDir, { recursive: true });
+    await writeFile(path.join(targetDir, '.postcssrc.json'), POSTCSS_CONFIG, 'utf8');
 }
-export async function createPostCssConfig(cwd) {
-    const postcssConfigPath = path.join(cwd, '.postcssrc.json');
-    await writeFile(postcssConfigPath, POSTCSS_CONFIG, 'utf8');
+/**
+ * The CSS `@import` is resolved by the bundler relative to the file containing
+ * it, so it has to be a real relative path — it cannot be assembled by slicing
+ * the alias.
+ *
+ * The previous version took the second segment of baseUrl and pasted the alias
+ * without its first character. It only worked for the `src/app` + `@/...`
+ * layout: with baseUrl `projects/admin/src/app` it aimed at `./admin/...`, and
+ * with an `@app/core` alias it produced `./appapp/core`.
+ */
+function coreImportPath(cwd, config) {
+    const cssDir = path.dirname(path.resolve(cwd, config.tailwind.css));
+    const coreDir = path.resolve(cwd, resolveAliasToPath(config.aliases.core, config.baseUrl));
+    const relative = path.relative(cssDir, coreDir).split(path.sep).join('/');
+    return relative.startsWith('.') ? relative : `./${relative}`;
 }
 export async function applyThemeToStyles(cwd, config) {
     const stylesPath = path.join(cwd, config.tailwind.css);
-    const selectedTheme = config.tailwind.baseColor;
-    const parts = config.baseUrl.split('/');
-    const base = parts.length > 1 ? parts[1] : parts[0];
-    const corePath = './' + base + config.aliases.core.substring(1);
-    const themeContent = getThemeContent(selectedTheme, corePath);
+    const themeContent = getThemeContent(config.tailwind.baseColor, coreImportPath(cwd, config));
+    // In a library that file usually does not exist — init creates it, so the
+    // library can expose the tokens to whoever consumes it.
+    await mkdir(path.dirname(stylesPath), { recursive: true });
     await writeFile(stylesPath, themeContent, 'utf8');
 }
 //# sourceMappingURL=tailwind-setup.js.map

package/commands/init/tailwind-setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"tailwind-setup.js","sourceRoot":"","sources":["../../../src/commands/init/tailwind-setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,cAAc,GAAG;;;;;CAKtB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,MAAc;IAC7D,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW;IACnD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC5D,MAAM,SAAS,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,MAAc;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,eAAe,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,SAAS,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"tailwind-setup.js","sourceRoot":"","sources":["../../../src/commands/init/tailwind-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAe,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,cAAc,GAAG;;;;;CAKtB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,WAAW,GAAG,GAAG;IACtE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEjD,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AACnF,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,cAAc,CAAC,GAAW,EAAE,MAAc;IACjD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,MAAc;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IAE7F,0EAA0E;IAC1E,wDAAwD;IACxD,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,MAAM,SAAS,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC"}

package/commands/init/tsconfig-updater.d.ts

@@ -1,3 +1,10 @@
 import { type Config } from '../../utils/config.js';
-export declare function updateTsConfig(cwd: string, config: Config): Promise<void>;
+/**
+ * Writes the alias into the tsconfig the projects actually extend.
+ *
+ * In an Nx workspace that is `tsconfig.base.json`: the root `tsconfig.json` is
+ * inherited by no project, and a mapping written there would never reach the
+ * compiler — the alias resolved in the editor and broke in the build.
+ */
+export declare function updateTsConfig(cwd: string, config: Config, tsconfigFile?: string): Promise<void>;
 //# sourceMappingURL=tsconfig-updater.d.ts.map

package/commands/init/tsconfig-updater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig-updater.d.ts","sourceRoot":"","sources":["../../../src/commands/init/tsconfig-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAOnD,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/E"}
+{"version":3,"file":"tsconfig-updater.d.ts","sourceRoot":"","sources":["../../../src/commands/init/tsconfig-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAOjE;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,SAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/G"}

package/commands/init/tsconfig-updater.js

@@ -1,12 +1,20 @@
+import { aliasPattern } from '../../utils/config.js';
 import { logger } from '../../utils/logger.js';
 import * as commentJson from 'comment-json';
 import { existsSync } from 'fs';
 import { writeFile, readFile } from 'node:fs/promises';
 import * as path from 'path';
-export async function updateTsConfig(cwd, config) {
-    const tsconfigPath = path.join(cwd, 'tsconfig.json');
+/**
+ * Writes the alias into the tsconfig the projects actually extend.
+ *
+ * In an Nx workspace that is `tsconfig.base.json`: the root `tsconfig.json` is
+ * inherited by no project, and a mapping written there would never reach the
+ * compiler — the alias resolved in the editor and broke in the build.
+ */
+export async function updateTsConfig(cwd, config, tsconfigFile = 'tsconfig.json') {
+    const tsconfigPath = path.join(cwd, tsconfigFile);
     if (!existsSync(tsconfigPath)) {
-        logger.warn('tsconfig.json not found, skipping path configuration');
+        logger.warn(`${tsconfigFile} not found, skipping path configuration`);
         return;
     }
     try {
@@ -15,7 +23,7 @@ export async function updateTsConfig(cwd, config) {
         await writeTsConfig(tsconfigPath, updatedTsConfig);
     }
     catch (error) {
-        logger.warn('Failed to update tsconfig.json paths');
+        logger.warn(`Failed to update ${tsconfigFile} paths`);
         logger.error(error);
     }
 }
@@ -27,21 +35,32 @@ function updatePaths(tsconfig, config) {
     if (!tsconfig.compilerOptions) {
         tsconfig.compilerOptions = {};
     }
-    if (!tsconfig.compilerOptions.baseUrl) {
-        tsconfig.compilerOptions.baseUrl = './';
-    }
     if (!tsconfig.compilerOptions.paths) {
         tsconfig.compilerOptions.paths = {};
     }
-    const pathMappings = {
-        '@/*': [`${config.baseUrl}/*`],
-    };
+    // The key comes from the chosen alias, not from a fixed `@/*`: someone who
+    // configured `@app/components` generates imports with that prefix, and mapping
+    // a different one would leave every import in the project unresolved.
     tsconfig.compilerOptions.paths = {
         ...tsconfig.compilerOptions.paths,
-        ...pathMappings,
+        [aliasPattern(config.aliases.components)]: [`${pathMappingBase(tsconfig, config)}/*`],
     };
     return tsconfig;
 }
+/**
+ * Writes the mapping without introducing `baseUrl`.
+ *
+ * Declaring `baseUrl` breaks the build on TypeScript 6 — the option became an
+ * error and disappears in 7 — and since 4.1 it is no longer necessary: without
+ * it, paths are resolved relative to the tsconfig itself. Projects that already
+ * declare the option are still honoured, with the mapping written relative to it.
+ */
+function pathMappingBase(tsconfig, config) {
+    const baseUrl = tsconfig.compilerOptions.baseUrl;
+    if (!baseUrl)
+        return `./${config.baseUrl}`;
+    return path.posix.relative(path.posix.normalize(baseUrl), path.posix.normalize(config.baseUrl)) || '.';
+}
 async function writeTsConfig(tsconfigPath, tsconfig) {
     const updatedContent = commentJson.stringify(tsconfig, null, 2);
     await writeFile(tsconfigPath, updatedContent, 'utf8');

package/commands/init/tsconfig-updater.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig-updater.js","sourceRoot":"","sources":["../../../src/commands/init/tsconfig-updater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,MAAc;IAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,aAAa,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,YAAoB;IAC9C,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC7D,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAQ,CAAC;AACnD,CAAC;AAED,SAAS,WAAW,CAAC,QAAa,EAAE,MAAc;IAChD,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC9B,QAAQ,CAAC,eAAe,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACtC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACpC,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC;KAC/B,CAAC;IAEF,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG;QAC/B,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK;QACjC,GAAG,YAAY;KAChB,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,YAAoB,EAAE,QAAa;IAC9D,MAAM,cAAc,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,SAAS,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"tsconfig-updater.js","sourceRoot":"","sources":["../../../src/commands/init/tsconfig-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,MAAc,EAAE,YAAY,GAAG,eAAe;IAC9F,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAElD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,yCAAyC,CAAC,CAAC;QACtE,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,aAAa,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,oBAAoB,YAAY,QAAQ,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,YAAoB;IAC9C,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC7D,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAQ,CAAC;AACnD,CAAC;AAED,SAAS,WAAW,CAAC,QAAa,EAAE,MAAc;IAChD,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC9B,QAAQ,CAAC,eAAe,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACpC,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;IACtC,CAAC;IAED,2EAA2E;IAC3E,+EAA+E;IAC/E,sEAAsE;IACtE,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG;QAC/B,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK;QACjC,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC;KACtF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,eAAe,CAAC,QAAa,EAAE,MAAc;IACpD,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;IAEjD,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;IAE3C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC;AACzG,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,YAAoB,EAAE,QAAa;IAC9D,MAAM,cAAc,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,SAAS,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AACxD,CAAC"}

package/commands/init/update-angular-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-config.d.ts","sourceRoot":"","sources":["../../../src/commands/init/update-angular-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAWnD;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6EpF"}
+{"version":3,"file":"update-angular-config.d.ts","sourceRoot":"","sources":["../../../src/commands/init/update-angular-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AA4BnD;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCpF"}