lucy-cli 0.0.4 → 0.5.0

package/src/index.ts

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { spawnSync } from 'child_process';
-import { existsSync, mkdirSync, promises as fsPromises } from 'fs';
+import { existsSync } from 'fs';
 import chalk from 'chalk';
 import settings from './settings.json' assert { type: 'json' };
 
@@ -11,122 +10,114 @@ import fs from 'fs/promises';
 
 import { init } from './init.js';
 import { dev } from './dev.js';
+import { sync } from './sync.js';
 
-type ModuleSettings = {
+export type ModuleSettings = {
 	packageRoot: string;
 	targetFolder: string;
 	args: string[];
 	wixConfigPath: string;
 	lucyConfigPath: string;
+	packageJonPath: string;
+	settings: typeof settings;
 }
 
-type ProjectSettings = {
+export type ProjectSettings = {
 	packages?: Record<string, string>;
 	modules?: Record<string, string>;
+	lucySettings?: Record<string, string>;
+	packageJSON?: Record<string, any>;
+	lucyJSON?: Record<string, any>;
 }
-
+export const orange = chalk.hex('#FFA500');
+export const blue = chalk.blueBright;
+export const green = chalk.greenBright;
+export const red = chalk.redBright;
+export const yellow = chalk.yellow;
+export const magenta = chalk.magentaBright;
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const __filename = fileURLToPath(import.meta.url);
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const __dirname = dirname(__filename);
 
 
-
 /**
- *
+ * Main function
+ * @returns {Promise<void>}
  */
-async function main() {
+async function main(): Promise<void> {
 
 	const moduleSettings: ModuleSettings = {
 		packageRoot: dirname(__dirname),
 		targetFolder: process.cwd(),
 		args:  process.argv.slice(2),
+		settings,
 		wixConfigPath: join(process.cwd(), 'wix.config.json'),
-		lucyConfigPath: join(process.cwd(), 'lucy.json')
+		lucyConfigPath: join(process.cwd(), 'lucy.json'),
+		packageJonPath: join(process.cwd(), 'package.json'),
 	}
 
-	let projectSettings: ProjectSettings | undefined; 
+	let projectSettings: ProjectSettings = {}; 
+
+	if(moduleSettings.args.includes('version') || moduleSettings.args.includes('-v')){
+		console.log("🐾" + blue.bold(' => 1.0.0'));
+        
+		return;
+	}
+
+	if(moduleSettings.args.includes('help') || moduleSettings.args.includes('-h')){
+		console.log("🦮" + green.underline.bold(' => Lucy CLI Help'));
+        
+		return;
+	}
 
 	if (!existsSync(moduleSettings.wixConfigPath)) {
-		console.log(chalk.red.underline.bold(`This is not a WIX project ${moduleSettings.targetFolder}`));
+		console.log((`💩 ${red.underline.bold("=> This is not a WIX project =>")} ${orange(moduleSettings.targetFolder)}`));
 		return;
     }
 
-	const packageJSONraw = await fs.readFile(join(moduleSettings.targetFolder, 'package.json'), 'utf8');
-	const packageJSON = JSON.parse(packageJSONraw);
+	if(existsSync(moduleSettings.packageJonPath)) {
+		const packageJSONraw = await fs.readFile(join(moduleSettings.packageJonPath), 'utf8');
+		try {
+			projectSettings.packageJSON = JSON.parse(packageJSONraw);
+		} catch (parseError) {
+			console.log((`💩 ${red.underline.bold("=> Error parsing package.json =>")} ${orange(parseError)}`));
+			return;
+		}
+	}
 
 	if(existsSync(moduleSettings.lucyConfigPath)) {
 		try {
 			const data = await fs.readFile(moduleSettings.lucyConfigPath, 'utf8');
-			projectSettings = JSON.parse(data);
+			projectSettings.lucySettings = JSON.parse(data);
 		} catch (parseError) {
-			console.error(chalk.red.underline.bold('Error parsing Lucy.json', parseError));
+			console.log((`💩 ${red.underline.bold("=> Error parsing Lucy.json =>")} ${orange(parseError)}`));
 		}
 	} else {
-		console.log(chalk.blueBright.underline.bold('Project not Intialized!'));
-		return;
-	}
-
-
-
-	if(packageJSON?.wixLucy?.intialized && ! args.includes('-f')) {
-		console.error(chalk.red.underline.bold(`This project is already initialized ${moduleSettings.targetFolder}`));
-		return;
-	}
-
-	console.log({ args, cwd });
-	if(args.includes('help') || args.includes('-h')){
-		console.log('Help is on the way!');
-        
-		return;
-	}
-	if(args.includes('version') || args.includes('-v')){
-		console.log('1.0.0');
-        
-		return;
+		if(!moduleSettings.args.includes('init')) {
+			return console.log(yellow.underline.bold('🐶 => Project not Intialized! Please initialize using "lucy-cli init"'));
+		};
 	}
     
-	if(args.includes('init')){
-		init(cwd, packageRoot, args);
+	if(moduleSettings.args.includes('init')){
+		console.log("🐕" + magenta.underline(' => Initializing project'));
+		init(moduleSettings, projectSettings);
 		
 		return;
 	}
 
-	if(args.includes('dev')){
-		dev(cwd, args);
-		
-		return;
+	if(moduleSettings.args.includes('dev')){
+		dev(moduleSettings, projectSettings);
+
+		return;	
 	}
 
-	if(args.includes('sync')){
-		console.log('Hello serve');
+	if(moduleSettings.args.includes('sync')){
+		sync(moduleSettings, projectSettings);
 
 		return;
 	}
 
 }
 
-main();
-
-// const fs = require("fs"),
-//     path = require("path")
-
-// /** Parse the command line */
-// var args = process.argv.slice(2);
-
-// // Validate input
-// if (args.length !== 2) {
-//     console.log("Warning: Requires 2 arguments");
-//     console.log("node index.js [path/source.html] [targetfile]");
-//     process.exit();
-// }
-
-// const src = args[0];
-// const target = args[1];
-// const dirsrc = path.dirname(src);
-
-// if (!fs.existsSync(src)) {
-//     console.log("Error: Source file doesn't exist. Given: ", src);
-//     process.exit();
-// }
-
+main();

package/src/init.ts

@@ -2,17 +2,11 @@ import chalk from 'chalk';
 import { existsSync, mkdirSync, promises as fsPromises } from 'fs';
 import fse from 'fs-extra';
 import { join } from 'path';
-import { simpleGit, SimpleGit, SimpleGitOptions } from 'simple-git';
+import { simpleGit } from 'simple-git';
 import fs from 'fs/promises';
 import { spawnSync } from 'child_process';
-import settings from './settings.json' assert { type: 'json' };
 import path from 'path';
-
-
-type ProjectSettings = {
-	packages?: Record<string, string>;
-	modules?: Record<string, string>;
-}
+import { ModuleSettings, ProjectSettings, blue, green, orange, red } from './index.js';
 
 /**
  * Init Lucy project
@@ -20,54 +14,26 @@ type ProjectSettings = {
  * @param {string} packageRoot Package root directory
  * @returns {void}
  */
-export async function init(cwd: string, packageRoot:string, args: string[]) {
-	const sourceFolder = join(packageRoot, 'files');
-	const targetFolder = cwd;
-	let projectSettings: ProjectSettings|undefined; 
-
-	if(existsSync(join(targetFolder, 'lucy.json'))) {
-		try {
-			const lucyConfig = join(targetFolder, 'lucy.json');
-			const data = await fs.readFile(lucyConfig, 'utf8');
-			projectSettings = JSON.parse(data);
-		} catch (parseError) {
-			console.error(chalk.red.underline.bold('Error parsinc Lucy.json', parseError));
-		}
-	} else {
-		const lucyConfig = {
-			packages: settings.packages,
-			modules: settings.modules
-		}
-		await fs.writeFile(join(targetFolder, 'lucy.json'), JSON.stringify(lucyConfig, null, 2), 'utf8');
-		console.log(chalk.blueBright.underline.bold('Created Lucy config file!'));
-	}
-
-    const wixConfigPath = join(targetFolder, 'wix.config.json');
-	const packageJSONraw = await fs.readFile(join(targetFolder, 'package.json'), 'utf8');
-	const packageJSON = JSON.parse(packageJSONraw);
+export async function init(moduleSettings: ModuleSettings, projectSettings: ProjectSettings) {
 	
-	if(packageJSON?.wixLucy?.intialized && ! args.includes('-f')) {
-		console.error(chalk.red.underline.bold(`This project is already initialized ${targetFolder}`));
+	if(projectSettings.packageJSON && projectSettings.packageJSON.wixLucy?.intialized && !moduleSettings.args.includes('-f')) {
+		console.log((`💩 ${red.underline.bold("=> This project is already initialized =>")} ${orange(moduleSettings.targetFolder)}`));
 		return;
 	}
 
-    if (!existsSync(wixConfigPath)) {
-		console.error(chalk.red.underline.bold(`This is not a WIX project ${targetFolder}`));
-		return;
-    }
+	await copyFolder(join(moduleSettings.packageRoot, 'files'), moduleSettings.targetFolder);
 
-	await copyFolder(sourceFolder, targetFolder);
+	await editJson(moduleSettings.packageJonPath, ['type', 'scripts', 'wixLucy'], ['module', moduleSettings.settings.scripts, moduleSettings.settings.lucySettings ]);
+	await stringReplace(join(moduleSettings.targetFolder, 'currents.config.js'), ['__ProjectName__'], [path.basename(moduleSettings.targetFolder)]);
 
-	await editJson(join(targetFolder, 'package.json'), ['type', 'scripts', 'wixLucy'], ['module', settings.scripts, settings.lucySettings ]);
-	await stringReplace(join(targetFolder, 'currents.config.js'), ['__ProjectName__'], [path.basename(targetFolder)]);
+	await installPackages(projectSettings?.packages ? projectSettings?.packages :  moduleSettings.settings.packages, moduleSettings.targetFolder);
 
-	await installPackages(projectSettings?.packages ? projectSettings?.packages :  settings.packages, targetFolder);
+	await editJson(join(moduleSettings.targetFolder, 'jsconfig.json'), ['compilerOptions', 'exclude'], [moduleSettings.settings.wixSettings.compilerOptions, moduleSettings.settings.wixSettings.exclude]);
+	await editJson(join(moduleSettings.targetFolder, 'typedoc.json'), ['name'], [path.basename(moduleSettings.targetFolder)]);
 
-	await editJson(join(targetFolder, 'jsconfig.json'), ['compilerOptions', 'exclude'], [settings.wixSettings.compilerOptions, settings.wixSettings.exclude]);
-	await editJson(join(targetFolder, 'typedoc.json'), ['name'], [path.basename(targetFolder)]);
+	await gitInit(moduleSettings.targetFolder, projectSettings?.modules ? projectSettings?.modules : moduleSettings.settings.modules);
 
-	await gitInit(targetFolder, projectSettings?.modules ? projectSettings?.modules : settings.modules);
-	console.log(chalk.blueBright.underline.bold('Done!'));
+	console.log(chalk.greenBright.underline('🐶 => Initialization done!'));
 }
 
 /**
@@ -78,7 +44,7 @@ export async function init(cwd: string, packageRoot:string, args: string[]) {
  */
 async function copyFolder(source: string, target: string): Promise<void> {
 	if (!existsSync(target)){
-		console.error(chalk.red.underline.bold(`Target folder doesn't exist: ${target}`));
+		console.log((`💩 ${red.underline.bold("=> Target folder doesn't exist =>")} ${orange(target)}`));
 		return;
 	}
 
@@ -102,9 +68,9 @@ async function copyFolder(source: string, target: string): Promise<void> {
 			}
 		}
 	} catch (err){
-		console.error(chalk.red.underline.bold(err));
+		console.log((`💩 ${red.underline.bold("=> There was an error while copying files =>")} ${orange(err)}`));
 	} finally {
-		console.log(chalk.blueBright.underline.bold('Copy files completed!'));
+		console.log("🐕" + blue.underline.bold(' => Copy files completed!'));
 	}
 }
 
@@ -123,7 +89,7 @@ async function editJson(filePath: string, keys: string[], values: string[] | Obj
 		try {
 			jsonData = JSON.parse(data);
 		} catch (parseError) {
-			console.error(chalk.red.underline.bold('Error parsing JSON:', parseError));
+			console.log((`💩 ${red.underline.bold("=> Error parsing JSON =>")} ${orange(parseError)}`));
 			return;
 		}
 
@@ -136,9 +102,9 @@ async function editJson(filePath: string, keys: string[], values: string[] | Obj
 		const updatedJsonData = JSON.stringify(jsonData, null, 2);
 		await fs.writeFile(filePath, updatedJsonData, 'utf8');
 	} catch (err) {
-		console.log(chalk.red.underline.bold(err));
+		console.log((`💩 ${red.underline.bold("=> Error editing JSON Data =>")} ${orange(err)}`));
 	} finally {
-		console.log(chalk.blueBright.underline.bold(`File ${filePath} updated successfully!`));
+		console.log("🐕" + blue.underline(` => Updated file ${orange(filePath)}`));
 	}
 }
 
@@ -156,9 +122,9 @@ async function stringReplace(filePath: string, keys: string[], values: string[])
 
 		await fs.writeFile(filePath, modifiedContent, 'utf8');
 	} catch (err) {
-		console.log(chalk.red.underline.bold(err));
+		console.log((`💩 ${red.underline.bold("=> Durring string replace =>")} ${orange(err)}`));
 	} finally {
-		console.log(chalk.blueBright.underline.bold(`File ${filePath} updated successfully!`));
+		console.log(blue.underline(`🐕 => Updated file ${orange(filePath)}`));
 	}
 }
 
@@ -166,12 +132,12 @@ async function installPackages(packages: Record<string, string>, cwd: string) {
 	const packageNames = Object.keys(packages);
 	const packageVersions = Object.values(packages);
 	const packageNamesAndVersions = packageNames.map((name, index) => `${name}@${packageVersions[index]}`);
-	const command = `yarn add ${packageNamesAndVersions.join(' ')}`;
+	const command = `yarn add -D ${packageNamesAndVersions.join(' ')}`;
 	const result = spawnSync(command, { shell: true, stdio: 'inherit' });
 	if (result.error) {
-		console.error(chalk.red.underline.bold(`Command failed: ${result.error.message}`));
+		console.log((`💩 ${red.underline.bold("=> Failed to install packages =>")} ${orange(result.error.message)}`));
 	} else {
-		console.log(chalk.blueBright.underline.bold(`Command succeeded: ${result.stdout}`));
+		console.log("🐕" + blue.underline(` => Packeges installed!`));
 	}																
 }
 
@@ -181,11 +147,11 @@ async function gitInit(cwd: string, modules: Record<string, string>) {
 		console.log(chalk.green.underline.bold(`Cloning ${name}`));
 		try {
 			await git.submoduleAdd(url, name)
-		} catch (e) {
-			console.error(chalk.red.underline.bold(`Command failed: ${e}`));
+		} catch (err) {
+			console.log((`💩 ${red.underline.bold("=> Command failed =>")} ${orange(err)}`));
 		} finally {	
-			console.log(chalk.blueBright.underline.bold(`Cloned ${name}`));
+			console.log("🐕" + blue.underline(` => Cloned ${orange(name)}`));
 		}
 	}
-	console.log(chalk.blueBright.underline.bold(`All Modules cloned!`));
+	console.log("🐶" + green.underline(' => All Modules cloned!'));
 }

package/src/settings.json

@@ -1,6 +1,6 @@
 {
   "modules": {
-    "wix-lucy-lib": "git@github.com:Integral-Systems/wix-lucy-lib.git"
+    "lucy-lib": "git@github.com:Integral-Systems/lucy-lib.git"
   },
   "wixSettings": {
     "compilerOptions": {
@@ -24,8 +24,11 @@
     "@js-joda/locale": "4.8.10",
     "@js-joda/locale_de": "4.8.10",
     "@js-joda/locale_en": "4.8.10",
+    "@js-joda/locale_fr": "4.8.10",
+    "@js-joda/locale_it": "4.8.10",
     "@js-joda/timezone": "2.18.0",
     "@react-pdf/renderer": "2.0.17",
+    "velo-sync": "^0.0.9",
     "@total-typescript/ts-reset": "^0.4.2",
     "@types/i18n": "^0.13.6",
     "@types/jest": "^29.5.3",

package/src/sync.ts

@@ -0,0 +1,10 @@
+import { modifierNames } from "chalk";
+import { ModuleSettings, ProjectSettings } from ".";
+
+export function sync(moduleSettings: ModuleSettings, projectSettings: ProjectSettings) {
+
+    if(moduleSettings.args.includes('sync')){
+		
+	}
+    console.log('Hello sync');
+}

package/src/types.d.ts

@@ -2,4 +2,5 @@ declare module 'gulp-exec';
 declare module 'gulp-clean';
 declare module 'gulp-foreach';
 declare module 'gulp-string-replace';
-declare module 'gulp-wait';
+declare module 'gulp-wait';
+declare module 'gulp-jest';

package/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["plugin:@wix/cli/recommended"]
-}

package/files/jest.config.ts

@@ -1,28 +0,0 @@
-import type {  JestConfigWithTsJest} from 'ts-jest';
-
-const config: JestConfigWithTsJest = {
-	verbose: true,
-	extensionsToTreatAsEsm: ['.ts'],
-	transform: {
-		'^.+\\.tsx?$': [
-			'ts-jest',
-			{
-				tsconfig: './typescript/tsconfig.json',
-				usESM: true,
-			},
-		],
-	},
-	preset: 'ts-jest',
-	setupFilesAfterEnv: [],
-	testEnvironment: 'node',
-	collectCoverage: true,
-	coverageDirectory: '../coverage',
-	coverageReporters: ['clover', 'json', 'lcov', 'text'],
-	rootDir: './typescript',
-	testMatch: ['**/*.spec.ts'],
-	moduleNameMapper: {
-		"public/(.*)": "<rootDir>/public/$1"
-	}
-};
-
-export default config;

package/files/tsconfig.json

@@ -1,51 +0,0 @@
-{
-    "typeAcquisition": {
-        "enable": true
-    },
-    "compilerOptions": {
-        "outDir": "../src",
-        "rootDir": "../typescript",
-        "target": "ES2020",
-        "build": true,
-        "module": "ESNext",
-        "moduleResolution": "Node",
-        "preserveConstEnums": true,
-        "allowSyntheticDefaultImports": true,
-        "skipLibCheck": true,
-        "jsx": "react-jsx",
-        "lib": ["DOM"],
-        "declaration": true,
-        "strict": true,
-        "noEmitOnError": false,
-        "strictNullChecks": true,
-        "noImplicitAny": true,
-        "noImplicitReturns": true,
-        "noUncheckedIndexedAccess": true,
-        "noImplicitThis": true,
-        "strictBindCallApply": true,
-        "strictFunctionTypes": true,
-        "strictPropertyInitialization": true,
-        "experimentalDecorators": true,
-        "esModuleInterop": true,
-        "resolveJsonModule": true,
-        "paths": {
-            "public/*": ["./public/*"],
-            "backend/*": ["./backend/*"],
-            "pages/*": ["./pages/*"],
-        },
-        "plugins": [
-            {
-                "name": "typescript-hbs-plugin"
-            }
-        ]
-    },
-    "exclude": ["../node_modules", "../.wix", "node_modules", "./wix", "./**/*.spec.ts"],
-    "include":[
-        "public/**/*.tsx"
-        ],
-    "references": [
-        {
-        "path": "../jsconfig.json"
-        }
-    ]
-}