Merge pull request #6 from nodejs/feat/support-chaining

Author: GeoffreyBooth

coffeescript-loader/loader.js

@@ -14,22 +14,23 @@ const baseURL = pathToFileURL(process.cwd() + '/').href;
 // CoffeeScript files end in .coffee, .litcoffee or .coffee.md.
 const extensionsRegex = /\.coffee$|\.litcoffee$|\.coffee\.md$/;
 
-export async function resolve(specifier, context, defaultResolve) {
+export async function resolve(specifier, context, nextResolve) {
   const { parentURL = baseURL } = context;
 
   // Node.js normally errors on unknown file extensions, so return a URL for
   // specifiers ending in the CoffeeScript file extensions.
   if (extensionsRegex.test(specifier)) {
     return {
+      shortCircuit: true,
       url: new URL(specifier, parentURL).href
     };
   }
 
   // Let Node.js handle all other specifiers.
-  return defaultResolve(specifier, context, defaultResolve);
+  return nextResolve(specifier, context);
 }
 
-export async function load(url, context, defaultLoad) {
+export async function load(url, context, nextLoad) {
   // Now that we patched resolve to let CoffeeScript URLs through, we need to
   // tell Node.js what format such URLs should be interpreted as. Because
   // CoffeeScript transpiles into JavaScript, it should be one of the two
@@ -47,22 +48,26 @@ export async function load(url, context, defaultLoad) {
     // loader. Avoiding the need for a separate CommonJS handler is a future
     // enhancement planned for ES module loaders.
     if (format === 'commonjs') {
-      return { format };
+      return {
+        format,
+        shortCircuit: true,
+      };
     }
 
-    const { source: rawSource } = await defaultLoad(url, { format });
+    const { source: rawSource } = await nextLoad(url, { format });
     // This hook converts CoffeeScript source code into JavaScript source code
     // for all imported CoffeeScript files.
     const transformedSource = coffeeCompile(rawSource.toString(), url)
 
     return {
       format,
+      shortCircuit: true,
       source: transformedSource,
     };
   }
 
   // Let Node.js handle all other URLs.
-  return defaultLoad(url, context, defaultLoad);
+  return nextLoad(url, context);
 }
 
 async function getPackageType(url) {

coffeescript-loader/package-lock.json

@@ -1,28 +1,33 @@
-import { ok } from 'assert';
-import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+import { ok, strictEqual } from 'assert';
+import { spawnSync } from 'child_process';
 import { execPath } from 'process';
 
 // Run this test yourself with debugging mode via:
 // node --inspect-brk --experimental-loader ./loader.js ./fixtures/esm-and-commonjs-imports.coffee
 
-const child = spawn(execPath, [
-  '--experimental-loader',
+const loader = fileURLToPath(new URL(
   './loader.js',
+  import.meta.url
+));
+const fixture = fileURLToPath(new URL(
   './fixtures/esm-and-commonjs-imports.coffee',
-]);
-let stdout = '';
-child.stdout.setEncoding('utf8');
-child.stdout.on('data', (data) => {
-  stdout += data;
-});
-let stderr = '';
-child.stderr.setEncoding('utf8');
-child.stderr.on('data', (data) => {
-  stderr += data;
-});
+  import.meta.url
+));
 
-child.on('close', (code, signal) => {
-  ok(stdout.includes('Hello from CoffeeScript'), 'Main entry transpiles');
-  ok(stdout.includes('HELLO FROM ESM'), 'ESM import transpiles');
-  ok(stdout.includes('Hello from CommonJS!'), 'Named CommonJS import fails');
-});
+const { status, stderr, stdout } = spawnSync(
+  execPath,
+  [
+    '--experimental-loader',
+    loader,
+    fixture,
+  ],
+  { encoding: 'utf8' },
+);
+
+console.error(stderr);
+
+strictEqual(status, 0);
+ok(stdout.includes('Hello from CoffeeScript'), 'Main entry transpiles');
+ok(stdout.includes('HELLO FROM ESM'), 'ESM import transpiles');
+ok(stdout.includes('Hello from CommonJS!'), 'Named CommonJS import fails');

coffeescript-loader/test.js

@@ -1,26 +1,28 @@
 import { get } from 'https';
 
-export function resolve(specifier, context, defaultResolve) {
+export function resolve(specifier, context, nextResolve) {
   const { parentURL = null } = context;
 
   // Normally Node.js would error on specifiers starting with 'https://', so
   // this hook intercepts them and converts them into absolute URLs to be
   // passed along to the later hooks below.
   if (specifier.startsWith('https://')) {
     return {
+      shortCircuit: true,
       url: specifier
     };
   } else if (parentURL && parentURL.startsWith('https://')) {
     return {
+      shortCircuit: true,
       url: new URL(specifier, parentURL).href
     };
   }
 
   // Let Node.js handle all other specifiers.
-  return defaultResolve(specifier, context, defaultResolve);
+  return nextResolve(specifier, context);
 }
 
-export function load(url, context, defaultLoad) {
+export function load(url, context, nextLoad) {
   // For JavaScript to be loaded over the network, we need to fetch and
   // return it.
   if (url.startsWith('https://')) {
@@ -32,12 +34,13 @@ export function load(url, context, defaultLoad) {
           // This example assumes all network-provided JavaScript is ES module
           // code.
           format: 'module',
+          shortCircuit: true,
           source: data,
         }));
       }).on('error', err => reject(err));
     });
   }
 
   // Let Node.js handle all other URLs.
-  return defaultLoad(url, context, defaultLoad);
+  return nextLoad(url, context);
 }

https-loader/loader.js

@@ -1,24 +1,32 @@
-import { ok } from 'assert';
-import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+import { ok, strictEqual } from 'assert';
+import { spawnSync } from 'child_process';
 import { execPath } from 'process';
-import { fileURLToPath, URL } from 'url';
-
 
 // Run this test yourself with debugging mode via:
 // node --inspect-brk --experimental-loader ./loader.js ./fixture.js
 
-const child = spawn(execPath, [
-  '--experimental-loader',
-  fileURLToPath(new URL('./loader.js', import.meta.url).href),
-  fileURLToPath(new URL('./fixture.js', import.meta.url).href),
-]);
+const loader = fileURLToPath(new URL(
+  './loader.js',
+  import.meta.url
+));
+const fixture = fileURLToPath(new URL(
+  './fixture.js',
+  import.meta.url
+));
+
+const { status, stderr, stdout } = spawnSync(
+  execPath,
+  [
+    '--experimental-loader',
+    loader,
+    fixture,
+  ],
+  { encoding: 'utf8' },
+);
+
+console.error(stderr);
 
-let stdout = '';
-child.stdout.setEncoding('utf8');
-child.stdout.on('data', (data) => {
-  stdout += data;
-});
 
-child.on('close', (code, signal) => {
-  ok(/The browser-based version of CoffeeScript hosted at coffeescript\.org is: \d+\.\d+\.\d+/.test(stdout.toString()));
-});
+strictEqual(status, 0);
+ok(/The browser-based version of CoffeeScript hosted at coffeescript\.org is: \d+\.\d+\.\d+/.test(stdout.toString()));