fix: 🐛 fix schema naming and tests

Author: josh-hemphill

src/csp.types.ts

@@ -232,14 +232,18 @@ export const directiveValuesByCategory = {
 				'Hostname': 'string',
 				'Protocol': hostProtocolScheme,
 			},
-			compose: (args: Record<string,string>) =>
+			compose: (args: {
+				'Port': number,
+				'Hostname': string,
+				'Protocol': HostProtocolSchemes,
+			}) =>
 				<HostSource>`${args?.['Protocol'] || ''}${args?.['Hostname'] || ''}${args?.['Port'] ? ':' + args?.['Port'] : ''}`,
 		},
 	],
 	schemeSource,
 	cryptoSource: [
 		{
-			displayName: 'Hostname/URL Source',
+			displayName: 'Crypto Nonce/Hash Source',
 			consumes: {
 				'Hash': 'string',
 				'Algorithm': validCrypto,

src/globals.d.ts

@@ -5,3 +5,5 @@ type HostSource = `${HostSchemes}${HostNameScheme}${PortScheme}`
 type HttpDelineators = '/' | '?' | '#' | '\\'
 type OptionalPath = `${HttpDelineators}${string}` | ''
 declare type UrlString = `${HostSource}${OptionalPath}`;
+
+declare type Obj = Record<string | number | symbol,unknown>

src/index.ts

@@ -8,7 +8,7 @@ export const directiveNamesList = <(keyof typeof directiveMap)[]>Object.keys(dir
 type DirectiveName = keyof typeof directiveMap;
 type DirectiveValue = typeof directiveMap[DirectiveName]
 type DirectiveMapPair = [DirectiveName,DirectiveValue]
-type CategoryValue = typeof directiveValuesByCategory[DirectiveValue[number]]
+type CategoryValue = FlatArray<(typeof directiveValuesByCategory[DirectiveValue[number]]),1>
 type DirectiveResult = {
 	values: Partial<CategoryValue>[]
 	categories: DirectiveValue
@@ -17,7 +17,7 @@ export const DirectiveMap = new Map<DirectiveName,DirectiveResult>(Object.entrie
 	const [k,v] = <DirectiveMapPair>dPair;
 	return [k,{
 		get values (): Partial<CategoryValue>[] {
-			return this.categories.map((category) => directiveValuesByCategory[category]).flat(0);
+			return this.categories.map((category) => directiveValuesByCategory[category]).flat(1);
 		},
 		categories: v,
 	}];

tests/mapping.test.ts

@@ -0,0 +1,108 @@
+import { DirectiveMap } from '../src/index.js';
+
+function isObject (obj: unknown): obj is Record<PropertyKey,unknown> {
+	return Object.prototype.toString.call(obj) === '[object Object]';
+}
+function hasOwnProperty<T> (obj: T, prop: PropertyKey): prop is keyof T {
+	return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+describe('DirectiveMap.get()',() => {
+	describe('Dynamic Options',() => {
+		it('Handles Hostname/URL Source',() => {
+			const src = DirectiveMap.get('child-src');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const start: any = undefined;
+			const result = src?.values.reduce((_,v) => {
+				if (
+					isObject(v) &&
+					hasOwnProperty(v,'displayName') &&
+					v.displayName === 'Hostname/URL Source'
+				) {
+					return v?.compose?.({
+						'Hostname': 'example.com',
+						'Port': 443,
+						'Protocol':'https://',
+					});
+				}
+				return _;
+			},start);
+			expect(result).toBe('https://example.com:443');
+		});
+		it('Crypto Nonce/Hash Source',() => {
+			const src = DirectiveMap.get('child-src');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const start: any = undefined;
+			const result = src?.values.reduce((_,v) => {
+				if (
+					isObject(v) &&
+					hasOwnProperty(v,'displayName') &&
+					v.displayName === 'Crypto Nonce/Hash Source'
+				) {
+					return v?.compose?.({
+						'Algorithm':'sha256',
+						'Hash':'SomeBase64String',
+					});
+				}
+				return _;
+			},start);
+			expect(result).toBe('sha256-SomeBase64String');
+		});
+		it('Handles URI Source',() => {
+			const src = DirectiveMap.get('child-src');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const start: any = undefined;
+			const result = src?.values.reduce((_,v) => {
+				if (
+					isObject(v) &&
+					hasOwnProperty(v,'displayName') &&
+					v.displayName === 'URI Source'
+				) {
+					return v?.compose?.({
+						'Beginning Delineator':'/',
+						'Remaining Path':'send/reports/to',
+					});
+				}
+				return _;
+			},start);
+			expect(result).toBe('/send/reports/to');
+		});
+		it('Handles Plugin MIME Type Source',() => {
+			const src = DirectiveMap.get('child-src');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const start: any = undefined;
+			const result = src?.values.reduce((_,v) => {
+				if (
+					isObject(v) &&
+					hasOwnProperty(v,'displayName') &&
+					v.displayName === 'Plugin MIME Type Source'
+				) {
+					return v?.compose?.({
+						'MIME Category':'application',
+						'MIME Implementation':'xml',
+					});
+				}
+				return _;
+			},start);
+			expect(result).toBe('application/xml');
+		});
+		it('Handles Any String',() => {
+			const src = DirectiveMap.get('child-src');
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const start: any = undefined;
+			const result = src?.values.reduce((_,v) => {
+				if (
+					isObject(v) &&
+					hasOwnProperty(v,'displayName') &&
+					v.displayName === 'Any String'
+				) {
+					return v?.compose?.({
+						'String':'hello world',
+					});
+				}
+				return _;
+			},start);
+			expect(result).toBe('hello world');
+		});
+	});
+});