uc-dev 1.0.0-beta.5 → 1.0.2

package/out/cli.js

@@ -724,7 +724,7 @@ import { existsSync as existsSync4 } from "node:fs";
 
 // src/utils/prompt.ts
 import { existsSync as existsSync3, readFileSync, writeFileSync } from "node:fs";
-import { dirname as dirname2, resolve as resolve2 } from "node:path";
+import { dirname as dirname2, resolve as resolve3 } from "node:path";
 import readline from "node:readline";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
@@ -1094,7 +1094,7 @@ var ImportMapResolver = class {
 // ../ap-shared-core/out/uc-dev/ConfigHandler.js
 import { createRequire } from "module";
 import fs2, { readdirSync } from "node:fs";
-import path2, { join as join2, normalize as normalize2 } from "node:path";
+import path2, { join as join2, normalize as normalize2, resolve as resolve2 } from "node:path";
 import url2 from "node:url";
 
 // ../ap-shared-core/out/uc-dev/userConfigManage.js
@@ -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 = prow.projectPath;
-        let resolvPath = path2.resolve(fpath, relPath);
+        let fpath = resolve2(prow.projectPath, prow.rootPath);
+        let resolvPath = normalize2(path2.join(fpath, relPath));
+        if (!fs2.existsSync(resolvPath)) {
+          console.warn("ImportMap path not found:", resolvPath);
+          continue;
+        }
         if (!fs2.existsSync(resolvPath)) {
           console.warn("ImportMap path not found:", resolvPath);
           continue;
@@ -1382,10 +1386,10 @@ function ask(question, def) {
     output: process.stdout
   });
   const hint = def ? ` (${def})` : "";
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     rl.question(`${question}${hint}: `, (ans) => {
       rl.close();
-      resolve12(ans.trim() || def || "");
+      resolve13(ans.trim() || def || "");
     });
   });
 }
@@ -1397,7 +1401,7 @@ async function askYesNo(question, def = true, autoYes = false) {
   return ans.startsWith("y");
 }
 function runTemplate(tptPath, importmeta, row) {
-  const tpath = resolve2(dirname2(fileURLToPath4(importmeta)), tptPath);
+  const tpath = resolve3(dirname2(fileURLToPath4(importmeta)), tptPath);
   let tptContent = readFileSync(tpath, "utf8");
   const tmaker = new TemplateMaker();
   const callback = tmaker.compileTemplate(tptContent);
@@ -1444,22 +1448,22 @@ var cliDependancyChecker = class {
     return _deps;
   }
   detectPackageManager() {
-    if (existsSync4("pnpm-lock.yaml")) return "pnpm add -D";
-    if (existsSync4("yarn.lock")) return "yarn add -D";
-    return "npm install -D";
+    if (existsSync4("pnpm-lock.yaml")) return "pnpm add ";
+    if (existsSync4("yarn.lock")) return "yarn add ";
+    return "npm install ";
   }
   installPackages(pkgs) {
     const [pm, ...baseArgs] = this.detectPackageManager().split(" ");
     const args2 = [...baseArgs, ...pkgs];
     console.log("Installing:", pkgs.join(", "));
     console.log(">", pm, args2.join(" "));
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const child = spawn(pm, args2, {
         stdio: "inherit",
         shell: true
       });
       child.on("close", (code) => {
-        if (code === 0) resolve12();
+        if (code === 0) resolve13();
         else reject(new Error(`Install failed with code ${code}`));
       });
       child.on("error", reject);
@@ -1512,7 +1516,7 @@ function getProjectDir(startPath) {
 
 // src/utils/inquiry/cliUcconfigInquiry.ts
 import { existsSync as existsSync6, readFileSync as readFileSync2 } from "node:fs";
-import { dirname as dirname3, join as join3, resolve as resolve3 } from "node:path";
+import { dirname as dirname3, join as join3, resolve as resolve4 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 var cliUcconfigInquiry = class {
   constructor(main2) {
@@ -1598,7 +1602,7 @@ var cliUcconfigInquiry = class {
     };
     try {
       await writeFileSafely(
-        resolve3("ucconfig.js"),
+        resolve4("ucconfig.js"),
         _runTemplate("templates/js.ucconfig", JSON.parse(JSON.stringify(cfg))),
         this.main.cliOptions
       );
@@ -1804,16 +1808,16 @@ function splitCSSById(cssContent, rtrn) {
 
 // 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 { join as join6, normalize as normalize5, relative as relative2, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath8 } from "url";
 
 // src/lib/processes/commonGeneratorX.ts
 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";
+import { dirname as dirname5, join as join5, normalize as normalize4, resolve as resolve6 } from "path";
 
 // src/lib/processes/ResourceBuildEngine.ts
 import { existsSync as existsSync7, readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname4, extname, join as join4, normalize as normalize3, resolve as resolve4, sep } from "path";
+import { dirname as dirname4, extname, join as join4, normalize as normalize3, resolve as resolve5, sep } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 var SCSS_IMPORT_RE = /@(use|import)\s+(?:url\()?["']([^"')]+)["']\)?\s*;/gi;
 var CSS_URL_RE = /url\(\s*["']?([^"')]+)["']?\s*\)/gi;
@@ -1918,7 +1922,7 @@ var ResourceBuildEngine = class {
     if (_path.startsWith("file:///")) _path = fileURLToPath6(_path);
     const absPath = (
       /*GetProject(path)*/
-      resolve4(_path)
+      resolve5(_path)
     );
     const blueprint = new UserResource();
     Object.assign(blueprint, _blueprint);
@@ -1979,7 +1983,7 @@ var ResourceBuildEngine = class {
     css = stripCssComments(css);
     css = ucUtil.devEsc(css);
     css = css.replace(INSIDE_ATTR_RE, (_m, _q, rel, rest) => {
-      const targetAbs = resolve4(dirname4(absPath), rel);
+      const targetAbs = resolve5(dirname4(absPath), rel);
       const key = this.build(targetAbs);
       return key ? `[inside="${key}"]${rest}` : _m;
     });
@@ -2056,7 +2060,7 @@ var ResourceBuildEngine = class {
       this.resourceMap.set(rel, res);
       return ResourceKeyBridge.makeKey(guid);
     }
-    const abs = resolve4(dirname4(importerPath), rel);
+    const abs = resolve5(dirname4(importerPath), rel);
     if (!existsSync7(abs)) return rel;
     return this.build(abs, _blueprint);
   }
@@ -2180,7 +2184,7 @@ var commonGeneratorX = class _commonGeneratorX {
       declareClassPath: BuildingProcess.configHandler.MAIN_CONFIG.projectName == "uc-runtime" ? "uc-runtime/src/core-main" : "uc-runtime/core-main"
     };
     const srcDec = x.srcDec;
-    let resSrcFile = resolve5(proj.projectPath, x.srcDec.dirPath, x.cli.ResourceStorageFile);
+    let resSrcFile = resolve6(proj.projectPath, x.srcDec.dirPath, x.cli.ResourceStorageFile);
     rowForRes.projectList.forEach((s) => {
       const resFullpath = s.resourceRelativePath;
       s.resourceRelativePath = JSON.stringify(resFullpath);
@@ -7391,7 +7395,7 @@ var BuildDesigner = class {
     const srcPathof = _row.src.allPathOf[pref.srcDec];
     const outPathof = _row.src.allPathOf[pref.outDec];
     let onSelect_xName = BuildingProcess.Event.onSelect_xName;
-    let projectPath = resolve6();
+    let projectPath = resolve7();
     let htmlcode = this.common0(_row);
     if (htmlcode == void 0) return void 0;
     htmlcode = ucUtil.devEsc(htmlcode);
@@ -7502,7 +7506,7 @@ var BuildDesigner = class {
     }
   };
   nc(_path, fromFilePath) {
-    let fpath = join6(resolve6(), _path);
+    let fpath = join6(resolve7(), _path);
     return correctpath(ucUtil.resolveSubNode(relativeFilePath(fromFilePath, fpath)));
   }
 };
@@ -7789,7 +7793,7 @@ var cliMenuSource = class {
 };
 
 // src/utils/inquiry/cliElectronInquiry.ts
-import { dirname as dirname6, join as join9, resolve as resolve7 } from "node:path";
+import { dirname as dirname6, join as join9, resolve as resolve8 } from "node:path";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
 var cliElectronInquiry = class {
   constructor(main2) {
@@ -7798,13 +7802,13 @@ var cliElectronInquiry = class {
   async generate(hasAddedSampleForm = false) {
     const cfg = this.main.config;
     const cli = cfg.cli;
-    const mainFilePath = resolve7(join9(cli.srcDir, cli.mainProcessFilePath));
-    const preloadFilePath = resolve7(join9(cli.srcDir, cli.preloadScriptFilePath));
-    const baseHtmlPath = resolve7(cli.baseHtmlPath);
-    const baseCodePath = resolve7(join9(cli.srcDir, cli.baseCodePath));
-    const baseCodeOutPath = resolve7(join9(cli.outDir, cli.baseCodePath));
-    const ResourceStorageFile = resolve7(join9(cli.srcDir, cli.ResourceStorageFile));
-    const baseCssPath = resolve7(cli.baseCssPath);
+    const mainFilePath = resolve8(join9(cli.srcDir, cli.mainProcessFilePath));
+    const preloadFilePath = resolve8(join9(cli.srcDir, cli.preloadScriptFilePath));
+    const baseHtmlPath = resolve8(cli.baseHtmlPath);
+    const baseCodePath = resolve8(join9(cli.srcDir, cli.baseCodePath));
+    const baseCodeOutPath = resolve8(join9(cli.outDir, cli.baseCodePath));
+    const ResourceStorageFile = resolve8(join9(cli.srcDir, cli.ResourceStorageFile));
+    const baseCssPath = resolve8(cli.baseCssPath);
     writeFileSafely(
       mainFilePath,
       _runTemplate2("templates/electron/ts.main", {
@@ -7865,14 +7869,14 @@ function _runTemplate2(rel, options) {
 }
 
 // src/utils/inquiry/cliNewStartInquiry.ts
-import { dirname as dirname7, join as join10, resolve as resolve8 } from "node:path";
+import { dirname as dirname7, join as join10, resolve as resolve9 } from "node:path";
 import { fileURLToPath as fileURLToPath10 } from "node:url";
 var cliNewStartInquiry = class {
   constructor(main2) {
     this.main = main2;
   }
   async inquiry() {
-    const cfg = await ImportUserConfig(resolve8("ucconfig.js"));
+    const cfg = await ImportUserConfig(resolve9("ucconfig.js"));
     if (await askYesNo(`
 +-----------------------------+
 |        EMPTY PROJECT        |
@@ -7888,12 +7892,12 @@ ADD BLANK FORM?
       let ddirdpath = await ask(`WHERE TO GENERATE?
 INSIDE ('${renderDirPath}' DIRECTORY)
 >`, "");
-      __dpath = join10(resolve8(renderDirPath), ddirdpath);
+      __dpath = join10(resolve9(renderDirPath), ddirdpath);
     } else {
       let dirPath = await ask(`WHERE TO GENERATE?
 INSIDE ('${srcdec.dirPath}' DIRECTORY)
 >`, "");
-      __dpath = join10(resolve8(srcdec.dirPath), dirPath);
+      __dpath = join10(resolve9(srcdec.dirPath), dirPath);
     }
     writeFileSafely(
       join10(__dpath, "form1.uc.html"),
@@ -7914,7 +7918,7 @@ function _runTemplate3(rel, options) {
 
 // src/utils/inquiry/cliTypeScriptInquiry.ts
 import { existsSync as existsSync10 } from "node:fs";
-import { dirname as dirname8, join as join11, resolve as resolve9 } from "node:path";
+import { dirname as dirname8, join as join11, resolve as resolve10 } from "node:path";
 var cliTypeScriptInquiry = class {
   constructor(main2) {
     this.main = main2;
@@ -7925,7 +7929,7 @@ var cliTypeScriptInquiry = class {
   }
   async inquiry() {
     const x = extractPathConfig(this.main.config);
-    if (x.cli.useTypeScript && !existsSync10(resolve9("tsconfig.json"))) {
+    if (x.cli.useTypeScript && !existsSync10(resolve10("tsconfig.json"))) {
       if (await askYesNo(
         `
 ADD 'tsconfig.json' with required settings?
@@ -8014,11 +8018,11 @@ async function makeMenu(title, content, defaultOpt) {
 }
 
 // src/utils/inquiry/cli_menu_generate.ts
-import { dirname as dirname11, join as join14, resolve as resolve11 } from "node:path";
+import { dirname as dirname11, join as join14, resolve as resolve12 } from "node:path";
 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 { dirname as dirname10, join as join13, relative as relative4, resolve as resolve11 } from "node:path";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
 import { readFileSync as readFileSync6 } from "node:fs";
 async function cli_sample_style1(main2) {
@@ -8026,18 +8030,18 @@ async function cli_sample_style1(main2) {
   const sampleroot = dirname10(join13(cli.srcDir, cli.baseCodePath));
   const sample = {
     frmDashboard: {
-      html: resolve10(join13(sampleroot, "frmDashboard.uc.html")),
-      scss: resolve10(join13(sampleroot, "frmDashboard.uc.scss")),
-      code: resolve10(join13(sampleroot, "frmDashboard.uc.ts"))
+      html: resolve11(join13(sampleroot, "frmDashboard.uc.html")),
+      scss: resolve11(join13(sampleroot, "frmDashboard.uc.scss")),
+      code: resolve11(join13(sampleroot, "frmDashboard.uc.ts"))
     },
     tptDashboard: {
-      html: resolve10(join13(sampleroot, "tptDashboard.tpt.html")),
-      scss: resolve10(join13(sampleroot, "tptDashboard.tpt.scss")),
-      code: resolve10(join13(sampleroot, "tptDashboard.tpt.ts"))
+      html: resolve11(join13(sampleroot, "tptDashboard.tpt.html")),
+      scss: resolve11(join13(sampleroot, "tptDashboard.tpt.scss")),
+      code: resolve11(join13(sampleroot, "tptDashboard.tpt.ts"))
     }
   };
-  const relHtmlPath = relative4(resolve10(cli.srcDir), sample.frmDashboard.html);
-  const designerRoot = ucUtil.changeExtension(resolve10(join13(cli.srcDir, cli.designerDir, relHtmlPath)), ".html", ".designer.js");
+  const relHtmlPath = relative4(resolve11(cli.srcDir), sample.frmDashboard.html);
+  const designerRoot = ucUtil.changeExtension(resolve11(join13(cli.srcDir, cli.designerDir, relHtmlPath)), ".html", ".designer.js");
   const templateRoot = "templates/sample1";
   await writeFileSafely(
     sample.frmDashboard.html,
@@ -8116,7 +8120,7 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
       case "t":
         const cli = main2.config.cli;
         await writeFileSafely(
-          resolve11("tsconfig.json"),
+          resolve12("tsconfig.json"),
           _runTemplate5("templates/typescript/json.tsconfig", {
             outDir: main2.config.cli.outDir,
             srcDir: main2.config.cli.srcDir,
@@ -8128,7 +8132,7 @@ async function cli_menu_generate(main2, back_menu_callback = async () => {
         break;
       case "v":
         await writeFileSafely(
-          resolve11(".vscode/settings.json"),
+          resolve12(".vscode/settings.json"),
           _runTemplate5("templates/.vscode/json.settings", {}),
           main2.cliOptions
         );
@@ -8331,7 +8335,7 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
       await this._cliTypeScriptInq.inquiry();
     }
   }
-  async checkBasicNeed() {
+  async checkBasicNeed(inquiry = true) {
     this.projectDir = getProjectDir(process.cwd());
     if (this.projectDir == null) {
       throw Error("NO PROJECT FOUND");
@@ -8339,11 +8343,11 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
     this.dependancyChecker = new cliDependancyChecker(this);
     await this.updateDependancies();
     const depNeed = ["uc-runtime"];
-    if (!this.dependentProjects.includes("typescript"))
-      this.config.cli.useTypeScript = await cliTypeScriptInquiry.AskIsTypescript(true);
-    if (this.config.cli.useTypeScript)
-      depNeed.push("typescript", "@types/node");
-    await this.dependancyChecker.ensureDependencies(depNeed);
+    if (inquiry) {
+      if (this.config.cli.useTypeScript)
+        depNeed.push("typescript", "@types/node");
+      await this.dependancyChecker.ensureDependencies(depNeed);
+    }
   }
   updateDependancies() {
     if (this.projectDir != void 0) {
@@ -8391,7 +8395,7 @@ switch (cmd) {
     break;
   case "setup":
     if (!ignreq)
-      await main.checkBasicNeed();
+      await main.checkBasicNeed(false);
     await cli_menu_MainMenu(main);
     break;
   case "--help":

package/package.json

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