fix: format js

web-infra-dev · May 9, 2024 · 390745f · 390745f
1 parent c1cea74
commit 390745f
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 40 deletions.
diff --git a/packages/rspack/src/Compiler.ts b/packages/rspack/src/Compiler.ts
@@ -47,7 +47,12 @@ import { assertNotNill } from "./util/assertNotNil";
 import { FileSystemInfoEntry } from "./FileSystemInfo";
 import { RuntimeGlobals } from "./RuntimeGlobals";
 import { tryRunOrWebpackError } from "./lib/HookWebpackError";
-import { CodeGenerationResult, ContextModuleFactoryBeforeResolveResult, ContextModuleFactoryAfterResolveResult, Module, ResolveData } from "./Module";
+import {
+ CodeGenerationResult,
+ ContextModuleFactoryAfterResolveResult,
+ Module,
+ ResolveData
+} from "./Module";
 import { canInherentFromParent } from "./builtin-plugin/base";
 import ExecuteModulePlugin from "./ExecuteModulePlugin";
 import { Chunk } from "./Chunk";
@@ -530,32 +535,48 @@ class Compiler {
  binding.RegisterJsTapKind.ContextModuleFactoryBeforeResolve,
  () =>
  this.compilationParams!.contextModuleFactory.hooks.beforeResolve,
- queried => async (bindingData: false | binding.JsContextModuleFactoryBeforeResolveData) => {
- return queried.promise(bindingData);
- }
+ queried =>
+ async (
+ bindingData:
+ | false
+ | binding.JsContextModuleFactoryBeforeResolveData
+ ) => {
+ return queried.promise(bindingData);
+ }
  ),
  registerContextModuleFactoryAfterResolveTaps:
  this.#createHookRegisterTaps(
  binding.RegisterJsTapKind.ContextModuleFactoryAfterResolve,
  () => this.compilationParams!.contextModuleFactory.hooks.afterResolve,
- queried => async (bindingData: false | binding.JsContextModuleFactoryAfterResolveData) => {
- const data = bindingData ? {
- resource: bindingData.resource,
- regExp: bindingData.regExp ? new RegExp(bindingData.regExp) : undefined,
- request: bindingData.request,
- context: bindingData.context,
- // TODO: Dependencies are not fully supported yet; this is a placeholder to prevent errors in moment-locales-webpack-plugin.
- dependencies: [],
- } satisfies ContextModuleFactoryAfterResolveResult : false;
- const ret = await queried.promise(data);
- const result = ret ? {
- resource: ret.resource,
- context: ret.context,
- request: ret.request,
- regExp: ret.regExp?.toString(),
- } satisfies binding.JsContextModuleFactoryAfterResolveData : undefined;
- return result;
- }
+ queried =>
+ async (
+ bindingData:
+ | false
+ | binding.JsContextModuleFactoryAfterResolveData
+ ) => {
+ const data = bindingData
+ ? ({
+ resource: bindingData.resource,
+ regExp: bindingData.regExp
+ ? new RegExp(bindingData.regExp)
+ : undefined,
+ request: bindingData.request,
+ context: bindingData.context,
+ // TODO: Dependencies are not fully supported yet; this is a placeholder to prevent errors in moment-locales-webpack-plugin.
+ dependencies: []
+ } satisfies ContextModuleFactoryAfterResolveResult)
+ : false;
+ const ret = await queried.promise(data);
+ const result = ret
+ ? ({
+ resource: ret.resource,
+ context: ret.context,
+ request: ret.request,
+ regExp: ret.regExp?.toString()
+ } satisfies binding.JsContextModuleFactoryAfterResolveData)
+ : undefined;
+ return result;
+ }
  )
  };
 

diff --git a/packages/rspack/src/ContextModuleFactory.ts b/packages/rspack/src/ContextModuleFactory.ts
@@ -1,14 +1,23 @@
 import * as liteTapable from "./lite-tapable";
-import { ContextModuleFactoryAfterResolveResult, ContextModuleFactoryBeforeResolveResult } from "./Module";
+import {
+ ContextModuleFactoryAfterResolveResult,
+ ContextModuleFactoryBeforeResolveResult
+} from "./Module";
 
 export class ContextModuleFactory {
  hooks: {
  // TODO: second param resolveData
  // resolveForScheme: HookMap<
  // AsyncSeriesBailHook<[ResourceDataWithData], true | void>
  // >;
- beforeResolve: liteTapable.AsyncSeriesWaterfallHook<[ContextModuleFactoryBeforeResolveResult], ContextModuleFactoryBeforeResolveResult | void>;
- afterResolve: liteTapable.AsyncSeriesWaterfallHook<[ContextModuleFactoryAfterResolveResult], ContextModuleFactoryAfterResolveResult | void>;
+ beforeResolve: liteTapable.AsyncSeriesWaterfallHook<
+ [ContextModuleFactoryBeforeResolveResult],
+ ContextModuleFactoryBeforeResolveResult | void
+ >;
+ afterResolve: liteTapable.AsyncSeriesWaterfallHook<
+ [ContextModuleFactoryAfterResolveResult],
+ ContextModuleFactoryAfterResolveResult | void
+ >;
  };
  constructor() {
  this.hooks = {

diff --git a/packages/rspack/src/Module.ts b/packages/rspack/src/Module.ts
@@ -26,18 +26,22 @@ export type ResolveData = {
  createData?: CreateData;
 };
 
-export type ContextModuleFactoryBeforeResolveResult = false | {
- context: string;
- request?: string;
-}
-
-export type ContextModuleFactoryAfterResolveResult = false | {
- resource: string;
- context: string
- request: string
- regExp?: RegExp;
- dependencies: Array<any>;
-}
+export type ContextModuleFactoryBeforeResolveResult =
+ | false
+ | {
+ context: string;
+ request?: string;
+ };
+
+export type ContextModuleFactoryAfterResolveResult =
+ | false
+ | {
+ resource: string;
+ context: string;
+ request: string;
+ regExp?: RegExp;
+ dependencies: Array<any>;
+ };
 
 export class Module {
  #inner: JsModule;

diff --git a/packages/rspack/src/lite-tapable/index.ts b/packages/rspack/src/lite-tapable/index.ts
@@ -822,7 +822,7 @@ export class AsyncSeriesWaterfallHook<
  (r: R) => {
  index += 1;
  if (r !== undefined) {
- data = r
+ data = r;
  }
  if (index === tapsInRange.length) {
  done();
@@ -843,7 +843,7 @@ export class AsyncSeriesWaterfallHook<
  } else {
  index += 1;
  if (r !== undefined) {
- data = r
+ data = r;
  }
  if (index === tapsInRange.length) {
  done();
@@ -857,7 +857,7 @@ export class AsyncSeriesWaterfallHook<
  try {
  const r = tap.fn(data);
  if (r !== undefined) {
- data = r
+ data = r;
  }
  } catch (e) {
  hasError = true;