+
Skip to content

feat(new tool): xml formatter #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ declare module '@vue/runtime-core' {
UserAgentParser: typeof import('./src/tools/user-agent-parser/user-agent-parser.vue')['default']
UserAgentResultCards: typeof import('./src/tools/user-agent-parser/user-agent-result-cards.vue')['default']
UuidGenerator: typeof import('./src/tools/uuid-generator/uuid-generator.vue')['default']
XmlFormatter: typeof import('./src/tools/xml-formatter/xml-formatter.vue')['default']
YamlToJson: typeof import('./src/tools/yaml-to-json-converter/yaml-to-json.vue')['default']
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"uuid": "^8.3.2",
"vue": "^3.2.47",
"vue-router": "^4.1.6",
"xml-formatter": "^3.3.2",
"yaml": "^2.2.1"
},
"devDependencies": {
Expand Down
15 changes: 15 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/components/TextareaCopyable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const props = withDefaults(
hljs.registerLanguage('sql', sqlHljs);
hljs.registerLanguage('json', jsonHljs);
hljs.registerLanguage('html', xmlHljs);
hljs.registerLanguage('xml', xmlHljs);
hljs.registerLanguage('yaml', yamlHljs);

const { value, language, followHeightOf, copyPlacement, copyMessage } = toRefs(props);
Expand Down
2 changes: 2 additions & 0 deletions src/tools/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import { tool as urlEncoder } from './url-encoder';
import { tool as urlParser } from './url-parser';
import { tool as uuidGenerator } from './uuid-generator';
import { tool as macAddressLookup } from './mac-address-lookup';
import { tool as xmlFormatter } from './xml-formatter';

export const toolsByCategory: ToolCategory[] = [
{
Expand Down Expand Up @@ -114,6 +115,7 @@ export const toolsByCategory: ToolCategory[] = [
sqlPrettify,
chmodCalculator,
dockerRunToDockerComposeConverter,
xmlFormatter,
],
},
{
Expand Down
12 changes: 12 additions & 0 deletions src/tools/xml-formatter/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Code } from '@vicons/tabler';
import { defineTool } from '../tool';

export const tool = defineTool({
name: 'XML formatter',
path: '/xml-formatter',
description: 'Prettify your XML string to a human friendly readable format.',
keywords: ['xml', 'prettify', 'format'],
component: () => import('./xml-formatter.vue'),
icon: Code,
createdAt: new Date('2023-06-17'),
});
23 changes: 23 additions & 0 deletions src/tools/xml-formatter/xml-formatter.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { expect, test } from '@playwright/test';

test.describe('Tool - XML formatter', () => {
test.beforeEach(async ({ page }) => {
await page.goto('/xml-formatter');
});

test('Has correct title', async ({ page }) => {
await expect(page).toHaveTitle('XML formatter - IT Tools');
});

test('XML is converted into a human readable format', async ({ page }) => {
await page.getByTestId('input').fill('<foo><bar>baz</bar><bar>baz</bar></foo>');

const formattedXml = await page.getByTestId('area-content').innerText();

expect(formattedXml.trim()).toEqual(`
<foo>
<bar>baz</bar>
<bar>baz</bar>
</foo>`.trim());
});
});
27 changes: 27 additions & 0 deletions src/tools/xml-formatter/xml-formatter.service.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { describe, expect, it } from 'vitest';
import { formatXml } from './xml-formatter.service';

describe('xml-formatter service', () => {
describe('formatXml', () => {
it('converts XML into a human readable format', () => {
const initString = '<hello><world>foo</world><world>bar</world></hello>';

expect(formatXml(initString)).toMatchInlineSnapshot(`
"<hello>
<world>
foo
</world>
<world>
bar
</world>
</hello>"
`);
});

it('returns an empty string if the input is not valid XML', () => {
const initString = 'hello world';

expect(formatXml(initString)).toEqual('');
});
});
});
28 changes: 28 additions & 0 deletions src/tools/xml-formatter/xml-formatter.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import xmlFormat, { type XMLFormatterOptions } from 'xml-formatter';
import { withDefaultOnError } from '@/utils/defaults';

export { formatXml, isValidXML };

function cleanRawXml(rawXml: string): string {
return rawXml.trim();
}

function formatXml(rawXml: string, options?: XMLFormatterOptions): string {
return withDefaultOnError(() => xmlFormat(cleanRawXml(rawXml), options) ?? '', '');
}

function isValidXML(rawXml: string): boolean {
const cleanedRawXml = cleanRawXml(rawXml);

if (cleanedRawXml === '') {
return true;
}

try {
xmlFormat(cleanedRawXml);
return true;
}
catch (e) {
return false;
}
}
46 changes: 46 additions & 0 deletions src/tools/xml-formatter/xml-formatter.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<script setup lang="ts">
import { formatXml, isValidXML } from './xml-formatter.service';
import type { UseValidationRule } from '@/composable/validation';

const defaultValue = '<hello><world>foo</world><world>bar</world></hello>';
const indentSize = useStorage('xml-formatter:indent-size', 2);
const collapseContent = useStorage('xml-formatter:collapse-content', true);

function transformer(value: string) {
return formatXml(value, {
indentation: ' '.repeat(indentSize.value),
collapseContent: collapseContent.value,
lineSeparator: '\n',
});
}

const rules: UseValidationRule<string>[] = [
{
validator: isValidXML,
message: 'Provided XML is not valid.',
},
];
</script>

<template>
<div important:flex-full important:flex-shrink-0 important:flex-grow-0>
<div flex justify-center>
<n-form-item label="Collapse content:" label-placement="left">
<n-switch v-model:value="collapseContent" />
</n-form-item>
<n-form-item label="Indent size:" label-placement="left" label-width="100" :show-feedback="false">
<n-input-number v-model:value="indentSize" min="0" max="10" w-100px />
</n-form-item>
</div>
</div>

<format-transformer
input-label="Your XML"
input-placeholder="Paste your XML here..."
output-label="Formatted XML from your XML"
output-language="xml"
:input-validation-rules="rules"
:transformer="transformer"
:input-default="defaultValue"
/>
</template>
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载