feat(transform): allow non-usage of WeakRef in Module conditionally (#71

) * feat(transform): allow non-usage of WeakRef in Module conditionally * Add changeset
Anber · Apr 16, 2024 · cd7b7f0 · cd7b7f0
1 parent 7cc243b
commit cd7b7f0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 4 deletions.
diff --git a/.changeset/weak-yaks-call.md b/.changeset/weak-yaks-call.md
@@ -0,0 +1,5 @@
+---
+'@wyw-in-js/transform': patch
+---
+
+Allow conditional usage of WeakRef in Module evalutation through a new feature flag `useWeakRefInEval`
diff --git a/packages/shared/src/options/types.ts b/packages/shared/src/options/types.ts
@@ -58,6 +58,7 @@ type AllFeatureFlags = {
   happyDOM: FeatureFlag;
   softErrors: FeatureFlag;
   useBabelConfigs: FeatureFlag;
+  useWeakRefInEval: FeatureFlag;
 };
 
 export type FeatureFlags<

diff --git a/packages/transform/src/__tests__/module.test.ts b/packages/transform/src/__tests__/module.test.ts
@@ -25,6 +25,7 @@ const options: StrictOptions = {
     happyDOM: true,
     softErrors: false,
     useBabelConfigs: true,
+    useWeakRefInEval: true,
   },
   highPriorityPlugins: [],
   overrideContext: (context) => ({

diff --git a/packages/transform/src/__tests__/shaker.test.ts b/packages/transform/src/__tests__/shaker.test.ts
@@ -26,6 +26,7 @@ const run = (only: string[]) => (code: TemplateStringsArray) => {
         happyDOM: false,
         softErrors: false,
         useBabelConfigs: false,
+        useWeakRefInEval: true,
       },
       highPriorityPlugins: [],
       onlyExports: only,

diff --git a/packages/transform/src/module.ts b/packages/transform/src/module.ts
@@ -18,7 +18,7 @@ import vm from 'vm';
 
 import { invariant } from 'ts-invariant';
 
-import type { Debugger } from '@wyw-in-js/shared';
+import { isFeatureEnabled, type Debugger } from '@wyw-in-js/shared';
 
 import './utils/dispose-polyfill';
 import type { TransformCacheCollection } from './cache';
@@ -192,7 +192,7 @@ export class Module {
 
   private cache: TransformCacheCollection;
 
-  #entrypointRef: WeakRef<Entrypoint>;
+  #entrypointRef: WeakRef<Entrypoint> | Entrypoint;
 
   constructor(
     private services: Services,
@@ -201,7 +201,13 @@ export class Module {
     private moduleImpl: HiddenModuleMembers = DefaultModuleImplementation
   ) {
     this.cache = services.cache;
-    this.#entrypointRef = new WeakRef(entrypoint);
+    this.#entrypointRef = isFeatureEnabled(
+      services.options.pluginOptions.features,
+      'useWeakRefInEval',
+      entrypoint.name
+    )
+      ? new WeakRef(entrypoint)
+      : entrypoint;
     this.idx = entrypoint.idx;
     this.id = entrypoint.name;
     this.filename = entrypoint.name;
@@ -232,7 +238,10 @@ export class Module {
   }
 
   protected get entrypoint(): Entrypoint {
-    const entrypoint = this.#entrypointRef.deref();
+    const entrypoint =
+      this.#entrypointRef instanceof WeakRef
+        ? this.#entrypointRef.deref()
+        : this.#entrypointRef;
     invariant(entrypoint, `Module ${this.idx} is disposed`);
     return entrypoint;
   }

diff --git a/packages/transform/src/transform/helpers/loadWywOptions.ts b/packages/transform/src/transform/helpers/loadWywOptions.ts
@@ -55,6 +55,7 @@ export function loadWywOptions(
     happyDOM: true,
     softErrors: false,
     useBabelConfigs: true,
+    useWeakRefInEval: true,
   };
 
   const options: StrictOptions = {