mirrors/it-tools
1
0
Fork 0
mirror of https://github.com/CorentinTh/it-tools.git synced 2025-05-08 07:11:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Using existing yaml package instead of js-yaml

Browse source
This commit is contained in:
Isaiah 2023-11-29 14:04:10 -05:00
parent 5f92d640c9
commit 1e8dc931a9
4 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -62,7 +62,6 @@
"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",
"js-yaml": "^4.1.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",
@ -102,7 +101,6 @@
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/dompurify": "^3.0.5", "@types/dompurify": "^3.0.5",
"@types/js-yaml": "^4.0.9",
"@types/jsdom": "^21.0.0", "@types/jsdom": "^21.0.0",
"@types/lodash": "^4.14.192", "@types/lodash": "^4.14.192",
"@types/mime-types": "^2.1.1", "@types/mime-types": "^2.1.1",

11
pnpm-lock.yaml generated
View file

@ -86,9 +86,6 @@ dependencies:
ibantools: ibantools:
specifier: ^4.3.3 specifier: ^4.3.3
version: 4.3.3 version: 4.3.3
js-yaml:
specifier: ^4.1.0
version: 4.1.0
json5: json5:
specifier: ^2.2.3 specifier: ^2.2.3
version: 2.2.3 version: 2.2.3
@ -202,9 +199,6 @@ devDependencies:
'@types/dompurify': '@types/dompurify':
specifier: ^3.0.5 specifier: ^3.0.5
version: 3.0.5 version: 3.0.5
'@types/js-yaml':
specifier: ^4.0.9
version: 4.0.9
'@types/jsdom': '@types/jsdom':
specifier: ^21.0.0 specifier: ^21.0.0
version: 21.1.0 version: 21.1.0
@ -2948,10 +2942,6 @@ packages:
'@types/node': 18.15.11 '@types/node': 18.15.11
dev: true dev: true
/@types/js-yaml@4.0.9:
resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
dev: true
/@types/jsdom@21.1.0: /@types/jsdom@21.1.0:
resolution: {integrity: sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==} resolution: {integrity: sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==}
dependencies: dependencies:
@ -6530,6 +6520,7 @@ packages:
hasBin: true hasBin: true
dependencies: dependencies:
argparse: 2.0.1 argparse: 2.0.1
dev: true
/jsbn@1.1.0: /jsbn@1.1.0:
resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==} resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}

8
src/tools/yaml-viewer/yaml-models.ts
View file

@ -1,6 +1,6 @@
import { type MaybeRef, get } from '@vueuse/core'; import { type MaybeRef, get } from '@vueuse/core';
import yaml from 'js-yaml'; import yaml from 'yaml';
export { formatYaml }; export { formatYaml };
@ -13,10 +13,10 @@ function formatYaml({
sortKeys?: MaybeRef<boolean> sortKeys?: MaybeRef<boolean>
indentSize?: MaybeRef<number> indentSize?: MaybeRef<number>
}) { }) {
const parsedYaml = yaml.load(get(rawYaml)); const parsedYaml = yaml.parse(get(rawYaml));
const formattedYAML = yaml.dump(parsedYaml, { const formattedYAML = yaml.stringify(parsedYaml, {
sortKeys: get(sortKeys), sortMapEntries: get(sortKeys),
indent: get(indentSize), indent: get(indentSize),
}); });

4
src/tools/yaml-viewer/yaml-viewer.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import yaml from 'js-yaml'; import yaml from 'yaml';
import { useStorage } from '@vueuse/core'; import { useStorage } from '@vueuse/core';
import { formatYaml } from './yaml-models'; import { formatYaml } from './yaml-models';
import { withDefaultOnError } from '@/utils/defaults'; import { withDefaultOnError } from '@/utils/defaults';
@ -18,7 +18,7 @@ const rawYamlValidation = useValidation({
source: rawYaml, source: rawYaml,
rules: [ rules: [
{ {
validator: v => v === '' || yaml.load(v), validator: v => v === '' || yaml.parse(v),
message: 'Provided YAML is not valid.', message: 'Provided YAML is not valid.',
}, },
], ],