refactor: extract createContextObject

Author: exuanbo

src/import.ts

@@ -7,8 +7,8 @@ import {
   isVMModuleAvailable,
   pathToFileURLString,
   getCallerDirname,
-  shallowMergeContext,
   createGlobalObject,
+  createContextObject,
   resolveModuleSpecifier
 } from './utils'
 
@@ -83,16 +83,13 @@ Enable '--experimental-vm-modules' CLI option or replace it with dynamic 'import
   const moduleFileURLString = pathToFileURLString(moduleFilename)
 
   const globalObject = createGlobalObject(globals, useCurrentGlobal)
-  const contextObject = shallowMergeContext(
+  const contextObject = createContextObject(
     {
       __dirname: dirname,
       __filename: moduleFilename
     },
     globalObject
   )
-  if (!('global' in contextObject)) {
-    contextObject.global = contextObject
-  }
   contextObject[IMPORTS] = {}
   const context = createContext(contextObject)
 

src/require.ts

@@ -5,8 +5,8 @@ import { nanoid } from 'nanoid'
 import {
   isInESModuleScope,
   getCallerDirname,
-  shallowMergeContext,
   createGlobalObject,
+  createContextObject,
   resolveModuleSpecifier
 } from './utils'
 
@@ -30,7 +30,7 @@ export const requireFromString = (
   contextModule.require = createRequire(moduleFilename)
 
   const globalObject = createGlobalObject(globals, useCurrentGlobal)
-  const contextObject = shallowMergeContext(
+  const contextObject = createContextObject(
     {
       __dirname: contextModule.path,
       __filename: contextModule.filename,
@@ -40,9 +40,6 @@ export const requireFromString = (
     },
     globalObject
   )
-  if (!('global' in contextObject)) {
-    contextObject.global = contextObject
-  }
 
   runInNewContext(code, contextObject, {
     filename: moduleFilename,

src/utils.ts

@@ -54,7 +54,7 @@ const forEachPropertyKey = (
   Object.getOwnPropertySymbols(context).forEach(callbackfn)
 }
 
-export const shallowMergeContext = (target: Context, source: Context): Context => {
+const shallowMergeContext = (target: Context, source: Context): Context => {
   forEachPropertyKey(source, propertyKey => {
     Object.defineProperty(target, propertyKey, {
       ...Object.getOwnPropertyDescriptor(source, propertyKey)
@@ -93,6 +93,14 @@ export const createGlobalObject = (globals: Context, useCurrentGlobal: boolean):
   return globalObject
 }
 
+export const createContextObject = (moduleContext: Context, globalObject: Context): Context => {
+  const contextObject: Context = shallowMergeContext(moduleContext, globalObject)
+  if (!('global' in contextObject)) {
+    contextObject.global = contextObject
+  }
+  return contextObject
+}
+
 export const resolveModuleSpecifier = (specifier: string, dirname: string): string => {
   const specifierPath = fileURLStringToPath(specifier)
   return specifierPath.startsWith('.') || isAbsolute(specifierPath)