{
`,
})
class TestComponent {
- @ViewChild('element')
+ @ViewChild(`element`)
readonly element!: ElementRef
;
- content = '';
+ content = ``;
context?: SecurityContext = SecurityContext.HTML;
config? = {};
@@ -66,7 +65,7 @@ describe('NgDompurifyPipe', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [CommonModule, NgDompurifyModule],
+ imports: [CommonModule, NgDompurifyPipe],
declarations: [TestComponent],
providers: [
{
@@ -75,13 +74,11 @@ describe('NgDompurifyPipe', () => {
},
{
provide: APP_BASE_HREF,
- useValue: '/',
+ useValue: `/`,
},
],
});
- });
- beforeEach(() => {
fixture = TestBed.createComponent(TestComponent);
testComponent = fixture.componentInstance;
fixture.detectChanges();
@@ -91,14 +88,14 @@ describe('NgDompurifyPipe', () => {
removeAllHooks();
});
- it('sanitizes HTML', () => {
+ it(`sanitizes HTML`, () => {
testComponent.content = dirtyHtml;
fixture.detectChanges();
expect(testComponent.element.nativeElement.innerHTML).toBe(cleanHtml);
});
- it('sanitizes HTML by default', () => {
+ it(`sanitizes HTML by default`, () => {
testComponent.content = dirtyHtml;
testComponent.context = undefined;
testComponent.config = undefined;
@@ -107,55 +104,56 @@ describe('NgDompurifyPipe', () => {
expect(testComponent.element.nativeElement.innerHTML).toBe(cleanHtml);
});
- it('sanitizes HTML with config', () => {
+ it(`sanitizes HTML with config`, () => {
testComponent.content = dirtyHtml;
- testComponent.config = {FORBID_TAGS: ['br']};
+ testComponent.config = {FORBID_TAGS: [`br`]};
fixture.detectChanges();
expect(testComponent.element.nativeElement.innerHTML).toBe(
- cleanHtml.replace('
', ''),
+ cleanHtml.replace(`
`, ``),
);
});
- it('sanitizes URL', () => {
+ it(`sanitizes URL`, () => {
testComponent.content = dirtyUrl;
testComponent.context = SecurityContext.URL;
fixture.detectChanges();
- expect(testComponent.element.nativeElement.getAttribute('src')).toBe(cleanUrl);
+ expect(testComponent.element.nativeElement.getAttribute(`src`)).toBe(cleanUrl);
});
- it('sanitizes RESOURCE URL', () => {
+ it(`sanitizes RESOURCE URL`, () => {
testComponent.content = dirtyUrl;
testComponent.context = SecurityContext.RESOURCE_URL;
fixture.detectChanges();
- expect(testComponent.element.nativeElement.getAttribute('src')).toBe(cleanUrl);
+ expect(testComponent.element.nativeElement.getAttribute(`src`)).toBe(cleanUrl);
});
- it('sanitizes STYLE', () => {
- testComponent.content = 'some style';
+ it(`sanitizes STYLE`, () => {
+ testComponent.content = `some style`;
testComponent.context = SecurityContext.STYLE;
fixture.detectChanges();
- expect(testComponent.element.nativeElement.getAttribute('style')).toBe(null);
+ expect(testComponent.element.nativeElement.getAttribute(`style`)).toBeNull();
});
- it('throws error by using SCRIPT security context', done => {
+ it(`throws error by using SCRIPT security context`, done => {
try {
testComponent.context = SecurityContext.SCRIPT;
fixture.detectChanges();
} catch (error) {
+ // eslint-disable-next-line jest/no-conditional-expect
expect(error).toBeTruthy();
done();
}
});
- it('clears content when used with NONE context', () => {
+ it(`clears content when used with NONE context`, () => {
testComponent.content = dirtyHtml;
testComponent.context = SecurityContext.NONE;
fixture.detectChanges();
- expect(testComponent.element.nativeElement.innerHTML).toBe('');
+ expect(testComponent.element.nativeElement.innerHTML).toBe(``);
});
});
diff --git a/projects/ng-dompurify/tests/ng-dompurify.service.spec.ts b/projects/ng-dompurify/tests/ng-dompurify.service.spec.ts
new file mode 100644
index 0000000..a5c42ac
--- /dev/null
+++ b/projects/ng-dompurify/tests/ng-dompurify.service.spec.ts
@@ -0,0 +1,116 @@
+import {APP_BASE_HREF} from '@angular/common';
+import {SecurityContext} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {
+ DOMPURIFY_HOOKS,
+ NgDompurifyHook,
+ NgDompurifySanitizer,
+ SANITIZE_STYLE,
+} from '@tinkoff/ng-dompurify';
+import {removeAllHooks} from 'dompurify';
+
+import {cleanHtml, dirtyHtml} from './test-samples/html';
+import {sanitizeStyle} from './test-samples/sanitize-style';
+import {cleanUrl, dirtyUrl} from './test-samples/url';
+
+describe(`Purify`, () => {
+ describe(`NgDompurifySanitizer`, () => {
+ const hooks: readonly NgDompurifyHook[] = [
+ {
+ name: `beforeSanitizeAttributes`,
+ hook: (node: Element) => {
+ if (node instanceof HTMLElement) {
+ node.removeAttribute(`id`);
+ }
+ },
+ },
+ ];
+ let service: NgDompurifySanitizer;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [
+ {
+ provide: SANITIZE_STYLE,
+ useValue: sanitizeStyle,
+ },
+ {
+ provide: DOMPURIFY_HOOKS,
+ useValue: hooks,
+ },
+ NgDompurifySanitizer,
+ {
+ provide: APP_BASE_HREF,
+ useValue: `/`,
+ },
+ ],
+ });
+
+ service = TestBed.inject(NgDompurifySanitizer);
+ });
+
+ afterEach(() => {
+ removeAllHooks();
+ });
+
+ it(`should be created`, () => {
+ expect(service).toBeTruthy();
+ });
+
+ it(`should work with null value`, () => {
+ const sanitized = service.sanitize(SecurityContext.HTML, null);
+
+ expect(sanitized).toBe(``);
+ });
+
+ it(`should sanitize HTML`, () => {
+ const sanitized = service.sanitize(SecurityContext.HTML, dirtyHtml);
+
+ expect(sanitized).toBe(cleanHtml);
+ });
+
+ it(`should sanitize URL`, () => {
+ const sanitized = service.sanitize(SecurityContext.URL, dirtyUrl);
+
+ expect(sanitized).toBe(cleanUrl);
+ });
+
+ it(`should sanitize styles`, () => {
+ expect(service.sanitize(SecurityContext.STYLE, `test`)).toBe(`test`);
+ expect(service.sanitize(SecurityContext.STYLE, `(test)`)).toBe(``);
+ });
+
+ it(`hooks should work`, () => {
+ const html = `test
`;
+ const sanitized = service.sanitize(SecurityContext.HTML, html);
+
+ expect(sanitized).toBe(`test
`);
+ });
+ });
+
+ describe(`NgDompurifySanitizer default DI`, () => {
+ let service: NgDompurifySanitizer;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [
+ NgDompurifySanitizer,
+ {
+ provide: APP_BASE_HREF,
+ useValue: `/`,
+ },
+ ],
+ });
+
+ service = TestBed.inject(NgDompurifySanitizer);
+ });
+
+ afterEach(() => {
+ removeAllHooks();
+ });
+
+ it(`does not sanitize styles by default`, () => {
+ expect(service.sanitize(SecurityContext.STYLE, `(test)`)).toBe(`(test)`);
+ });
+ });
+});
diff --git a/projects/ng-dompurify/src/lib/test/test-samples/html.ts b/projects/ng-dompurify/tests/test-samples/html.ts
similarity index 100%
rename from projects/ng-dompurify/src/lib/test/test-samples/html.ts
rename to projects/ng-dompurify/tests/test-samples/html.ts
diff --git a/projects/ng-dompurify/tests/test-samples/sanitize-style.ts b/projects/ng-dompurify/tests/test-samples/sanitize-style.ts
new file mode 100644
index 0000000..7e35a0e
--- /dev/null
+++ b/projects/ng-dompurify/tests/test-samples/sanitize-style.ts
@@ -0,0 +1,3 @@
+import {SanitizeStyle} from '../../lib/types/sanitize-style';
+
+export const sanitizeStyle: SanitizeStyle = style => (style.includes(`(`) ? `` : style);
diff --git a/projects/ng-dompurify/src/lib/test/test-samples/url.ts b/projects/ng-dompurify/tests/test-samples/url.ts
similarity index 100%
rename from projects/ng-dompurify/src/lib/test/test-samples/url.ts
rename to projects/ng-dompurify/tests/test-samples/url.ts
diff --git a/projects/ng-dompurify/tsconfig.lib.json b/projects/ng-dompurify/tsconfig.lib.json
index f90b871..f06740b 100644
--- a/projects/ng-dompurify/tsconfig.lib.json
+++ b/projects/ng-dompurify/tsconfig.lib.json
@@ -1,10 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
- "outDir": "dist/out-tsc/lib",
- "lib": ["es6", "esnext", "dom"]
+ "outDir": "dist/out-tsc/lib"
},
- "exclude": ["src/test.ts", "**/*.spec.ts"],
+ "exclude": ["**/*.spec.ts"],
"angularCompilerOptions": {
"compilationMode": "partial"
}
diff --git a/scripts/postbuild.js b/scripts/postbuild.js
deleted file mode 100644
index beacdea..0000000
--- a/scripts/postbuild.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const fs = require('fs');
-
-const DIST_LIB_PATH = 'dist/ng-dompurify/';
-const README_PATH = 'README.md';
-
-const PATH_TO = DIST_LIB_PATH + README_PATH;
-
-copyReadmeIntoDistFolder();
-
-function copyReadmeIntoDistFolder() {
- if (!fs.existsSync(README_PATH)) {
- throw new Error('README.md does not exist');
- } else {
- fs.copyFileSync(README_PATH, PATH_TO);
- }
-}
diff --git a/scripts/syncVersions.js b/scripts/syncVersions.js
deleted file mode 100644
index 2ec7bea..0000000
--- a/scripts/syncVersions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const fs = require('fs');
-const glob = require('glob');
-
-const JSON_INDENTATION_LEVEL = 4;
-
-const {version} = require('../package.json');
-
-syncVersions('projects/ng-dompurify');
-
-function syncVersions(root) {
- glob(
- root + '/*(package.json|package-lock.json)',
- {
- ignore: '**/node_modules/**',
- },
- (_, files) => {
- files.forEach(file => {
- const packageJson = JSON.parse(fs.readFileSync(file));
-
- fs.writeFileSync(
- file,
- JSON.stringify(
- {
- ...packageJson,
- version,
- },
- null,
- JSON_INDENTATION_LEVEL,
- ),
- );
- });
- },
- );
-}
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
deleted file mode 100644
index 56b08ec..0000000
--- a/tsconfig.eslint.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "rootDir": ".",
- "baseUrl": ".",
- "strict": false,
- "incremental": true
- },
- "include": ["projects", "setup-jest.ts", "jest.config.ts"],
- "exclude": ["**/node_modules", "**/.*/", "*.js"]
-}
diff --git a/tsconfig.json b/tsconfig.json
index bfbccd9..71b176f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,64 +1,15 @@
{
- "compileOnSave": false,
- "angularCompilerOptions": {
- "enableIvy": true,
- "preserveWhitespaces": false,
- "annotateForClosureCompiler": false,
- "skipTemplateCodegen": true,
- "strictMetadataEmit": true,
- "fullTemplateTypeCheck": true,
- "strictInjectionParameters": true,
- "enableResourceInlining": true,
- "strictLiteralTypes": true,
- "strictInputTypes": true,
- "strictInputAccessModifiers": true,
- "allowSyntheticDefaultImports": true,
- "esModuleInterop": true,
- "strictNullInputTypes": true,
- "strictAttributeTypes": true,
- "strictSafeNavigationTypes": true,
- "strictDomLocalRefTypes": true,
- "strictOutputEventTypes": true,
- "strictDomEventTypes": true,
- "strictContextGenerics": true
- },
+ "extends": "@taiga-ui/tsconfig",
"compilerOptions": {
- "strict": true,
"baseUrl": "./",
"outDir": "./dist",
- "target": "es2015",
"module": "es2020",
+ "target": "es2017",
"lib": ["esnext", "dom"],
"typeRoots": ["node_modules/@types"],
- "skipLibCheck": true,
- "downlevelIteration": true,
- "skipDefaultLibCheck": true,
- "declaration": false,
- "moduleResolution": "node",
- "experimentalDecorators": true,
- "resolveJsonModule": true,
- "esModuleInterop": true,
- "allowSyntheticDefaultImports": true,
- "preserveConstEnums": true,
- "importHelpers": true,
- "noFallthroughCasesInSwitch": true,
- "noUnusedLocals": true,
- "noImplicitReturns": true,
- "noUnusedParameters": true,
- "incremental": true,
- "newLine": "lf",
- "isolatedModules": false,
- "alwaysStrict": true,
- "allowUnreachableCode": false,
- "allowUnusedLabels": false,
- "noStrictGenericChecks": false,
- "allowUmdGlobalAccess": true,
- "useDefineForClassFields": false,
- "forceConsistentCasingInFileNames": true,
- "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo",
- "noImplicitOverride": true,
+ "types": ["jest", "node"],
"paths": {
- "@tinkoff/ng-dompurify": ["./projects/ng-dompurify/src/public-api"]
+ "@tinkoff/ng-dompurify": ["./projects/ng-dompurify/lib"]
}
}
}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
deleted file mode 100644
index 3f36268..0000000
--- a/tsconfig.spec.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extends": "./tsconfig.spec.json",
- "compilerOptions": {
- "outDir": "./out-tsc/spec",
- "types": ["jest", "node"]
- }
-}