lucy-cli 0.0.4 → 0.5.0

package/dist/init.js

@@ -5,55 +5,27 @@ import { join } from 'path';
 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';
+import { blue, green, orange, red } from './index.js';
 /**
  * Init Lucy project
  * @param {string} cwd Current working directory
  * @param {string} packageRoot Package root directory
  * @returns {void}
  */
-export async function init(cwd, packageRoot, args) {
-    const sourceFolder = join(packageRoot, 'files');
-    const targetFolder = cwd;
-    let projectSettings;
-    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);
-    if (packageJSON?.wixLucy?.intialized && !args.includes('-f')) {
-        console.error(chalk.red.underline.bold(`This project is already initialized ${targetFolder}`));
-        return;
-    }
-    if (!existsSync(wixConfigPath)) {
-        console.error(chalk.red.underline.bold(`This is not a WIX project ${targetFolder}`));
+export async function init(moduleSettings, projectSettings) {
+    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;
     }
-    await copyFolder(sourceFolder, 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 : settings.packages, 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(targetFolder, projectSettings?.modules ? projectSettings?.modules : settings.modules);
-    console.log(chalk.blueBright.underline.bold('Done!'));
+    await copyFolder(join(moduleSettings.packageRoot, 'files'), moduleSettings.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 installPackages(projectSettings?.packages ? projectSettings?.packages : moduleSettings.settings.packages, moduleSettings.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 gitInit(moduleSettings.targetFolder, projectSettings?.modules ? projectSettings?.modules : moduleSettings.settings.modules);
+    console.log(chalk.greenBright.underline('🐶 => Initialization done!'));
 }
 /**
  * Copy files from source to target
@@ -63,7 +35,7 @@ export async function init(cwd, packageRoot, args) {
  */
 async function copyFolder(source, target) {
     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;
     }
     try {
@@ -87,10 +59,10 @@ async function copyFolder(source, target) {
         }
     }
     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!'));
     }
 }
 /**
@@ -108,7 +80,7 @@ async function editJson(filePath, keys, values) {
             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;
         }
         for (const key of keys) {
@@ -120,10 +92,10 @@ async function editJson(filePath, keys, values) {
         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)}`));
     }
 }
 async function stringReplace(filePath, keys, values) {
@@ -139,23 +111,23 @@ async function stringReplace(filePath, keys, values) {
         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)}`));
     }
 }
 async function installPackages(packages, cwd) {
     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!`));
     }
 }
 async function gitInit(cwd, modules) {
@@ -165,12 +137,12 @@ async function gitInit(cwd, modules) {
         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/dist/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/dist/sync.d.ts

@@ -0,0 +1,2 @@
+import { ModuleSettings, ProjectSettings } from ".";
+export declare function sync(moduleSettings: ModuleSettings, projectSettings: ProjectSettings): void;

package/dist/sync.js

@@ -0,0 +1,5 @@
+export function sync(moduleSettings, projectSettings) {
+    if (moduleSettings.args.includes('sync')) {
+    }
+    console.log('Hello sync');
+}

package/files/lucy.json

@@ -1,5 +1,5 @@
 {
   "modules": {
-    "wix-lucy-lib": "git@github.com:Integral-Systems/wix-lucy-lib.git"
+    "lucy-lib": "git@github.com:Integral-Systems/lucy-lib.git"
   }
 }

package/files/typedoc.json

@@ -1,10 +1,10 @@
 {
-    "entryPoints": ["typescript/**/*.ts"],
+    "entryPoints": ["typescript/**/*.ts", "typescript/**/*.tsx"],
     "entryPointStrategy": "expand",
     "out": "docs",
     "plugin": ["typedoc-theme-hierarchy"],
     "theme": "hierarchy",
-    "tsconfig": "./typescript/docs.tsconfig.json",
+    "tsconfig": "docs.tsconfig.json",
     "excludeExternals": true,
     "externalPattern":[
         "**/node_modules/**",

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "lucy-cli",
-  "version": "0.0.4",
+  "version": "0.5.0",
   "description": "Lucy Framwork for WIX Studio Editor",
   "main": ".dist/index.js",
   "scripts": {
@@ -25,6 +25,9 @@
   },
   "homepage": "https://github.com/Integral-Systems/wix-lucy-cli#readme",
   "bin": "./dist/index.js",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
   "dependencies": {
     "@wix/cli": "^1.0.83",
     "@wix/eslint-plugin-cli": "^1.0.1",
@@ -39,21 +42,24 @@
     "gulp-foreach": "^0.1.0",
     "gulp-if": "^3.0.0",
     "gulp-insert": "^0.5.0",
+    "gulp-jest": "^4.0.4",
     "gulp-json-editor": "^2.5.7",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
     "gulp-shell": "^0.8.0",
     "gulp-string-replace": "^1.1.2",
     "gulp-tap": "^2.0.0",
+    "gulp-typedoc": "^3.0.2",
     "gulp-typescript": "^6.0.0-alpha.1",
     "gulp-wait": "^0.0.2",
-    "jest": "^29.6.1",
+    "jest": "^29.7.0",
     "merge-stream": "^2.0.0",
     "prettier": "^3.0.3",
     "sass": "^1.65.1",
     "simple-git": "^3.20.0",
     "ts-jest": "^29.1.1",
-    "typedoc": "^0.25.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.25.4",
     "typedoc-theme-hierarchy": "^4.0.0",
     "velo-sync": "^0.0.9"
   },

package/settings/backend-settings.json

@@ -6,14 +6,24 @@
     "strict": true,
     "strictNullChecks": true,
     "paths": {
-      "backend/*": ["../../../typescript/backend/*"],
+      "public/*": ["../../../lucy-lib/public/*"],
+      "backend/*": [
+        "../../../lucy-lib/backend/*",
+        "../../../lucy-lib/public/*"
+      ],
       "wix-types/*": ["../wix-code-types/dist/types/*"],
-      "types/*": ["../../../typescript/types/*"]
+      "types/*": ["../../../typescript/types/*", "../../../lucy-lib/types/*"]
     }
   },
   "include": [
+    "../../../lucy-lib/public/**/*",
+    "../../../lucy-lib/backend/**/*.web.ts",
+    "../../../lucy-lib/backend/**/*",
     "../../../typescript/__mocks__/**/*",
+    "../../../lucy-lib/__mocks__/**/*",
     "../../../typescript/backend/**/*.json",
-    "../../../typescript/backend/**/*"
+    "../../../lucy-lib/backend/**/*.json",
+    "../../../typescript/backend/**/*",
+    "../../../lucy-lib/backend/**/*"
   ]
 }

package/settings/master-settings.json

@@ -8,10 +8,17 @@
     "noUncheckedIndexedAccess": true,
     "lib": ["DOM"],
     "paths": {
-      "backend/*": ["../../../typescript/backend/*"],
+      "public/*": ["../../../lucy-lib/public/*"],
+      "backend/*": [
+        "../../../typescript/backend/*",
+        "../../../lucy-lib/backend/*"
+      ],
       "wix-types/*": ["../wix-code-types/dist/types/*"],
-      "types/*": ["../../../typescript/types/*"]
+      "types/*": ["../../../typescript/types/*", "../../../lucy-lib/types/*"]
     }
   },
-  "include": ["../../../typescript/backend/**/*"]
+  "include": [
+    "../../../typescript/backend/**/*",
+    "../../../lucy-lib/backend/**/*"
+  ]
 }

package/settings/page-settings.json

@@ -9,10 +9,18 @@
     "noUncheckedIndexedAccess": true,
     "lib": ["DOM"],
     "paths": {
-      "backend/*": ["../../../typescript/backend/*"],
+      "public/*": ["../../../lucy-lib/public/*"],
+      "backend/*": [
+        "../../../typescript/backend/*",
+        "../../../lucy-lib/backend/*"
+      ],
       "wix-types/*": ["../wix-code-types/dist/types/*"],
-      "types/*": ["../../../typescript/types/*"]
+      "types/*": ["../../../typescript/types/*", "../../../lucy-lib/types/*"]
     }
   },
-  "include": ["../../../typescript/backend/**/*"]
+  "include": [
+    "../../../lucy-lib/public/*",
+    "../../../typescript/backend/**/*",
+    "../../../lucy-lib/backend/**/*"
+  ]
 }

package/settings/public-settings.json

@@ -8,14 +8,23 @@
     "strictNullChecks": true,
     "lib": ["DOM"],
     "paths": {
-      "backend/*": ["../../../typescript/backend/*"],
-      "public/*": ["../../../typescript/public/*"],
-      "types/*": ["../../../typescript/types/*"],
+      "backend/*": [
+        "../../../typescript/backend/*",
+        "../../../lucy-lib/backend/*"
+      ],
+      "public/*": [
+        "../../../typescript/public/*",
+        "../../../lucy-lib/public/*"
+      ],
+      "types/*": ["../../../typescript/types/*", "../../../lucy-lib/types/*"],
       "wix-types/*": ["../wix-code-types/dist/types/*"]
     }
   },
   "include": [
+    "../../../lucy-lib/public/**/*",
     "../../../typescript/__mocks__/**/*",
-    "../../../typescript/backend/**/*"
+    "../../../lucy-lib/__mocks__/**/*",
+    "../../../typescript/backend/**/*",
+    "../../../lucy-lib/backend/**/*"
   ]
 }