ide-assi 0.194.0 → 0.196.0

package/dist/bundle.cjs.js

@@ -193345,14 +193345,15 @@ class IdeUtils
 	static getSourcePath = (menuUrl) => {
 		const path = menuUrl.replace(/^\/+/, '');
 
-		const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		//const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		const packageName = `${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
 		const namespace = path.split("/").slice(0, -1).join(".").toLowerCase();
 		const fileName = path.split("/").at(-1).toLowerCase().split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
 
 		//console.log(this.#parent, this.#parent.config, packageName, namespace, fileName);
 
 		return {
-			basePackage: packageName,
+			package: packageName,
 			namespace: namespace,
 			controller: `${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
 			service: `${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,
@@ -193410,6 +193411,45 @@ class IdeUtils
 	};
 }
 
+class IdeFetch {
+
+	static #request = (method, url, data = {}) => {
+
+		//console.log(method, url, data);
+
+		if (method === "GET") url += `?${new URLSearchParams(data)}`;
+
+		const options = {
+			method,
+			headers: { "Content-Type": "application/json" }
+		};
+
+		if (method !== "GET") {
+			options.body = JSON.stringify(data);
+		}
+
+		return fetch(url, options)
+			.then(res => {
+				if (!res.ok) {
+					return res.text().then(text => {
+						throw new Error(`API 오류 (${res.status}): ${text}`);
+					});
+				}
+				return res.json();
+			})
+			.catch(err => {
+				console.error(`[fetch.${method.toLowerCase()}] ${url} 실패:`, err);
+				throw err;
+			});
+	};
+
+	static get = (url, data = {}) => IdeFetch.#request("GET", url, data);
+
+	static post = (url, data = {}) => IdeFetch.#request("POST", url, data);
+}
+
+const api = IdeFetch;
+
 class IdeAi
 {
 	#API_URL = "http://localhost:8091";
@@ -193653,6 +193693,11 @@ class IdeAi
 
 		const src = await this.#invoke(promptFile, params);
 
+		await api.post(`/api/source/generateTmplFile`, {
+			fileNm: generateFileName,
+			contents: src,
+		});
+		/**
 		await fetch(`/api/source/generateTmplFile`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -193661,6 +193706,7 @@ class IdeAi
 				contents: src,
 			})
 		});
+			*/
 
 		return src;
 	};
@@ -193675,23 +193721,33 @@ class IdeAi
 
 			const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
+
+
 			console.log(where);
 
-			return "OKKKK";
+			//packageName
+			const srcPath = IdeUtils.getSourcePath(where.menu.url);
+			srcPath.package = this.#parent.config.basePackage + "." + srcPath.package;
+
+			console.log(srcPath);
+
+
 
 			const columnInfo = await this.#getColumnInfo(where.table);
 
-			const namespace = where.package;
+			//const namespace = where.package;
 			const classPackage = "ide.assi.be." + where.package.split(".").slice(0, -1).join(".");
 
 			//const mybatisXmlSource = await this.#generateMyBatis(userPrompt, where.package, columnInfo);
 			const mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/BuildMyBatisMapper.txt", "mybatis.xml", {
 				"userPrompt": userPrompt,
-				"namespace": namespace,
+				"namespace": srcPath.namespace,
 				"tableDefinitions": columnInfo
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
+			return "OKKKK";
+
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,
@@ -193731,45 +193787,6 @@ class IdeAi
 	}
 }
 
-class IdeFetch {
-
-	static #request = (method, url, data = {}) => {
-
-		//console.log(method, url, data);
-
-		if (method === "GET") url += `?${new URLSearchParams(data)}`;
-
-		const options = {
-			method,
-			headers: { "Content-Type": "application/json" }
-		};
-
-		if (method !== "GET") {
-			options.body = JSON.stringify(data);
-		}
-
-		return fetch(url, options)
-			.then(res => {
-				if (!res.ok) {
-					return res.text().then(text => {
-						throw new Error(`API 오류 (${res.status}): ${text}`);
-					});
-				}
-				return res.json();
-			})
-			.catch(err => {
-				console.error(`[fetch.${method.toLowerCase()}] ${url} 실패:`, err);
-				throw err;
-			});
-	};
-
-	static get = (url, data = {}) => IdeFetch.#request("GET", url, data);
-
-	static post = (url, data = {}) => IdeFetch.#request("POST", url, data);
-}
-
-const api = IdeFetch;
-
 class IdeAssi extends HTMLElement
 {
 	#ing = false;

package/dist/bundle.esm.js

@@ -193341,14 +193341,15 @@ class IdeUtils
 	static getSourcePath = (menuUrl) => {
 		const path = menuUrl.replace(/^\/+/, '');
 
-		const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		//const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		const packageName = `${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
 		const namespace = path.split("/").slice(0, -1).join(".").toLowerCase();
 		const fileName = path.split("/").at(-1).toLowerCase().split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
 
 		//console.log(this.#parent, this.#parent.config, packageName, namespace, fileName);
 
 		return {
-			basePackage: packageName,
+			package: packageName,
 			namespace: namespace,
 			controller: `${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
 			service: `${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,
@@ -193406,6 +193407,45 @@ class IdeUtils
 	};
 }
 
+class IdeFetch {
+
+	static #request = (method, url, data = {}) => {
+
+		//console.log(method, url, data);
+
+		if (method === "GET") url += `?${new URLSearchParams(data)}`;
+
+		const options = {
+			method,
+			headers: { "Content-Type": "application/json" }
+		};
+
+		if (method !== "GET") {
+			options.body = JSON.stringify(data);
+		}
+
+		return fetch(url, options)
+			.then(res => {
+				if (!res.ok) {
+					return res.text().then(text => {
+						throw new Error(`API 오류 (${res.status}): ${text}`);
+					});
+				}
+				return res.json();
+			})
+			.catch(err => {
+				console.error(`[fetch.${method.toLowerCase()}] ${url} 실패:`, err);
+				throw err;
+			});
+	};
+
+	static get = (url, data = {}) => IdeFetch.#request("GET", url, data);
+
+	static post = (url, data = {}) => IdeFetch.#request("POST", url, data);
+}
+
+const api = IdeFetch;
+
 class IdeAi
 {
 	#API_URL = "http://localhost:8091";
@@ -193649,6 +193689,11 @@ class IdeAi
 
 		const src = await this.#invoke(promptFile, params);
 
+		await api.post(`/api/source/generateTmplFile`, {
+			fileNm: generateFileName,
+			contents: src,
+		});
+		/**
 		await fetch(`/api/source/generateTmplFile`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -193657,6 +193702,7 @@ class IdeAi
 				contents: src,
 			})
 		});
+			*/
 
 		return src;
 	};
@@ -193671,23 +193717,33 @@ class IdeAi
 
 			const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
 			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
+
+
 			console.log(where);
 
-			return "OKKKK";
+			//packageName
+			const srcPath = IdeUtils.getSourcePath(where.menu.url);
+			srcPath.package = this.#parent.config.basePackage + "." + srcPath.package;
+
+			console.log(srcPath);
+
+
 
 			const columnInfo = await this.#getColumnInfo(where.table);
 
-			const namespace = where.package;
+			//const namespace = where.package;
 			const classPackage = "ide.assi.be." + where.package.split(".").slice(0, -1).join(".");
 
 			//const mybatisXmlSource = await this.#generateMyBatis(userPrompt, where.package, columnInfo);
 			const mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/BuildMyBatisMapper.txt", "mybatis.xml", {
 				"userPrompt": userPrompt,
-				"namespace": namespace,
+				"namespace": srcPath.namespace,
 				"tableDefinitions": columnInfo
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
+			return "OKKKK";
+
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,
@@ -193727,45 +193783,6 @@ class IdeAi
 	}
 }
 
-class IdeFetch {
-
-	static #request = (method, url, data = {}) => {
-
-		//console.log(method, url, data);
-
-		if (method === "GET") url += `?${new URLSearchParams(data)}`;
-
-		const options = {
-			method,
-			headers: { "Content-Type": "application/json" }
-		};
-
-		if (method !== "GET") {
-			options.body = JSON.stringify(data);
-		}
-
-		return fetch(url, options)
-			.then(res => {
-				if (!res.ok) {
-					return res.text().then(text => {
-						throw new Error(`API 오류 (${res.status}): ${text}`);
-					});
-				}
-				return res.json();
-			})
-			.catch(err => {
-				console.error(`[fetch.${method.toLowerCase()}] ${url} 실패:`, err);
-				throw err;
-			});
-	};
-
-	static get = (url, data = {}) => IdeFetch.#request("GET", url, data);
-
-	static post = (url, data = {}) => IdeFetch.#request("POST", url, data);
-}
-
-const api = IdeFetch;
-
 class IdeAssi extends HTMLElement
 {
 	#ing = false;

package/dist/components/ideAi.js

@@ -1,10 +1,11 @@
 import ninegrid from "ninegrid2";
 import { IdeUtils } from "./ideUtils.js";
+import { api } from "./ideFetch.js";
 import { HumanMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { Ollama } from "@langchain/ollama";
 import { ChatOpenAI } from '@langchain/openai';
-import {PromptTemplate} from "@langchain/core/prompts";
+import { PromptTemplate } from "@langchain/core/prompts";
 
 export class IdeAi
 {
@@ -263,6 +264,11 @@ export class IdeAi
 
 		const src = await this.#invoke(promptFile, params);
 
+		await api.post(`/api/source/generateTmplFile`, {
+			fileNm: generateFileName,
+			contents: src,
+		});
+		/**
 		await fetch(`/api/source/generateTmplFile`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -271,6 +277,7 @@ export class IdeAi
 				contents: src,
 			})
 		});
+			*/
 
 		return src;
 	};
@@ -284,24 +291,34 @@ export class IdeAi
 			this.#parent.addMessage("명령을 이해했습니다.");
 
 			const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
-			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
+			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
+
+
 			console.log(where);
 
-			return "OKKKK";
+			//packageName
+			const srcPath = IdeUtils.getSourcePath(where.menu.url);
+			srcPath.package = this.#parent.config.basePackage + "." + srcPath.package;
+
+			console.log(srcPath);
+
+
 
 			const columnInfo = await this.#getColumnInfo(where.table);
 
-			const namespace = where.package;
+			//const namespace = where.package;
 			const classPackage = "ide.assi.be." + where.package.split(".").slice(0, -1).join(".");
 
 			//const mybatisXmlSource = await this.#generateMyBatis(userPrompt, where.package, columnInfo);
 			const mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/BuildMyBatisMapper.txt", "mybatis.xml", {
 				"userPrompt": userPrompt,
-				"namespace": namespace,
+				"namespace": srcPath.namespace,
 				"tableDefinitions": columnInfo
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
+			return "OKKKK";
+
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,

package/dist/components/ideUtils.js

@@ -35,14 +35,15 @@ export class IdeUtils
 	static getSourcePath = (menuUrl) => {
 		const path = menuUrl.replace(/^\/+/, '');
 
-		const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		//const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		const packageName = `${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
 		const namespace = path.split("/").slice(0, -1).join(".").toLowerCase();
 		const fileName = path.split("/").at(-1).toLowerCase().split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
 
 		//console.log(this.#parent, this.#parent.config, packageName, namespace, fileName);
 
 		return {
-			basePackage: packageName,
+			package: packageName,
 			namespace: namespace,
 			controller: `${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
 			service: `${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,

package/package.json

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

package/src/components/ideAi.js

@@ -1,10 +1,11 @@
 import ninegrid from "ninegrid2";
 import { IdeUtils } from "./ideUtils.js";
+import { api } from "./ideFetch.js";
 import { HumanMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { Ollama } from "@langchain/ollama";
 import { ChatOpenAI } from '@langchain/openai';
-import {PromptTemplate} from "@langchain/core/prompts";
+import { PromptTemplate } from "@langchain/core/prompts";
 
 export class IdeAi
 {
@@ -263,6 +264,11 @@ export class IdeAi
 
 		const src = await this.#invoke(promptFile, params);
 
+		await api.post(`/api/source/generateTmplFile`, {
+			fileNm: generateFileName,
+			contents: src,
+		});
+		/**
 		await fetch(`/api/source/generateTmplFile`, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -271,6 +277,7 @@ export class IdeAi
 				contents: src,
 			})
 		});
+			*/
 
 		return src;
 	};
@@ -284,24 +291,34 @@ export class IdeAi
 			this.#parent.addMessage("명령을 이해했습니다.");
 
 			const where = await this.#where(userPrompt, this.#getMenuInfo(), await this.#getTableList());
-			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.");
+			this.#parent.addMessage("대상 메뉴와 테이블을 찾았습니다.")
+
+
 			console.log(where);
 
-			return "OKKKK";
+			//packageName
+			const srcPath = IdeUtils.getSourcePath(where.menu.url);
+			srcPath.package = this.#parent.config.basePackage + "." + srcPath.package;
+
+			console.log(srcPath);
+
+
 
 			const columnInfo = await this.#getColumnInfo(where.table);
 
-			const namespace = where.package;
+			//const namespace = where.package;
 			const classPackage = "ide.assi.be." + where.package.split(".").slice(0, -1).join(".");
 
 			//const mybatisXmlSource = await this.#generateMyBatis(userPrompt, where.package, columnInfo);
 			const mybatisXmlSource = await this.#generateTmplFile("/prompts/meta/BuildMyBatisMapper.txt", "mybatis.xml", {
 				"userPrompt": userPrompt,
-				"namespace": namespace,
+				"namespace": srcPath.namespace,
 				"tableDefinitions": columnInfo
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
+			return "OKKKK";
+
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,

package/src/components/ideUtils.js

@@ -35,14 +35,15 @@ export class IdeUtils
 	static getSourcePath = (menuUrl) => {
 		const path = menuUrl.replace(/^\/+/, '');
 
-		const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		//const packageName = `${this.#parent.config.basePackage}.${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
+		const packageName = `${path.split("/").slice(0, -1).join(".").toLowerCase()}`;
 		const namespace = path.split("/").slice(0, -1).join(".").toLowerCase();
 		const fileName = path.split("/").at(-1).toLowerCase().split('-').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('');
 
 		//console.log(this.#parent, this.#parent.config, packageName, namespace, fileName);
 
 		return {
-			basePackage: packageName,
+			package: packageName,
 			namespace: namespace,
 			controller: `${packageName.replaceAll(".", "/")}/controller/${fileName}Controller.java`,
 			service: `${packageName.replaceAll(".", "/")}/service/${fileName}Service.java`,