ide-assi 0.170.0 → 0.172.0

package/dist/bundle.cjs.js

@@ -193327,18 +193327,9 @@ class IdeUtils
 
 	static extractResponse = (response, gptServer) => {
 
-		const extractJsonSnippet = (text) => {
-
-			console.log(text);
-
-			//return text.replace(/```[\s\S]*?```/g, '').trim();
-			//const match = text.match(/```json([\s\S]*?)```/);
-			//return match ? match[1].trim() : text;
-			let match = text.match(/```json([\s\S]*?)```/);
-			if (!match) match = text.match(/```jsx([\s\S]*?)```/);
-			if (!match) match = text.match(/```xml([\s\S]*?)```/);
-			if (!match) match = text.match(/```java([\s\S]*?)```/);
-
+		const extractCodeSnippet = (text) => {
+			const pattern = /```(?:json|jsx|xml|java)([\s\S]*?)```/;
+			const match = text.match(pattern);
 			return match ? match[1].trim() : text;
 		};
 
@@ -193346,13 +193337,13 @@ class IdeUtils
 		let r;
 		switch (gptServer) {
 			case "openai":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "gemini":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "ollama":
-				r = extractJsonSnippet(response);
+				r = extractCodeSnippet(response);
 				break;
 		}
 
@@ -193643,8 +193634,6 @@ class IdeAi
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
-			return "111";
-
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,
@@ -193740,8 +193729,6 @@ class IdeAssi extends HTMLElement
 	#init = (info) => {
 		this.settings = this.shadowRoot.querySelector("ide-assi-settings");
 
-		this.settings.server = "ollama";
-
 		this.shadowRoot.querySelector("textarea").addEventListener("keydown", this.#keydownHandler);
 
 		this.shadowRoot.querySelector(".expand-icon").addEventListener("click", this.#toggleCollapseHandler);
@@ -193865,8 +193852,6 @@ customElements.define("ide-assi", IdeAssi);
 class ideAssiSettings extends HTMLElement
 {
 	constructor() {
-		console.log("construct");
-
 		super();
 		this.attachShadow({ mode: 'open' });
 	}

package/dist/bundle.esm.js

@@ -193323,18 +193323,9 @@ class IdeUtils
 
 	static extractResponse = (response, gptServer) => {
 
-		const extractJsonSnippet = (text) => {
-
-			console.log(text);
-
-			//return text.replace(/```[\s\S]*?```/g, '').trim();
-			//const match = text.match(/```json([\s\S]*?)```/);
-			//return match ? match[1].trim() : text;
-			let match = text.match(/```json([\s\S]*?)```/);
-			if (!match) match = text.match(/```jsx([\s\S]*?)```/);
-			if (!match) match = text.match(/```xml([\s\S]*?)```/);
-			if (!match) match = text.match(/```java([\s\S]*?)```/);
-
+		const extractCodeSnippet = (text) => {
+			const pattern = /```(?:json|jsx|xml|java)([\s\S]*?)```/;
+			const match = text.match(pattern);
 			return match ? match[1].trim() : text;
 		};
 
@@ -193342,13 +193333,13 @@ class IdeUtils
 		let r;
 		switch (gptServer) {
 			case "openai":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "gemini":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "ollama":
-				r = extractJsonSnippet(response);
+				r = extractCodeSnippet(response);
 				break;
 		}
 
@@ -193639,8 +193630,6 @@ class IdeAi
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
-			return "111";
-
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,
@@ -193736,8 +193725,6 @@ class IdeAssi extends HTMLElement
 	#init = (info) => {
 		this.settings = this.shadowRoot.querySelector("ide-assi-settings");
 
-		this.settings.server = "ollama";
-
 		this.shadowRoot.querySelector("textarea").addEventListener("keydown", this.#keydownHandler);
 
 		this.shadowRoot.querySelector(".expand-icon").addEventListener("click", this.#toggleCollapseHandler);
@@ -193861,8 +193848,6 @@ customElements.define("ide-assi", IdeAssi);
 class ideAssiSettings extends HTMLElement
 {
 	constructor() {
-		console.log("construct");
-
 		super();
 		this.attachShadow({ mode: 'open' });
 	}

package/dist/components/ideAi.js

@@ -299,8 +299,6 @@ export class IdeAi
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
-			return "111";
-
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,

package/dist/components/ideAssi.js

@@ -57,8 +57,6 @@ export class IdeAssi extends HTMLElement
 	#init = (info) => {
 		this.settings = this.shadowRoot.querySelector("ide-assi-settings");
 
-		this.settings.server = "ollama";
-
 		this.shadowRoot.querySelector("textarea").addEventListener("keydown", this.#keydownHandler);
 
 		this.shadowRoot.querySelector(".expand-icon").addEventListener("click", this.#toggleCollapseHandler);

package/dist/components/ideAssiSettings.js

@@ -3,8 +3,6 @@ import ninegrid from "ninegrid2";
 class ideAssiSettings extends HTMLElement
 {
 	constructor() {
-		console.log("construct");
-
 		super();
 		this.attachShadow({ mode: 'open' });
 	}

package/dist/components/ideUtils.js

@@ -17,9 +17,7 @@ export class IdeUtils
 
 	static extractResponse = (response, gptServer) => {
 
-		const extractJsonSnippet = (text) => {
-
-			console.log(text);
+		const extractJsonSnippet1 = (text) => {
 
 			//return text.replace(/```[\s\S]*?```/g, '').trim();
 			//const match = text.match(/```json([\s\S]*?)```/);
@@ -32,6 +30,13 @@ export class IdeUtils
 			return match ? match[1].trim() : text;
 		};
 
+		const extractCodeSnippet = (text) => {
+			const pattern = /```(?:json|jsx|xml|java)([\s\S]*?)```/;
+			const match = text.match(pattern);
+			return match ? match[1].trim() : text;
+		};
+
+
 		const extractSnippet = (text) => {
 			// 모든 종류의 마크다운 코드 블록 (```언어명 ... ```)을 제거
 			// 언어명 없는 순수 ``` 블록도 포함
@@ -49,13 +54,13 @@ export class IdeUtils
 		let r;
 		switch (gptServer) {
 			case "openai":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "gemini":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "ollama":
-				r = extractJsonSnippet(response);
+				r = extractCodeSnippet(response);
 				break;
 			default:
 				break;

package/package.json

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

package/src/components/ideAi.js

@@ -299,8 +299,6 @@ export class IdeAi
 			});
 			this.#parent.addMessage("MyBatis 소스파일을 생성했습니다.");
 
-			return "111";
-
 			const serviceSrc = await this.#generateTmplFile("/prompts/meta/BuildService.txt", "service.java", {
 				userPrompt: userPrompt,
 				menuUrl: where.menu.url,

package/src/components/ideAssi.js

@@ -57,8 +57,6 @@ export class IdeAssi extends HTMLElement
 	#init = (info) => {
 		this.settings = this.shadowRoot.querySelector("ide-assi-settings");
 
-		this.settings.server = "ollama";
-
 		this.shadowRoot.querySelector("textarea").addEventListener("keydown", this.#keydownHandler);
 
 		this.shadowRoot.querySelector(".expand-icon").addEventListener("click", this.#toggleCollapseHandler);

package/src/components/ideAssiSettings.js

@@ -3,8 +3,6 @@ import ninegrid from "ninegrid2";
 class ideAssiSettings extends HTMLElement
 {
 	constructor() {
-		console.log("construct");
-
 		super();
 		this.attachShadow({ mode: 'open' });
 	}

package/src/components/ideUtils.js

@@ -17,9 +17,7 @@ export class IdeUtils
 
 	static extractResponse = (response, gptServer) => {
 
-		const extractJsonSnippet = (text) => {
-
-			console.log(text);
+		const extractJsonSnippet1 = (text) => {
 
 			//return text.replace(/```[\s\S]*?```/g, '').trim();
 			//const match = text.match(/```json([\s\S]*?)```/);
@@ -32,6 +30,13 @@ export class IdeUtils
 			return match ? match[1].trim() : text;
 		};
 
+		const extractCodeSnippet = (text) => {
+			const pattern = /```(?:json|jsx|xml|java)([\s\S]*?)```/;
+			const match = text.match(pattern);
+			return match ? match[1].trim() : text;
+		};
+
+
 		const extractSnippet = (text) => {
 			// 모든 종류의 마크다운 코드 블록 (```언어명 ... ```)을 제거
 			// 언어명 없는 순수 ``` 블록도 포함
@@ -49,13 +54,13 @@ export class IdeUtils
 		let r;
 		switch (gptServer) {
 			case "openai":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "gemini":
-				r = extractJsonSnippet(response.content.trim());
+				r = extractCodeSnippet(response.content.trim());
 				break;
 			case "ollama":
-				r = extractJsonSnippet(response);
+				r = extractCodeSnippet(response);
 				break;
 			default:
 				break;