uc-dev 1.0.0-beta.3 → 1.0.0-beta.5

package/out/cli.js

@@ -715,7 +715,7 @@ var ucUtil = class _ucUtil {
 };
 
 // src/utils/cliMain.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync7 } from "fs";
 import path6, { join as join15 } from "path";
 
 // src/utils/cliDependancyChecker.ts
@@ -1208,8 +1208,12 @@ var ConfigHandler = class {
       const pathAlias = prow.config?.browser?.importmap ?? {};
       for (let [als, relPath] of Object.entries(pathAlias)) {
         als = trimPath(als);
-        let fpath = join2(prow.projectPath, prow.rootPath);
-        let resolvPath = normalize2(path2.join(fpath, relPath));
+        let fpath = prow.projectPath;
+        let resolvPath = path2.resolve(fpath, relPath);
+        if (!fs2.existsSync(resolvPath)) {
+          console.warn("ImportMap path not found:", resolvPath);
+          continue;
+        }
         const isDir = fs2.statSync(resolvPath).isDirectory();
         let np = correctpath(path2.relative(fpath, resolvPath));
         np = cpath(np, isDir);
@@ -1349,7 +1353,6 @@ var ConfigHandler = class {
         const pkgJsonPath = appRequire.resolve(`${pkgName}/package.json`);
         return path2.dirname(pkgJsonPath);
       } catch (ee) {
-        console.log(ee);
         return null;
       }
     }
@@ -1612,9 +1615,6 @@ function _runTemplate(rel, options) {
 import path5 from "path";
 import url3 from "url";
 
-// src/lib/processes/BuildDesigner.ts
-import { join as join6, normalize as normalize5, relative as relative2, resolve as resolve6 } from "path";
-
 // ../ap-shared-core/out/uc-runtime/stylerRegs.js
 function ScssExtractor(csscontent) {
   let ocHandler = new openCloser();
@@ -1802,8 +1802,13 @@ function splitCSSById(cssContent, rtrn) {
   rtrn.outerCssContents = outerRulesCSS;
 }
 
+// src/lib/processes/BuildDesigner.ts
+import { existsSync as existsSync9, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { join as join6, normalize as normalize5, relative as relative2, resolve as resolve6 } from "path";
+import { fileURLToPath as fileURLToPath8 } from "url";
+
 // src/lib/processes/commonGeneratorX.ts
-import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 import { dirname as dirname5, join as join5, normalize as normalize4, resolve as resolve5 } from "path";
 
 // src/lib/processes/ResourceBuildEngine.ts
@@ -2137,14 +2142,14 @@ var commonGeneratorX = class _commonGeneratorX {
           let srctype = "ts";
           ensureDirectoryExistence(row.src.pathOf[designerFileSrctype]);
           _data = this.filex(`${srctype}${uctype}.designer`)(row);
-          writeFileSync3(row.src.pathOf[designerFileSrctype], _data);
+          writeFileSync2(row.src.pathOf[designerFileSrctype], _data);
           if (!existsSync8(row.src.pathOf[codeFileSrctype])) {
             _data = this.filex(`${srctype}${uctype}.code`)(row);
-            writeFileSync3(row.src.pathOf[codeFileSrctype], _data);
+            writeFileSync2(row.src.pathOf[codeFileSrctype], _data);
           }
           if (!existsSync8(row.src.pathOf.scss)) {
             _data = this.filex(`${srctype}${uctype}.style`)(row);
-            writeFileSync3(row.src.pathOf.scss, _data);
+            writeFileSync2(row.src.pathOf.scss, _data);
           }
         }
       }
@@ -2185,20 +2190,16 @@ var commonGeneratorX = class _commonGeneratorX {
     });
     ensureDirectoryExistence(resSrcFile);
     let resContent = this.filex("ts.resources")(rowForRes);
-    writeFileSync3(resSrcFile, resContent, "utf-8");
+    writeFileSync2(resSrcFile, resContent, "utf-8");
     if (!proj.config.cli.useTypeScript) {
       let resSrcTypeFile = ucUtil.changeExtension(resSrcFile, ".js", ".d.ts");
       let resContentTypes = this.filex("t.resources")(rowForRes);
-      writeFileSync3(resSrcTypeFile, resContentTypes, "utf-8");
+      writeFileSync2(resSrcTypeFile, resContentTypes, "utf-8");
     }
     return true;
   }
 };
 
-// src/lib/processes/BuildDesigner.ts
-import { existsSync as existsSync9, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
-import { fileURLToPath as fileURLToPath8 } from "url";
-
 // node_modules/htmlparser2/node_modules/entities/dist/esm/decode-codepoint.js
 var _a;
 var decodeMap = /* @__PURE__ */ new Map([
@@ -7325,7 +7326,7 @@ var BuildDesigner = class {
 </WRAPPER>`;
     }
     if (!existsSync9(finfo.allPathOf[pref.srcDec].scss)) {
-      writeFileSync4(finfo.allPathOf[pref.srcDec].scss, `&{
+      writeFileSync3(finfo.allPathOf[pref.srcDec].scss, `&{
     position: relative; 
     display:block;  width: 800px; height: 500px;
     background-color: #aeaeae;  
@@ -7627,9 +7628,11 @@ function registerMain() {
     encrypt: cfg.encryptResource
   }));
   mp.cssGuid = JSON.stringify(ResourceKeyBridge.extractKey(_cssbuilder.build(stylePath, {})));
-  if (cfg.cli.baseHtmlPath != void 0) {
+  if (cfg.cli.baseHtmlPath != void 0 && cfg.cli.baseHtmlPath.length > 0) {
     let htmlPath = join8(_mainProj.projectPath, cfg.cli.baseHtmlPath);
-    mp.mainHtmlGuid = ResourceKeyBridge.extractKey(_cssbuilder.build(htmlPath, {}));
+    const mainHtmlRes = _cssbuilder.build(htmlPath, {});
+    if (mainHtmlRes != void 0)
+      mp.mainHtmlGuid = ResourceKeyBridge.extractKey(mainHtmlRes);
   }
   mp.ucConfigGuid = JSON.stringify(ResourceKeyBridge.extractKey(_cssbuilder.build(void 0, {
     content: JSON.stringify(_mainProj.config)
@@ -8017,7 +8020,7 @@ import { fileURLToPath as fileURLToPath12 } from "node:url";
 // src/utils/inquiry/cli_sample_style1.ts
 import { dirname as dirname10, join as join13, relative as relative4, resolve as resolve10 } from "node:path";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
-import { readFileSync as readFileSync7 } from "node:fs";
+import { readFileSync as readFileSync6 } from "node:fs";
 async function cli_sample_style1(main2) {
   const cli = main2.config.cli;
   const sampleroot = dirname10(join13(cli.srcDir, cli.baseCodePath));
@@ -8070,7 +8073,7 @@ function _runTemplate4(rel, options) {
 }
 function _runTemplate_x(rel, row) {
   const fpath = join13(dirname10(fileURLToPath11(import.meta.url)), "utils/inquiry", rel);
-  let content = readFileSync7(fpath, "utf-8");
+  let content = readFileSync6(fpath, "utf-8");
   content = ucUtil.PHP_REMOVE(content);
   const tmaker = new TemplateMaker();
   const callback = tmaker.compileTemplate(content);
@@ -8084,7 +8087,6 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
   const cmd2 = await makeMenu("G E N E R A T E", `
   E = Electron Stuffs
   S = Sample Style1
-  U = 'ucconfig.js' file
   V = '.vscode/settings.json' file
   T = 'tsconfig.json' for project
   A = Do All Above
@@ -8094,7 +8096,6 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
   async function _select(selectedOption) {
     switch (selectedOption.toLowerCase().trim()) {
       case "a":
-        await _select("u");
         await _select("v");
         await _select("t");
         await _select("s");
@@ -8109,9 +8110,6 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
         await cli_sample_style1(main2);
         hasAddedSampleForm = true;
         break;
-      case "u":
-        await main2._cliUcconfigInq.generateUcConfig();
-        break;
       case "e":
         await main2._cliElectronInq.generate(hasAddedSampleForm);
         break;
@@ -8146,6 +8144,33 @@ function _runTemplate5(rel, options) {
   return runTemplate(join14(dirname11(fileURLToPath12(import.meta.url)), "utils/inquiry", rel), import.meta.url, options);
 }
 
+// src/utils/inquiry/cli_menu_dependancy.ts
+async function cli_menu_dependancy(main2, back_menu_callback = async () => {
+}) {
+  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);
+  async function _select(selectedOption) {
+    const packages = [];
+    if (selectedOption.includes("e")) packages.push("electron");
+    if (selectedOption.includes("t")) packages.push("typescript", "@types/node");
+    if (selectedOption.includes("r")) packages.push("rimraf");
+    if (selectedOption.includes("u")) packages.push("uc-runtime");
+    if (selectedOption.includes("d")) packages.push("uc-dev");
+    if (selectedOption.includes("c")) packages.push("uc-controls");
+    if (packages.length > 0)
+      await main2.dependancyChecker.installPackages(packages);
+    console.log("INSTALLED..");
+  }
+}
+
 // src/utils/inquiry/cli_menu_MainMenu.ts
 async function cli_menu_MainMenu(main2, back_menu_callback = async () => {
 }) {
@@ -8153,12 +8178,16 @@ async function cli_menu_MainMenu(main2, back_menu_callback = async () => {
   P = Perameters
   B = Build Designers and Resource File  
   G = Generate
+  D = Dependancy
   Q = Quit
     `, "q");
   switch (cmd2.toLowerCase().trim()) {
     case "b":
       await main2.startBuild();
       break;
+    case "d":
+      await cli_menu_dependancy(main2, cli_menu_MainMenu);
+      break;
     case "p":
       await main2._cliSurveys.inquiry();
       await cli_menu_MainMenu(main2);
@@ -8327,7 +8356,7 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
       throw new Error("package.json not found in project directory");
     }
     const pkgJson = JSON.parse(
-      readFileSync8(pkgPath, "utf-8")
+      readFileSync7(pkgPath, "utf-8")
     );
     const deps = {
       ...pkgJson.dependencies,

package/package.json

@@ -13,7 +13,7 @@
     "designer-build",
     "electron-tools"
   ],
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Electron CLI project builder for uc-runtime apps",
   "license": "ISC",
   "author": "AP",