diff --git a/package.json b/package.json index d22dd0b0..c849e40c 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "@types/lodash.flattendeep": "^4.4.9", "@types/lodash.last": "^3.0.9", "@types/turndown": "^5.0.4", + "@types/arr-diff": "^4.0.3", "@types/figlet": "^1.5.8", "@types/markdown-it": "^13.0.7", "@vicons/material": "^0.12.0", @@ -77,6 +78,7 @@ "@vueuse/head": "^1.0.0", "@vueuse/router": "^10.0.0", "@zxing/library": "^0.21.0", + "arr-diff": "^4.0.0", "bcryptjs": "^2.4.3", "change-case": "^4.1.2", "chatgpt-prompt-splitter": "^1.0.5", @@ -104,6 +106,7 @@ "duration-fns": "^3.0.2", "email-normalizer": "^1.0.0", "emojilib": "^3.0.10", + "fast_array_intersect": "^1.1.0", "figlet": "^1.7.0", "figue": "^1.2.0", "flatten-anything": "^4.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7a680a7..b5044384 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,9 @@ dependencies: '@tiptap/vue-3': specifier: 2.7.4 version: 2.7.4(@tiptap/core@2.9.1)(@tiptap/pm@2.7.4)(vue@3.3.4) + '@types/arr-diff': + specifier: ^4.0.3 + version: 4.0.3 '@types/figlet': specifier: ^1.5.8 version: 1.5.8 @@ -113,6 +116,9 @@ dependencies: '@zxing/library': specifier: ^0.21.0 version: 0.21.3 + arr-diff: + specifier: ^4.0.0 + version: 4.0.0 bcryptjs: specifier: ^2.4.3 version: 2.4.3 @@ -191,6 +197,9 @@ dependencies: emojilib: specifier: ^3.0.10 version: 3.0.10 + fast_array_intersect: + specifier: ^1.1.0 + version: 1.1.0 figlet: specifier: ^1.7.0 version: 1.7.0 @@ -3780,6 +3789,10 @@ packages: resolution: {integrity: sha512-yhxwIlFVSVcMym3O31HoMnRXpoenmpIxcj4Yoes2DUpe+xCJnA7ECQP1Vw889V0jTt/2nzvpLQ/UuMYCd3JPIg==} dev: true + /@types/arr-diff@4.0.3: + resolution: {integrity: sha512-oIBe7qtc48Q1JPNuqSIUYCNMQxYzTkQAEw07b0NEZpwKbUeOswzex3qfvXCLrZDIQ9t3ucIxH6JqFmjRTPbDEg==} + dev: false + /@types/asn1@0.2.4: resolution: {integrity: sha512-V91DSJ2l0h0gRhVP4oBfBzRBN9lAbPUkGDMCnwedqPKX2d84aAMc9CulOvxdw1f7DfEYx99afab+Rsm3e52jhA==} dependencies: @@ -5122,6 +5135,11 @@ packages: engines: {node: '>= 0.4'} dev: false + /arr-diff@4.0.0: + resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==} + engines: {node: '>=0.10.0'} + dev: false + /array-buffer-byte-length@1.0.0: resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} dependencies: @@ -7269,6 +7287,10 @@ packages: resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==} dev: false + /fast_array_intersect@1.1.0: + resolution: {integrity: sha512-/DCilZlUdz2XyNDF+ASs0PwY+RKG9Y4Silp/gbS72Cvbg4oibc778xcecg+pnNyiNHYgh/TApsiDTjpdniyShw==} + dev: false + /fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} dependencies: diff --git a/src/tools/index.ts b/src/tools/index.ts index 9fc831ba..bdb7c4ed 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -74,6 +74,7 @@ import { tool as tomlToJson } from './toml-to-json'; import { tool as jsonToCsv } from './json-to-csv'; import { tool as cameraRecorder } from './camera-recorder'; import { tool as listConverter } from './list-converter'; +import { tool as listComparer } from './list-comparer'; import { tool as phoneParserAndFormatter } from './phone-parser-and-formatter'; import { tool as jsonDiff } from './json-diff'; import { tool as ipv4RangeExpander } from './ipv4-range-expander'; @@ -176,6 +177,7 @@ export const toolsByCategory: ToolCategory[] = [ jsonToYaml, jsonToToml, listConverter, + listComparer, tomlToJson, tomlToYaml, htmlToMarkdown, diff --git a/src/tools/list-comparer/index.ts b/src/tools/list-comparer/index.ts new file mode 100644 index 00000000..88262c14 --- /dev/null +++ b/src/tools/list-comparer/index.ts @@ -0,0 +1,12 @@ +import { List } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'Lists Comparer', + path: '/list-comparer', + description: 'Compare two list items', + keywords: ['list', 'comparer'], + component: () => import('./list-comparer.vue'), + icon: List, + createdAt: new Date('2024-08-15'), +}); diff --git a/src/tools/list-comparer/list-comparer.service.test.ts b/src/tools/list-comparer/list-comparer.service.test.ts new file mode 100644 index 00000000..98affcf7 --- /dev/null +++ b/src/tools/list-comparer/list-comparer.service.test.ts @@ -0,0 +1,97 @@ +import { describe, expect, it } from 'vitest'; +import { compareLists } from './list-comparer.service'; + +describe('list-comparer', () => { + describe('compareLists', () => { + it('return correct comparaison', () => { + expect(compareLists({ + list1: '1\n 2\n3\n4\n5\n4\n7\nA', + list2: '1\n2\n3\n4\n6\n4\n7\na', + trimItems: true, + ignoreCase: true, + })).to.deep.eq({ + list1Not2: [ + '5', + ], + list2Not1: [ + '6', + ], + same: [ + '1', + '2', + '3', + '4', + '7', + 'a', + ], + }); + + expect(compareLists({ + list1: '1\n 2\n3\n4\n5\n4\n7\nA', + list2: '1\n2\n3\n4\n6\n4\n7\na', + trimItems: false, + ignoreCase: false, + })).to.deep.eq({ + list1Not2: [ + ' 2', + '5', + 'A', + ], + list2Not1: [ + '2', + '6', + 'a', + ], + same: [ + '1', + '3', + '4', + '7', + ], + }); + + expect(compareLists({ + list1: '1, 2,3,4,5\n4,7,A,A', + list2: '1\n2\n3\n4\n6\n4\n7\na', + trimItems: false, + ignoreCase: false, + separator: ',', + })).to.deep.eq({ + list1Not2: [ + ' 2', + '5', + 'A', + ], + list2Not1: [ + '2', + '6', + 'a', + ], + same: [ + '1', + '3', + '4', + '7', + ], + }); + + expect(compareLists({ + list1: '10\n20\n20\n30', + list2: '30\n20\n40', + trimItems: false, + ignoreCase: false, + })).to.deep.eq({ + list1Not2: [ + '10', + ], + list2Not1: [ + '40', + ], + same: [ + '30', + '20', + ], + }); + }); + }); +}); diff --git a/src/tools/list-comparer/list-comparer.service.ts b/src/tools/list-comparer/list-comparer.service.ts new file mode 100644 index 00000000..c0ca4a45 --- /dev/null +++ b/src/tools/list-comparer/list-comparer.service.ts @@ -0,0 +1,36 @@ +import _ from 'lodash'; +import intersect from 'fast_array_intersect'; +import diff from 'arr-diff'; + +export function compareLists({ + list1, + list2, + ignoreCase = false, + trimItems = true, + separator = '', +}: { + list1: string + list2: string + separator?: string + ignoreCase?: boolean + trimItems?: boolean +}) { + const splitSep = separator ? `${separator}|` : ''; + const splitRegExp = new RegExp(`(?:${splitSep}\\n)`, 'g'); + + const prepareList = (list: string) => + _.chain(list ?? '') + .thru(text => ignoreCase ? text.toLowerCase() : text) + .split(splitRegExp) + .map(text => trimItems ? text.trim() : text) + .value(); + + const list1Arr = prepareList(list1); + const list2Arr = prepareList(list2); + + return { + same: [...new Set(intersect([list1Arr, list2Arr]))], + list2Not1: [...new Set(diff(list2Arr, list1Arr))], + list1Not2: [...new Set(diff(list1Arr, list2Arr))], + }; +} diff --git a/src/tools/list-comparer/list-comparer.vue b/src/tools/list-comparer/list-comparer.vue new file mode 100644 index 00000000..94caa5a4 --- /dev/null +++ b/src/tools/list-comparer/list-comparer.vue @@ -0,0 +1,82 @@ + + +