ide-assi 0.691.0 → 0.693.0

package/src/components/ideAi.js

@@ -246,26 +246,6 @@ export class IdeAi
 		return o;
 	};
 
-
-	#generateRealFile_BAK = async (srcPath, apply) => {
-
-		//const files = ["mybatis.xml", "service.java", "controller.java", "react.jsx"];
-		let files = [];
-		if (apply.mybatis) files.push("mybatis.xml");
-		if (apply.service) files.push("service.java");
-		if (apply.controller) files.push("controller.java");
-		if (apply.javascript) files.push("react.jsx");
-
-		const params = await Promise.all(
-			files.map(async (file) => ({
-				path: ninegrid.decode(file, "mybatis.xml", srcPath.mybatisPullPath, "service.java", srcPath.servicePullPath, "controller.java", srcPath.controllerPullPath, "react.jsx", srcPath.javascriptPullPath),
-				contents: await fetch(`/api/templates/${file}`).then(res => res.text()),
-			}))
-		);
-
-		api.post(`/api/source/generateRealFile`, { list: params });
-	};
-
 	#generateRealFile = async (srcPath, apply) => {
 		const fileMap = {
 			mybatis: { name: "mybatis.xml", path: srcPath.mybatisPullPath },
@@ -307,41 +287,6 @@ export class IdeAi
 		return src;
 	};
 
-	#getSourcePath_BAK = (menuUrl) => {
-		const path = menuUrl.replace(/^\/+/, '');
-
-		const raw = path.split("/").join(".").toLowerCase();
-		const cleaned = raw.replace(/[^a-z0-9.]/g, "");
-		const namespace = `${this.#parent.config.basePackage}.${cleaned}`;
-
-		const packageName = namespace.split(".").slice(0, -1).join(".");
-
-		//const packageName = `${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
-		//const packageName = path.split("/").join(".").toLowerCase();
-		const fileName = path.split("/").at(-1).toLowerCase().split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
-
-		return {
-			package: packageName,
-			namespace: namespace,
-			baseClass: fileName,
-			resultType: this.#parent.config.basePackage.split(".").slice(0, -1).join(".") + ".core.utils.CamelCaseMap",
-			mybatis: `${cleaned.split(".").slice(0, -1).join("/")}/${fileName}Mapper.xml`,
-			javascript: `/src/views/${cleaned.split(".").slice(0, -1).join("/")}/${path.split("/").at(-1)}.jsx`,
-			mybatisPullPath: `${this.#parent.settings.beProjectName}/src/main/resources/mapper/${cleaned.split(".").slice(0, -1).join("/")}/${fileName}Mapper.xml`,
-			controllerPullPath: `${this.#parent.settings.beProjectName}/src/main/java/${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
-			servicePullPath: `${this.#parent.settings.beProjectName}/src/main/java/${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,
-			javascriptPullPath: `${this.#parent.settings.feProjectName}/src/views/${cleaned.split(".").slice(0, -1).join("/")}/${path.split("/").at(-1)}.jsx`,
-		};
-		/***
-		 return {
-		 package: packageName,
-		 namespace: namespace,
-		 controller: `/src/main/java/${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
-		 service: `/src/main/java/${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,
-		 mybatis: `/src/main/resource/mapper/${path.split("/").slice(0, -1).join("/").toLowerCase()}/${fileName}Mapper.xml`,
-		 javascript: `/${jsroot}/${path.split("/").slice(0, -1).join("/").toLowerCase()}/${path.split("/").at(-1)}.jsx`,
-		 };*/
-	};
 
 	#findFirstEmptyDetailWrapper = () => {
 		const allWrappers = document.querySelectorAll('div[class^="detail-wrapper-"]');
@@ -427,58 +372,6 @@ export class IdeAi
 	};
 
 
-
-	#createSource = async (userPrompt, apply) => {
-		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
-		this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
-
-		console.log(where);
-
-		const srcPath = this.#getSourcePath(where.menu.url);
-		console.log(srcPath);
-
-		const columnInfo = await this.#getColumnInfo(where.table);
-
-		const mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/C.BuildMyBatisMapper.txt", "mybatis.xml", {
-			userPrompt: userPrompt,
-			resultType: srcPath.resultType,
-			namespace: srcPath.namespace,
-			tableDefinitions: JSON.stringify(columnInfo)
-		});
-		this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
-
-		const serviceSrc = await this.#generateTmplFile("/prompts/meta/C.BuildService.txt", "service.java", {
-			userPrompt: userPrompt,
-			baseClass: srcPath.baseClass,
-			myBatisPath: srcPath.mybatis,
-			namespace: srcPath.namespace,
-			package: srcPath.package + ".service",
-			mybatisXmlSource: mybatisXmlSource,
-		});
-		this.#parent.addMessage("Java(Service) 소스파일을 생성했습니다.");
-
-		const controllerSrc = await this.#generateTmplFile("/prompts/meta/C.BuildController.txt", "controller.java", {
-			userPrompt: userPrompt,
-			baseClass: srcPath.baseClass,
-			menuUrl: where.menu.url,
-			package: srcPath.package + ".controller",
-			serviceSource: serviceSrc,
-		});
-		this.#parent.addMessage("Java(Controller) 소스파일을 생성했습니다.");
-
-		const jsSrc = await this.#generateTmplFile("/prompts/meta/C.BuildReactJsx.txt", "react.jsx", {
-			userPrompt: userPrompt,
-			menuUrl: where.menu.url,
-			menuName: where.menu.name,
-			baseClass: srcPath.baseClass,
-			controllerSource: controllerSrc,
-			tableDefinitions: JSON.stringify(columnInfo),
-		});
-		this.#parent.addMessage("Jsx(React) 소스파일을 생성했습니다.");
-
-		await this.#generateRealFile(srcPath, apply);
-	};
-
 	#modifySource = async (userPrompt, apply, progressMessageInstance) => {
 
 		const el = ninegrid.querySelector("nx-side-menu-item.active");
@@ -649,6 +542,187 @@ console.log(el, href, title);
 		return returnSrc;
 	};
 
+	#generateSource = async (userPrompt, apply, progressMessageInstance) => {
+
+		/**
+		 const el = ninegrid.querySelector("nx-side-menu-item.active");
+		 if (!el) throw new Error("관련 메뉴를 찾을 수 없습니다.");
+
+		 const href = el.getAttribute("href");
+		 const title = el.getAttribute("title");
+
+		 console.log(el, href, title);
+
+		 const srcPath = this.#getSourcePath(href);
+		 console.log(srcPath);
+		 */
+
+
+		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
+		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
+
+		console.log(where);
+
+		const srcPath = this.#getSourcePath(where.menu.url);
+		console.log(srcPath);
+
+
+		/**
+		 * {
+		 *     "package": "ide.assi.be.tmpla",
+		 *     "namespace": "ide.assi.be.tmpla.docmanager",
+		 *     "baseClass": "DocManager",
+		 *     "resultType": "ide.assi.core.utils.CamelCaseMap",
+		 *     "mybatis": "tmpla/DocManagerMapper.xml",
+		 *     "mybatisPullPath": "ide-assi-be/src/main/resources/mapper/tmpla/DocManagerMapper.xml",
+		 *     "controllerPullPath": "ide-assi-be/src/main/java/ide/assi/be/tmpla/controller/DocManagerController.java",
+		 *     "servicePullPath": "ide-assi-be/src/main/java/ide/assi/be/tmpla/service/DocManagerService.java",
+		 *     "javascriptPullPath": "ide-assi-fe-vite-react-js/src/views/tmpla/doc-manager.jsx"
+		 * }
+		 */
+		const src = await api.post("/api/source/read", srcPath);
+		//console.log(src);
+
+		/**
+		 const response = await fetch(srcPath.javascript);
+		 src.javascript = await response.text();*/
+
+		//console.log(src);
+		//const template = await fetch(path).then(res => res.text());
+		/*
+		arr.push({
+			//menuId: elem.getAttribute("menu-id"),
+			url: elem.getAttribute("href"),
+			title: elem.getAttribute("title"),
+		})*/
+
+
+
+
+
+		//const where = await this.#where(`${title}에서 ${userPrompt}`, [{url: href, title: title}], await this.#getTableList());
+		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
+		progressMessageInstance.updateProgress('prepare2', 'completed');
+
+		//console.log(where);
+
+		//const srcPath = this.#getSourcePath(where.menu.url);
+
+
+
+		const columnInfo = await this.#getColumnInfo(where.table);
+
+		let mybatisXmlSource;
+		if (apply.mybatis) {
+			mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/U.BuildMyBatisMapper.txt", "mybatis.xml", {
+				userPrompt: userPrompt,
+				originSrc: src.mybatis,
+				resultType: srcPath.resultType,
+				namespace: srcPath.namespace,
+				tableDefinitions: JSON.stringify(columnInfo),
+			});
+			//this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
+			progressMessageInstance.updateProgress('mybatis', 'completed');
+		}
+		else {
+			mybatisXmlSource = src.mybatis;
+		}
+
+		let serviceSrc;
+		if (apply.service) {
+			serviceSrc = await this.#generateTmplFile("/prompts/meta/U.BuildService.txt", "service.java", {
+				userPrompt: userPrompt,
+				originSrc: src.service,
+				baseClass: srcPath.baseClass,
+				myBatisPath: srcPath.mybatis,
+				namespace: srcPath.namespace,
+				package: srcPath.package + ".service",
+				mybatisXmlSource: mybatisXmlSource,
+			});
+			//this.#parent.addMessage("Java(Service) 소스파일을 생성했습니다.");
+			progressMessageInstance.updateProgress('service', 'completed');
+		}
+		else {
+			serviceSrc = src.service;
+		}
+
+		let controllerSrc;
+		if (apply.controller) {
+			controllerSrc = await this.#generateTmplFile("/prompts/meta/U.BuildController.txt", "controller.java", {
+				userPrompt: userPrompt,
+				originSrc: src.controller,
+				baseClass: srcPath.baseClass,
+				menuUrl: where.menu.url,
+				package: srcPath.package + ".controller",
+				serviceSource: serviceSrc,
+			});
+			//this.#parent.addMessage("Java(Controller) 소스파일을 생성했습니다.");
+			progressMessageInstance.updateProgress('controller', 'completed');
+		}
+		else {
+			controllerSrc = src.controller;
+		}
+
+		let jsSrc;
+		if (apply.javascript) {
+			jsSrc = await this.#generateTmplFile(this.prompt.react.filter(item => item.includes(".main.") || item.includes(".all.")), "react.jsx", {
+				userPrompt: userPrompt,
+				mybatis: srcPath.mybatis,
+				originSrc: src.javascript,
+				menuUrl: where.menu.url,
+				menuName: where.menu.name,
+				baseClass: srcPath.baseClass,
+				mybatisXmlSource: mybatisXmlSource,
+				controllerSource: controllerSrc,
+				tableDefinitions: JSON.stringify(columnInfo),
+			});
+			//this.#parent.addMessage("Jsx(React) 소스파일을 생성했습니다.");
+			progressMessageInstance.updateProgress('javascript', 'completed');
+		}
+		else {
+			jsSrc = src.javascript;
+		}
+
+		//await this.#generateRealFile(srcPath, apply);
+
+		const returnSrc = [];
+
+		const mapping = {
+			mybatis: {
+				path: srcPath.mybatisPullPath,
+				src: mybatisXmlSource,
+			},
+			service: {
+				path: srcPath.servicePullPath,
+				src: serviceSrc,
+			},
+			controller: {
+				path: srcPath.controllerPullPath,
+				src: controllerSrc,
+			},
+			javascript: {
+				path: srcPath.javascriptPullPath,
+				src: jsSrc,
+			}
+		};
+
+		for (const key in apply) {
+			if (apply[key]) {
+				returnSrc.push({
+					[key]: {
+						asis: src[key],
+						tobe: mapping[key].src,
+						tobePath: mapping[key].path,
+					}
+				});
+			}
+		}
+
+		console.log(returnSrc);
+
+		return returnSrc;
+	};
+
 	#generateListSource = async (userPrompt, apply, progressMessageInstance) => {
 
 		/**
@@ -772,10 +846,7 @@ console.log(el, href, title);
 
 		let jsSrc;
 		if (apply.javascript) {
-			//reactArray.filter(item => item.contains(".main.") || item.endsWith(".all."));
-			console.log(this.prompt.react.filter(item => item.contains(".main.") || item.endsWith(".all.")));
-			//jsSrc = await this.#generateTmplFile("/prompts/meta/U.BuildReactJsx.txt", "react.jsx", {
-			jsSrc = await this.#generateTmplFile(this.prompt.react.filter(item => item.contains(".main.") || item.endsWith(".all.")), "react.jsx", {
+			jsSrc = await this.#generateTmplFile(this.prompt.react.filter(item => item.includes(".main.") || item.includes(".all.")), "react.jsx", {
 				userPrompt: userPrompt,
 				mybatis: srcPath.mybatis,
 				originSrc: src.javascript,
@@ -1238,7 +1309,7 @@ console.log(el, href, title);
 			}
 			//await this.#createSource(userPrompt, apply);
 			//return await this.#modifySource(userPrompt, apply, progressMessageInstance);
-			return await this.#generateListSource(userPrompt, apply, progressMessageInstance);
+			return await this.#generateSource(userPrompt, apply, progressMessageInstance);
 		}
 		else if (what === "C2") {
 			if (!apply.mybatis || !apply.service || !apply.controller || !apply.javascript) {
@@ -1252,7 +1323,8 @@ console.log(el, href, title);
 			const el = document.querySelector(".list-wrapper.active");
 
 			if (el) {
-				return await this.#modifySource(userPrompt, apply, progressMessageInstance);
+				//return await this.#modifySource(userPrompt, apply, progressMessageInstance);
+				return await this.#generateSource(userPrompt, apply, progressMessageInstance);
 			}
 			else {
 				return await this.#modifyDetailSource(userPrompt, apply, progressMessageInstance);

package/src/components/ideUtils.js

@@ -6,9 +6,6 @@ export class IdeUtils
 	constructor() {
 	}
 
-
-
-
 	static generatePrompt = async (paths, params) => {
 
 		if (!Array.isArray(paths)) paths = [paths];