added abstract @match header generator

userscripters · Aug 9, 2021 · d32e014 · d32e014
1 parent 0839cda
commit d32e014
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/src/generators/greasemonkey/index.ts b/src/generators/greasemonkey/index.ts
@@ -1,4 +1,9 @@
-import { generateGrantHeaders, HeaderEntries, HeaderGenerator } from "..";
+import {
+    generateGrantHeaders,
+    generateMatchHeaders,
+    HeaderEntries,
+    HeaderGenerator,
+} from "..";
 import { finalizeMonkeyHeaders } from "../common/monkey";
 import {
     GreasemonkeyGrantOptions,
@@ -8,7 +13,7 @@ import {
 
 //TODO: finish creating the processor
 export const generateGreasemonkeyHeaders: HeaderGenerator<GreasemonkeyGrantOptions> =
-    (_packageInfo, { grants = [] }) => {
+    (_packageInfo, { matches = [], grants = [] }) => {
         const grantMap: Record<GreasemonkeyGrantOptions, GreasemonkeyGrants> = {
             set: "GM.setValue",
             get: "GM.getValue",
@@ -20,12 +25,17 @@ export const generateGreasemonkeyHeaders: HeaderGenerator<GreasemonkeyGrantOptio
             unsafe: "unsafeWindow",
         };
 
+        const matchHeaders = generateMatchHeaders(matches);
+
         const grantHeaders = generateGrantHeaders<
             GreasemonkeyHeaders,
             GreasemonkeyGrantOptions
         >(grantMap, grants);
 
-        const headers: HeaderEntries<GreasemonkeyHeaders> = [...grantHeaders];
+        const headers: HeaderEntries<GreasemonkeyHeaders> = [
+            ...grantHeaders,
+            ...matchHeaders,
+        ];
 
         return finalizeMonkeyHeaders(headers, 4);
     };
diff --git a/src/generators/index.ts b/src/generators/index.ts
@@ -48,12 +48,12 @@ export type CommonHeaders<T extends object = {}> = T & {
 
 export type CustomHeaders = { contributors: string };
 
-export type HeaderEntry<T> = [keyof T & string, T[keyof T]];
+export type HeaderEntry<T> = [keyof T & string, string];
 
 export type HeaderEntries<T> = HeaderEntry<T>[];
 
 /**
- * @summary abstract header generator
+ * @summary abstract '@grant' header generator
  */
 export const generateGrantHeaders = <
     T extends CommonHeaders,
@@ -71,3 +71,12 @@ export const generateGrantHeaders = <
         ? grantHeaders
         : ([["grant", "none"]] as HeaderEntries<Pick<T, "grant">>);
 };
+
+/**
+ * @summary abstract '@match' header generator
+ */
+export const generateMatchHeaders = <T extends CommonHeaders>(
+    matches: string[]
+): HeaderEntries<T> => {
+    return matches.map((uri) => ["match", uri]);
+};
diff --git a/src/generators/tampermonkey/index.ts b/src/generators/tampermonkey/index.ts
@@ -1,4 +1,4 @@
-import { generateGrantHeaders, HeaderEntries, HeaderGenerator } from "..";
+import { generateGrantHeaders, generateMatchHeaders, HeaderEntries, HeaderGenerator } from "..";
 import { formatAuthor, parseAuthor } from "../../utils/author";
 import { parseName } from "../../utils/common";
 import { finalizeMonkeyHeaders } from "../common/monkey";
@@ -26,9 +26,7 @@ export const generateTampermonkeyHeaders: HeaderGenerator<TampermonkeyGrantOptio
         const parsedAuthor = parseAuthor(author);
         const { packageName, scope } = parseName(name);
 
-        const matchHeaders: HeaderEntries<TampermonkeyHeaders> = matches.map(
-            (uri) => ["match", uri]
-        );
+        const matchHeaders = generateMatchHeaders(matches);
 
         const grantMap: Record<TampermonkeyGrantOptions, TampermonkeyGrants> = {
             set: "GM_setValue",