ide-assi 0.495.0 → 0.497.0

package/dist/bundle.cjs.js

@@ -202370,10 +202370,22 @@ class IdeAi
 		const returnSrc = [];
 
 		const mapping = {
-			mybatis: mybatisXmlSource,
-			service: serviceSrc,
-			controller: controllerSrc,
-			javascript: jsSrc
+			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) {
@@ -202381,7 +202393,8 @@ class IdeAi
 				returnSrc.push({
 					[key]: {
 						asis: src[key],
-						tobe: mapping[key]
+						tobe: mapping[key].src,
+						tobePath: mapping[key].path,
 					}
 				});
 			}
@@ -202994,12 +203007,12 @@ export default DocManager;
 	<th>최종수정일</th>
 </tr>
 `; */
-		this.shadowRoot.querySelector("ide-diff-popup").popup({
+		this.shadowRoot.querySelector("ide-diff-popup").popup([{
 			javascript: {
 				asis: src1,
 				tobe: src2
 			}
-		});
+		}]);
 
 		return;
 	}
@@ -203181,6 +203194,8 @@ customElements.define("ide-assi-settings", ideAssiSettings);
 
 class IdeDiffPopup extends HTMLElement
 {
+	#changedSource;
+
 	constructor() {
 	
 		super();
@@ -203194,8 +203209,13 @@ class IdeDiffPopup extends HTMLElement
 
 		this.shadowRoot.innerHTML = `
 			<style>
+				
 			</style>
 			
+			<div>
+				<button onclick="this.#apply()">소스 적용</button>
+			</div>
+			
 			<nx-dialog>
 				<nx-tab theme="theme-4">
 				  <nx-tab-page caption="mybatis">
@@ -203214,9 +203234,34 @@ class IdeDiffPopup extends HTMLElement
 			</nx-dialog>
 		`;
 	}
+
+	#apply = () => {
+		let params = [];
+
+		for (const o of this.#changedSource) {
+			console.log(o);
+			const type = Object.keys(o)[0];
+
+			const diff = ninegrid.querySelector(`ide-diff.${type}`, this.shadowRoot);
+
+			console.log(diff);
+
+			params.push({
+				path: o.tobePath,
+				contents: diff.getContents(),
+			});
+		}
+
+		console.log(params);
+
+		api.post(`/api/source/generateRealFile`, { list: params });
+	}
+
 	
 	popup = (changedSource) => {
 
+		this.#changedSource = changedSource;
+
 		const tab = this.shadowRoot.querySelector('nx-tab');
 
 		setTimeout(() => {
@@ -235833,6 +235878,10 @@ class IdeDiff extends HTMLElement {
 		}
 	}
 
+	getContents = () => {
+		return (this.#tobeEditorView) ? this.#tobeEditorView.state.doc.toString() : "";
+	};
+
 	#initCodeMirror = () => {
 		this.#asisEditorEl = this.shadowRoot.querySelector('.panel.asis');
 		this.#tobeEditorEl = this.shadowRoot.querySelector('.panel.tobe');

package/dist/bundle.esm.js

@@ -202366,10 +202366,22 @@ class IdeAi
 		const returnSrc = [];
 
 		const mapping = {
-			mybatis: mybatisXmlSource,
-			service: serviceSrc,
-			controller: controllerSrc,
-			javascript: jsSrc
+			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) {
@@ -202377,7 +202389,8 @@ class IdeAi
 				returnSrc.push({
 					[key]: {
 						asis: src[key],
-						tobe: mapping[key]
+						tobe: mapping[key].src,
+						tobePath: mapping[key].path,
 					}
 				});
 			}
@@ -202990,12 +203003,12 @@ export default DocManager;
 	<th>최종수정일</th>
 </tr>
 `; */
-		this.shadowRoot.querySelector("ide-diff-popup").popup({
+		this.shadowRoot.querySelector("ide-diff-popup").popup([{
 			javascript: {
 				asis: src1,
 				tobe: src2
 			}
-		});
+		}]);
 
 		return;
 	}
@@ -203177,6 +203190,8 @@ customElements.define("ide-assi-settings", ideAssiSettings);
 
 class IdeDiffPopup extends HTMLElement
 {
+	#changedSource;
+
 	constructor() {
 	
 		super();
@@ -203190,8 +203205,13 @@ class IdeDiffPopup extends HTMLElement
 
 		this.shadowRoot.innerHTML = `
 			<style>
+				
 			</style>
 			
+			<div>
+				<button onclick="this.#apply()">소스 적용</button>
+			</div>
+			
 			<nx-dialog>
 				<nx-tab theme="theme-4">
 				  <nx-tab-page caption="mybatis">
@@ -203210,9 +203230,34 @@ class IdeDiffPopup extends HTMLElement
 			</nx-dialog>
 		`;
 	}
+
+	#apply = () => {
+		let params = [];
+
+		for (const o of this.#changedSource) {
+			console.log(o);
+			const type = Object.keys(o)[0];
+
+			const diff = ninegrid.querySelector(`ide-diff.${type}`, this.shadowRoot);
+
+			console.log(diff);
+
+			params.push({
+				path: o.tobePath,
+				contents: diff.getContents(),
+			});
+		}
+
+		console.log(params);
+
+		api.post(`/api/source/generateRealFile`, { list: params });
+	}
+
 	
 	popup = (changedSource) => {
 
+		this.#changedSource = changedSource;
+
 		const tab = this.shadowRoot.querySelector('nx-tab');
 
 		setTimeout(() => {
@@ -235829,6 +235874,10 @@ class IdeDiff extends HTMLElement {
 		}
 	}
 
+	getContents = () => {
+		return (this.#tobeEditorView) ? this.#tobeEditorView.state.doc.toString() : "";
+	};
+
 	#initCodeMirror = () => {
 		this.#asisEditorEl = this.shadowRoot.querySelector('.panel.asis');
 		this.#tobeEditorEl = this.shadowRoot.querySelector('.panel.tobe');

package/dist/components/ideAi.js

@@ -522,10 +522,22 @@ export class IdeAi
 		const returnSrc = [];
 
 		const mapping = {
-			mybatis: mybatisXmlSource,
-			service: serviceSrc,
-			controller: controllerSrc,
-			javascript: jsSrc
+			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) {
@@ -533,7 +545,8 @@ export class IdeAi
 				returnSrc.push({
 					[key]: {
 						asis: src[key],
-						tobe: mapping[key]
+						tobe: mapping[key].src,
+						tobePath: mapping[key].path,
 					}
 				});
 			}

package/dist/components/ideAssi.js

@@ -491,12 +491,12 @@ export default DocManager;
 	<th>최종수정일</th>
 </tr>
 `; */
-		this.shadowRoot.querySelector("ide-diff-popup").popup({
+		this.shadowRoot.querySelector("ide-diff-popup").popup([{
 			javascript: {
 				asis: src1,
 				tobe: src2
 			}
-		});
+		}]);
 
 		return;
 

package/dist/components/ideDiff.js

@@ -222,6 +222,10 @@ export class IdeDiff extends HTMLElement {
 		}
 	}
 
+	getContents = () => {
+		return (this.#tobeEditorView) ? this.#tobeEditorView.state.doc.toString() : "";
+	};
+
 	#initCodeMirror = () => {
 		this.#asisEditorEl = this.shadowRoot.querySelector('.panel.asis');
 		this.#tobeEditorEl = this.shadowRoot.querySelector('.panel.tobe');

package/dist/components/ideDiffPopup.js

@@ -1,7 +1,10 @@
 import ninegrid from "ninegrid2";
+import {api} from "./ideFetch.js";
 
 class IdeDiffPopup extends HTMLElement
 {
+	#changedSource;
+
 	constructor() {
 	
 		super();
@@ -15,8 +18,13 @@ class IdeDiffPopup extends HTMLElement
 
 		this.shadowRoot.innerHTML = `
 			<style>
+				
 			</style>
 			
+			<div>
+				<button onclick="this.#apply()">소스 적용</button>
+			</div>
+			
 			<nx-dialog>
 				<nx-tab theme="theme-4">
 				  <nx-tab-page caption="mybatis">
@@ -35,9 +43,34 @@ class IdeDiffPopup extends HTMLElement
 			</nx-dialog>
 		`;
 	}
+
+	#apply = () => {
+		let params = [];
+
+		for (const o of this.#changedSource) {
+			console.log(o);
+			const type = Object.keys(o)[0];
+
+			const diff = ninegrid.querySelector(`ide-diff.${type}`, this.shadowRoot);
+
+			console.log(diff);
+
+			params.push({
+				path: o.tobePath,
+				contents: diff.getContents(),
+			})
+		}
+
+		console.log(params);
+
+		api.post(`/api/source/generateRealFile`, { list: params });
+	}
+
 	
 	popup = (changedSource) => {
 
+		this.#changedSource = changedSource;
+
 		const tab = this.shadowRoot.querySelector('nx-tab');
 
 		setTimeout(() => {

package/package.json

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

package/src/components/ideAi.js

@@ -522,10 +522,22 @@ export class IdeAi
 		const returnSrc = [];
 
 		const mapping = {
-			mybatis: mybatisXmlSource,
-			service: serviceSrc,
-			controller: controllerSrc,
-			javascript: jsSrc
+			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) {
@@ -533,7 +545,8 @@ export class IdeAi
 				returnSrc.push({
 					[key]: {
 						asis: src[key],
-						tobe: mapping[key]
+						tobe: mapping[key].src,
+						tobePath: mapping[key].path,
 					}
 				});
 			}

package/src/components/ideAssi.js

@@ -491,12 +491,12 @@ export default DocManager;
 	<th>최종수정일</th>
 </tr>
 `; */
-		this.shadowRoot.querySelector("ide-diff-popup").popup({
+		this.shadowRoot.querySelector("ide-diff-popup").popup([{
 			javascript: {
 				asis: src1,
 				tobe: src2
 			}
-		});
+		}]);
 
 		return;
 

package/src/components/ideDiff.js

@@ -222,6 +222,10 @@ export class IdeDiff extends HTMLElement {
 		}
 	}
 
+	getContents = () => {
+		return (this.#tobeEditorView) ? this.#tobeEditorView.state.doc.toString() : "";
+	};
+
 	#initCodeMirror = () => {
 		this.#asisEditorEl = this.shadowRoot.querySelector('.panel.asis');
 		this.#tobeEditorEl = this.shadowRoot.querySelector('.panel.tobe');

package/src/components/ideDiffPopup.js

@@ -1,7 +1,10 @@
 import ninegrid from "ninegrid2";
+import {api} from "./ideFetch.js";
 
 class IdeDiffPopup extends HTMLElement
 {
+	#changedSource;
+
 	constructor() {
 	
 		super();
@@ -15,8 +18,13 @@ class IdeDiffPopup extends HTMLElement
 
 		this.shadowRoot.innerHTML = `
 			<style>
+				
 			</style>
 			
+			<div>
+				<button onclick="this.#apply()">소스 적용</button>
+			</div>
+			
 			<nx-dialog>
 				<nx-tab theme="theme-4">
 				  <nx-tab-page caption="mybatis">
@@ -35,9 +43,34 @@ class IdeDiffPopup extends HTMLElement
 			</nx-dialog>
 		`;
 	}
+
+	#apply = () => {
+		let params = [];
+
+		for (const o of this.#changedSource) {
+			console.log(o);
+			const type = Object.keys(o)[0];
+
+			const diff = ninegrid.querySelector(`ide-diff.${type}`, this.shadowRoot);
+
+			console.log(diff);
+
+			params.push({
+				path: o.tobePath,
+				contents: diff.getContents(),
+			})
+		}
+
+		console.log(params);
+
+		api.post(`/api/source/generateRealFile`, { list: params });
+	}
+
 	
 	popup = (changedSource) => {
 
+		this.#changedSource = changedSource;
+
 		const tab = this.shadowRoot.querySelector('nx-tab');
 
 		setTimeout(() => {