lucy-cli 2.0.0-beta.1 → 2.0.0-beta.11

package/src/commands/exec.ts

@@ -5,6 +5,7 @@ import { logger } from "../utils/logger.js";
 import { FileSystem } from "@effect/platform"
 import Enquirer from "enquirer";
 import { AppError } from "../error.js";
+import { editors } from "../schemas/index.js";
 
 export const execCommand = Effect.gen(function*() {
     const config = yield* Config;
@@ -38,22 +39,16 @@ export const open = Effect.scoped(Effect.gen(function*() {
     yield* command.pipe().pipe(Command.stdout("inherit"), Command.stderr("inherit"), Command.exitCode);
 }))
 
-export const openVSCode = Effect.gen(function*() {
+export const openEditor = Effect.gen(function*() {
     const config = yield* Config;
-    const open = Command.make(
-        "code", 
-        config.config.cwd,
-        ).pipe(
-        Command.stdout("inherit"), // Stream stdout to process.stdout
-        Command.stderr("inherit"), // Stream stderr to process.stderr
-        Command.exitCode // Get the exit code
-    )
-    const overwriteQuestion = new Enquirer();
-    const openVScodeQuestion = yield* Effect.tryPromise({
-        try: () => overwriteQuestion.prompt({
-            type: 'confirm',
-            name: 'openVSCode',
-            message: `Do you want to open the project in VSCode?`,
+
+    const editorQuestion = new Enquirer();
+    const openEditorQuestion = yield* Effect.tryPromise({
+        try: () => editorQuestion.prompt({
+            type: 'select',
+            name: 'openEditor',
+            message: `Do you want to open the project in a supported editor?`,
+            choices: [...editors, 'No'],
         }),
         catch: (e) => {
             return new AppError({
@@ -62,8 +57,17 @@ export const openVSCode = Effect.gen(function*() {
             });
         }
     })
-    const choice = yield* Schema.decodeUnknown(Schema.Struct({ openVSCode: Schema.Boolean }))(openVScodeQuestion);
-    if (choice.openVSCode) {
+    const choice = yield* Schema.decodeUnknown(Schema.Struct({ openEditor: Schema.Literal(...editors, 'No') }))(openEditorQuestion);
+
+    const open = Command.make(
+        choice.openEditor, 
+        config.config.cwd,
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.stderr("inherit"), // Stream stderr to process.stderr
+        Command.exitCode // Get the exit code
+    )
+    if (choice.openEditor !== 'No') {
         yield* open
     }
-})
+})

package/src/commands/home.ts

@@ -1,6 +1,6 @@
 import { Effect } from "effect/index";
 import { Config } from "../config.js";
-import { FileSystem } from "@effect/platform"
+import { FileSystem, Path } from "@effect/platform"
 import { logger, orange } from "../utils/logger.js";
 import path, { join } from 'path';
 
@@ -8,15 +8,49 @@ export const createLucyHome = () => {
     return Effect.gen(function*() {
         const config = yield* Config
         const fs = yield* FileSystem.FileSystem
+        const p = yield* Path.Path
 
         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)
+
+        const shouldExclude = (relativePath: string): boolean => {
+            const segments = relativePath.split(/[/\\]/)
+            return segments.includes("node_modules") || segments.includes("Pods")
+        }
+
+        const copyDirFiltered = (src: string, dest: string, base?: string): Effect.Effect<void, any> =>
+            Effect.gen(function*() {
+                const entries = yield* fs.readDirectory(src)
+                yield* fs.makeDirectory(dest, { recursive: true })
+                yield* Effect.forEach(
+                    entries,
+                    (entry) => Effect.gen(function*() {
+                        const from = p.join(src, entry)
+                        const to = p.join(dest, entry)
+                        const rel = base ? p.relative(base, from) : entry
+
+                        if (shouldExclude(rel)) {
+                            return
+                        }
+
+                        const stat = yield* fs.stat(from)
+                        if (stat.type === "Directory") {
+                            yield* copyDirFiltered(from, to, base ?? src)
+                            return
+                        }
+                        yield* fs.copyFile(from, to)
+                    }),
+                    { discard: true }
+                )
+            })
+
         yield* Effect.forEach(
             templateFiles,
-            (file) => fs.copy(path.join(config.config.filesFolder, file), path.join(config.config.lucyHome, file), { overwrite: true })
+            (file) => copyDirFiltered(path.join(config.config.filesFolder, file), path.join(config.config.lucyHome, file)),
+            { discard: true }
         )
     });
 }

package/src/commands/install.ts

@@ -105,18 +105,19 @@ export const runInstall = Effect.gen(function*() {
     yield* install;
 })
 
-// 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 yarnSetVersion = Effect.gen(function*() {
+        const set = Command.make(
+            "yarn",
+            "set",
+            "version",
+            "berry",
+        ).pipe(
+        Command.stdout("inherit"), // Stream stdout to process.stdout
+        Command.exitCode // Get the exit code
+    )
+    yield* set;
+})
+
 export const installVeloPackages = Effect.gen(function*() {
     const config = yield* Config;
         const simpleSchedule = Schedule.tapOutput(
@@ -192,18 +193,37 @@ export const installVeloPackages = Effect.gen(function*() {
         devPkgs.push(key);
     }
 
-    const yarn = Command.make(
-            "yarn",
-            "add",
+    const manager = config.config.lucySettings.packageManager;
+    function pkgMgrParamsInstall():string[] {
+        if (manager === "npm") {
+            return ["install"];
+        }
+        if (manager === "pnpm") {
+            return ["install"];
+        }
+        return ["add"];
+    }
+    function pkgMgrParamsInstallDev():string[] {
+        if (manager === "npm") {
+            return ["install", "-D"];
+        }
+        if (manager === "pnpm") {
+            return ["install", "-D"];
+        }
+        return ["add", "-D"];
+    }
+
+    const install = Command.make(
+        manager,
+        ...pkgMgrParamsInstall(),
             ...pkgs,
         ).pipe(
         Command.stdout("inherit"), // Stream stdout to process.stdout
         Command.exitCode // Get the exit code
     )
-    const yarnDev = Command.make(
-            "yarn",
-            "add",
-            "-D",
+    const installDev = Command.make(
+            manager,
+            ...pkgMgrParamsInstallDev(),
             ...devPkgs,
         ).pipe(
         Command.stdout("inherit"), // Stream stdout to process.stdout
@@ -217,12 +237,12 @@ export const installVeloPackages = Effect.gen(function*() {
     }
 
     logger.info("Installing dependencies");
-    if ((yield* yarn) !== 0) {
+    if ((yield* install) !== 0) {
         return logger.error("Failed to install dependencies. Please check the error message above.");
     }
 
     logger.info("Installing dev dependencies");
-    if ((yield* yarnDev) !== 0) {
+    if ((yield* installDev) !== 0) {
         return logger.error("Failed to install dev dependencies. Please check the error message above.");
     }
 

package/src/helpers.ts

@@ -89,13 +89,5 @@ export function cleanupWatchers() {
 
     logger.info(`Cleaning watchers for directory: ${cwd}`);
     const result = spawnSync(command, { shell: true, encoding: 'utf-8' });
-
-    // if (result.stderr) {
-    //     logger.error(`spawnSync error: ${result.stderr}`);
-    //     return;
-    // }
-    // if (!result.stdout.trim()) {
-    //     logger.info(`No watchers found to clean up.`);
-    //     return;
-    // }
+    return result;
 }

package/src/index.ts

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { Effect, pipe} from "effect";
 import { build_runtime } from "./runtime.js";
 import { get_args } from "./args.js";
@@ -21,8 +20,9 @@ export function setNeedsCleanup(value: boolean) {
 process.on('exit', (code) => {
     if(!needsCleanup) return;
     if(exitReason === 'none') {
-	    killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
+	    killAllProcesses('@wix/cli/bin/wix.cjs');
         killAllProcesses('wix:dev');   
+        killAllProcesses('wix dev');   
         cleanupWatchers();
     }
 
@@ -35,6 +35,7 @@ process.on('SIGINT', () => {
 	logger.info(`🐕 Received Ctrl+C (SIGINT), cleaning up...`);
 	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
 	killAllProcesses('wix:dev');  
+    killAllProcesses('wix dev');  
     cleanupWatchers();
     process.exit(); // Exit explicitly after handling
 });
@@ -45,6 +46,7 @@ process.on('SIGTERM', () => {
 	logger.info(`🛑 Received termination signal (SIGTERM), cleaning up...`);
 	killAllProcesses('@wix/cli/bin/wix.cjs'); // Matches processes running the Wix CLI
 	killAllProcesses('wix:dev');  
+    killAllProcesses('wix dev');  
     cleanupWatchers();
     process.exit(); // Exit explicitly after handling
 });

package/src/init/blocks.ts

@@ -7,7 +7,7 @@ import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized } from ".
 import { writeLucySettings, writePackageJson } from "../commands/write.js";
 import { copyTemplateFiles } from "../commands/copy.js";
 import { readPackageJson } from "../commands/read.js";
-import { execCommand, openVSCode } from "../commands/exec.js";
+import { execCommand, openEditor } from "../commands/exec.js";
 import { approveBuilds, installPackages } from "../commands/install.js";
 import { AppError } from "../error.js";
 import { cleanup } from "../commands/cleanup.js";
@@ -80,6 +80,6 @@ export const init_blocks = () => {
 
         logger.success("Blocks project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/cargo.ts

@@ -5,7 +5,7 @@ import { copyTemplateFiles } from "../commands/copy.js";
 import { gitInit } from "../commands/git.js";
 import { checkForDirty } from "../commands/checks.js";
 import { setInitialized } from "../commands/edit.js";
-import { openVSCode } from "../commands/exec.js";
+import { openEditor } from "../commands/exec.js";
 
 export const init_cargo = () => {
     return Effect.gen(function*() {
@@ -20,6 +20,6 @@ export const init_cargo = () => {
         
         logger.success("Cargo project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/expo.ts

@@ -7,7 +7,7 @@ import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized } from ".
 import { writeLucySettings, writePackageJson } from "../commands/write.js";
 import { copyTemplateFiles } from "../commands/copy.js";
 import { readPackageJson } from "../commands/read.js";
-import { execCommand, openVSCode } from "../commands/exec.js";
+import { execCommand, openEditor } from "../commands/exec.js";
 import { approveBuilds, installPackages } from "../commands/install.js";
 import { AppError } from "../error.js";
 import { cleanup } from "../commands/cleanup.js";
@@ -64,6 +64,6 @@ export const init_expo = () => {
         
         logger.success("Expo project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/index.ts

@@ -14,7 +14,9 @@ import { init_submodules } from "./gitModules.js";
 import { init_tauri } from "./tauri.js";
 import { pkgManagers } from "../schemas/lucy.js";
 
-
+//TODO: Get Templates from Reposytory
+//TODO: Update Local tsconfig for libs
+//TODO: Fix PNPM in VELO
 export const init = Effect.gen(function* (_) {
     const config = yield* Config;
     if(config.config.action.initType === undefined) {
@@ -40,13 +42,19 @@ export const init = Effect.gen(function* (_) {
     yield* selectTemplate();
     yield* readLucyJsonFromTemplate;
 
+    function supportedPackageManagers() {
+        if(config.config.action.initType === 'velo') {
+            return pkgManagers.filter(pkgMgr => pkgMgr !== 'pnpm')
+        }
+        return pkgManagers
+    }
     const pkgMgrQuestion = new Enquirer();
     const pkgMgr = yield* Effect.tryPromise({
         try: () => pkgMgrQuestion.prompt({
             type: 'select',
             name: 'packageManager',
             message: 'Select a package manager',
-            choices: [...pkgManagers],
+            choices: [...supportedPackageManagers()],
         }),
         catch: (e) => {
             return new AppError({ cause: e, message: 'Error selecting package manager' });

package/src/init/monorepo.ts

@@ -10,7 +10,7 @@ import { approveBuilds, installPackages, runInstall } from "../commands/install.
 import { cleanup } from "../commands/cleanup.js";
 import { gitInit } from "../commands/git.js";
 import { checkForDirty } from "../commands/checks.js";
-import { openVSCode } from "../commands/exec.js";
+import { openEditor } from "../commands/exec.js";
 
 export const init_monorepo = () => {
     return Effect.gen(function*() {
@@ -67,6 +67,6 @@ export const init_monorepo = () => {
 
         logger.success("Monorepo initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/tauri.ts

@@ -9,7 +9,7 @@ import { Config } from "../config.js";
 import { Command, FileSystem, Path } from "@effect/platform"
 import { AppError } from "../error.js";
 import { approveBuilds, installPackages } from "../commands/install.js";
-import { openVSCode } from "../commands/exec.js";
+import { openEditor } from "../commands/exec.js";
 
 export const init_tauri = () => {
     return Effect.gen(function*() {
@@ -37,6 +37,6 @@ export const init_tauri = () => {
 
         logger.success("Tauri project initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/init/velo.ts

@@ -6,14 +6,14 @@ 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, runInstall } from "../commands/install.js";
+import { installVeloPackages, runInstall, yarnSetVersion } from "../commands/install.js";
 import { cleanup } from "../commands/cleanup.js";
 import { gitInit } from "../commands/git.js";
 import { checkForVelo } from "../commands/checks.js";
 import { AppError } from "../error.js";
 import Enquirer from "enquirer";
 import { prepareVelo } from "./prepareVelo.js";
-import { openVSCode } from "../commands/exec.js";
+import { openEditor } from "../commands/exec.js";
 
 export const init_velo = () => {
     return Effect.gen(function*() {
@@ -53,6 +53,7 @@ export const init_velo = () => {
         yield* writeLucySettings;
         yield* writePackageJson;
         yield* gitInit();
+        yield* runInstall;
         yield* installVeloPackages;
         yield* runInstall;
         yield* cleanup;
@@ -60,6 +61,6 @@ export const init_velo = () => {
         
         logger.success("Velo initialized successfully!");
 
-        yield* openVSCode;
+        yield* openEditor;
     })
 }

package/src/schemas/index.ts

@@ -13,3 +13,5 @@ export const wixSDKSettings = Schema.Struct({
 	siteId: Schema.String,
 });
 export type WixSDKSettings = typeof wixSDKSettings.Type;
+
+export const editors = ['vscode', 'cursor'] as const;

package/src/schemas/lucy.ts

@@ -1,7 +1,7 @@
 import { Schema } from "effect/index";
 import { initTypes } from "./types.js";
 
-export const pkgManagers = ['pnpm', 'npm', 'yarn'] as const;
+export const pkgManagers = ['pnpm', 'yarn', 'npm'] as const;
 export const lucySettings = Schema.mutable(Schema.Struct({
 	modules: Schema.Record({
         key: Schema.String, 

package/src/tasks/Gulpfile.ts

@@ -55,7 +55,7 @@ export const task_runGulp = Effect.gen(function* (_) {
 	logger.action(`Running task: ${task}`);
 
 	gulp.task('check-ts', gulp.parallel( 
-		checkTs(taskOptions),
+		checkTs(taskOptions, false),
 	));
 
 	gulp.task('scss', gulp.parallel( 
@@ -102,7 +102,7 @@ export const task_runGulp = Effect.gen(function* (_) {
 	});
 
 	gulp.task('sync-types', shell.task([
-		'yarn postinstall',
+		'wix sync-types',
 	]));
 
 	gulp.task('fix-wix-types', gulp.parallel(
@@ -118,7 +118,7 @@ export const task_runGulp = Effect.gen(function* (_) {
 	));
 
 	gulp.task('start-wix', shell.task([
-		'yarn wix:dev',
+		'wix dev',
 	]));
 
 	gulp.task('gen-docs', shell.task([

package/src/tasks/gulp/checks.ts

@@ -52,7 +52,7 @@ import { TaskType } from '../../schemas/types.js';
  * @param {string} filePath File path
  * @param {string} pattern Pattern to match
  */
-function extractMatchFromFile(filePath: string, pattern: string) {
+async function extractMatchFromFile(filePath: string, pattern: string) {
 	return new Promise((resolve, reject) => {
 		fs.readFile(filePath, 'utf8', (err, data) => {
 			if (err){
@@ -77,29 +77,30 @@ function extractMatchFromFile(filePath: string, pattern: string) {
 async function readFilesInFolder(folderPath: string, pattern: string | null, globPattern: string,) {
 	const files = await glob.glob(path.join(folderPath, globPattern));
 	const filenameList: Object[] = [];
-	function traverseFiles(index: number) {
+	async function traverseFiles(index: number) {
 		if (index === files.length){
 			return;
 		}
 		const file = files[index];
 		if(pattern){
 			if(!file) return
-			extractMatchFromFile(file, pattern)
-				.then((capturedGroup) => {
-					if (capturedGroup){
-						filenameList.push(capturedGroup);
-					}
-					traverseFiles(index + 1);
-				})
-				.catch(() => { throw new Error(`Error reading file: ${file}`); });
+			try {
+				const capturedGroup = await extractMatchFromFile(file, pattern);
+				if (capturedGroup){
+					filenameList.push(capturedGroup);
+				}
+			} catch (error) {
+				throw new Error(`Error reading file: ${file}`);
+			}
 		}
 		if(!pattern){
 			if(!file) return
 			filenameList.push(path.basename(file));
-			traverseFiles(index + 1);
 		}
+		await traverseFiles(index + 1);
+
 	}
-	traverseFiles(0);
+	await traverseFiles(0);
 	
 	return filenameList;
 }
@@ -107,7 +108,7 @@ export async function checkPages(fail: boolean, force: boolean) {
 	logger.action('Checking pages...');
 	return new Promise<void>(async (resolve, reject) => {
 		try {
-			const sourcePages = await readFilesInFolder('./.wix/types/', '\\/pages\\/(?<page>.*\\.ts)', '**/*.json',) as string[];
+			const sourcePages = await readFilesInFolder('./.wix/types/', '\\/pages\\/(?<page>.*\\.ts)', '*/*.json',) as string[];
 			const tsPages = await readFilesInFolder('./typescript/pages', null, '**/*.ts',) as string[];
 
 			const sourcePagesSet = new Set(sourcePages);
@@ -187,7 +188,7 @@ export function checkTs(options: TaskOptions, watching: boolean = false): TaskTy
     const task = (done: gulp.TaskFunctionCallback) => {
 		let hasError = false;
 		const stream = gulp
-			.src([`${folder}/**/*.ts`, `!${folder}/types/**/*.ts`])
+			.src([`${folder}/**/*.{ts,tsx}`, `!${folder}/types/**/*.ts`])
 			.pipe(tsProject(customReporter))
 			.on("error", (error) => {
 				hasError = true;

package/src/tasks/gulp/watchers.ts

@@ -35,7 +35,7 @@ export function watchAll(options: TaskOptions): TaskType {
             '*/public/**/*.tsx',
             '!src/**/*',
         ], gulp.parallel(
-            checkTs(options),
+            checkTs(options, true),
             buildPublic(options),
         ));
     }
@@ -43,7 +43,7 @@ export function watchAll(options: TaskOptions): TaskType {
     function watchPages() {
         return 	gulp.watch(['typescript/pages/**/*.ts', '!src/**/*',], 
         gulp.parallel(
-            checkTs(options),
+            checkTs(options, true),
             buildPages(options),
             )
         );
@@ -68,7 +68,7 @@ export function watchAll(options: TaskOptions): TaskType {
             '!src/**/*',
         ], gulp.parallel(
             previewTemplates(options),
-            checkTs(options),
+            checkTs(options, true),
             )
         );
     }