fix(Node 14.4+) Fix the module by breaking out dynamicInstantiate i…

…nto getSource jim (#133)

* feat: Almost have Node 14.4+ working

* fix(default destructuring): I'm an idiot

* cleanup: Remove unused debugging

Dockerfile.dev

@@ -4,6 +4,4 @@ RUN apk add --no-cache git
 # Add Sudo to allow occasional usage of root. I wish I could remove this but I can't seem to get the node_modules volume working correctly.
 RUN apk add --no-cache sudo \
   && echo node ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/node \
-  && chmod 0440 /etc/sudoers.d/node
-
-CMD [ "tail", "-f", "/dev/null" ]
+  && chmod 0440 /etc/sudoers.d/node

README.md

@@ -9,6 +9,10 @@
 
 This is a Node.JS Loader hook for Node.JS 13.9 or newer that transpiles TypeScript files into JavaScript using the `getFormat`, `resolve`, and `transformSource` hooks.
 
+For Node.JS `<= 14.4` use `npm install @k-foss/[email protected]`
+
+For Node.jS `=> 14.5` use `npm install @k-foss/ts-esnode@latest`
+
 ## Usage
 
 You should already have `"type": "module"` in your `package.json`
@@ -57,8 +61,6 @@ Follow these steps to open this project in a container:
 
 #### TODO
 
-- I would really like to remove the hack to support destructed imports of legacy node_modules, see [this comment](https://github.com/K-FOSS/TS-ESNode/issues/1#issuecomment-596750379) for more information.
-
 - Worker Threads to avoid the TypeScript compiling affecting main thread.
 
 - Performance improvements. (Better file/import finding.)

Testing/Tests/Axios/src/Axios.test.ts

@@ -9,6 +9,8 @@ export class AxiosSuite extends TestSuite {
   public async test(): Promise<void> {
     const axios = await getAxios();
 
+    console.log(axios);
+
     notDeepStrictEqual(axios, {}, 'axios !== {}');
 
     const dynamicAxios = await getAxiosDynamic();

package.json

@@ -14,7 +14,7 @@
     "@k-foss/ts-estests": "^1.0.6",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/git": "9.0.0",
-    "@types/node": "14.0.13",
+    "@types/node": "^14.10.1",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
     "conventional-changelog-conventionalcommits": "^4.3.0",
@@ -28,13 +28,13 @@
     "eslint-plugin-standard": "^4.0.1",
     "prettier": "2.0.5",
     "semantic-release": "17.0.8",
-    "typescript": "3.9.5"
+    "typescript": "^4.0.2"
   },
   "peerDependencies": {
     "typescript": ">=3.7"
   },
   "engines": {
-    "node": ">= 13.9"
+    "node": ">= 14.5"
   },
   "scripts": {
     "pretest": "npm run build",

src/index.ts

@@ -7,6 +7,9 @@ import { findFiles } from './findFiles';
 import {
   DynamicInstantiateResponse,
   GetFormatResponse,
+  GetSourceContext,
+  GetSourceHook,
+  GetSourceResponse,
   ModuleFormat,
   ResolveContext,
   ResolveResponse,
@@ -84,7 +87,6 @@ export async function resolve(
     };
   }
 
-  // Let Node.js handle all other specifiers.
   return defaultResolve(specifier, { ...context, parentURL }, defaultResolve);
 }
 
@@ -132,6 +134,8 @@ export async function dynamicInstantiate(
 
 const formatCache = new Map<string, ModuleFormat>();
 
+const CommonJSMap = new Set<string>();
+
 export async function getFormat(
   url: string,
   context: never,
@@ -156,19 +160,95 @@ export async function getFormat(
      * We need to use our dynamic hook on Node.JS CommonJS `node_modules` due to
      * anything exported by TypeScript not being accepted by the exports check in Node
      */
-    if (url.includes('node_modules') && format === 'commonjs') {
-      format = 'dynamic';
-    }
+    // if (url.includes('node_modules') && format === 'commonjs') {
+    //   format = 'dynamic';
+    // }
   }
 
   formatCache.set(url, format);
 
+  if (format === 'commonjs') {
+    format = 'module';
+
+    CommonJSMap.add(url);
+  }
+
   // Let Node.js handle all other URLs.
   return {
     format,
   };
 }
 
+export async function getSource(
+  url: string,
+  context: GetSourceContext,
+  defaultGetSource: GetSourceHook,
+): Promise<GetSourceResponse> {
+  const { format } = context;
+
+  if (CommonJSMap.has(url)) {
+    const urlParts = url.split('/node_modules/');
+
+    // Extract the module name after node_modules.
+    const moduleName = urlParts.pop()!;
+
+    // With NPM, this is just top-level node_modules.
+    // With PNPM, this is the innermost node_modules.
+    const nodeModulesPath = urlParts.join('/node_modules/');
+
+    // Create a require function next to node_module, and import the CommonJS module.
+    const require = createRequire(`${nodeModulesPath}/noop.js`);
+    const dynModule = require(moduleName);
+    let isDefault = false;
+
+    let defaultKeys: string[] = [];
+
+    if (dynModule.default) {
+      if (dynModule.default !== dynModule) {
+        isDefault = true;
+        defaultKeys = Object.keys(dynModule.default);
+      }
+    }
+
+    // Export as ES Module.
+    const linkKeys = Object.keys(dynModule).filter((key) => key !== 'default');
+
+    const code = `
+import {createRequire} from 'module';
+
+const require = createRequire('${nodeModulesPath}/noop.js');
+const cjs = require('${moduleName}');
+
+${linkKeys
+  .map((prop: any) => `let $${prop} = cjs[${JSON.stringify(prop)}];`)
+  .join(';\n')}
+
+${defaultKeys
+  .map(
+    (prop: any) =>
+      `let $default${prop} = cjs.default[${JSON.stringify(prop)}];`,
+  )
+  .join(';\n')}
+
+export {
+${linkKeys.map((prop: string) => ` $${prop} as ${prop},`).join('\n')}
+}
+
+export {
+${defaultKeys.map((prop: string) => ` $default${prop} as ${prop},`).join('\n')}
+}
+
+${isDefault ? `export default cjs['default'];` : 'export default cjs;'}
+`;
+
+    return {
+      source: code,
+    };
+  }
+
+  return defaultGetSource(url, context, defaultGetSource);
+}
+
 export async function transformSource(
   source: Source,
   context: TransformContext,

src/types.ts

@@ -37,3 +37,17 @@ export interface DynamicInstantiateResponse {
 export interface GetFormatResponse {
   format: ModuleFormat;
 }
+
+export interface GetSourceContext {
+  format: string;
+}
+
+export type GetSourceHook = (
+  url: string,
+  context: GetSourceContext,
+  defaultGetSource: GetSourceHook,
+) => Promise<GetSourceResponse>;
+
+export interface GetSourceResponse {
+  source: string | SharedArrayBuffer | Uint8Array;
+}