lucy-cli 2.0.0-alpha.20 → 2.0.0-alpha.21

package/src/config.ts

@@ -30,7 +30,6 @@ export class Config extends Context.Tag("Config")<
             templateDir: string;
             templateFiles: string;
             projectName: string;
-            defaultModuleBasePath: string;
             veloSyncSettings?: VeloSyncSettings;
             wixSDKSettings?: WixSDKSettings;
         }
@@ -95,7 +94,7 @@ export const ConfigLayer = (args: Awaited<ReturnType<typeof get_args>>) => {
 
             const defaultModulePath = () => {
                 if (args.type === 'monorepo') {
-                    return join('packages');
+                    return 'packages';
                 }
                 return '';
             };
@@ -131,10 +130,11 @@ export const ConfigLayer = (args: Awaited<ReturnType<typeof get_args>>) => {
                         scripts: {},
                         initialized: false,
                         type: args.initType || 'velo',
+                        packageManager: 'npm',
+                        defaultModulePath: ''
                     },
                     templateFiles: '',
-                    templateDir: '',
-                    defaultModuleBasePath: defaultModulePath(),
+                    templateDir: '',                    
                 }
             });
         }).pipe(Effect.provide(NodeContext.layer))

package/src/index.ts

@@ -52,7 +52,6 @@ process.on('SIGTERM', () => {
 const lucyCLI = pipe(
     Effect.gen(function* (_) {
         const config = yield* Config; 
-        const t = Config; 
         if (config.config.action.action === 'init') {
             return yield* init;
         }

package/src/init/blocks.ts

@@ -73,7 +73,7 @@ export const init_blocks = () => {
         yield* writePackageJson;
         yield* copyTemplateFiles;
         yield* execCommand;
-        yield* installPackages;
+        yield* installPackages();
         yield* cleanup;
         yield* setInitialized;
 

package/src/init/expo.ts

@@ -56,7 +56,7 @@ export const init_expo = () => {
         yield* writePackageJson;
         yield* copyTemplateFiles;
         yield* execCommand;
-        yield* installPackages;
+        yield* installPackages();
         yield* cleanup;
         yield* setInitialized;
         

package/src/init/index.ts

@@ -12,6 +12,7 @@ import { init_blocks } from "./blocks.js";
 import { init_velo } from "./velo.js";
 import { init_submodules } from "./gitModules.js";
 import { init_tauri } from "./tauri.js";
+import { pkgManagers } from "../schemas/lucy.js";
 
 
 export const init = Effect.gen(function* (_) {
@@ -38,6 +39,23 @@ export const init = Effect.gen(function* (_) {
     config.config.projectName = selectedName.projectName.trim();
     yield* selectTemplate();
     yield* readLucyJsonFromTemplate;
+
+    const pkgMgrQuestion = new Enquirer();
+    const pkgMgr = yield* Effect.tryPromise({
+        try: () => pkgMgrQuestion.prompt({
+            type: 'select',
+            name: 'packageManager',
+            message: 'Select a package manager',
+            choices: [...pkgManagers],
+        }),
+        catch: (e) => {
+            return new AppError({ cause: e, message: 'Error selecting package manager' });
+        }
+    })
+    const selectedPkgMgr = yield* Schema.decodeUnknown(Schema.Struct({ packageManager: Schema.Literal(...pkgManagers) }))(pkgMgr)
+    config.config.lucySettings.packageManager = selectedPkgMgr.packageManager;
+    
+
     if(config.config.action.initType === 'expo') {
         return yield* init_expo();
     }

package/src/init/monorepo.ts

@@ -1,25 +1,54 @@
-import { Effect, Schema } from "effect/index"
+import { Effect } from "effect/index"
 import { Config } from "../config.js";
-import { FileSystem, Path } from "@effect/platform"
+import { Command, FileSystem, Path } from "@effect/platform"
 import { logger } from "../utils/logger.js";
 import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized, setProjectName, stringReplace } from "../commands/edit.js";
 import { writeLucySettings, writePackageJson } from "../commands/write.js";
 import { copyTemplateFiles } from "../commands/copy.js";
 import { readPackageJson } from "../commands/read.js";
-import { runYarn, yarnSetVersion } from "../commands/install.js";
+import { installPackages, runInstall } from "../commands/install.js";
 import { cleanup } from "../commands/cleanup.js";
 import { gitInit } from "../commands/git.js";
 import { checkForDirty } from "../commands/checks.js";
+import { openVSCode } from "../commands/exec.js";
 
 export const init_monorepo = () => {
     return Effect.gen(function*() {
         const config = yield* Config;
         const path = yield* Path.Path;
+        const fs = yield* FileSystem.FileSystem;
 
         logger.action("Initializing monorepo...");
 
         yield* checkForDirty();
 
+        const createMonoRepo = Command.make(
+            "npx", 
+            "-y",
+            "create-nx-workspace", 
+            config.config.projectName,
+            `--appName=${config.config.projectName}`,
+            `--pm=${config.config.lucySettings.packageManager}`, 
+            "--preset=ts", 
+            "--g=true",
+            "--e2eTestRunner=cypress",
+            "--formatter=prettier"
+            ).pipe(
+            Command.stdout("inherit"), // Stream stdout to process.stdout
+            Command.exitCode // Get the exit code
+        )
+
+        yield* createMonoRepo;
+        
+        const tempPath = path.join(config.config.cwd, config.config.projectName)
+        const projectFiles = yield* fs.readDirectory(tempPath)
+        yield* Effect.forEach(
+            projectFiles.filter(file => file !== '.git'),
+            (file) => fs.copy(path.join(tempPath, file), path.join(config.config.cwd, file), { overwrite: true }),
+            { discard: true }
+        )
+        yield* fs.remove(tempPath, { recursive: true })
+
         yield* copyTemplateFiles;
         yield* stringReplace(path.join(config.config.cwd, 'currents.config.ts'), ['__ProjectName__'], [config.config.projectName]);
         yield* readPackageJson;
@@ -29,11 +58,12 @@ export const init_monorepo = () => {
         yield* writeLucySettings;
         yield* writePackageJson;
         yield* gitInit();
-        yield* yarnSetVersion;
-        yield* runYarn;
+        yield* runInstall;
+        yield* installPackages(true);
         yield* cleanup;
         yield* setInitialized;
-        
+        yield* openVSCode;
+
         logger.success("Monorepo initialized successfully!");
     })
 }

package/src/init/prepareVelo.ts

@@ -2,7 +2,7 @@ import { Effect } from 'effect/index';
 import { logger } from '../utils/logger.js';
 import { checkForVelo } from '../commands/checks.js';
 import { gitInit } from '../commands/git.js';
-import { installVeloPackages, yarnSetVersion } from '../commands/install.js';
+import { installVeloPackages, runInstall } from '../commands/install.js';
 import { setInitialized } from '../commands/edit.js';
 
 export const prepareVelo = Effect.gen(function*() {
@@ -10,8 +10,8 @@ export const prepareVelo = Effect.gen(function*() {
 	yield* checkForVelo();
 
 	yield* gitInit(true);
-	yield* yarnSetVersion;
 	yield* installVeloPackages
+	yield* runInstall
 	yield* setInitialized;
 	
     logger.success("Velo Prepared initialized successfully!");

package/src/init/tauri.ts

@@ -7,10 +7,8 @@ import { checkForDirty } from "../commands/checks.js";
 import { setInitialized } from "../commands/edit.js";
 import { Config } from "../config.js";
 import { Command, FileSystem, Path } from "@effect/platform"
-import { JsonSchema } from "../schemas/index.js";
 import { AppError } from "../error.js";
 import { installPackages } from "../commands/install.js";
-import { Terminal } from "@effect/platform"
 
 export const init_tauri = () => {
     return Effect.gen(function*() {
@@ -30,7 +28,7 @@ export const init_tauri = () => {
             yield* Effect.fail(new AppError({ message: "Failed to initialize Tauri project. Please check the error message above.", cause: new Error("Failed to initialize Tauri project") }));
         }
         yield* copyTemplateFiles;
-        yield* installPackages;
+        yield* installPackages();
         yield* writeLucySettings;
         yield* gitInit();
         yield* setInitialized;

package/src/init/templates.ts

@@ -25,7 +25,7 @@ export const selectTemplate = () => {
         const templateChoices: string[] = [];
         for (const dirent of files) {
             if (dirent.isDirectory()) {
-                const lucyRaw = yield* fs.readFileString(lucyJsonPath);   
+                const lucyRaw = yield* fs.readFileString(join(templatesPath, dirent.name, lucyJsonName));   
                 const lucySettingsJSON = yield* Schema.decodeUnknown(JsonSchema)(lucyRaw); 
                 const lucySetting = yield* Schema.decodeUnknown(lucySettings)(lucySettingsJSON)
                 if (lucySetting.type === config.config.action.initType) {

package/src/init/velo.ts

@@ -6,7 +6,7 @@ import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized, setProje
 import { writeLucySettings, writePackageJson } from "../commands/write.js";
 import { copyTemplateFiles } from "../commands/copy.js";
 import { readPackageJson } from "../commands/read.js";
-import { installVeloPackages, runYarn, yarnSetVersion } from "../commands/install.js";
+import { installVeloPackages, runInstall } from "../commands/install.js";
 import { cleanup } from "../commands/cleanup.js";
 import { gitInit } from "../commands/git.js";
 import { checkForVelo } from "../commands/checks.js";
@@ -52,8 +52,8 @@ export const init_velo = () => {
         yield* writeLucySettings;
         yield* writePackageJson;
         yield* gitInit();
-        yield* yarnSetVersion;
         yield* installVeloPackages;
+        yield* runInstall;
         yield* cleanup;
         yield* setInitialized;
         

package/src/schemas/lucy.ts

@@ -1,6 +1,7 @@
 import { Schema } from "effect/index";
 import { initTypes } from "./types.js";
 
+export const pkgManagers = ['npm', 'yarn', 'pnpm'] as const;
 export const lucySettings = Schema.mutable(Schema.Struct({
 	modules: Schema.Record({
         key: Schema.String, 
@@ -35,6 +36,8 @@ export const lucySettings = Schema.mutable(Schema.Struct({
     }),
 	additionalCommands: Schema.optional(Schema.Array(Schema.Array(Schema.String))),
 	additionalPkgProps: Schema.optional(Schema.Object),
+	packageManager: Schema.mutable(Schema.Literal(...pkgManagers)),
+	defaultModulePath: Schema.optional(Schema.String),
 }));
 
 export type LucySettings = typeof lucySettings.Type;

package/files/templates/monorepo[D]/files/package.json

@@ -1,39 +0,0 @@
-{
-	"name": "vitest",
-	"private": true,
-	"type": "module",
-	"scripts": {
-		"build": "turbo run build",
-		"dev": "turbo run dev",
-		"lint": "turbo run lint",
-		"format": "prettier --write \"./*.json\" \"**/*.{ts,tsx,md,json,jsonc,json5}\"",
-		"check-types": "turbo run check-types",
-		"update": "syncpack -- update",
-		"update:list": "syncpack -- list",
-		"test": "turbo run test",
-		"test:projects": "vitest run",
-		"test:projects:watch": "vitest --watch",
-		"view-report": "turbo run view-report",
-		"test:ui": "vitest --ui",
-		"test:e2e": "turbo run test:e2e"
-	},
-	"devDependencies": {
-		"prettier": "^3.5.0",
-		"syncpack": "13.0.4",
-		"turbo": "^2.5.5",
-		"typescript": "5.8.3",
-		"vitest": "^3.2.4",
-		"@vitest/ui": "3.2.4",
-		"eslint": "^9.31.0",
-		"typescript-eslint": "^8.35.0",
-		"typescript-eslint-language-service": "^5.0.5",
-		"@typescript-eslint/parser": "^8.37.0"
-	},
-	"engines": {
-		"node": ">=20"
-	},
-	"workspaces": [
-		"apps/*",
-		"packages/*"
-	]
-}

package/files/templates/monorepo[D]/files/turbo.json

@@ -1,34 +0,0 @@
-{
-	"$schema": "https://turborepo.com/schema.json",
-	"ui": "tui",
-	"tasks": {
-		"build": {
-			"dependsOn": ["^build"],
-			"inputs": ["$TURBO_DEFAULT$", ".env*"],
-			"outputs": [".next/**", "!.next/cache/**", "dist/**"]
-		},
-		"lint": {
-			"dependsOn": ["^lint"]
-		},
-		"check-types": {
-			"dependsOn": ["^check-types"]
-		},
-		"dev": {
-			"cache": false,
-			"persistent": true
-		},
-		"test:e2e": {
-			"cache": false,
-			"persistent": true
-		},
-		"test": {
-			"inputs": ["$TURBO_DEFAULT$", "$TURBO_ROOT$/vitest.config.ts"],
-			"dependsOn": ["transit", "@lucy/vitest-config#build", "//#test:ui"],
-			"outputs": ["coverage.json"]
-		},
-		"transit": {
-			"dependsOn": ["^transit"]
-		},
-		"//#test:ui": {}
-	}
-}