diff --git a/package.json b/package.json index 3f828831..3c138c00 100644 --- a/package.json +++ b/package.json @@ -213,6 +213,7 @@ "mathjs": "^14.2.1", "md-editor-v3": "^4.21.3", "memorystream": "^0.3.1", + "merge-anything": "^6.0.6", "mermaid": "^11.6.0", "mime-types": "^2.1.35", "mitex-wasm": "^0.2.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23a7d63e..55d14ab9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -527,6 +527,9 @@ dependencies: memorystream: specifier: ^0.3.1 version: 0.3.1 + merge-anything: + specifier: ^6.0.6 + version: 6.0.6 mermaid: specifier: ^11.6.0 version: 11.6.0 @@ -11312,7 +11315,7 @@ packages: resolution: {integrity: sha512-tNBpTytI180+uGpKu4dFupbkA7rmEl+ZFo27mSeR8Ov80rpMDBbmLORGTsCkCN8s50aOS79P0sg3YUKz3Tr/4Q==} engines: {node: '>=18'} dependencies: - is-what: 5.0.2 + is-what: 5.2.1 ts-toolbelt: 9.6.0 dev: false diff --git a/src/tools/json-merger/index.ts b/src/tools/json-merger/index.ts new file mode 100644 index 00000000..0dc886ba --- /dev/null +++ b/src/tools/json-merger/index.ts @@ -0,0 +1,13 @@ +import { Braces } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'JSON Merger', + path: '/json-merger', + description: 'Merge deeply two JSON content', + keywords: ['json', 'merger'], + component: () => import('./json-merger.vue'), + icon: Braces, + createdAt: new Date('2025-07-19'), + category: 'JSON', +}); diff --git a/src/tools/json-merger/json-merger.vue b/src/tools/json-merger/json-merger.vue new file mode 100644 index 00000000..d52a4154 --- /dev/null +++ b/src/tools/json-merger/json-merger.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/tools/json-merger/merge-anything.d.ts b/src/tools/json-merger/merge-anything.d.ts new file mode 100644 index 00000000..5e3959c8 --- /dev/null +++ b/src/tools/json-merger/merge-anything.d.ts @@ -0,0 +1,3 @@ +declare module 'merge-anything' { + export function merge(obj1: any, obj2: any): any; +} \ No newline at end of file diff --git a/src/tools/yaml-merger/index.ts b/src/tools/yaml-merger/index.ts new file mode 100644 index 00000000..85f0e2bd --- /dev/null +++ b/src/tools/yaml-merger/index.ts @@ -0,0 +1,14 @@ +import { AlignJustified } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'YAML Merger', + path: '/yaml-merger', + description: 'Merge deeply two YAML content', + keywords: ['yaml', 'merger'], + component: () => import('./yaml-merger.vue'), + icon: AlignJustified, + createdAt: new Date('2025-07-19'), + npmPackages: ['yaml'], + category: 'YAML', +}); diff --git a/src/tools/yaml-merger/yaml-merger.vue b/src/tools/yaml-merger/yaml-merger.vue new file mode 100644 index 00000000..ac8bc644 --- /dev/null +++ b/src/tools/yaml-merger/yaml-merger.vue @@ -0,0 +1,42 @@ + + +