diff --git a/components.d.ts b/components.d.ts index ac2824ad..e39000f4 100644 --- a/components.d.ts +++ b/components.d.ts @@ -146,10 +146,18 @@ declare module '@vue/runtime-core' { IcalMerger: typeof import('./src/tools/ical-merger/ical-merger.vue')['default'] IcalParser: typeof import('./src/tools/ical-parser/ical-parser.vue')['default'] IcoConverter: typeof import('./src/tools/ico-converter/ico-converter.vue')['default'] + 'IconMdi:brushVariant': typeof import('~icons/mdi/brush-variant')['default'] 'IconMdi:kettleSteamOutline': typeof import('~icons/mdi/kettle-steam-outline')['default'] + IconMdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] + IconMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default'] IconMdiClose: typeof import('~icons/mdi/close')['default'] + IconMdiContentCopy: typeof import('~icons/mdi/content-copy')['default'] IconMdiEye: typeof import('~icons/mdi/eye')['default'] IconMdiEyeOff: typeof import('~icons/mdi/eye-off')['default'] + IconMdiHeart: typeof import('~icons/mdi/heart')['default'] + IconMdiSearch: typeof import('~icons/mdi/search')['default'] + IconMdiTranslate: typeof import('~icons/mdi/translate')['default'] + IconMdiTriangleDown: typeof import('~icons/mdi/triangle-down')['default'] ImageConverter: typeof import('./src/tools/image-converter/image-converter.vue')['default'] ImageExifReader: typeof import('./src/tools/image-exif-reader/image-exif-reader.vue')['default'] ImageResizer: typeof import('./src/tools/image-resizer/image-resizer.vue')['default'] @@ -229,13 +237,27 @@ declare module '@vue/runtime-core' { MongoObjectidConverter: typeof import('./src/tools/mongo-objectid-converter/mongo-objectid-converter.vue')['default'] MorseConverter: typeof import('./src/tools/morse-converter/morse-converter.vue')['default'] MultiLinkDownloader: typeof import('./src/tools/multi-link-downloader/multi-link-downloader.vue')['default'] + NAlert: typeof import('naive-ui')['NAlert'] NanoidGenerator: typeof import('./src/tools/nanoid-generator/nanoid-generator.vue')['default'] NanoMemo: typeof import('./src/tools/nano-memo/nano-memo.vue')['default'] 'NanoMemo.content': typeof import('./src/tools/nano-memo/nano-memo.content.md')['default'] NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default'] + NCode: typeof import('naive-ui')['NCode'] + NCollapseTransition: typeof import('naive-ui')['NCollapseTransition'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] + NDivider: typeof import('naive-ui')['NDivider'] + NEllipsis: typeof import('naive-ui')['NEllipsis'] + NFormItem: typeof import('naive-ui')['NFormItem'] NginxFormatter: typeof import('./src/tools/nginx-formatter/nginx-formatter.vue')['default'] + NH1: typeof import('naive-ui')['NH1'] + NH3: typeof import('naive-ui')['NH3'] NIcon: typeof import('naive-ui')['NIcon'] + NInputNumber: typeof import('naive-ui')['NInputNumber'] + NLayout: typeof import('naive-ui')['NLayout'] + NLayoutSider: typeof import('naive-ui')['NLayoutSider'] + NMenu: typeof import('naive-ui')['NMenu'] + NScrollbar: typeof import('naive-ui')['NScrollbar'] + NSwitch: typeof import('naive-ui')['NSwitch'] NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default'] OcrImage: typeof import('./src/tools/ocr-image/ocr-image.vue')['default'] Option43Generator: typeof import('./src/tools/option43-generator/option43-generator.vue')['default'] diff --git a/src/tools/yaml-viewer/composeverter.d.ts b/src/tools/yaml-viewer/composeverter.d.ts index 44b6303e..eda6f43f 100644 --- a/src/tools/yaml-viewer/composeverter.d.ts +++ b/src/tools/yaml-viewer/composeverter.d.ts @@ -17,4 +17,5 @@ declare module 'composeverter' { export function migrateFromV2xToV3x(content: string, configuration?: Configuration = null): string; export function getDockerComposeSchemaWithoutFormats(): object; export function yamlParse(content: string): object; + export function yamlCheck(content: string): object; } \ No newline at end of file diff --git a/src/tools/yaml-viewer/yaml-models.ts b/src/tools/yaml-viewer/yaml-models.ts index 9167fd7a..83726815 100644 --- a/src/tools/yaml-viewer/yaml-models.ts +++ b/src/tools/yaml-viewer/yaml-models.ts @@ -1,5 +1,5 @@ import { type MaybeRef, get } from '@vueuse/core'; -import { yamlParse } from 'composeverter'; +import { yamlCheck } from 'composeverter'; import yaml from 'yaml'; export { formatYaml }; @@ -13,7 +13,9 @@ function formatYaml({ sortKeys?: MaybeRef indentSize?: MaybeRef }) { - const parsedYaml = yamlParse(get(rawYaml)); + const rawYamlString = get(rawYaml); + yamlCheck(rawYamlString); + const parsedYaml = yaml.parse(rawYamlString, { intAsBigInt: true }); const formattedYAML = yaml.stringify(parsedYaml, { sortMapEntries: get(sortKeys),