@aerogel/cli 0.0.0-next.59bf5f7cc06e728d0cf6c00de28f1da48d7d6b8e → 0.0.0-next.60462e474474f4e52d52d457f9150df63c117214

package/src/lib/App.ts

@@ -1,32 +1,90 @@
 import { stringToSlug } from '@noeldemartin/utils';
 
-import File from '@/lib/File';
-import Log from '@/lib/Log';
-import Template from '@/lib/Template';
-import { basePath } from '@/lib/utils';
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+import Template from '@aerogel/cli/lib/Template';
+import { packNotFound, packagePackPath, packagePath, templatePath } from '@aerogel/cli/lib/utils/paths';
+import { Editor } from '@aerogel/cli/lib/Editor';
+
+interface Dependencies {
+    aerogelCli: string;
+    aerogelCore: string;
+    aerogelCypress: string;
+    aerogelPluginI18n: string;
+    aerogelPluginSoukai: string;
+    aerogelVite: string;
+}
 
 export interface Options {
     local?: boolean;
+    linkedLocal?: boolean;
 }
 
 export default class App {
 
-    constructor(protected name: string, protected options: Options = {}) {}
+    constructor(
+        protected name: string,
+        protected options: Options = {},
+    ) {}
 
     public create(path: string): void {
         if (File.exists(path) && (!File.isDirectory(path) || !File.isEmptyDirectory(path))) {
             Log.fail(`Folder at '${path}' already exists!`);
         }
 
-        Template.instantiate(basePath('templates/app'), path, {
+        Template.instantiate(templatePath('app'), path, {
             app: {
                 name: this.name,
                 slug: stringToSlug(this.name),
             },
-            local: this.options.local && {
-                aerogelPath: basePath('../'),
-            },
+            dependencies: this.getDependencies(),
+            contentPath: this.options.linkedLocal
+                ? `${packagePath('core')}/dist/**/*.js`
+                : './node_modules/@aerogel/core/dist/**/*.js',
         });
     }
 
+    public edit(): Editor {
+        return new Editor();
+    }
+
+    protected getDependencies(): Dependencies {
+        const withFilePrefix = <T extends Record<string, string>>(paths: T) =>
+            Object.entries(paths).reduce(
+                (pathsWithFile, [name, path]) => Object.assign(pathsWithFile, { [name]: `file:${path}` }) as T,
+                {} as T,
+            );
+
+        if (this.options.linkedLocal) {
+            return withFilePrefix({
+                aerogelCli: packagePath('cli'),
+                aerogelCore: packagePath('core'),
+                aerogelCypress: packagePath('cypress'),
+                aerogelPluginI18n: packagePath('plugin-i18n'),
+                aerogelPluginSoukai: packagePath('plugin-soukai'),
+                aerogelVite: packagePath('vite'),
+            });
+        }
+
+        if (this.options.local) {
+            return withFilePrefix({
+                aerogelCli: packagePackPath('cli') ?? packNotFound('cli'),
+                aerogelCore: packagePackPath('core') ?? packNotFound('core'),
+                aerogelCypress: packagePackPath('cypress') ?? packNotFound('cypress'),
+                aerogelPluginI18n: packagePackPath('plugin-i18n') ?? packNotFound('plugin-i18n'),
+                aerogelPluginSoukai: packagePackPath('plugin-soukai') ?? packNotFound('plugin-soukai'),
+                aerogelVite: packagePackPath('vite') ?? packNotFound('vite'),
+            });
+        }
+
+        return {
+            aerogelCli: 'next',
+            aerogelCore: 'next',
+            aerogelCypress: 'next',
+            aerogelPluginI18n: 'next',
+            aerogelPluginSoukai: 'next',
+            aerogelVite: 'next',
+        };
+    }
+
 }

package/src/lib/Editor.ts

@@ -0,0 +1,57 @@
+import { arrayFrom } from '@noeldemartin/utils';
+import { Project } from 'ts-morph';
+import type { SourceFile } from 'ts-morph';
+
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+import Shell from '@aerogel/cli/lib/Shell';
+
+export class Editor {
+
+    private project: Project;
+    private modifiedFiles: Set<string>;
+
+    constructor() {
+        this.project = new Project({ tsConfigFilePath: 'tsconfig.json' });
+        this.modifiedFiles = new Set();
+
+        this.project.addSourceFilesAtPaths('src/**/*.ts');
+        this.project.addSourceFilesAtPaths('vite.config.ts');
+        this.project.addSourceFilesAtPaths('package.json');
+    }
+
+    public addSourceFile(path: string): void {
+        this.project.addSourceFilesAtPaths(path);
+    }
+
+    public requireSourceFile(path: string): SourceFile {
+        return this.project.getSourceFileOrThrow(path);
+    }
+
+    public async format(): Promise<void> {
+        await Log.animate('Formatting modified files', async () => {
+            const usingPrettier = File.exists('prettier.config.js') || File.contains('package.json', '"prettier": {');
+            const usingESLint = File.exists('.eslintrc.js') || File.contains('package.json', '"eslintConfig"');
+            const usingPrettierESLint = File.contains('package.json', '"prettier-eslint-cli"');
+            const formatFile = usingPrettierESLint
+                ? (file: string) => Shell.run(`npx prettier-eslint ${file} --write`)
+                : async (file: string) => {
+                    usingPrettier && (await Shell.run(`npx prettier ${file} --write`));
+                    file.match(/\.(ts|js|vue)$/) && usingESLint && (await Shell.run(`npx eslint ${file} --fix`));
+                };
+
+            await Promise.all(arrayFrom(this.modifiedFiles).map(async (file) => formatFile(file)));
+        });
+    }
+
+    public async save(file: SourceFile): Promise<void> {
+        await file.save();
+
+        this.addModifiedFile(file.getFilePath());
+    }
+
+    public addModifiedFile(path: string): void {
+        this.modifiedFiles.add(path);
+    }
+
+}

package/src/lib/File.mock.ts

@@ -8,28 +8,28 @@ export class FileMockService extends FileService {
 
     private virtualFilesystem: Record<string, string | { directory: true }> = {};
 
-    public exists(path: string): boolean {
+    public override exists(path: string): boolean {
         return super.exists(path) || path in this.virtualFilesystem;
     }
 
-    public isDirectory(path: string): boolean {
+    public override isDirectory(path: string): boolean {
         return (
             super.isDirectory(path) ||
             (path in this.virtualFilesystem && typeof this.virtualFilesystem[path] === 'object')
         );
     }
 
-    public isFile(path: string): boolean {
+    public override isFile(path: string): boolean {
         return (
             super.isFile(path) || (path in this.virtualFilesystem && typeof this.virtualFilesystem[path] === 'string')
         );
     }
 
-    public makeDirectory(path: string): void {
+    public override makeDirectory(path: string): void {
         this.virtualFilesystem[path] = { directory: true };
     }
 
-    public read(path: string): string | null {
+    public override read(path: string): string | null {
         if (path in this.virtualFilesystem && typeof this.virtualFilesystem[path] === 'string') {
             return this.virtualFilesystem[path] as string;
         }
@@ -37,14 +37,10 @@ export class FileMockService extends FileService {
         return super.read(path);
     }
 
-    public write(path: string, contents: string): void {
+    public override write(path: string, contents: string): void {
         this.virtualFilesystem[path] = contents;
     }
 
-    public reset(): void {
-        this.virtualFilesystem = {};
-    }
-
     public expectCreated(path: string, expectContent?: (contents: string) => void): Assertion<string> {
         expect(typeof this.virtualFilesystem[path] === 'string', `expected '${path}' file to have been created`).toBe(
             true,
@@ -63,4 +59,4 @@ export class FileMockService extends FileService {
 
 }
 
-export default facade(new FileMockService());
+export default facade(FileMockService);

package/src/lib/File.ts

@@ -1,6 +1,6 @@
-import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'fs';
+import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { facade } from '@noeldemartin/utils';
-import { dirname, resolve } from 'path';
+import { dirname, resolve } from 'node:path';
 
 export class FileService {
 
@@ -12,6 +12,12 @@ export class FileService {
         return existsSync(path);
     }
 
+    public isSymlink(path: string): boolean {
+        const stats = lstatSync(path);
+
+        return stats.isSymbolicLink();
+    }
+
     public read(path: string): string | null {
         if (!this.isFile(path)) {
             return null;
@@ -67,4 +73,4 @@ export class FileService {
 
 }
 
-export default facade(new FileService());
+export default facade(FileService);

package/src/lib/Log.mock.ts

@@ -15,22 +15,19 @@ export class LogServiceMock extends LogService {
         expect(this.logs, `Expected log to have length ${count}`).toHaveLength(count);
     }
 
-    protected logLine(message: string): void {
+    protected override logLine(message: string): void {
         this.logs.push(message);
     }
 
-    public fail(message: string): void {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    public override fail<T = any>(message: string): T {
         throw new Error(`Fail: ${message}`);
     }
 
-    public reset(): void {
-        this.logs = [];
-    }
-
-    protected stdout(): void {
+    protected override stdout(): void {
         //
     }
 
 }
 
-export default facade(new LogServiceMock());
+export default facade(LogServiceMock);

package/src/lib/Log.test.ts

@@ -1,11 +1,11 @@
-import { bold, hex } from 'chalk';
+import chalk from 'chalk';
 import { describe, it } from 'vitest';
 
-import LogMock from '@/lib/Log.mock';
+import LogMock from '@aerogel/cli/lib/Log.mock';
 
 import Log from './Log';
 
-const info = hex('#00ffff');
+const info = chalk.hex('#00ffff');
 
 describe('Log', () => {
 
@@ -14,7 +14,7 @@ describe('Log', () => {
         Log.info('Foo **bar**');
 
         // Assert
-        LogMock.expectLogged(info(`Foo ${bold('bar')}`));
+        LogMock.expectLogged(info(`Foo ${chalk.bold('bar')}`));
     });
 
     it('renders multiline messages', () => {

package/src/lib/Log.ts

@@ -1,16 +1,17 @@
+import chalk from 'chalk';
+import { clearLine, cursorTo } from 'node:readline';
 import { facade, stringMatchAll } from '@noeldemartin/utils';
-import { bold, hex } from 'chalk';
-import { clearLine, cursorTo } from 'readline';
 
 export class LogService {
 
-    protected renderInfo = hex('#00ffff');
-    protected renderSuccess = hex('#00ff00');
-    protected renderError = hex('#ff0000');
+    protected renderInfo = chalk.hex('#00ffff');
+    protected renderSuccess = chalk.hex('#00ff00');
+    protected renderError = chalk.hex('#ff0000');
 
     public async animate<T>(message: string, operation: () => Promise<T>): Promise<T> {
-        const updateStdout = (end: string = '') => {
-            const progress = this.renderInfo(this.renderMarkdown(message) + '.'.repeat(frame % 4)) + end;
+        const updateStdout = (end: string = '', done: boolean = false) => {
+            const progress =
+                this.renderInfo(this.renderMarkdown(message) + (done ? '...' : '.'.repeat(frame % 4))) + end;
 
             this.stdout(progress);
         };
@@ -23,7 +24,7 @@ export class LogService {
         const result = await operation();
 
         clearInterval(interval);
-        updateStdout('\n');
+        updateStdout('\n', true);
 
         return result;
     }
@@ -36,7 +37,8 @@ export class LogService {
         this.log(this.renderMarkdown(message), this.renderError);
     }
 
-    public fail(message: string): void {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    public fail<T = any>(message: string): T {
         this.error(message);
 
         process.exit(1);
@@ -50,7 +52,7 @@ export class LogService {
         const matches = stringMatchAll<2>(message, /\*\*(.*)\*\*/g);
 
         for (const match of matches) {
-            message = message.replace(match[0], bold(match[1]));
+            message = message.replace(match[0], chalk.bold(match[1]));
         }
 
         return message;
@@ -90,4 +92,4 @@ export class LogService {
 
 }
 
-export default facade(new LogService());
+export default facade(LogService);

package/src/lib/Shell.mock.ts

@@ -7,8 +7,8 @@ export class ShellServiceMock extends ShellService {
 
     private history: string[] = [];
 
-    public async run(command: string): Promise<void> {
-        this.history.push(command);
+    public override async run(command: string): Promise<void> {
+        this.history.push(command.trim());
     }
 
     public expectRan(command: string): void {
@@ -17,4 +17,4 @@ export class ShellServiceMock extends ShellService {
 
 }
 
-export default facade(new ShellServiceMock());
+export default facade(ShellServiceMock);

package/src/lib/Shell.ts

@@ -1,4 +1,4 @@
-import { exec } from 'child_process';
+import { exec } from 'node:child_process';
 import { facade } from '@noeldemartin/utils';
 
 export class ShellService {
@@ -25,4 +25,4 @@ export class ShellService {
 
 }
 
-export default facade(new ShellService());
+export default facade(ShellService);

package/src/lib/Template.ts

@@ -1,12 +1,16 @@
-import { readFileSync } from 'fs';
-import { render } from 'mustache';
+import Mustache from 'mustache';
+import { readFileSync } from 'node:fs';
 import { toString } from '@noeldemartin/utils';
 
-import File from '@/lib/File';
+import File from '@aerogel/cli/lib/File';
 
 export default class Template {
 
-    public static instantiate(path: string, destination: string, replacements: Record<string, unknown>): string[] {
+    public static instantiate(
+        path: string,
+        destination: string = './',
+        replacements: Record<string, unknown> = {},
+    ): string[] {
         const template = new Template(path);
 
         return template.instantiate(destination, replacements);
@@ -28,7 +32,7 @@ export default class Template {
             const filePath =
                 destination + (relativePath.endsWith('.template') ? relativePath.slice(0, -9) : relativePath);
 
-            File.write(filePath, render(fileContents, replacements, undefined, ['<%', '%>']));
+            File.write(filePath, Mustache.render(fileContents, replacements, undefined, ['<%', '%>']));
             files.push(filePath);
         }
 
@@ -39,18 +43,21 @@ export default class Template {
         replacements: Record<string, unknown>,
         prefix: string = '',
     ): Record<string, string> {
-        return Object.entries(replacements).reduce((filenameReplacements, [key, value]) => {
-            if (typeof value === 'object') {
-                Object.assign(
-                    filenameReplacements,
-                    this.getFilenameReplacements(value as Record<string, unknown>, `${key}.`),
-                );
-            } else {
-                filenameReplacements[`[${prefix}${key}]`] = toString(value);
-            }
-
-            return filenameReplacements;
-        }, {} as Record<string, string>);
+        return Object.entries(replacements).reduce(
+            (filenameReplacements, [key, value]) => {
+                if (typeof value === 'object') {
+                    Object.assign(
+                        filenameReplacements,
+                        this.getFilenameReplacements(value as Record<string, unknown>, `${key}.`),
+                    );
+                } else {
+                    filenameReplacements[`[${prefix}${key}]`] = toString(value);
+                }
+
+                return filenameReplacements;
+            },
+            {} as Record<string, string>,
+        );
     }
 
 }

package/src/lib/utils/app.ts

@@ -0,0 +1,15 @@
+import App from '@aerogel/cli/lib/App';
+import File from '@aerogel/cli/lib/File';
+
+export function app(): App {
+    // TODO parse app name
+    return new App('');
+}
+
+export function isLocalApp(): boolean {
+    return File.contains('package.json', '"@aerogel/core": "file:');
+}
+
+export function isLinkedLocalApp(): boolean {
+    return File.isSymlink('node_modules/@aerogel/core');
+}

package/src/lib/utils/edit.ts

@@ -0,0 +1,44 @@
+import { arrayFrom } from '@noeldemartin/utils';
+import type { Node, SyntaxKind } from 'ts-morph';
+
+export function editFiles(): boolean {
+    // TODO mock editor instead of relying on this for unit tests
+    return true;
+}
+
+export function findDescendant<T extends Node>(
+    node: Node | undefined,
+    options: {
+        guard?: (node: Node | undefined) => node is T;
+        validate?: (node: T) => boolean;
+        skip?: SyntaxKind | SyntaxKind[];
+    } = {},
+): T | undefined {
+    if (!node) {
+        return;
+    }
+
+    const guard = options.guard ?? (() => true);
+    const validate = options.validate ?? (() => true);
+    const skipKinds = arrayFrom(options.skip ?? []);
+
+    return node.forEachDescendant((descendant, traversal) => {
+        if (guard(descendant) && validate(descendant as T)) {
+            return descendant as T;
+        }
+
+        const descendantKind = descendant.getKind();
+
+        if (skipKinds.includes(descendantKind)) {
+            traversal.skip();
+        }
+    });
+}
+
+export function when<T extends Node>(node: Node | undefined, assertion: (node: Node) => node is T): T | undefined {
+    if (!node || !assertion(node)) {
+        return;
+    }
+
+    return node as T;
+}

package/src/lib/utils/paths.ts

@@ -0,0 +1,42 @@
+import { URL, fileURLToPath } from 'node:url';
+import { stringMatch } from '@noeldemartin/utils';
+import { resolve } from 'node:path';
+
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+
+export function basePath(path: string = ''): string {
+    if (
+        File.contains(
+            fileURLToPath(new URL(/* @vite-ignore */ '../../../package.json', import.meta.url)),
+            '"packages/create-aerogel"',
+        )
+    ) {
+        return resolve(fileURLToPath(new URL(/* @vite-ignore */ '../', import.meta.url)), path);
+    }
+
+    const packageJson = File.read(
+        fileURLToPath(new URL(/* @vite-ignore */ '../../../../package.json', import.meta.url)),
+    );
+    const matches = stringMatch<2>(packageJson ?? '', /"@aerogel\/core": "file:(.*)\/aerogel-core-[\d.]*\.tgz"/);
+    const cliPath = matches?.[1] ?? Log.fail<string>('Could not determine base path');
+
+    return resolve(cliPath, path);
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function packNotFound(packageName: string): any {
+    return Log.fail(`Could not find ${packageName} pack file, did you run 'npm pack'?`);
+}
+
+export function packagePackPath(packageName: string): string | null {
+    return File.getFiles(packagePath(packageName)).find((file) => file.endsWith('.tgz')) ?? null;
+}
+
+export function packagePath(packageName: string): string {
+    return basePath(`../${packageName}`);
+}
+
+export function templatePath(name: string): string {
+    return fileURLToPath(new URL(/* @vite-ignore */ `../templates/${name}`, import.meta.url));
+}