uc-dev 1.0.6 → 1.0.8

package/README.md

@@ -41,15 +41,26 @@ Launches interactive setup menu.
 ```bash
 uc-dev setup
 ```
+
+if you fire  `uc-dev setup` in blank directory than it will ask you project name and 
+will create the initial startup project for you. :-)
+
+OR
+
+will show 
 📋 MAIN MENU
 ```bash
 --M A I N - M E N U-----------
-  P = Parameters
-  B = Build Designers
+  P = Perameters
+  B = Build Designers and Resource File
   G = Generate
+  D = Dependancy
+  S = Quick Startup
   Q = Quit
 What to Do Now ? (q):
 ```
+ *note (`Quit` not work in some menus)
+
 ### 🔹 P = Parameters 
 Configure project directories and related settings:
 src directory
@@ -59,9 +70,10 @@ designer directory
 other setup-related paths
 These values are later used when generating files.
 
-### 🔹 B = Build Designers
-
+### 🔹 B = Build Designers and Resource File
 Shortcut for:  `uc-dev build`
+
+
 ### 🔹 G = Generate
 Opens Generate Submenu
 ```bash

package/out/cli.js

@@ -103,15 +103,15 @@ function GetProject(_path, projectsArray, url4) {
   callerFilePath = correctpath(callerFilePath);
   return projectsArray.find((proj) => callerFilePath.startsWith(proj.projectPath));
 }
-function GetPackage(projectdir, path7, fs3) {
+function GetPackage(projectdir, path7, fs4) {
   let package_file_path = path7.join(projectdir, "package.json");
-  if (fs3.existsSync(package_file_path)) {
-    return JSON.parse(fs3.readFileSync(package_file_path, "binary"));
+  if (fs4.existsSync(package_file_path)) {
+    return JSON.parse(fs4.readFileSync(package_file_path, "binary"));
   }
   return void 0;
 }
-function GetProjectName(projectdir, path7, fs3) {
-  let packageContent = GetPackage(projectdir, path7, fs3);
+function GetProjectName(projectdir, path7, fs4) {
+  let packageContent = GetPackage(projectdir, path7, fs4);
   if (packageContent != void 0)
     return packageContent.name;
 }
@@ -715,8 +715,8 @@ var ucUtil = class _ucUtil {
 };
 
 // src/utils/cliMain.ts
-import { existsSync as existsSync12, readFileSync as readFileSync7 } from "fs";
-import path6, { join as join15 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync7 } from "fs";
+import path6, { join as join16 } from "path";
 
 // src/utils/cliDependancyChecker.ts
 import { spawn } from "node:child_process";
@@ -1384,10 +1384,10 @@ function ask(question, def) {
     output: process.stdout
   });
   const hint = def ? ` (${def})` : "";
-  return new Promise((resolve13) => {
+  return new Promise((resolve14) => {
     rl.question(`${question}${hint}: `, (ans) => {
       rl.close();
-      resolve13(ans.trim() || def || "");
+      resolve14(ans.trim() || def || "");
     });
   });
 }
@@ -1455,13 +1455,13 @@ var cliDependancyChecker = class {
     const args2 = [...baseArgs, ...pkgs];
     console.log("Installing:", pkgs.join(", "));
     console.log(">", pm, args2.join(" "));
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve14, reject) => {
       const child = spawn(pm, args2, {
         stdio: "inherit",
         shell: true
       });
       child.on("close", (code) => {
-        if (code === 0) resolve13();
+        if (code === 0) resolve14();
         else reject(new Error(`Install failed with code ${code}`));
       });
       child.on("error", reject);
@@ -7323,11 +7323,8 @@ var BuildDesigner = class {
     htmlCode = this.common0(_row);
     if (htmlCode == void 0) return void 0;
     else if (htmlCode.trim() == "") {
-      htmlCode = `<WRAPPER x-caption="${finfo.name}">
-    <UCWINFRAME x-name="winFrame1" x-from="uc-runtime/controls/ucWinFrame.uc.html">
-        
-    </UCWINFRAME>
-</WRAPPER>`;
+      htmlCode = `<WRAPPER x-caption="${finfo.name}"></WRAPPER>`;
+      writeFileSync3(finfo.allPathOf[pref.srcDec].html, htmlCode, "utf8");
     }
     if (!existsSync10(finfo.allPathOf[pref.srcDec].scss)) {
       writeFileSync3(finfo.allPathOf[pref.srcDec].scss, `&{
@@ -7974,6 +7971,27 @@ var cliSurveys = class {
   constructor(main2) {
     this.main = main2;
   }
+  setDefault() {
+    const cfg = this.main.config;
+    const cli = cfg.cli;
+    cli.useElectron = true;
+    cli.useTypeScript = true;
+    cli.srcDir = "src";
+    cli.outDir = "out";
+    cli.designerDir = "designerFiles";
+    cli.codeFileExt = ".ts";
+    cli.outputFileExt = ".js";
+    cli.mainProcessFilePath = `main/index${cli.codeFileExt}`;
+    cli.preloadScriptFilePath = `preload/index${cli.codeFileExt}`;
+    cli.baseCodePath = `renderer/index${cli.codeFileExt}`;
+    cli.devtools = true;
+    cli.removeMenu = true;
+    cli.baseCssPath = "styles.scss";
+    cli.baseHtmlPath = "index.html";
+    cli.ResourceStorageFile = `Resources${cli.codeFileExt}`;
+    cli.filesToMove = ".jpg,.png,.html,.scss,.ico,.svg";
+    cli.ignoreInBuild = `node_modules;.git;.vscode;${cli.outDir}`;
+  }
   async inquiry() {
     const projectDir = this.main.projectDir;
     const cfg = this.main.config;
@@ -7997,7 +8015,6 @@ var cliSurveys = class {
     }
     cli.baseCssPath = await ask(`base css filepath (in project root) :`, cli.baseCssPath ?? "styles.scss");
     cli.baseHtmlPath = await ask(`base html filepath (in project root):`, cli.baseHtmlPath ?? "index.html");
-    const renderDir = dirname9(cli.baseCodePath);
     cli.ResourceStorageFile = await ask(
       `ResourceFile Path (in ${cli.srcDir} directory): `,
       cli.ResourceStorageFile ?? correctpath(join12(cli.designerDir, `Resources${cli.codeFileExt}`))
@@ -8085,18 +8102,26 @@ function _runTemplate_x(rel, row) {
 }
 
 // src/utils/inquiry/cli_menu_generate.ts
-async function cli_menu_generate(main2, back_menu_callback = async () => {
-}) {
+async function cli_menu_generate(back_menu_callback = async () => {
+}, defCommand) {
   let hasAddedSampleForm = false;
-  const cmd2 = await makeMenu("G E N E R A T E", `
-  E = Electron Stuffs
-  S = Sample Style1
-  V = '.vscode/settings.json' file
-  T = 'tsconfig.json' for project
-  A = Do All Above
-  Q = Quit
-  `, "q");
-  await _select(cmd2);
+  const main2 = cliMain.ref;
+  let cmdlist = "";
+  if (defCommand == void 0) {
+    cmdlist = await makeMenu("G E N E R A T E", `
+      E = Electron Stuffs
+      S = Sample Style1
+      V = '.vscode/settings.json' file
+      T = 'tsconfig.json' for project
+      A = Do All Above
+      Q = Quit
+      `, "q");
+  } else {
+    cmdlist = defCommand;
+  }
+  for (let index = 0; index < cmdlist.length; index++) {
+    await _select(cmdlist[index]);
+  }
   async function _select(selectedOption) {
     switch (selectedOption.toLowerCase().trim()) {
       case "a":
@@ -8107,9 +8132,7 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
           await _select("e");
         await main2.startBuild();
         break;
-      case "p":
-        await main2._cliSurveys.inquiry();
-        break;
+      //case 'p': await main._cliSurveys.inquiry(); break;
       case "s":
         await cli_sample_style1(main2);
         hasAddedSampleForm = true;
@@ -8128,7 +8151,6 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
           }),
           main2.cliOptions
         );
-        await cli_menu_generate(main2);
         break;
       case "v":
         await writeFileSafely(
@@ -8141,7 +8163,6 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
         await back_menu_callback(main2);
         return;
     }
-    await cli_menu_generate(main2);
   }
 }
 function _runTemplate5(rel, options) {
@@ -8149,18 +8170,24 @@ function _runTemplate5(rel, options) {
 }
 
 // src/utils/inquiry/cli_menu_dependancy.ts
-async function cli_menu_dependancy(main2, back_menu_callback = async () => {
-}) {
+async function cli_menu_dependancy(back_menu_callback = async () => {
+}, defCommand) {
   let hasAddedSampleForm = false;
-  const cmd2 = await makeMenu("D E P E N D A N C Y", `
-  E = Electron
-  T = Type Script
-  R = rimraf
-  U = uc-runtime
-  D = uc-dev
-  C = uc-controls
-  `, "etrudc");
-  await _select(cmd2);
+  const main2 = cliMain.ref;
+  let cmdlist = "";
+  if (defCommand == void 0) {
+    cmdlist = await makeMenu("D E P E N D A N C Y", `
+      E = Electron
+      T = Type Script
+      R = rimraf
+      U = uc-runtime
+      D = uc-dev
+      C = uc-controls
+      `, "etruc");
+  } else {
+    cmdlist = defCommand;
+  }
+  await _select(cmdlist);
   async function _select(selectedOption) {
     const packages = [];
     if (selectedOption.includes("e")) packages.push("electron");
@@ -8175,6 +8202,43 @@ async function cli_menu_dependancy(main2, back_menu_callback = async () => {
   }
 }
 
+// src/utils/inquiry/cli_menu_quickStartup.ts
+import { existsSync as existsSync12 } from "node:fs";
+import { dirname as dirname12, join as join15, resolve as resolve13 } from "node:path";
+import { fileURLToPath as fileURLToPath13 } from "node:url";
+async function makesure_package_exist() {
+  const projDir = process.cwd();
+  const ppath = join15(projDir, "package.json");
+  if (!existsSync12(ppath)) {
+    const projectName = await ask(`Project Name : `, "sample-project");
+    await writeFileSafely(
+      resolve13("package.json"),
+      _runTemplate6("templates/json.package", {
+        projectName
+      }),
+      {}
+    );
+    cliMain.ref.projectDir = projDir;
+  }
+}
+async function cli_menu_quickStartup(main2, back_menu_callback = async () => {
+}) {
+  let hasAddedSampleForm = false;
+  const cfg = main2.config;
+  await makesure_package_exist();
+  cliMain.ref._cliSurveys.setDefault();
+  await main2._cliUcconfigInq.generateUcConfig();
+  await cli_menu_generate(cli_menu_MainMenu, "vtse");
+  await cli_menu_dependancy(cli_menu_MainMenu, "etruc");
+  await main2.startBuild();
+  console.log(`TO BUILD AND RUN PROJECT
+npm run rebuild:start`);
+  process.exit();
+}
+function _runTemplate6(rel, options) {
+  return runTemplate(join15(dirname12(fileURLToPath13(import.meta.url)), "utils/inquiry", rel), import.meta.url, options);
+}
+
 // src/utils/inquiry/cli_menu_MainMenu.ts
 async function cli_menu_MainMenu(main2, back_menu_callback = async () => {
 }) {
@@ -8183,6 +8247,7 @@ async function cli_menu_MainMenu(main2, back_menu_callback = async () => {
   B = Build Designers and Resource File  
   G = Generate
   D = Dependancy
+  S = Quick Startup
   Q = Quit
     `, "q");
   switch (cmd2.toLowerCase().trim()) {
@@ -8190,14 +8255,18 @@ async function cli_menu_MainMenu(main2, back_menu_callback = async () => {
       await main2.startBuild();
       break;
     case "d":
-      await cli_menu_dependancy(main2, cli_menu_MainMenu);
+      await cli_menu_dependancy(cli_menu_MainMenu);
       break;
     case "p":
       await main2._cliSurveys.inquiry();
       await cli_menu_MainMenu(main2);
       break;
     case "g":
-      await cli_menu_generate(main2, cli_menu_MainMenu);
+      await cli_menu_generate(cli_menu_MainMenu);
+      break;
+    case "s":
+      await cli_menu_quickStartup(main2, cli_menu_MainMenu);
+      await cli_menu_MainMenu(main2);
       break;
     case "q":
       return;
@@ -8211,6 +8280,7 @@ var cliOptions = class {
   force = false;
 };
 var cliMain = class {
+  static ref;
   cliOptions = new cliOptions();
   config = new UserUCConfig();
   menu;
@@ -8239,8 +8309,8 @@ var cliMain = class {
   }
   readConfig = async () => {
     try {
-      const cfgPath = join15(this.projectDir, "ucconfig.js");
-      if (existsSync12(cfgPath)) {
+      const cfgPath = join16(this.projectDir, "ucconfig.js");
+      if (existsSync13(cfgPath)) {
         this.config = await ImportUserConfig(cfgPath);
         if (this.config != void 0) {
           const x = extractPathConfig(this.config);
@@ -8338,7 +8408,11 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
   async checkBasicNeed(inquiry = true) {
     this.projectDir = getProjectDir(process.cwd());
     if (this.projectDir == null) {
-      throw Error("NO PROJECT FOUND");
+      await makesure_package_exist();
+      this.projectDir = getProjectDir(process.cwd());
+      if (this.projectDir == null) {
+        throw Error("NO PROJECT FOUND");
+      }
     }
     this.dependancyChecker = new cliDependancyChecker(this);
     await this.updateDependancies();
@@ -8356,7 +8430,7 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
   }
   listProjectDependencies() {
     const pkgPath = path6.resolve(this.projectDir, "package.json");
-    if (!existsSync12(pkgPath)) {
+    if (!existsSync13(pkgPath)) {
       throw new Error("package.json not found in project directory");
     }
     const pkgJson = JSON.parse(
@@ -8379,9 +8453,11 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
 };
 
 // src/cli.ts
+import fs3 from "fs";
 var args = process.argv.slice(2);
 var cmd = args[0];
 var main = new cliMain();
+cliMain.ref = main;
 await main.readConfig();
 var copt = main.cliOptions;
 copt.force = args.includes("--force");
@@ -8395,8 +8471,14 @@ switch (cmd) {
     await main.startBuild();
     break;
   case "setup":
-    if (!ignreq)
-      await main.checkBasicNeed(false);
+    if (isDirEmpty(main.projectDir)) {
+      if (!ignreq)
+        await main.checkBasicNeed(false);
+      await cli_menu_quickStartup(main, cli_menu_MainMenu);
+    } else {
+      if (!ignreq)
+        await main.checkBasicNeed(false);
+    }
     await cli_menu_MainMenu(main);
     break;
   case "--help":
@@ -8409,3 +8491,7 @@ Commands:
 `);
     break;
 }
+function isDirEmpty(path7) {
+  const files = fs3.readdirSync(path7);
+  return files.length === 0;
+}

package/out/utils/inquiry/templates/json.package

@@ -0,0 +1,17 @@
+{
+  "name": "<?= projectName ?>",
+  "version": "1.0.0",
+  "description": "",
+  "license": "ISC",
+  "author": "",
+  "type": "module",
+  "main": "out/main/index.js",
+  "scripts": {
+    "clean": "rimraf out",
+    "start": "electron .",
+    "build:dts": "tsc --emitDeclarationOnly",
+    "build": "tsc",
+    "rebuild": "npm run clean && npm run build && npm run build:dts",
+    "rebuild:start": "npm run rebuild && npm run start"
+  }
+}

package/out/utils/inquiry/templates/typescript/json.tsconfig

@@ -9,10 +9,9 @@
     "compileOnSave": true,
     "compilerOptions": { 
         "module": "ESNext",
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "target": "ESNext",
         "strict": true,
-        "baseUrl": ".",
         "outDir": "./<?= outDir ?>",
         "rootDir": "./<?= srcDir ?>",
         "declaration": true,

package/package.json

@@ -13,7 +13,7 @@
     "designer-build",
     "electron-tools"
   ],
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Electron CLI project builder for uc-runtime apps",
   "license": "ISC",
   "author": "AP",