feat: use a better jsoneditor version + current selected node jsonpath
Fix #672 (https://github.com/CorentinTh/it-tools/issues/672#issuecomment-1826885538) for current node jsonpath
This commit is contained in:
		
							parent
							
								
									a28ba6e146
								
							
						
					
					
						commit
						cf0d31f743
					
				
							
								
								
									
										3
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							| @ -133,6 +133,7 @@ declare module '@vue/runtime-core' { | |||||||
|     NConfigProvider: typeof import('naive-ui')['NConfigProvider'] |     NConfigProvider: typeof import('naive-ui')['NConfigProvider'] | ||||||
|     NDivider: typeof import('naive-ui')['NDivider'] |     NDivider: typeof import('naive-ui')['NDivider'] | ||||||
|     NEllipsis: typeof import('naive-ui')['NEllipsis'] |     NEllipsis: typeof import('naive-ui')['NEllipsis'] | ||||||
|  |     NForm: typeof import('naive-ui')['NForm'] | ||||||
|     NFormItem: typeof import('naive-ui')['NFormItem'] |     NFormItem: typeof import('naive-ui')['NFormItem'] | ||||||
|     NGi: typeof import('naive-ui')['NGi'] |     NGi: typeof import('naive-ui')['NGi'] | ||||||
|     NGrid: typeof import('naive-ui')['NGrid'] |     NGrid: typeof import('naive-ui')['NGrid'] | ||||||
| @ -145,7 +146,9 @@ declare module '@vue/runtime-core' { | |||||||
|     NLayoutSider: typeof import('naive-ui')['NLayoutSider'] |     NLayoutSider: typeof import('naive-ui')['NLayoutSider'] | ||||||
|     NMenu: typeof import('naive-ui')['NMenu'] |     NMenu: typeof import('naive-ui')['NMenu'] | ||||||
|     NScrollbar: typeof import('naive-ui')['NScrollbar'] |     NScrollbar: typeof import('naive-ui')['NScrollbar'] | ||||||
|  |     NSlider: typeof import('naive-ui')['NSlider'] | ||||||
|     NSpin: typeof import('naive-ui')['NSpin'] |     NSpin: typeof import('naive-ui')['NSpin'] | ||||||
|  |     NSwitch: typeof import('naive-ui')['NSwitch'] | ||||||
|     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default'] |     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default'] | ||||||
|     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default'] |     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default'] | ||||||
|     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default'] |     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default'] | ||||||
|  | |||||||
							
								
								
									
										10
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								package.json
									
									
									
									
									
								
							| @ -37,7 +37,6 @@ | |||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@it-tools/bip39": "^0.0.4", |     "@it-tools/bip39": "^0.0.4", | ||||||
|     "@it-tools/oggen": "^1.3.0", |     "@it-tools/oggen": "^1.3.0", | ||||||
|     "@originjs/vite-plugin-commonjs": "^1.0.3", |  | ||||||
|     "@sindresorhus/slugify": "^2.2.1", |     "@sindresorhus/slugify": "^2.2.1", | ||||||
|     "@tiptap/pm": "2.1.6", |     "@tiptap/pm": "2.1.6", | ||||||
|     "@tiptap/starter-kit": "2.1.6", |     "@tiptap/starter-kit": "2.1.6", | ||||||
| @ -58,6 +57,7 @@ | |||||||
|     "crypto-js": "^4.1.1", |     "crypto-js": "^4.1.1", | ||||||
|     "date-fns": "^2.29.3", |     "date-fns": "^2.29.3", | ||||||
|     "dompurify": "^3.0.6", |     "dompurify": "^3.0.6", | ||||||
|  |     "email-normalizer": "^1.0.0", | ||||||
|     "emojilib": "^3.0.10", |     "emojilib": "^3.0.10", | ||||||
|     "figlet": "^1.7.0", |     "figlet": "^1.7.0", | ||||||
|     "figue": "^1.2.0", |     "figue": "^1.2.0", | ||||||
| @ -65,7 +65,8 @@ | |||||||
|     "highlight.js": "^11.7.0", |     "highlight.js": "^11.7.0", | ||||||
|     "iarna-toml-esm": "^3.0.5", |     "iarna-toml-esm": "^3.0.5", | ||||||
|     "ibantools": "^4.3.3", |     "ibantools": "^4.3.3", | ||||||
|     "json-editor-vue3": "^1.1.1", |     "js-base64": "^3.7.6", | ||||||
|  |     "json-editor-vue": "^0.16.0", | ||||||
|     "json5": "^2.2.3", |     "json5": "^2.2.3", | ||||||
|     "jwt-decode": "^3.1.2", |     "jwt-decode": "^3.1.2", | ||||||
|     "libphonenumber-js": "^1.10.28", |     "libphonenumber-js": "^1.10.28", | ||||||
| @ -88,11 +89,13 @@ | |||||||
|     "unicode-emoji-json": "^0.4.0", |     "unicode-emoji-json": "^0.4.0", | ||||||
|     "unplugin-auto-import": "^0.16.4", |     "unplugin-auto-import": "^0.16.4", | ||||||
|     "uuid": "^9.0.0", |     "uuid": "^9.0.0", | ||||||
|  |     "vanilla-jsoneditor": "^0.23.8", | ||||||
|     "vue": "^3.3.4", |     "vue": "^3.3.4", | ||||||
|     "vue-i18n": "^9.9.1", |     "vue-i18n": "^9.9.1", | ||||||
|     "vue-router": "^4.1.6", |     "vue-router": "^4.1.6", | ||||||
|     "vue-tsc": "^1.8.1", |     "vue-tsc": "^1.8.1", | ||||||
|     "xml-formatter": "^3.3.2", |     "xml-formatter": "^3.3.2", | ||||||
|  |     "xml-js": "^1.6.11", | ||||||
|     "yaml": "^2.2.1" |     "yaml": "^2.2.1" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
| @ -139,5 +142,6 @@ | |||||||
|     "vitest": "^0.34.0", |     "vitest": "^0.34.0", | ||||||
|     "workbox-window": "^7.0.0", |     "workbox-window": "^7.0.0", | ||||||
|     "zx": "^7.2.1" |     "zx": "^7.2.1" | ||||||
|   } |   }, | ||||||
|  |   "packageManager": "pnpm@8.15.3" | ||||||
| } | } | ||||||
|  | |||||||
							
								
								
									
										644
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										644
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										3
									
								
								src/tools/json-editor/json-editor-vue3.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								src/tools/json-editor/json-editor-vue3.d.ts
									
									
									
									
										vendored
									
									
								
							| @ -1,3 +0,0 @@ | |||||||
| declare module 'json-editor-vue3'{ |  | ||||||
|      |  | ||||||
| } |  | ||||||
| @ -1,18 +1,50 @@ | |||||||
| <script setup lang="ts"> | <script setup lang="ts"> | ||||||
| import JsonEditorVue from 'json-editor-vue3'; | import JsonEditorVue from 'json-editor-vue'; | ||||||
| import { withDefaultOnError } from '@/utils/defaults'; | import { type AfterSelection, type InsideSelection, type JSONEditorSelection, type KeySelection, type MultiSelection, type ValueSelection, isAfterSelection, isInsideSelection, isKeySelection, isMultiSelection, isValueSelection, stringifyJSONPath } from 'vanilla-jsoneditor'; | ||||||
|  | import 'vanilla-jsoneditor/themes/jse-theme-dark.css'; | ||||||
|  | import { useStyleStore } from '@/stores/style.store'; | ||||||
| 
 | 
 | ||||||
| const jsonData = ref({ array: [1, 2, 3] }); | const styleStore = useStyleStore(); | ||||||
| const jsonText = computed(() => withDefaultOnError(() => JSON.stringify(jsonData.value, null, 2), '')); | 
 | ||||||
|  | const jsonText = ref('{ "a": { "array": [1, 2, 3] } }'); | ||||||
|  | const jsonPath = ref(''); | ||||||
|  | 
 | ||||||
|  | function updateJsonPath(selection: JSONEditorSelection) { | ||||||
|  |   if (isAfterSelection (selection)) { | ||||||
|  |     jsonPath.value = `$.${stringifyJSONPath((selection as AfterSelection).path)}`; | ||||||
|  |   } | ||||||
|  |   else if (isInsideSelection (selection)) { | ||||||
|  |     jsonPath.value = `$.${stringifyJSONPath((selection as InsideSelection).path)}`; | ||||||
|  |   } | ||||||
|  |   else if (isKeySelection (selection)) { | ||||||
|  |     jsonPath.value = `$.${stringifyJSONPath((selection as KeySelection).path)}`; | ||||||
|  |   } | ||||||
|  |   else if (isValueSelection (selection)) { | ||||||
|  |     jsonPath.value = `$.${stringifyJSONPath((selection as ValueSelection).path)}`; | ||||||
|  |   } | ||||||
|  |   else if (isMultiSelection (selection)) { | ||||||
|  |     jsonPath.value = `$.${stringifyJSONPath((selection as MultiSelection).focusPath)}`; | ||||||
|  |   } | ||||||
|  |   else { | ||||||
|  |     jsonPath.value = 'No available in this mode'; | ||||||
|  |   } | ||||||
|  | } | ||||||
| </script> | </script> | ||||||
| 
 | 
 | ||||||
| <template> | <template> | ||||||
|   <div> |   <div> | ||||||
|     <JsonEditorVue |     <JsonEditorVue | ||||||
|       v-model="jsonData" |       v-model="jsonText" | ||||||
|       mode="text" |       mode="text" | ||||||
|  |       :class="styleStore.isDarkTheme ? 'jse-theme-dark' : ''" | ||||||
|  |       :on-select="updateJsonPath" | ||||||
|  |       mb-2 | ||||||
|     /> |     /> | ||||||
| 
 | 
 | ||||||
|  |     <n-form-item label="Current Selected Node JSONPath:"> | ||||||
|  |       <textarea-copyable :value="jsonPath" /> | ||||||
|  |     </n-form-item> | ||||||
|  | 
 | ||||||
|     <n-divider /> |     <n-divider /> | ||||||
| 
 | 
 | ||||||
|     <n-form-item label="Your edited JSON:"> |     <n-form-item label="Your edited JSON:"> | ||||||
|  | |||||||
| @ -15,7 +15,6 @@ import { VitePWA } from 'vite-plugin-pwa'; | |||||||
| import markdown from 'vite-plugin-vue-markdown'; | import markdown from 'vite-plugin-vue-markdown'; | ||||||
| import svgLoader from 'vite-svg-loader'; | import svgLoader from 'vite-svg-loader'; | ||||||
| import { configDefaults } from 'vitest/config'; | import { configDefaults } from 'vitest/config'; | ||||||
| import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; |  | ||||||
| 
 | 
 | ||||||
| const baseUrl = process.env.BASE_URL ?? '/'; | const baseUrl = process.env.BASE_URL ?? '/'; | ||||||
| 
 | 
 | ||||||
| @ -98,9 +97,6 @@ export default defineConfig({ | |||||||
|       resolvers: [NaiveUiResolver(), IconsResolver({ prefix: 'icon' })], |       resolvers: [NaiveUiResolver(), IconsResolver({ prefix: 'icon' })], | ||||||
|     }), |     }), | ||||||
|     Unocss(), |     Unocss(), | ||||||
|     viteCommonjs({ |  | ||||||
|       include: ['jsoneditor'], |  | ||||||
|     }), |  | ||||||
|   ], |   ], | ||||||
|   base: baseUrl, |   base: baseUrl, | ||||||
|   resolve: { |   resolve: { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user