ide-assi 0.650.0 → 0.652.0

package/dist/bundle.cjs.js

@@ -203215,15 +203215,169 @@ console.log(el, href, title);
 		*/
 
 
-		const where1 = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
+		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
 
-		console.log(where1);
+		console.log(where);
+
+		const srcPath = this.#getSourcePath(where.menu.url);
+		console.log(srcPath);
 
-		const srcPath1 = this.#getSourcePath(where1.menu.url);
-		console.log(srcPath1);
 
-		return;
+		/**
+		 * {
+		 *     "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("/prompts/meta/U.BuildReactJsx.txt", "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;
 	};
 
 	#generateDetailSource = async (userPrompt, apply, progressMessageInstance) => {
@@ -237399,6 +237553,54 @@ class IdeDiff extends HTMLElement {
 
 customElements.define("ide-diff", IdeDiff);
 
+class aiNatualInput extends HTMLElement
+{
+	#selectFunc;
+
+	constructor() {
+		super();
+	}
+	
+	connectedCallback() {
+		this.#init();
+	};
+
+	set selectFunc(v) { this.#selectFunc = v; };
+
+	#exprFunction = (s) => {
+
+		let args = '...args';
+		let body = 'return ' + s + ';';
+
+		//console.log(s);
+
+		return new Function(args, body);
+		//return new Function('data', 'currow', 'return ' + s + ';');
+	};
+
+	#keyDownHandler = e => {
+		console.log(e);
+
+		if (e.key === 'Enter' && !e.isComposing && this.#selectFunc) {
+			//this.#exprFunction(this.#selectFunc.call(this, {"aaa": "14"}));
+			console.log(this.#selectFunc);
+			this.#selectFunc.call(this, {"aaa": "14"});
+		}
+	};
+
+	#init = () => {
+		const placeholder = this.getAttribute("placeholder") || "자연어 검색어를 입력하세요 (ex: 작성자가 홍길동인 데이타를 찾아줘)";
+
+		this.innerHTML = `
+			 <input type="text" placeholder="${placeholder}"/>
+		`;
+
+		this.querySelector("input").addEventListener('keydown', this.#keyDownHandler);
+	}
+}
+
+customElements.define("ai-natual-input", aiNatualInput);
+
 //import "./components/ideAssi.js";
 
 

package/dist/bundle.esm.js

@@ -203211,15 +203211,169 @@ console.log(el, href, title);
 		*/
 
 
-		const where1 = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
+		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
 
-		console.log(where1);
+		console.log(where);
+
+		const srcPath = this.#getSourcePath(where.menu.url);
+		console.log(srcPath);
 
-		const srcPath1 = this.#getSourcePath(where1.menu.url);
-		console.log(srcPath1);
 
-		return;
+		/**
+		 * {
+		 *     "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("/prompts/meta/U.BuildReactJsx.txt", "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;
 	};
 
 	#generateDetailSource = async (userPrompt, apply, progressMessageInstance) => {
@@ -237395,6 +237549,54 @@ class IdeDiff extends HTMLElement {
 
 customElements.define("ide-diff", IdeDiff);
 
+class aiNatualInput extends HTMLElement
+{
+	#selectFunc;
+
+	constructor() {
+		super();
+	}
+	
+	connectedCallback() {
+		this.#init();
+	};
+
+	set selectFunc(v) { this.#selectFunc = v; };
+
+	#exprFunction = (s) => {
+
+		let args = '...args';
+		let body = 'return ' + s + ';';
+
+		//console.log(s);
+
+		return new Function(args, body);
+		//return new Function('data', 'currow', 'return ' + s + ';');
+	};
+
+	#keyDownHandler = e => {
+		console.log(e);
+
+		if (e.key === 'Enter' && !e.isComposing && this.#selectFunc) {
+			//this.#exprFunction(this.#selectFunc.call(this, {"aaa": "14"}));
+			console.log(this.#selectFunc);
+			this.#selectFunc.call(this, {"aaa": "14"});
+		}
+	};
+
+	#init = () => {
+		const placeholder = this.getAttribute("placeholder") || "자연어 검색어를 입력하세요 (ex: 작성자가 홍길동인 데이타를 찾아줘)";
+
+		this.innerHTML = `
+			 <input type="text" placeholder="${placeholder}"/>
+		`;
+
+		this.querySelector("input").addEventListener('keydown', this.#keyDownHandler);
+	}
+}
+
+customElements.define("ai-natual-input", aiNatualInput);
+
 //import "./components/ideAssi.js";
 
 

package/dist/components/aiNatualInput.js

@@ -0,0 +1,47 @@
+class aiNatualInput extends HTMLElement
+{
+	#selectFunc;
+
+	constructor() {
+		super();
+	}
+	
+	connectedCallback() {
+		this.#init();
+	};
+
+	set selectFunc(v) { this.#selectFunc = v; };
+
+	#exprFunction = (s) => {
+
+		let args = '...args';
+		let body = 'return ' + s + ';';
+
+		//console.log(s);
+
+		return new Function(args, body);
+		//return new Function('data', 'currow', 'return ' + s + ';');
+	};
+
+	#keyDownHandler = e => {
+		console.log(e);
+
+		if (e.key === 'Enter' && !e.isComposing && this.#selectFunc) {
+			//this.#exprFunction(this.#selectFunc.call(this, {"aaa": "14"}));
+			console.log(this.#selectFunc);
+			this.#selectFunc.call(this, {"aaa": "14"});
+		}
+	};
+
+	#init = () => {
+		const placeholder = this.getAttribute("placeholder") || "자연어 검색어를 입력하세요 (ex: 작성자가 홍길동인 데이타를 찾아줘)";
+
+		this.innerHTML = `
+			 <input type="text" placeholder="${placeholder}"/>
+		`;
+
+		this.querySelector("input").addEventListener('keydown', this.#keyDownHandler);
+	}
+}
+
+customElements.define("ai-natual-input", aiNatualInput);

package/dist/components/ideAi.js

@@ -666,15 +666,13 @@ console.log(el, href, title);
 		*/
 
 
-		const where1 = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
+		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
 
-		console.log(where1);
-
-		const srcPath1 = this.#getSourcePath(where1.menu.url);
-		console.log(srcPath1);
+		console.log(where);
 
-		return;
+		const srcPath = this.#getSourcePath(where.menu.url);
+		console.log(srcPath);
 
 
 		/**
@@ -710,11 +708,11 @@ console.log(el, href, title);
 
 
 
-		const where = await this.#where(`${title}에서 ${userPrompt}`, [{url: href, title: title}], await this.#getTableList());
+		//const where = await this.#where(`${title}에서 ${userPrompt}`, [{url: href, title: title}], await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
 		progressMessageInstance.updateProgress('prepare2', 'completed');
 
-		console.log(where);
+		//console.log(where);
 
 		//const srcPath = this.#getSourcePath(where.menu.url);
 

package/dist/index.js

@@ -8,6 +8,8 @@ import "./components/ideDiff.js";
 import { IdeFetch } from "./components/ideFetch.js";
 import { IdeAi } from "./components/ideAi.js";
 
+import "./components/aiNatualInput.js";
+
 export { IdeAssi, IdeFetch as api, IdeAi as ai }; // Named Export
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ide-assi",
   "type": "module",
-  "version": "0.650.0",
+  "version": "0.652.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

package/src/components/aiNatualInput.js

@@ -0,0 +1,47 @@
+class aiNatualInput extends HTMLElement
+{
+	#selectFunc;
+
+	constructor() {
+		super();
+	}
+	
+	connectedCallback() {
+		this.#init();
+	};
+
+	set selectFunc(v) { this.#selectFunc = v; };
+
+	#exprFunction = (s) => {
+
+		let args = '...args';
+		let body = 'return ' + s + ';';
+
+		//console.log(s);
+
+		return new Function(args, body);
+		//return new Function('data', 'currow', 'return ' + s + ';');
+	};
+
+	#keyDownHandler = e => {
+		console.log(e);
+
+		if (e.key === 'Enter' && !e.isComposing && this.#selectFunc) {
+			//this.#exprFunction(this.#selectFunc.call(this, {"aaa": "14"}));
+			console.log(this.#selectFunc);
+			this.#selectFunc.call(this, {"aaa": "14"});
+		}
+	};
+
+	#init = () => {
+		const placeholder = this.getAttribute("placeholder") || "자연어 검색어를 입력하세요 (ex: 작성자가 홍길동인 데이타를 찾아줘)";
+
+		this.innerHTML = `
+			 <input type="text" placeholder="${placeholder}"/>
+		`;
+
+		this.querySelector("input").addEventListener('keydown', this.#keyDownHandler);
+	}
+}
+
+customElements.define("ai-natual-input", aiNatualInput);

package/src/components/ideAi.js

@@ -666,15 +666,13 @@ console.log(el, href, title);
 		*/
 
 
-		const where1 = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
+		const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
 
-		console.log(where1);
-
-		const srcPath1 = this.#getSourcePath(where1.menu.url);
-		console.log(srcPath1);
+		console.log(where);
 
-		return;
+		const srcPath = this.#getSourcePath(where.menu.url);
+		console.log(srcPath);
 
 
 		/**
@@ -710,11 +708,11 @@ console.log(el, href, title);
 
 
 
-		const where = await this.#where(`${title}에서 ${userPrompt}`, [{url: href, title: title}], await this.#getTableList());
+		//const where = await this.#where(`${title}에서 ${userPrompt}`, [{url: href, title: title}], await this.#getTableList());
 		//this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
 		progressMessageInstance.updateProgress('prepare2', 'completed');
 
-		console.log(where);
+		//console.log(where);
 
 		//const srcPath = this.#getSourcePath(where.menu.url);
 

package/src/index.js

@@ -8,6 +8,8 @@ import "./components/ideDiff.js";
 import { IdeFetch } from "./components/ideFetch.js";
 import { IdeAi } from "./components/ideAi.js";
 
+import "./components/aiNatualInput.js";
+
 export { IdeAssi, IdeFetch as api, IdeAi as ai }; // Named Export