♻️ resolve circular dependencies

Author: momocow

lib/index.ts

@@ -4,5 +4,21 @@ import { UserscriptPlugin } from './plugin';
 
 export default UserscriptPlugin;
 
+export {
+  Feature,
+  HeaderClass,
+  HeadersProvider,
+  LoadHeadersOptions,
+  ProxyScriptFeatureOptions,
+  ProxyScriptOptions,
+  RenderHeadersOptions,
+  ResolveBaseURLsOptions,
+  SSRIAlgorithm,
+  SSRIFeatureOptions,
+  SSRIOptions,
+  SSRITag,
+  URLFilter,
+  ValidateHeadersOptions,
+} from './features';
 export * from './plugin';
 export * from './types';

lib/plugin.ts

@@ -12,41 +12,50 @@ import {
   FixTags,
   Interpolater,
   LoadHeaders,
+  LoadHeadersOptions,
   ProcessProxyScript,
   ProcessSSRI,
+  ProxyScriptOptions,
   RenderHeaders,
+  RenderHeadersOptions,
   ResolveBaseURLs,
+  ResolveBaseURLsOptions,
   SetDefaultTags,
+  SSRIOptions,
   ValidateHeaders,
+  ValidateHeadersOptions,
 } from './features';
 import {
   CompilationContext,
   FileInfo,
   HeadersProps,
-  UserscriptOptions,
   UserscriptPluginInstance,
   WaterfallContext,
 } from './types';
 import { date } from './utils';
 
 const { ConcatSource, RawSource } = sources;
 
+export interface UserscriptPluginOptions {
+  metajs?: boolean;
+  skip?: (fileInfo: FileInfo) => boolean;
+  proxyScript?: unknown;
+}
+
+export type UserscriptOptions = LoadHeadersOptions &
+  ResolveBaseURLsOptions &
+  SSRIOptions &
+  ProxyScriptOptions &
+  RenderHeadersOptions &
+  ValidateHeadersOptions &
+  UserscriptPluginOptions;
+
 export class UserscriptPlugin
   implements WebpackPluginInstance, UserscriptPluginInstance
 {
   public readonly name = 'UserscriptPlugin';
 
-  public readonly features: Feature[] = [
-    new LoadHeaders(this.options),
-    new FixTags(this.options),
-    new ResolveBaseURLs(this.options),
-    new ProcessSSRI(this.options),
-    new SetDefaultTags(this.options),
-    new ProcessProxyScript(this.options),
-    new Interpolater(this.options),
-    new ValidateHeaders(this.options),
-    new RenderHeaders(this.options),
-  ];
+  public readonly features: Feature[];
 
   public readonly hooks = {
     init: new AsyncParallelHook<[Compiler]>(['compiler']),
@@ -79,14 +88,25 @@ export class UserscriptPlugin
   };
 
   private readonly contexts = new WeakMap<Compilation, CompilationContext>();
-
-  public constructor(public options: UserscriptOptions = {}) {
-    const { metajs = true, strict = true } = this.options;
-
-    Object.assign(this.options, {
-      metajs,
-      strict,
-    });
+  private options: UserscriptPluginOptions = {};
+
+  public constructor(options: UserscriptOptions = {}) {
+    const { metajs = true, strict = true } = options;
+    Object.assign(options, { metajs, strict } as UserscriptOptions);
+
+    this.features = [
+      new LoadHeaders(options),
+      new FixTags(options),
+      new ResolveBaseURLs(options),
+      new ProcessSSRI(options),
+      new SetDefaultTags(options),
+      new ProcessProxyScript(options),
+      new Interpolater(options),
+      new ValidateHeaders(options),
+      new RenderHeaders(options),
+    ];
+
+    this.options = options;
   }
 
   public apply(compiler: Compiler): void {

lib/types.ts

@@ -5,15 +5,6 @@ import {
 } from 'tapable';
 import { Chunk, Compilation, Compiler } from 'webpack';
 
-import {
-  LoadHeadersOptions,
-  ProxyScriptOptions,
-  RenderHeadersOptions,
-  ResolveBaseURLsOptions,
-  SSRIOptions,
-  ValidateHeadersOptions,
-} from './features';
-
 export type SingleValue = string | undefined;
 export type MultiValue = SingleValue | SingleValue[];
 export type NamedValue = Record<string, SingleValue>;
@@ -141,33 +132,3 @@ export interface UserscriptPluginInstance {
     renderProxyHeaders: AsyncSeriesBailHook<HeadersProps, string>;
   };
 }
-
-export interface UserscriptPluginOptions {
-  metajs?: boolean;
-  skip?: (fileInfo: FileInfo) => boolean;
-}
-
-export type UserscriptOptions = LoadHeadersOptions &
-  ResolveBaseURLsOptions &
-  SSRIOptions &
-  ProxyScriptOptions &
-  RenderHeadersOptions &
-  ValidateHeadersOptions &
-  UserscriptPluginOptions;
-
-export {
-  Feature,
-  HeaderClass,
-  HeadersProvider,
-  LoadHeadersOptions,
-  ProxyScriptFeatureOptions,
-  ProxyScriptOptions,
-  RenderHeadersOptions,
-  ResolveBaseURLsOptions,
-  SSRIAlgorithm,
-  SSRIFeatureOptions,
-  SSRIOptions,
-  SSRITag,
-  URLFilter,
-  ValidateHeadersOptions,
-} from './features';