lucy-cli 2.0.0-alpha.11 → 2.0.0-alpha.12

package/src/commands/edit.ts

@@ -0,0 +1,83 @@
+import { Effect, Schema } from "effect/index";
+import { Config } from "../config.js";
+import { FileSystem, Path } from "@effect/platform"
+import { logger } from "../utils/logger.js";
+import { JsonSchema } from "../schemas/index.js";
+import { LucySettings } from "../schemas/lucy.js";
+
+export const editJson = (json: any, keys: string[], values: string[] | Object[]) => {
+    return Effect.gen(function*() {
+        const config = yield* Config;
+
+        for (const key of keys){
+			const index = keys.indexOf(key);
+			const value = values[index];
+			json[key] = value;
+		}
+    })
+}
+
+export const mergeLucySettings2PackageJson = Effect.gen(function*() {
+    const config = yield* Config;
+    const lucySettings = config.config.lucySettings;
+    const packageJson = config.config.packageJson;
+
+    if (Object.keys(lucySettings.scripts).length > 0) {
+        yield* editJson(packageJson, ['scripts'], [{...packageJson.scripts, ...lucySettings.scripts}]);
+    }
+})
+
+export const setModule = Effect.gen(function*() {
+    const config = yield* Config;
+    const lucySettings = config.config.lucySettings;
+    const packageJson = config.config.packageJson;
+
+	yield* editJson(packageJson, ['type'], ['module']);
+})
+
+export const mergeAdditions = Effect.gen(function*() {
+    const config = yield* Config;
+    const lucySettings = config.config.lucySettings;
+    const packageJson = config.config.packageJson;
+
+	config.config.packageJson = {
+        ...packageJson,
+        ...lucySettings.additionalPkgProps,
+    }
+})
+
+export const setProjectName = Effect.gen(function*() {
+    const config = yield* Config;
+    const packageJson = config.config.packageJson;
+
+	yield * editJson(packageJson, ["name"], [config.config.projectName]);
+})
+
+export const setInitialized = Effect.gen(function*() {
+    const config = yield* Config;
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const lucyRaw = yield* fs.readFileString(path.join(config.config.cwd, 'lucy.json'));
+    const lucyJSON = (yield* Schema.decodeUnknown(JsonSchema)(lucyRaw)) as any;
+    lucyJSON.initialized = true;
+
+    yield* fs.writeFileString(path.join(config.config.cwd, 'lucy.json'), JSON.stringify(lucyJSON, null, 2));
+})
+
+export const stringReplace = (filePath: string, keys: string[], values: string[]) => {
+    return Effect.gen(function*() {
+        const fs = yield* FileSystem.FileSystem;
+        let modifiedContent: string = '';
+
+        logger.action(`Replacing ${keys} with ${values} in ${filePath}`);
+        const data = yield* fs.readFileString(filePath, 'utf8');
+        for (const key of keys){
+			const index = keys.indexOf(key);
+			const value = values[index];
+			const regex = new RegExp(`${key}`, 'g');
+			modifiedContent = data.replace(regex, `${value}`);
+		}
+        yield* fs.writeFileString(filePath, modifiedContent);
+        logger.info(`Updated file ${filePath}`);
+    })
+}

package/src/commands/exec.ts

@@ -0,0 +1,37 @@
+import { Effect } from "effect/index";
+import { Config } from "../config.js";
+import { Command } from "@effect/platform/index";
+import { logger } from "../utils/logger.js";
+import { FileSystem } from "@effect/platform"
+
+export const execCommand = Effect.gen(function*() {
+    const config = yield* Config;
+    const cmds = config.config.lucySettings.additionalCommands ?? [];
+    logger.info("Executing additional commands...", cmds);
+    if (cmds.length > 0) {
+        logger.info("Executing additional commands");
+      yield *
+        Effect.all([
+            ...cmds.map((cmd) => {
+            return Command.make(cmd[0], ...cmd.slice(1))
+                .pipe()
+                .pipe(Command.stdout("inherit"), Command.exitCode);
+            }),
+        ]);
+    }
+})
+
+export const open = Effect.scoped(Effect.gen(function*() {
+    const config = yield* Config;
+    const fs = yield* FileSystem.FileSystem
+    console.log("Opening Lucy home directory:", config.config.lucyHome);
+    let command: ReturnType<typeof Command.make>;
+    switch (process.platform) {
+        case 'darwin': command = Command.make('open', config.config.lucyHome); break;
+        case 'win32': command = Command.make('start', config.config.lucyHome); break;
+        default: command = Command.make('xdg-open', config.config.lucyHome); break;
+    }
+    
+    command.pipe().pipe(Command.stdout("inherit"), Command.exitCode);
+    yield* command.pipe().pipe(Command.stdout("inherit"), Command.exitCode);
+}))

package/src/commands/git.ts

@@ -0,0 +1,113 @@
+import { Effect } from 'effect/index';
+import { simpleGit, SimpleGit } from 'simple-git';
+import { Config } from '../config.js';
+import { AppError } from '../error.js';
+import { logger } from '../utils/logger.js';
+import { FileSystem, Path } from "@effect/platform"
+
+export const isSubmoduleRegistered = (git: SimpleGit, submoduleName: string) => Effect.gen(function* () {
+    const value = yield* Effect.tryPromise({
+        try: () => git.getConfig(`submodule.${submoduleName}.url`),
+        catch: (error) => {
+            return new AppError({
+                cause: error,
+                message: "Failed to get submodule url",
+            });
+        }
+    })
+    return !!value.value;
+})
+
+export const gitInit = (update: boolean = false) => Effect.gen(function* () {
+    const config = yield* Config;
+    const git = simpleGit({ baseDir: config.config.cwd });
+    const path = yield * Path.Path;
+
+    const isGit = yield* Effect.tryPromise({
+        try: () => git.checkIsRepo(),
+        catch: (error) => {
+            return new AppError({
+                cause: error,
+                message: "Failed to check if the directory is a git repository",
+            });
+        }
+    })
+
+    if(!isGit) {
+        yield* Effect.tryPromise({
+            try: () => git.init(),
+            catch: (error) => {
+                return new AppError({
+                    cause: error,
+                    message: "Failed to initialize git repository",
+                });
+            }
+        })
+    }
+
+    if (!config.config.lucySettings.modules) {
+        logger.alert('No submodules defined in settings, skipping.');
+		return;
+	}
+    yield* initSubmodules(update);
+})
+
+export const initSubmodules = (update: boolean = false) => Effect.gen(function* () {
+    const config = yield* Config;
+    const git = simpleGit({ baseDir: config.config.cwd });
+    const path = yield* Path.Path;
+    const fs = yield* FileSystem.FileSystem;
+    const gitmodulesPath = path.join(config.config.cwd, ".gitmodules");
+
+    for (const [name, repo] of Object.entries(config.config.lucySettings.modules)) {
+        logger.action(`Processing submodule ${name}`);
+		const clonePath = repo.path || path.join(config.config.defaultModuleBasePath, name);
+
+        const isRegistered = yield* isSubmoduleRegistered(git, clonePath);
+        const isConfiguredInFile = (yield* fs.exists(gitmodulesPath)) && (yield* fs.readFileString(gitmodulesPath, 'utf-8')).includes(`[submodule "${clonePath}"]`);
+
+        if (!isConfiguredInFile || config.config.force) {
+            logger.action(`Adding/updating submodule ${name} at ${clonePath}...`);
+            // If git already has a config entry, we must use --force to repair it.
+            const submoduleArgs = () => {
+                if (update) {
+                    return ['add', '--force', repo.source, clonePath];
+                }
+                return ['add', ...(config.config.force || isRegistered ? ['--force'] : []), repo.source, clonePath];
+            }
+            // await git.subModule(submoduleArgs);
+            yield* Effect.tryPromise({
+                try: () => git.subModule(submoduleArgs()),
+                catch: (error) => {
+                    return new AppError({
+                        cause: error,
+                        message: "Failed to add submodule",
+                    });
+                }
+            })
+        } else {
+            logger.alert(`Submodule ${name} at ${clonePath} already registered. Skipping add.`);
+        }
+
+        yield* Effect.tryPromise({
+            try: () => git.submoduleUpdate(['--init', '--recursive', clonePath]),
+            catch: (error) => {
+                return new AppError({
+                    cause: error,
+                    message: "Failed to update submodule",
+                });
+            }
+        })
+        yield* Effect.tryPromise({
+            try: () => simpleGit({ baseDir: path.join(config.config.cwd, clonePath) }).checkout(repo.branch),
+            catch: (error) => {
+                return new AppError({
+                    cause: error,
+                    message: `Failed to checkout submodule ${repo} branch ${repo.branch}`,
+                });
+            }
+        })
+    }
+    logger.success("All modules processed!");
+
+})

package/src/commands/home.ts

@@ -0,0 +1,22 @@
+import { Effect } from "effect/index";
+import { Config } from "../config.js";
+import { FileSystem } from "@effect/platform"
+import { logger, orange } from "../utils/logger.js";
+import path, { join } from 'path';
+
+export const createLucyHome = () => {
+    return Effect.gen(function*() {
+        const config = yield* Config
+        const fs = yield* FileSystem.FileSystem
+
+        if(!(yield* fs.exists(config.config.lucyHome))) {
+            logger.action(`Creating Lucy home directory at ${orange(config.config.lucyHome)}`);
+            yield* fs.makeDirectory(config.config.lucyHome, { recursive: true });
+        }
+        const templateFiles = yield* fs.readDirectory(config.config.filesFolder)
+        yield* Effect.forEach(
+            templateFiles,
+            (file) => fs.copy(path.join(config.config.filesFolder, file), path.join(config.config.lucyHome, file), { overwrite: true })
+        )
+    });
+}

package/src/commands/install.ts

@@ -0,0 +1,186 @@
+import { Command } from "@effect/platform/index";
+import { Effect, Schedule } from "effect/index";
+import { Config } from "../config.js";
+import { logger } from "../utils/logger.js";
+import { CommandExecutor, ExitCode } from "@effect/platform/CommandExecutor";
+import { PlatformError } from "@effect/platform/Error";
+
+export const installPackages = Effect.gen(function*() {
+    const config = yield* Config;
+
+    const pkgs: string[] = []
+    for (const [key, value] of Object.entries(config.config.lucySettings.dependencies)) {
+        if (value.length > 0) {
+            pkgs.push(`${key}@${value}`);
+            continue
+        }
+        pkgs.push(key);
+    }
+    const devPkgs: string[] = []
+    for (const [key, value] of Object.entries(config.config.lucySettings.devDependencies)) {
+        if (value.length > 0) {
+            devPkgs.push(`${key}@${value}`);
+            continue
+        }
+        devPkgs.push(key);
+    }
+
+
+    logger.info("Installing dependencies");
+    const yarn = Command.make(
+            "yarn",
+            "add",
+            ...pkgs,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    logger.info("Installing dev dependencies");
+    const yarnDev = Command.make(
+            "yarn",
+            "add",
+            "-D",
+            ...devPkgs,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+
+    if ((yield* yarn) !== 0) {
+        return logger.error("Failed to install dependencies. Please check the error message above.");
+    }
+    if ((yield* yarnDev) !== 0) {
+        return logger.error("Failed to install dev dependencies. Please check the error message above.");
+    }
+})
+
+export const runYarn = Effect.gen(function*() {
+        const yarnDev = Command.make(
+            "yarn",
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    yield* yarnDev;
+})
+
+export const yarnSetVersion = Effect.gen(function*() {
+        const yarnDev = Command.make(
+            "yarn",
+            "set",
+            "version",
+            "berry",
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    yield* yarnDev;
+})
+export const installVeloPackages = Effect.gen(function*() {
+    const config = yield* Config;
+        const simpleSchedule = Schedule.tapOutput(
+            Schedule.fromDelays(50, 100, 200, 400, 800, 1600, 3200),
+            (n, ) => Effect.succeed(logger.warning(`Failed to install WIX package. Retrying...`))
+        );
+
+    const pkgs: string[] = []
+    for (const [key, value] of Object.entries(config.config.lucySettings.dependencies)) {
+        if (value.length > 0) {
+            pkgs.push(`${key}@${value}`);
+            continue
+        }
+        pkgs.push(key);
+    }
+
+    const wixPkgs: Effect.Effect<ExitCode, PlatformError, CommandExecutor>[] = []
+    const wixInstall = (cmd: Effect.Effect<ExitCode, PlatformError, CommandExecutor>) => Effect.gen(function*() {
+        const code = yield* Effect.retryOrElse(
+            Effect.gen(function*() {
+                const code = yield* cmd;
+                if (code !== 0) {
+                    return yield* Effect.fail(code);
+                }
+                return yield* Effect.succeed(code);
+            }), 
+            simpleSchedule,
+            () => Effect.succeed(0 as ExitCode)
+        )
+        if (code !== 0) {
+            logger.error("Failed to install WIX package.");
+        } 
+        return code;
+    })
+
+    for (const [key, value] of Object.entries(config.config.lucySettings.dependencies)) {
+        if (value.length > 0) {
+            wixPkgs.push(
+                wixInstall(
+                    Command.make(
+                        "wix",
+                        "install",
+                        `${key}@${value}`
+                ).pipe(
+                    Command.stdout("inherit"),
+                    Command.exitCode
+                )
+            )
+        )
+            continue
+        }
+        wixPkgs.push(
+            wixInstall(
+                Command.make(
+                    "wix",
+                    "install",
+                    `${key}`
+            ).pipe(
+                Command.stdout("inherit"),
+                Command.exitCode
+            ),
+        ))
+    }
+
+    const devPkgs: string[] = []
+    for (const [key, value] of Object.entries(config.config.lucySettings.devDependencies)) {
+        if (value.length > 0) {
+            devPkgs.push(`${key}@${value}`);
+            continue
+        }
+        devPkgs.push(key);
+    }
+
+    const yarn = Command.make(
+            "yarn",
+            "add",
+            ...pkgs,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    const yarnDev = Command.make(
+            "yarn",
+            "add",
+            "-D",
+            ...devPkgs,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+
+    logger.info("Installing dependencies with wix...");
+    const status = yield* Effect.all([...wixPkgs], { concurrency: 15});
+    if(status.every((s) => s !== 0)) {
+        return logger.error("Failed to install WIX dependencies. Please check the error message above.");
+    }
+
+    logger.info("Installing dependencies");
+    if ((yield* yarn) !== 0) {
+        return logger.error("Failed to install dependencies. Please check the error message above.");
+    }
+
+    logger.info("Installing dev dependencies");
+    if ((yield* yarnDev) !== 0) {
+        return logger.error("Failed to install dev dependencies. Please check the error message above.");
+    }
+
+})

package/src/commands/read.ts

@@ -0,0 +1,37 @@
+import { Effect, Schema } from "effect/index";
+import { FileSystem, Path } from "@effect/platform"
+import { Config } from "../config.js";
+import { JsonSchema } from "../schemas/index.js";
+import { lucySettings } from "../schemas/lucy.js";
+import { logger } from "../utils/logger.js";
+
+export const readPackageJson = Effect.gen(function* () {
+    const config = yield* Config;
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+
+    const packageJsonPath = path.join(config.config.cwd, "package.json")
+    const packageJsonRaw = yield* fs.readFile(packageJsonPath)
+    config.config.packageJson = yield* Schema.decodeUnknown(JsonSchema)(packageJsonRaw.toString());
+})
+
+export const readLucyJsonFromTemplate = Effect.gen(function* () {
+    const config = yield* Config;
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+
+    const lucyJsonPath = path.join(config.config.templateDir, "lucy.json")
+    const lucyRaw = yield* fs.readFileString(lucyJsonPath, 'utf-8');   
+    const lucySettingsJSON = yield* Schema.decodeUnknown(JsonSchema)(lucyRaw); 
+    const lucySetting = yield* Schema.decodeUnknown(lucySettings)(lucySettingsJSON)
+    if(config.config.lucySettings.initialized) {
+        if(config.config.force) {
+            logger.warning(`lucy.json already exists in the template directory, but 'force' is set. Overwriting...`);
+            config.config.lucySettings = lucySetting;
+            return;
+        }
+        logger.warning(`lucy.json already exists in the template directory. Skipping reading lucy.json from template.`);
+        return;
+    }
+    config.config.lucySettings = lucySetting;
+})

package/src/commands/write.ts

@@ -0,0 +1,24 @@
+import { Effect } from "effect/index";
+import { Command, FileSystem, Path } from "@effect/platform"
+import { Config } from "../config.js";
+
+export const writeLucySettings = Effect.gen(function* (_) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const config = yield* Config;
+    
+    yield* fs.writeFileString(
+        path.join(config.config.cwd, "lucy.json"),
+        JSON.stringify(config.config.lucySettings, null, 2)
+    );
+})
+
+export const writePackageJson = Effect.gen(function* (_) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const config = yield* Config;
+    yield* fs.writeFileString(
+        path.join(config.config.cwd, "package.json"),
+        JSON.stringify(config.config.packageJson, null, 2)
+    );
+})

package/src/config.ts

@@ -1,27 +1,36 @@
-import { Context, Layer } from "effect"
+import { Context, Layer, Schema } from "effect"
 import { get_args } from "./args.js";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFileSync, existsSync } from "fs";
-type Action = 'init';
+import { lucySettings, LucySettings } from "./schemas/lucy.js";
+import { logger } from "./utils/logger.js";
+import os from 'os';
+import { Action, Actions } from "./schemas/types.js";
 
-type Actions = {
-    action: Action;
-    type: 'velo' | 'expo' | 'blocks' | undefined;
-}
 export class Config extends Context.Tag("Config")<
     Config,
     {
         readonly config: {
             readonly action: Actions;
+            readonly force: boolean;
             readonly cwd: string;
             readonly packageRoot: string;
             readonly filesFolder: string;
-            readonly packageJson: any;
+            packageJson: any;
+            lucySettings: LucySettings;
+            readonly lucyHome: string;
+            templateDir: string;
+            templateFiles: string;
+            projectName: string;
+            defaultModuleBasePath: string;
         }
     }
 >() {}
 
+// or, if you want just the inner config object:
+export type LucyConfig = typeof Config.Service["config"];
+
 // In an ES module, `__dirname` is not available by default.
 // We can replicate it using `import.meta.url`.
 const __filename = fileURLToPath(import.meta.url);
@@ -34,14 +43,30 @@ const packageRoot = join(__dirname, "..");
 
 export const ConfigLayer = (args: Awaited<ReturnType<typeof get_args>>) => {
     let packageJson = '{}';
+    let lucyJson: LucySettings | undefined = undefined;
     const packageJsonPath = join(process.cwd(), 'package.json');
+    const lucyJsonPath = join(process.cwd(), 'lucy.json');
     try {
         if (existsSync(packageJsonPath)) {
             const raw = readFileSync(packageJsonPath, 'utf-8');
             packageJson = JSON.parse(raw);
         }
     } catch (error) {
-        console.error("Error reading package.json:", error);
+        logger.error("Error reading package.json:", error);
+    }
+    try {
+        if (existsSync(lucyJsonPath)) {
+            const raw = readFileSync(lucyJsonPath, 'utf-8');
+            lucyJson = Schema.decodeUnknownSync(lucySettings)(JSON.parse(raw));
+        }
+    } catch (error) {
+        logger.error("Error reading lucy.json:", error);
+    }
+    const defaultModulePath = () => {
+        if (args.type === 'monorepo') {
+            return join('packages');
+        }
+        return '';
     }
     return Layer.succeed(
         Config,
@@ -49,12 +74,27 @@ export const ConfigLayer = (args: Awaited<ReturnType<typeof get_args>>) => {
             config: {
                 action: {
                     type: args.type,
-                    action: args._[0] as Action
+                    action: args._[0],
+                    task: args.task,
                 },
+                force: args.force === true ? true : false,
                 cwd: process.cwd(),
+                projectName: process.cwd().split('/').pop() || 'lucy-project',
                 packageRoot: packageRoot,
                 filesFolder: join(packageRoot, 'files'),
-                packageJson
+                packageJson,
+                lucyHome: join(os.homedir(), '.lucy-cli'),
+                lucySettings: lucyJson || {
+                    modules: {},
+                    devDependencies: {},
+                    dependencies: {},
+                    scripts: {},
+                    initialized: false,
+                    type: args.type || 'velo',
+                },
+                templateFiles: '',
+                templateDir: '',
+                defaultModuleBasePath: defaultModulePath(),
             }
         })
     );

package/src/error.ts

@@ -1,4 +1,3 @@
 import { Data } from "effect";
 
-export class AppError extends Data.TaggedError('AppError')<{cause: Error, message: string}> {}
-export class ScaleError extends Data.TaggedError('ScaleError')<{cause: Error, message: string}> {}
+export class AppError extends Data.TaggedError('AppError')<{cause: unknown, message: string}> {}