uc-dev 1.0.4 → 1.0.6

package/out/cli.js

@@ -58,8 +58,8 @@ function correctpath(str, trim = false) {
 function subtractPath(basePath, targetPath, pathModule) {
   const absBase = pathModule.resolve(basePath);
   const absTarget = pathModule.resolve(targetPath);
-  const relative5 = pathModule.relative(absBase, absTarget);
-  return relative5;
+  const relative6 = pathModule.relative(absBase, absTarget);
+  return relative6;
 }
 function trimPath(pth) {
   return pth.replace(/^\.?\/*|\/*$/g, "");
@@ -93,7 +93,7 @@ var ProjectRowBase = class {
   resolvablePackages = {};
   configGuid = "";
   rootPath = "";
-  aliceToPath = {};
+  // aliceTo_Path?: { [alice: string]: string; } = {};
   projectPrimaryAlice = "";
   children = [];
   config = new UserUCConfig();
@@ -715,15 +715,15 @@ var ucUtil = class _ucUtil {
 };
 
 // src/utils/cliMain.ts
-import { existsSync as existsSync11, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync12, readFileSync as readFileSync7 } from "fs";
 import path6, { join as join15 } from "path";
 
 // src/utils/cliDependancyChecker.ts
 import { spawn } from "node:child_process";
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 
 // src/utils/prompt.ts
-import { existsSync as existsSync3, readFileSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync4, readFileSync, writeFileSync } from "node:fs";
 import { dirname as dirname2, resolve as resolve3 } from "node:path";
 import readline from "node:readline";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
@@ -1093,8 +1093,8 @@ 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, resolve as resolve2 } from "node:path";
+import fs2, { existsSync as existsSync3, readdirSync } from "node:fs";
+import path2, { join as join2, normalize as normalize2, relative as relative2, resolve as resolve2 } from "node:path";
 import url2 from "node:url";
 
 // ../ap-shared-core/out/uc-dev/userConfigManage.js
@@ -1185,6 +1185,7 @@ var ConfigHandler = class {
     scopes: {}
   };
   MAKE_IMPORTMAP = (mainProjRow) => {
+    debugger;
     const __ImpMap = {
       imports: {},
       scopes: {}
@@ -1203,24 +1204,20 @@ var ConfigHandler = class {
         p = "./";
       return p;
     }
+    const _this = this;
     function walk(prow) {
       const aliases2 = {};
       const pathAlias = prow.config?.browser?.importmap ?? {};
       for (let [als, relPath] of Object.entries(pathAlias)) {
         als = trimPath(als);
-        console.log(prow.projectPath);
-        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;
-        }
+        let ___projectRootPath = resolve2(_this.MAIN_PROJECT_PATH, prow.rootPath);
+        let resolvPath = normalize2(path2.join(___projectRootPath, 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));
+        let np = correctpath(path2.relative(_this.MAIN_PROJECT_PATH, resolvPath));
         np = cpath(np, isDir);
         aliases2[isDir ? `${als}/` : `${als}`] = np;
       }
@@ -1253,36 +1250,35 @@ var ConfigHandler = class {
     this.srcDirPath = this.pref.dirDeclaration[this.pref.srcDec].dirPath;
     this.outDirPath = this.pref.dirDeclaration[this.pref.outDec].dirPath;
     this.allConfig.sort((a, b) => b.importMetaURL.length - a.importMetaURL.length);
-    this.updateAliceToPath(this.allConfig);
+    this.update_Alice_To_Path(this.allConfig);
     this.importmap = this.MAKE_IMPORTMAP(this.ucConfig);
+    console.log("done.");
     for (const [k, v] of Object.entries(this.importmap.scopes)) {
       if (v == void 0 || Object.keys(v).length == 0)
         delete this.importmap.scopes[k];
     }
     ImportMapResolver.init(this.importmap, this.MAIN_PROJECT_PATH);
   };
-  updateAliceToPath(rows) {
+  update_Alice_To_Path(rows) {
     let mainProjectPath = this.MAIN_CONFIG.projectPath;
     const dict = this.ALL_PROJECTS_DIRECTORIES;
     rows.forEach((row) => {
-      for (const [pathAliasKey, pathAliasValue] of Object.entries(row.config.browser.importmap)) {
-        let fullPath = correctpath(path2.join(mainProjectPath, pathAliasValue) + "/");
-        let p = rows.find((s) => fullPath.startsWith(s.projectPath));
-        if (p != void 0)
-          row.aliceToPath[pathAliasKey] = p.projectPath;
-      }
       const cfg = row.config;
       cfg.browser = cfg.browser ?? { importmap: {}, resolveProjects: [] };
       cfg.browser.importmap = cfg.browser.importmap ?? {};
       const imap = cfg.browser.importmap;
     });
   }
+  addedProject = {};
   async RecurciveFindConfigAndFill(projectDirPath, row) {
+    const _this = this;
     if (projectDirPath != void 0) {
-      projectDirPath = path2.normalize(projectDirPath);
       if (this.allConfig.findIndex((s) => isSamePath2(s.projectPath, projectDirPath)) >= 0)
         return;
       let projectName = GetProjectName(projectDirPath, path2, fs2);
+      if (this.allConfig.findIndex((s) => s.projectName == projectName) >= 0)
+        return;
+      projectDirPath = path2.normalize(projectDirPath);
       const ucConfigPath = path2.join(projectDirPath, "ucconfig.js");
       if (fs2.existsSync(ucConfigPath)) {
         let ucCfg = await ImportUserConfig(ucConfigPath);
@@ -1296,12 +1292,8 @@ var ConfigHandler = class {
           row.projectPath = correctpath(projectDirPath);
           const cfg = row.config;
           this.ALL_PROJECTS_DIRECTORIES[row.projectName] = this.ALL_PROJECTS_DIRECTORIES[row.projectName] ?? row.projectPath;
-          row.rootPath = correctpath(path2.normalize(path2.relative(
-            this.MAIN_PROJECT_PATH,
-            row.projectPath
-            /*join(row.projectPath, outdec.dirPath)*/
-          )));
-          row.rootPath = row.rootPath == "." ? "." : path2.join("./", row.rootPath, "/");
+          const _rpath = correctpath(normalize2(relative2(this.MAIN_PROJECT_PATH, row.projectPath)));
+          row.rootPath = _rpath == "." ? "." : path2.join("./", _rpath, "/");
           cfg.browser = cfg.browser ?? new BrowserUcConfig();
           cfg.browser.importmap = cfg.browser.importmap ?? {};
           const pref = cfg.preference;
@@ -1310,15 +1302,20 @@ var ConfigHandler = class {
           row.importMetaURL = url2.pathToFileURL(projectDirPath).href;
           let dirs = this.listProjectPath(projectDirPath);
           row.resolvablePackages = this.PACKAGE_LIST;
-          for (const [k, v] of Object.entries(row.resolvablePackages)) {
-            const als = aliceFromExternalProject(v, this.MAIN_PROJECT_PATH);
-            Object.assign(row.config.browser.importmap, als);
+          const browser = row.config.browser;
+          for (const [k, pkg] of Object.entries(row.resolvablePackages)) {
+            const als = aliceFromExternalProject(pkg, this.MAIN_PROJECT_PATH);
+            Object.assign(browser.importmap, als);
           }
           for (let i = 0, ilen = dirs.length; i < ilen; i++) {
             const child_project_dir = dirs[i];
             let nchild = new ProjectRowBase();
+            const chld = row.children;
+            chld.push(nchild);
             await this.RecurciveFindConfigAndFill(child_project_dir, nchild);
-            row.children.push(nchild);
+            if (!existsSync3(nchild.projectPath)) {
+              row.children = chld.filter((s) => s !== nchild);
+            }
           }
         }
       } else {
@@ -1409,7 +1406,7 @@ function runTemplate(tptPath, importmeta, row) {
   return callback(row);
 }
 async function writeFileSafely(fpath, data, options) {
-  if (existsSync3(fpath)) {
+  if (existsSync4(fpath)) {
     options = JSON.parse(JSON.stringify(options));
     const overwrite = options.force ?? await askYesNo(
       `${fpath} already exists. Overwrite?`,
@@ -1449,8 +1446,8 @@ var cliDependancyChecker = class {
     return _deps;
   }
   detectPackageManager() {
-    if (existsSync4("pnpm-lock.yaml")) return "pnpm add ";
-    if (existsSync4("yarn.lock")) return "yarn add ";
+    if (existsSync5("pnpm-lock.yaml")) return "pnpm add ";
+    if (existsSync5("yarn.lock")) return "yarn add ";
     return "npm install ";
   }
   installPackages(pkgs) {
@@ -1497,14 +1494,14 @@ var cliDependancyChecker = class {
 };
 
 // src/utils/cliFindProjects.ts
-import { existsSync as existsSync5, realpathSync, statSync } from "fs";
+import { existsSync as existsSync6, realpathSync, statSync } from "fs";
 import path3 from "path";
 function getProjectDir(startPath) {
   let dir = statSync(startPath).isFile() ? path3.dirname(startPath) : startPath;
   dir = realpathSync(dir);
   while (true) {
     const candidate = path3.join(dir, "package.json");
-    if (existsSync5(candidate)) {
+    if (existsSync6(candidate)) {
       return dir;
     }
     const parent = path3.dirname(dir);
@@ -1516,7 +1513,7 @@ function getProjectDir(startPath) {
 }
 
 // src/utils/inquiry/cliUcconfigInquiry.ts
-import { existsSync as existsSync6, readFileSync as readFileSync2 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync2 } from "node:fs";
 import { dirname as dirname3, join as join3, resolve as resolve4 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 var cliUcconfigInquiry = class {
@@ -1524,7 +1521,7 @@ var cliUcconfigInquiry = class {
     this.main = main2;
   }
   get exist() {
-    return existsSync6(this.configFilepath);
+    return existsSync7(this.configFilepath);
   }
   async read() {
     this.main.config = await ImportUserConfig(this.configFilepath);
@@ -1533,7 +1530,7 @@ var cliUcconfigInquiry = class {
     return join3(this.main.projectDir, "ucconfig.js");
   }
   inferConfigFromKnownFiles() {
-    if (existsSync6("tsconfig.json")) {
+    if (existsSync7("tsconfig.json")) {
       const ts = JSON.parse(readFileSync2("tsconfig.json", "utf-8"));
       return {
         srcDir: ts.compilerOptions?.rootDir ?? "src",
@@ -1808,16 +1805,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 resolve7 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { join as join6, normalize as normalize5, relative as relative3, 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 { existsSync as existsSync9, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
 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 { existsSync as existsSync8, readFileSync as readFileSync3 } from "fs";
 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;
@@ -1936,7 +1933,7 @@ var ResourceBuildEngine = class {
       }
       return ResourceKeyBridge.makeKey(res.guid);
     }
-    if (!existsSync7(absPath)) {
+    if (!existsSync8(absPath)) {
       console.log("Missing resource:", absPath);
       return void 0;
     }
@@ -2062,7 +2059,7 @@ var ResourceBuildEngine = class {
       return ResourceKeyBridge.makeKey(guid);
     }
     const abs = resolve5(dirname4(importerPath), rel);
-    if (!existsSync7(abs)) return rel;
+    if (!existsSync8(abs)) return rel;
     return this.build(abs, _blueprint);
   }
 };
@@ -2148,11 +2145,11 @@ var commonGeneratorX = class _commonGeneratorX {
           ensureDirectoryExistence(row.src.pathOf[designerFileSrctype]);
           _data = this.filex(`${srctype}${uctype}.designer`)(row);
           writeFileSync2(row.src.pathOf[designerFileSrctype], _data);
-          if (!existsSync8(row.src.pathOf[codeFileSrctype])) {
+          if (!existsSync9(row.src.pathOf[codeFileSrctype])) {
             _data = this.filex(`${srctype}${uctype}.code`)(row);
             writeFileSync2(row.src.pathOf[codeFileSrctype], _data);
           }
-          if (!existsSync8(row.src.pathOf.scss)) {
+          if (!existsSync9(row.src.pathOf.scss)) {
             _data = this.filex(`${srctype}${uctype}.style`)(row);
             writeFileSync2(row.src.pathOf.scss, _data);
           }
@@ -2185,13 +2182,15 @@ 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;
+    debugger;
     let resSrcFile = resolve6(proj.projectPath, x.srcDec.dirPath, x.cli.ResourceStorageFile);
     rowForRes.projectList.forEach((s) => {
       const resFullpath = s.resourceRelativePath;
       s.resourceRelativePath = JSON.stringify(resFullpath);
       const y = extractPathConfig(s.project.config);
-      const resFpath = join5(s.project.projectPath, y.srcDec.dirPath, y.cli.ResourceStorageFile);
-      s.importResource = s.projectGuid != chandler.MAIN_CONFIG.config.guid && existsSync8(resFpath);
+      let resFpath = join5(s.project.projectPath, y.outDec.dirPath, y.cli.ResourceStorageFile);
+      resFpath = ucUtil.changeExtension(resFpath, ".ts", ".js");
+      s.importResource = s.projectGuid != chandler.MAIN_CONFIG.config.guid && existsSync9(resFpath);
     });
     ensureDirectoryExistence(resSrcFile);
     let resContent = this.filex("ts.resources")(rowForRes);
@@ -5437,10 +5436,10 @@ function compareDocumentPosition(nodeA, nodeB) {
 function uniqueSort(nodes) {
   nodes = nodes.filter((node, i, arr) => !arr.includes(node, i + 1));
   nodes.sort((a, b) => {
-    const relative5 = compareDocumentPosition(a, b);
-    if (relative5 & DocumentPosition.PRECEDING) {
+    const relative6 = compareDocumentPosition(a, b);
+    if (relative6 & DocumentPosition.PRECEDING) {
       return -1;
-    } else if (relative5 & DocumentPosition.FOLLOWING) {
+    } else if (relative6 & DocumentPosition.FOLLOWING) {
       return 1;
     }
     return 0;
@@ -7330,7 +7329,7 @@ var BuildDesigner = class {
     </UCWINFRAME>
 </WRAPPER>`;
     }
-    if (!existsSync9(finfo.allPathOf[pref.srcDec].scss)) {
+    if (!existsSync10(finfo.allPathOf[pref.srcDec].scss)) {
       writeFileSync3(finfo.allPathOf[pref.srcDec].scss, `&{
     position: relative; 
     display:block;  width: 800px; height: 500px;
@@ -7355,7 +7354,7 @@ var BuildDesigner = class {
     const imppath = _row.src?.projectInfo.projectName == "uc-runtime" ? relativeFilePath(_row.src.allPathOf.out.designer, join6(_row.src.projectInfo.projectPath, "out/core.js")) : "uc-runtime/core.js";
     _importer.addImport(["Usercontrol", "intenseGenerator", "IUcOptions", "ResourceManage"], imppath);
     this.common2(row.designer, finfo);
-    const _exists = existsSync9;
+    const _exists = existsSync10;
     for (let i = 0, iObj = elements, len = iObj.length; i < len; i++) {
       const element = iObj[i];
       onSelect_xName(element, _row);
@@ -7401,7 +7400,7 @@ var BuildDesigner = class {
     if (htmlcode == void 0) return void 0;
     htmlcode = ucUtil.devEsc(htmlcode);
     let compileedCode = ucUtil.PHP_REMOVE(htmlcode);
-    let rootpath = relative2(projectPath, srcPathof.html);
+    let rootpath = relative3(projectPath, srcPathof.html);
     try {
       if (compileedCode.trim() != "") {
         compileedCode = ucUtil.PHP_REMOVE(htmlcode);
@@ -7420,7 +7419,7 @@ var BuildDesigner = class {
     );
     this.common2(row.designer, finfo);
     let cssContent = "";
-    if (existsSync9(srcPathof.scss)) cssContent = this.gen.cssBulder.treeShakeCss(srcPathof.scss);
+    if (existsSync10(srcPathof.scss)) cssContent = this.gen.cssBulder.treeShakeCss(srcPathof.scss);
     let cnt = {
       htmlGuid: ResourceKeyBridge.extractKey(this.gen.cssBulder.build(srcPathof.html, { source: srcPathof.html })),
       cssGuid: ResourceKeyBridge.extractKey(this.gen.cssBulder.build(srcPathof.scss, { source: srcPathof.scss }))
@@ -7514,7 +7513,7 @@ var BuildDesigner = class {
 
 // src/lib/processes/ResourceCopy.ts
 import { copyFileSync } from "fs";
-import { join as join7, relative as relative3 } from "path";
+import { join as join7, relative as relative4 } from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
 var ResourceCopy = class {
   sourceFileList = [];
@@ -7561,7 +7560,7 @@ var ResourceCopy = class {
         (s) => s.startsWith(dirDecfullPath) && res.includeExtensions.findIndex((e) => s.endsWith(e)) >= 0
       );
       filteed.forEach((full) => {
-        const commonPath = relative3(dirDecfullPath, full);
+        const commonPath = relative4(dirDecfullPath, full);
         res.toDeclares.forEach((todeclare) => {
           let targetDir = dirDeclaration[todeclare].dirPath;
           const dest = join7(targetDir, commonPath);
@@ -7918,7 +7917,7 @@ function _runTemplate3(rel, options) {
 }
 
 // src/utils/inquiry/cliTypeScriptInquiry.ts
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 import { dirname as dirname8, join as join11, resolve as resolve10 } from "node:path";
 var cliTypeScriptInquiry = class {
   constructor(main2) {
@@ -7930,7 +7929,7 @@ var cliTypeScriptInquiry = class {
   }
   async inquiry() {
     const x = extractPathConfig(this.main.config);
-    if (x.cli.useTypeScript && !existsSync10(resolve10("tsconfig.json"))) {
+    if (x.cli.useTypeScript && !existsSync11(resolve10("tsconfig.json"))) {
       if (await askYesNo(
         `
 ADD 'tsconfig.json' with required settings?
@@ -8023,7 +8022,7 @@ import { dirname as dirname11, join as join14, resolve as resolve12 } from "node
 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 resolve11 } from "node:path";
+import { dirname as dirname10, join as join13, relative as relative5, 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) {
@@ -8041,7 +8040,7 @@ async function cli_sample_style1(main2) {
       code: resolve11(join13(sampleroot, "tptDashboard.tpt.ts"))
     }
   };
-  const relHtmlPath = relative4(resolve11(cli.srcDir), sample.frmDashboard.html);
+  const relHtmlPath = relative5(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(
@@ -8054,7 +8053,7 @@ async function cli_sample_style1(main2) {
     _runTemplate_x(`${templateRoot}/frmDashboard.uc.scss.tp`, {}),
     main2.cliOptions
   );
-  const designerReletivePath = relative4(dirname10(sample.frmDashboard.code), designerRoot);
+  const designerReletivePath = relative5(dirname10(sample.frmDashboard.code), designerRoot);
   await writeFileSafely(
     sample.frmDashboard.code,
     _runTemplate4(`${templateRoot}/frmDashboard.uc.ts.tp`, {
@@ -8241,7 +8240,7 @@ var cliMain = class {
   readConfig = async () => {
     try {
       const cfgPath = join15(this.projectDir, "ucconfig.js");
-      if (existsSync11(cfgPath)) {
+      if (existsSync12(cfgPath)) {
         this.config = await ImportUserConfig(cfgPath);
         if (this.config != void 0) {
           const x = extractPathConfig(this.config);
@@ -8357,7 +8356,7 @@ Sub Directory Path (inside source directory) : `, fdec.subDirPath ?? "");
   }
   listProjectDependencies() {
     const pkgPath = path6.resolve(this.projectDir, "package.json");
-    if (!existsSync11(pkgPath)) {
+    if (!existsSync12(pkgPath)) {
       throw new Error("package.json not found in project directory");
     }
     const pkgJson = JSON.parse(
@@ -8388,6 +8387,7 @@ var copt = main.cliOptions;
 copt.force = args.includes("--force");
 copt.yes = args.includes("--yes");
 var ignreq = args.includes("--ignreq");
+debugger;
 switch (cmd) {
   case "build":
     if (!ignreq)

package/package.json

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