fix: 🏷️ export valid hash types

josh-hemphill · May 7, 2021 · 4133b14 · 4133b14
1 parent 5b72352
commit 4133b14
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
 	"scripts": {
 		"dev": "npm run build -- --watch",
 		"pre-push": "run-s build lint:* test:*",
-		"build": "tsup src/index.ts --sourcemap --dts --format cjs,esm",
+		"build": "tsup src/index.ts --sourcemap --dts --minify --format cjs,esm",
 		"log": "conventional-changelog -p angular -i CHANGELOG.md -s",
 		"lint": "run-s lint:*",
 		"lint:typescript": "eslint src --ext .ts --fix",

diff --git a/src/csp.types.ts b/src/csp.types.ts
@@ -15,7 +15,8 @@ type HostNameScheme = `${string}.${string}`
 type HostSource = `${HostProtocolSchemes}${HostNameScheme}${PortScheme}`
 
 // Crypto Source Definition
-export const validCrypto = ['nonce', 'sha256', 'sha384', 'sha512'] as const;
+export const validHashes = ['sha256', 'sha384', 'sha512'] as const;
+export const validCrypto = ['nonce', ...validHashes] as const;
 type ValidCrypto = typeof validCrypto[number];
 type CryptoSources = `${ValidCrypto}-${string}`
 

diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,20 @@
-import { directiveMap, Directives, ReportTo, ReferrerHeaderOptions, referrerHeaderOptions, directiveValuesByCategory } from './csp.types.js';
+import {
+	directiveMap,
+	Directives,
+	ReportTo,
+	ReferrerHeaderOptions,
+	referrerHeaderOptions,
+	directiveValuesByCategory,
+	validHashes,
+	validCrypto,
+} from './csp.types.js';
+
 type ReportTos = ReportTo | ReportTo[]
 function normalizeArrayString<T> (arrS: T[] | T): T[] {
 	return Array.isArray(arrS) ? arrS : [arrS];
 }
-
+export const ValidHashes = validHashes;
+export const ValidCrypto = validCrypto;
 export const directiveNamesList = <(keyof typeof directiveMap)[]>Object.keys(directiveMap);
 type DirectiveName = keyof typeof directiveMap;
 type DirectiveValue = typeof directiveMap[DirectiveName]
@@ -38,7 +49,12 @@ export class CspDirectives {
 	public ReportOnly: Directives | false
 	public ReportTo: ReportTos
 	public ReferrerHeader: ReferrerHeaderOptions
-	constructor (csp?: Directives,sendReportsTo?: ReportTos, reportSubset?: Directives,referrerHeaderOverride?: ReferrerHeaderOptions){
+	constructor (
+		csp?: Directives,
+		sendReportsTo?: ReportTos,
+		reportSubset?: Directives,
+		referrerHeaderOverride?: ReferrerHeaderOptions,
+	){
 		this.CSP = csp || {};
 		this.ReportOnly = reportSubset || false;
 		this.ReportTo = sendReportsTo || [];