diff --git a/package.json b/package.json index 80c0dd10..91654ebb 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "bcryptjs": "^2.4.3", "big.js": "^6.2.2", "bwip-js": "^4.5.1", - "change-case": "^4.1.2", + "change-case": "^5.4.4", "chatgpt-prompt-splitter": "^1.0.5", "chinesegen": "^0.3.3", "cidr-tools": "^11.0.2", @@ -313,7 +313,7 @@ "eslint": "^8.47.0", "hygen": "^6.2.11", "jsdom": "^22.0.0", - "less": "^4.1.3", + "less": "^4.2.2", "prettier": "^3.0.0", "typescript": "~5.2.2", "unocss": "^0.57.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 462647a3..23e1fc7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ dependencies: specifier: ^4.5.1 version: 4.5.1 change-case: - specifier: ^4.1.2 - version: 4.1.2 + specifier: ^5.4.4 + version: 5.4.4 chatgpt-prompt-splitter: specifier: ^1.0.5 version: 1.0.5 @@ -830,7 +830,7 @@ devDependencies: specifier: ^22.0.0 version: 22.1.0 less: - specifier: ^4.1.3 + specifier: ^4.2.2 version: 4.2.2 prettier: specifier: ^3.0.0 @@ -7720,13 +7720,6 @@ packages: upper-case: 1.1.3 dev: true - /camel-case@4.1.2: - resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==} - dependencies: - pascal-case: 3.1.2 - tslib: 2.8.1 - dev: false - /camelcase@5.3.1: resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} engines: {node: '>=6'} @@ -7744,14 +7737,6 @@ packages: /caniuse-lite@1.0.30001695: resolution: {integrity: sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==} - /capital-case@1.0.4: - resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - upper-case-first: 2.0.2 - dev: false - /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} dev: false @@ -7827,21 +7812,8 @@ packages: upper-case-first: 1.1.2 dev: true - /change-case@4.1.2: - resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==} - dependencies: - camel-case: 4.1.2 - capital-case: 1.0.4 - constant-case: 3.0.4 - dot-case: 3.0.4 - header-case: 2.0.4 - no-case: 3.0.4 - param-case: 3.0.4 - pascal-case: 3.1.2 - path-case: 3.0.4 - sentence-case: 3.0.4 - snake-case: 3.0.4 - tslib: 2.5.0 + /change-case@5.4.4: + resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==} dev: false /character-entities-html4@2.1.0: @@ -8186,14 +8158,6 @@ packages: upper-case: 1.1.3 dev: true - /constant-case@3.0.4: - resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==} - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - upper-case: 2.0.2 - dev: false - /constants-browserify@1.0.0: resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} dev: true @@ -8948,13 +8912,6 @@ packages: no-case: 2.3.2 dev: true - /dot-case@3.0.4: - resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - dev: false - /drange@1.1.1: resolution: {integrity: sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==} engines: {node: '>=4'} @@ -10815,13 +10772,6 @@ packages: upper-case: 1.1.3 dev: true - /header-case@2.0.4: - resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==} - dependencies: - capital-case: 1.0.4 - tslib: 2.8.1 - dev: false - /heic-convert@2.1.0: resolution: {integrity: sha512-1qDuRvEHifTVAj3pFIgkqGgJIr0M3X7cxEPjEp0oG4mo8GFjq99DpCo8Eg3kg17Cy0MTjxpFdoBHOatj7ZVKtg==} engines: {node: '>=12.0.0'} @@ -12338,12 +12288,6 @@ packages: resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==} dev: true - /lower-case@2.0.2: - resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} - dependencies: - tslib: 2.8.1 - dev: false - /lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} dev: false @@ -12960,13 +12904,6 @@ packages: lower-case: 1.1.4 dev: true - /no-case@3.0.4: - resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} - dependencies: - lower-case: 2.0.2 - tslib: 2.8.1 - dev: false - /node-abi@3.73.0: resolution: {integrity: sha512-z8iYzQGBu35ZkTQ9mtR8RqugJZ9RCLn8fv3d7LsgDBzOijGQP3RdKTX4LA7LXw03ZhU5z0l4xfhIMgSES31+cg==} engines: {node: '>=10'} @@ -13434,13 +13371,6 @@ packages: no-case: 2.3.2 dev: true - /param-case@3.0.4: - resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} - dependencies: - dot-case: 3.0.4 - tslib: 2.8.1 - dev: false - /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -13554,13 +13484,6 @@ packages: upper-case-first: 1.1.2 dev: true - /pascal-case@3.1.2: - resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - dev: false - /path-browserify@1.0.1: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} dev: true @@ -13571,13 +13494,6 @@ packages: no-case: 2.3.2 dev: true - /path-case@3.0.4: - resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} - dependencies: - dot-case: 3.0.4 - tslib: 2.8.1 - dev: false - /path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -14815,6 +14731,7 @@ packages: /semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true /semver@7.5.1: resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==} @@ -14849,14 +14766,6 @@ packages: upper-case-first: 1.1.2 dev: true - /sentence-case@3.0.4: - resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==} - dependencies: - no-case: 3.0.4 - tslib: 2.8.1 - upper-case-first: 2.0.2 - dev: false - /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} dependencies: @@ -15093,13 +15002,6 @@ packages: no-case: 2.3.2 dev: true - /snake-case@3.0.4: - resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} - dependencies: - dot-case: 3.0.4 - tslib: 2.8.1 - dev: false - /sortablejs@1.14.0: resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==} dev: false @@ -15949,10 +15851,6 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true - /tslib@2.5.0: - resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - dev: false - /tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} requiresBuild: true @@ -16542,22 +16440,10 @@ packages: upper-case: 1.1.3 dev: true - /upper-case-first@2.0.2: - resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} - dependencies: - tslib: 2.8.1 - dev: false - /upper-case@1.1.3: resolution: {integrity: sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==} dev: true - /upper-case@2.0.2: - resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} - dependencies: - tslib: 2.8.1 - dev: false - /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: diff --git a/src/tools/case-converter/case-converter.vue b/src/tools/case-converter/case-converter.vue index f9343ef1..18dbbe53 100644 --- a/src/tools/case-converter/case-converter.vue +++ b/src/tools/case-converter/case-converter.vue @@ -4,78 +4,97 @@ import { capitalCase, constantCase, dotCase, - headerCase, + kebabCase, noCase, - paramCase, pascalCase, pathCase, sentenceCase, snakeCase, + trainCase, } from 'change-case'; import InputCopyable from '../../components/InputCopyable.vue'; +import { useQueryParamOrStorage } from '@/composable/queryParams'; +import { useValidation } from '@/composable/validation'; -const baseConfig = { - stripRegexp: /[^A-Za-zÀ-ÖØ-öø-ÿ]+/gi, -}; +const cleaningRegex = useQueryParamOrStorage({ name: 'clean', storageName: 'case-conv:cl', defaultValue: '[^\\w\\d\\s]' }); +const cleaningRegexValidation = useValidation({ + source: cleaningRegex, + rules: [ + { + message: 'Invalid cleaning regex: {0}', + validator: value => new RegExp(value), + getErrorMessage: (value) => { + const _ = new RegExp(value); + return ''; + }, + }, + ], +}); const input = ref('lorem ipsum dolor sit amet'); +const inputCleaned = computed(() => { + if (!cleaningRegexValidation.isValid) { + return input.value; + } + return input.value.replace(new RegExp(cleaningRegex.value, 'g'), ''); +}); const formats = computed(() => [ { label: 'Lowercase:', - value: input.value.toLocaleLowerCase(), + value: inputCleaned.value.toLocaleLowerCase(), }, { label: 'Uppercase:', - value: input.value.toLocaleUpperCase(), + value: inputCleaned.value.toLocaleUpperCase(), }, { label: 'Camelcase:', - value: camelCase(input.value, baseConfig), + value: camelCase(inputCleaned.value), }, { label: 'Capitalcase:', - value: capitalCase(input.value, baseConfig), + value: capitalCase(inputCleaned.value), }, { label: 'Constantcase:', - value: constantCase(input.value, baseConfig), + value: constantCase(inputCleaned.value), }, { label: 'Dotcase:', - value: dotCase(input.value, baseConfig), + value: dotCase(inputCleaned.value), }, { - label: 'Headercase:', - value: headerCase(input.value, baseConfig), + label: 'Kebab/paramcase:', + value: kebabCase(inputCleaned.value), }, { label: 'Nocase:', - value: noCase(input.value, baseConfig), + value: noCase(inputCleaned.value), }, { - label: 'Paramcase:', - value: paramCase(input.value, baseConfig), + label: 'Train/headercase:', + value: trainCase(inputCleaned.value), }, { label: 'Pascalcase:', - value: pascalCase(input.value, baseConfig), + value: pascalCase(inputCleaned.value), }, { label: 'Pathcase:', - value: pathCase(input.value, baseConfig), + value: pathCase(inputCleaned.value), }, { label: 'Sentencecase:', - value: sentenceCase(input.value, baseConfig), + value: sentenceCase(inputCleaned.value), }, { label: 'Snakecase:', - value: snakeCase(input.value, baseConfig), + value: snakeCase(inputCleaned.value), }, { label: 'Mockingcase:', - value: input.value + value: inputCleaned.value .split('') .map((char, index) => (index % 2 === 0 ? char.toUpperCase() : char.toLowerCase())) .join(''), @@ -84,7 +103,7 @@ const formats = computed(() => [ const inputLabelAlignmentConfig = { labelPosition: 'left', - labelWidth: '120px', + labelWidth: '125px', labelAlign: 'right', }; @@ -97,6 +116,16 @@ const inputLabelAlignmentConfig = { placeholder="Your string..." raw-text v-bind="inputLabelAlignmentConfig" + mb-1 + /> + +