diff --git a/package.json b/package.json
index 0fb7bacf..20cd0783 100644
--- a/package.json
+++ b/package.json
@@ -211,6 +211,7 @@
"naive-ui": "^2.35.0",
"nanoid": "^5.0.9",
"nanoid-dictionary": "^4.3.0",
+ "nestify-anything": "^3.0.3",
"netmask": "^2.0.2",
"netstack.js": "^2.1.1",
"nginx-config-formatter": "^1.4.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7fed794f..a892b5d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -530,6 +530,9 @@ dependencies:
nanoid-dictionary:
specifier: ^4.3.0
version: 4.3.0
+ nestify-anything:
+ specifier: ^3.0.3
+ version: 3.0.3
netmask:
specifier: ^2.0.2
version: 2.0.2
@@ -2793,7 +2796,7 @@ packages:
'@babel/helper-split-export-declaration': 7.22.6
'@babel/parser': 7.22.10
'@babel/types': 7.22.10
- debug: 4.3.4
+ debug: 4.4.0
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -12692,6 +12695,11 @@ packages:
engines: {node: '>=18'}
dev: false
+ /is-what@5.2.1:
+ resolution: {integrity: sha512-FLNNgur29o+0/G6RcG3B6KRDCT6SvMfb7MlfjdydTZWPgBLfiemceChDhY0DHu50O35BDNbNp4rJLQXMt4fG0g==}
+ engines: {node: '>=18'}
+ dev: false
+
/is-windows@1.0.2:
resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
engines: {node: '>=0.10.0'}
@@ -13729,6 +13737,13 @@ packages:
engines: {node: '>= 0.10.0'}
dev: false
+ /merge-anything@6.0.6:
+ resolution: {integrity: sha512-F3K1W45PvTjRZzbcYIhXntNr8cux00gUxR8IzNPPG+80gNlAHZGVBwFyN4x5yjw/7QkLPKDbRQBK4KrJKo69mw==}
+ engines: {node: '>=18'}
+ dependencies:
+ is-what: 5.2.1
+ dev: false
+
/merge-stream@2.0.0:
resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
dev: true
@@ -14085,6 +14100,13 @@ packages:
dev: true
optional: true
+ /nestify-anything@3.0.3:
+ resolution: {integrity: sha512-prpbKIksMjdlnaSrkKn86b1p883y3phhPk3euQC5nqKONLbtWTVZ0772uouIBzr2QxhaJgyylIUhll/iNdeaJQ==}
+ engines: {node: '>=18'}
+ dependencies:
+ merge-anything: 6.0.6
+ dev: false
+
/netmask@2.0.2:
resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
engines: {node: '>= 0.4.0'}
diff --git a/src/tools/excel-to-data/excel-to-data.service.test.ts b/src/tools/excel-to-data/excel-to-data.service.test.ts
deleted file mode 100644
index 557d21d6..00000000
--- a/src/tools/excel-to-data/excel-to-data.service.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import yaml from 'yaml';
-import type { ExportFormat } from './excel-to-data.service';
-import { objectArrayToData } from './excel-to-data.service';
-
-describe('objectArrayToData', () => {
- const sampleData = [
- { id: 1, name: 'Alice', age: 25 },
- { id: 2, name: 'Bob', age: 30 },
- ];
- const tableName = 'users';
-
- it('should export JSON format correctly', () => {
- const result = objectArrayToData(sampleData, 'json', tableName);
- expect(result).toBe(JSON.stringify(sampleData, null, 2));
- });
-
- it('should export YAML format correctly', () => {
- const result = objectArrayToData(sampleData, 'yaml', tableName);
- expect(result).toBe(yaml.stringify(sampleData));
- });
-
- it('should export SQL format correctly', () => {
- const result = objectArrayToData(sampleData, 'sql', tableName);
- expect(result).toBe(`INSERT INTO users (id, name, age) VALUES (1, 'Alice', 25);
-INSERT INTO users (id, name, age) VALUES (2, 'Bob', 30);`);
- });
-
- it('should export CSV format correctly', () => {
- const result = objectArrayToData(sampleData, 'csv', tableName);
- expect(result).toContain('"id","name","age"');
- expect(result).toContain('"1","Alice","25"');
- expect(result).toContain('"2","Bob","30"');
- });
-
- it('should export Markdown format correctly', () => {
- const result = objectArrayToData(sampleData, 'markdown', tableName);
- expect(result).toContain('| id | name | age |');
- expect(result).toContain('| --- | --- | --- |');
- expect(result).toContain('| 1 | Alice | 25 |');
- expect(result).toContain('| 2 | Bob | 30 |');
- });
-
- it('should return empty string for unknown format', () => {
- const result = objectArrayToData(sampleData, 'unknown' as ExportFormat, tableName);
- expect(result).toBe('');
- });
-});
diff --git a/src/tools/excel-to-data/excel-to-data.service.ts b/src/tools/excel-to-data/excel-to-data.service.ts
deleted file mode 100644
index e18cab43..00000000
--- a/src/tools/excel-to-data/excel-to-data.service.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import yaml from 'yaml';
-
-export type ExportFormat = 'json' | 'yaml' | 'sql' | 'csv' | 'tsv' | 'csv_semicolon' | 'markdown';
-
-function escapeSQL(value: any) {
- return typeof value === 'string' ? `'${value.replace(/'/g, '\'\'')}'` : value;
-}
-
-function escapeCSV(value: any) {
- return `"${String(value).replace(/"/g, '""')}"`;
-}
-
-function escapeMarkdown(value: any) {
- return String(value).replace(/\|/g, '\\|').replace(/`/g, '\\`');
-}
-
-export function objectArrayToData(data: object[], format: ExportFormat, tableName: string) {
- switch (format) {
- case 'json':
- return JSON.stringify(data, null, 2);
- case 'yaml':
- return yaml.stringify(data);
- case 'sql':
- return data.map((row) => {
- const keys = Object.keys(row).map(k => k?.replace(/\s/g, '')).join(', ');
- const values = Object.values(row).map(escapeSQL).join(', ');
- return `INSERT INTO ${tableName} (${keys}) VALUES (${values});`;
- }).join('\n');
- case 'csv':
- case 'tsv':
- case 'csv_semicolon':
- // eslint-disable-next-line no-case-declarations
- let sep = ',';
- if (format === 'tsv') {
- sep = '\t';
- }
- else if (format === 'csv_semicolon') {
- sep = ';';
- }
- return [
- Object.keys(data[0]).map(escapeCSV).join(sep),
- ...data.map(row => Object.values(row).map(escapeCSV).join(sep)),
- ].join('\n');
- case 'markdown':
- return `| ${Object.keys(data[0]).map(escapeMarkdown).join(' | ')} |\n| ${Object.keys(data[0]).map(() => '---').join(' | ')} |\n${
- data.map(row => `| ${Object.values(row).map(escapeMarkdown).join(' | ')} |`).join('\n')}`;
- default:
- return '';
- }
-}
diff --git a/src/tools/excel-to-data/excel-to-data.vue b/src/tools/excel-to-data/excel-to-data.vue
index 14f40d5c..9ffa4658 100644
--- a/src/tools/excel-to-data/excel-to-data.vue
+++ b/src/tools/excel-to-data/excel-to-data.vue
@@ -1,12 +1,15 @@
@@ -42,17 +60,30 @@ function convertFile() {
@file-upload="handleFileUpload"
/>
+