@aerogel/cli 0.0.0-next.a68f133e2c9a1ae9ba84b4e2e42df909289e5fba → 0.0.0-next.b3caf219a503ce9b8c65ef1463132c9507f56c0a

package/src/commands/generate-service.ts

@@ -2,20 +2,20 @@ import { arrayFrom, formatCodeBlock, stringToCamelCase } from '@noeldemartin/uti
 import { Node, SyntaxKind } from 'ts-morph';
 import type { ObjectLiteralExpression, SourceFile } from 'ts-morph';
 
-import Command from '@/commands/Command';
-import File from '@/lib/File';
-import Log from '@/lib/Log';
-import Template from '@/lib/Template';
-import { app } from '@/lib/utils/app';
-import { templatePath } from '@/lib/utils/paths';
-import { editFiles, findDescendant } from '@/lib/utils/edit';
-import type { Editor } from '@/lib/Editor';
+import Command from '@aerogel/cli/commands/Command';
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+import Template from '@aerogel/cli/lib/Template';
+import { app } from '@aerogel/cli/lib/utils/app';
+import { templatePath } from '@aerogel/cli/lib/utils/paths';
+import { editFiles, findDescendant } from '@aerogel/cli/lib/utils/edit';
+import type { Editor } from '@aerogel/cli/lib/Editor';
 
 export class GenerateServiceCommand extends Command {
 
-    protected static command: string = 'generate:service';
-    protected static description: string = 'Generate an AerogelJS Service';
-    protected static parameters: [string, string][] = [['name', 'Service name']];
+    protected static override command: string = 'generate:service';
+    protected static override description: string = 'Generate an AerogelJS Service';
+    protected static override parameters: [string, string][] = [['name', 'Service name']];
 
     private name: string;
 
@@ -25,7 +25,7 @@ export class GenerateServiceCommand extends Command {
         this.name = name;
     }
 
-    protected async run(): Promise<void> {
+    protected override async run(): Promise<void> {
         this.assertAerogelOrDirectory('src/services');
 
         const files = new Set<string>();
@@ -95,8 +95,8 @@ export class GenerateServiceCommand extends Command {
 
                 export type AppServices = typeof services;
 
-                declare module '@vue/runtime-core' {
-                    interface ComponentCustomProperties extends AppServices {}
+                declare module '@aerogel/core' {
+                    interface Services extends AppServices {}
                 }
             `),
         );

package/src/commands/info.ts

@@ -1,14 +1,15 @@
-import Command from '@/commands/Command';
-import Log from '@/lib/Log';
+import { URL, fileURLToPath } from 'node:url';
 
+import Command from '@aerogel/cli/commands/Command';
+import Log from '@aerogel/cli/lib/Log';
 export class InfoCommand extends Command {
 
-    protected static command: string = 'info';
-    protected static description: string = 'Show debugging information about the CLI';
+    protected static override command: string = 'info';
+    protected static override description: string = 'Show debugging information about the CLI';
 
-    protected async run(): Promise<void> {
+    protected override async run(): Promise<void> {
         Log.info('[AerogelJS CLI info]');
-        Log.info('Installation directory: ' + __dirname);
+        Log.info('Installation directory: ' + fileURLToPath(new URL(/* @vite-ignore */ './', import.meta.url)));
     }
 
 }

package/src/commands/install.test.ts

@@ -1,7 +1,6 @@
 import { describe, it } from 'vitest';
 
-import FileMock from '@/lib/File.mock';
-import ShellMock from '@/lib/Shell.mock';
+import ShellMock from '@aerogel/cli/lib/Shell.mock';
 
 import { InstallCommand } from './install';
 
@@ -25,17 +24,4 @@ describe('Install plugin command', () => {
         ShellMock.expectRan('npm install @aerogel/plugin-soukai@next --save-exact');
     });
 
-    it('installs histoire', async () => {
-        // Arrange
-        FileMock.stub('package.json', '"@aerogel/core"');
-
-        // Act
-        await InstallCommand.run('histoire');
-
-        // Assert
-        ShellMock.expectRan('npm install histoire@0.17.6 --save-dev');
-        ShellMock.expectRan('npm install @aerogel/histoire@next --save-exact --save-dev');
-        ShellMock.expectRan('npm install patch-package --save-dev');
-    });
-
 });

package/src/commands/install.ts

@@ -1,20 +1,19 @@
-import Command from '@/commands/Command';
-import Log from '@/lib/Log';
-import { Histoire } from '@/plugins/Histoire';
-import { Solid } from '@/plugins/Solid';
-import { Soukai } from '@/plugins/Soukai';
-import type Plugin from '@/plugins/Plugin';
-
-const plugins = [new Soukai(), new Solid(), new Histoire()].reduce(
+import Command from '@aerogel/cli/commands/Command';
+import Log from '@aerogel/cli/lib/Log';
+import { Solid } from '@aerogel/cli/plugins/Solid';
+import { Soukai } from '@aerogel/cli/plugins/Soukai';
+import type Plugin from '@aerogel/cli/plugins/Plugin';
+
+const plugins = [new Soukai(), new Solid()].reduce(
     (pluginsObject, plugin) => Object.assign(pluginsObject, { [plugin.name]: plugin }),
     {} as Record<string, Plugin>,
 );
 
 export class InstallCommand extends Command {
 
-    protected static command: string = 'install';
-    protected static description: string = 'Install an AerogelJS plugin';
-    protected static parameters: [string, string][] = [['plugin', 'Plugin to install']];
+    protected static override command: string = 'install';
+    protected static override description: string = 'Install an AerogelJS plugin';
+    protected static override parameters: [string, string][] = [['plugin', 'Plugin to install']];
 
     private plugin: Plugin;
 
@@ -26,7 +25,7 @@ export class InstallCommand extends Command {
             Log.fail(`Plugin '${plugin}' doesn't exist. Available plugins: ${Object.keys(plugins).join(', ')}`);
     }
 
-    protected async run(): Promise<void> {
+    protected override async run(): Promise<void> {
         await this.plugin.install();
     }
 

package/src/lib/App.ts

@@ -1,10 +1,10 @@
 import { stringToSlug } from '@noeldemartin/utils';
 
-import File from '@/lib/File';
-import Log from '@/lib/Log';
-import Template from '@/lib/Template';
-import { packNotFound, packagePackPath, packagePath, templatePath } from '@/lib/utils/paths';
-import { Editor } from '@/lib/Editor';
+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;
@@ -22,7 +22,10 @@ export interface Options {
 
 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))) {

package/src/lib/Editor.ts

@@ -2,9 +2,9 @@ import { arrayFrom } from '@noeldemartin/utils';
 import { Project } from 'ts-morph';
 import type { SourceFile } from 'ts-morph';
 
-import File from '@/lib/File';
-import Log from '@/lib/Log';
-import Shell from '@/lib/Shell';
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+import Shell from '@aerogel/cli/lib/Shell';
 
 export class Editor {
 
@@ -16,7 +16,6 @@ export class Editor {
         this.modifiedFiles = new Set();
 
         this.project.addSourceFilesAtPaths('src/**/*.ts');
-        this.project.addSourceFilesAtPaths('tailwind.config.js');
         this.project.addSourceFilesAtPaths('vite.config.ts');
         this.project.addSourceFilesAtPaths('package.json');
     }

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,7 +37,7 @@ 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;
     }
 

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 {
 

package/src/lib/Log.mock.ts

@@ -15,16 +15,16 @@ 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);
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    public fail<T = any>(message: string): T {
+    public override fail<T = any>(message: string): T {
         throw new Error(`Fail: ${message}`);
     }
 
-    protected stdout(): void {
+    protected override stdout(): void {
         //
     }
 

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,12 +1,12 @@
+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 = '', done: boolean = false) => {
@@ -52,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;

package/src/lib/Shell.mock.ts

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

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 {

package/src/lib/Template.ts

@@ -1,8 +1,8 @@
-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 {
 
@@ -32,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);
         }
 
@@ -43,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

@@ -1,5 +1,5 @@
-import App from '@/lib/App';
-import File from '@/lib/File';
+import App from '@aerogel/cli/lib/App';
+import File from '@aerogel/cli/lib/File';
 
 export function app(): App {
     // TODO parse app name

package/src/lib/utils/edit.ts

@@ -23,8 +23,8 @@ export function findDescendant<T extends Node>(
     const skipKinds = arrayFrom(options.skip ?? []);
 
     return node.forEachDescendant((descendant, traversal) => {
-        if (guard(descendant) && validate(descendant)) {
-            return descendant;
+        if (guard(descendant) && validate(descendant as T)) {
+            return descendant as T;
         }
 
         const descendantKind = descendant.getKind();

package/src/lib/utils/paths.ts

@@ -1,15 +1,23 @@
-import { resolve } from 'path';
+import { URL, fileURLToPath } from 'node:url';
 import { stringMatch } from '@noeldemartin/utils';
+import { resolve } from 'node:path';
 
-import File from '@/lib/File';
-import Log from '@/lib/Log';
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
 
 export function basePath(path: string = ''): string {
-    if (File.contains(resolve(__dirname, '../../../package.json'), '"name": "aerogel"')) {
-        return resolve(__dirname, '../', path);
+    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(resolve(__dirname, '../../../../package.json'));
+    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');
 
@@ -30,5 +38,5 @@ export function packagePath(packageName: string): string {
 }
 
 export function templatePath(name: string): string {
-    return resolve(__dirname, `../templates/${name}`);
+    return fileURLToPath(new URL(/* @vite-ignore */ `../templates/${name}`, import.meta.url));
 }

package/src/plugins/Plugin.ts

@@ -1,13 +1,13 @@
 import { Node, SyntaxKind } from 'ts-morph';
 import type { ArrayLiteralExpression, ImportDeclarationStructure, OptionalKind, SourceFile } from 'ts-morph';
 
-import Log from '@/lib/Log';
-import Shell from '@/lib/Shell';
-import File from '@/lib/File';
-import { app, isLinkedLocalApp, isLocalApp } from '@/lib/utils/app';
-import { editFiles, findDescendant, when } from '@/lib/utils/edit';
-import { packNotFound, packagePackPath, packagePath } from '@/lib/utils/paths';
-import type { Editor } from '@/lib/Editor';
+import Log from '@aerogel/cli/lib/Log';
+import Shell from '@aerogel/cli/lib/Shell';
+import File from '@aerogel/cli/lib/File';
+import { app, isLinkedLocalApp, isLocalApp } from '@aerogel/cli/lib/utils/app';
+import { editFiles, findDescendant, when } from '@aerogel/cli/lib/utils/edit';
+import { packNotFound, packagePackPath, packagePath } from '@aerogel/cli/lib/utils/paths';
+import type { Editor } from '@aerogel/cli/lib/Editor';
 
 export default abstract class Plugin {
 
@@ -101,25 +101,6 @@ export default abstract class Plugin {
         });
     }
 
-    protected async updateTailwindConfig(editor: Editor, options: { content: string }): Promise<void> {
-        await Log.animate('Updating tailwind configuration', async () => {
-            const tailwindConfig = editor.requireSourceFile('tailwind.config.js');
-            const contentArray = this.getTailwindContentArray(tailwindConfig);
-
-            if (!contentArray) {
-                return Log.fail(`
-                    Could not find content array in tailwind config, please add the following manually:
-
-                    ${options.content}
-                `);
-            }
-
-            contentArray.addElement(options.content);
-
-            await editor.save(tailwindConfig);
-        });
-    }
-
     protected getBootstrapPluginsDeclaration(mainConfig: SourceFile): ArrayLiteralExpression | null {
         const bootstrapAppCall = findDescendant(mainConfig, {
             guard: Node.isCallExpression,

package/src/plugins/Solid.ts

@@ -1,10 +1,8 @@
-import File from '@/lib/File';
-import Log from '@/lib/Log';
-import Plugin from '@/plugins/Plugin';
-import Shell from '@/lib/Shell';
-import { isLinkedLocalApp } from '@/lib/utils/app';
-import { packagePath } from '@/lib/utils/paths';
-import type { Editor } from '@/lib/Editor';
+import File from '@aerogel/cli/lib/File';
+import Log from '@aerogel/cli/lib/Log';
+import Plugin from '@aerogel/cli/plugins/Plugin';
+import Shell from '@aerogel/cli/lib/Shell';
+import type { Editor } from '@aerogel/cli/lib/Editor';
 
 export class Solid extends Plugin {
 
@@ -12,22 +10,16 @@ export class Solid extends Plugin {
         super('solid');
     }
 
-    protected async updateFiles(editor: Editor): Promise<void> {
-        await this.updateTailwindConfig(editor, {
-            content: isLinkedLocalApp()
-                ? `'${packagePath('plugin-solid')}/dist/**/*.js'`
-                : '\'./node_modules/@aerogel/plugin-solid/dist/**/*.js\'',
-        });
-
+    protected override async updateFiles(editor: Editor): Promise<void> {
         await this.updateNpmScripts(editor);
         await this.updateGitIgnore();
         await super.updateFiles(editor);
     }
 
-    protected async installNpmDependencies(): Promise<void> {
+    protected override async installNpmDependencies(): Promise<void> {
         await Shell.run('npm install soukai-solid@next --save-exact');
         await Shell.run('npm install @noeldemartin/solid-utils@next --save-exact');
-        await Shell.run('npm install @solid/community-server@7 --save');
+        await Shell.run('npm install @solid/community-server@7.1.6 --save-dev -E');
         await super.installNpmDependencies();
     }
 
@@ -56,11 +48,12 @@ export class Solid extends Plugin {
                 .replace(
                     '"dev": "vite",',
                     '"dev": "vite",\n' +
-                        '"dev:serve-pod": "community-solid-server -c @css:config/file.json -f ./solid-data",',
+                        '"dev:serve-pod": "community-solid-server -c @css:config/file.json -f ./solid",',
                 )
                 .replace(
-                    '"test:serve-app": "vite --port 5001"',
-                    '"test:serve-app": "vite --port 5001",\n"test:serve-pod": "community-solid-server -l warn"',
+                    '"test:serve-app": "vite --port 5001 --mode testing"',
+                    '"test:serve-app": "vite --port 5001 --mode testing",\n' +
+                        '"test:serve-pod": "community-solid-server -l warn"',
                 ),
         );
 
@@ -72,7 +65,7 @@ export class Solid extends Plugin {
 
         const gitignore = File.read('.gitignore') ?? '';
 
-        File.write('.gitignore', `${gitignore}/solid-data\n`);
+        File.write('.gitignore', `${gitignore}/solid\n`);
     }
 
 }

package/src/plugins/Soukai.ts

@@ -1,5 +1,5 @@
-import Plugin from '@/plugins/Plugin';
-import Shell from '@/lib/Shell';
+import Plugin from '@aerogel/cli/plugins/Plugin';
+import Shell from '@aerogel/cli/lib/Shell';
 
 export class Soukai extends Plugin {
 
@@ -7,12 +7,12 @@ export class Soukai extends Plugin {
         super('soukai');
     }
 
-    protected async installNpmDependencies(): Promise<void> {
+    protected override async installNpmDependencies(): Promise<void> {
         await Shell.run('npm install soukai@next --save-exact');
         await super.installNpmDependencies();
     }
 
-    protected getBootstrapConfig(): string {
+    protected override getBootstrapConfig(): string {
         return 'soukai({ models: import.meta.glob(\'@/models/*\', { eager: true }) })';
     }