GeneratoOptions should extend from CommonGeneratorOptions

userscripters · May 10, 2022 · 1bf3556 · 1bf3556
1 parent 0d3d643
commit 1bf3556
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/generate.ts b/src/generate.ts
@@ -1,6 +1,7 @@
 import chulk from "chalk";
 import { existsSync } from "fs";
 import { appendFile } from "fs/promises";
+import type { CommonGeneratorOptions } from "./generators/common/index.js";
 import { generateGreasemonkeyHeaders } from "./generators/greasemonkey/index.js";
 import type {
     GrantOptions,
@@ -21,7 +22,7 @@ import {
 
 export type RunAtOption = "start" | "end" | "idle" | "body" | "menu";
 
-export type GeneratorOptions<T extends GrantOptions> = {
+export type GeneratorOptions<T extends GrantOptions> = CommonGeneratorOptions & {
     collapse: boolean;
     direct?: boolean;
     downloadURL?: string;
@@ -30,7 +31,6 @@ export type GeneratorOptions<T extends GrantOptions> = {
     homepage?: string;
     inject?: string;
     matches?: string[];
-    namespace?: string;
     output: string;
     packagePath: string;
     pretty?: boolean;

diff --git a/src/generators/common/index.ts b/src/generators/common/index.ts
@@ -3,7 +3,7 @@ import { parseName, prettifyName } from "../../utils/name.js";
 import type { PackageInfo } from "../../utils/package.js";
 import type { CommonHeaders, HeaderEntries } from "../index.js";
 
-export type CommonHeadersOptions = {
+export type CommonGeneratorOptions = {
     namespace?: string;
     pretty: boolean;
 }
@@ -15,7 +15,7 @@ export type CommonHeadersOptions = {
  */
 export const generateCommonHeaders = (
     pkg: PackageInfo,
-    options: CommonHeadersOptions
+    options: CommonGeneratorOptions
 ) => {
     const { namespace, pretty } = options;