Miscellaneous improvements to commonjs-extension-resolution-loader and pgp-loader

commonjs-extension-resolution-loader/loader.js

@@ -1,8 +1,8 @@
-import { builtinModules } from 'node:module';
-import { dirname } from 'path';
-import { cwd } from 'process';
-import { fileURLToPath, pathToFileURL } from 'url';
-import { promisify } from 'util';
+import { isBuiltin } from 'node:module';
+import { dirname } from 'node:path';
+import { cwd } from 'node:process';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { promisify } from 'node:util';
 
 import resolveCallback from 'resolve/async.js';
 
@@ -14,7 +14,7 @@ const baseURL = pathToFileURL(cwd() + '/').href;
 export async function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
 
-  if (specifier.startsWith('node:') || builtinModules.includes(specifier)) {
+  if (isBuiltin(specifier)) {
     return next(specifier, context);
   }
 

commonjs-extension-resolution-loader/test/fixtures/.gitignore

@@ -0,0 +1 @@
+!node_modules/

pgp-loader/create-key-and-encript.js → pgp-loader/create-key-and-encrypt.js

@@ -36,7 +36,7 @@ pgp.generateKey({
     privateKeys: privateKeys
 }))
 .then(cipher => {
-    console.log('Encripted module:\n', cipher.data);
+    console.log('Encrypted module:\n', cipher.data);
     return fs.writeFile('fixture.js.pgp', cipher.data.replace(/\r/g, ''));
 })
 
@@ -50,11 +50,11 @@ pgp.generateKey({
     privateKeys: privateKeys
 }))
 
-.then(decripted => assert.equal(decripted.data, moduleSrc))
+.then(decrypted => assert.equal(decrypted.data, moduleSrc))
 
 .then(() => console.log('All fine!'))
 
 .catch(err => {
-    console.error('>>> Encriptation fail! <<<\n', err);
+    console.error('>>> Encryption fail! <<<\n', err);
     process.exit(1);
 })

pgp-loader/loader.js

@@ -12,11 +12,13 @@ export function resolve(specifier, context, defaultResolve) {
       specifier = new URL(specifier, import.meta.url).href
     }
     return {
-      url: specifier
+      shortCircuit: true,
+      url: specifier,
     };
   } else if (parentURL && parentURL.endsWith('.pgp')) {
     return {
-      url: new URL(specifier, parentURL).href
+      shortCircuit: true,
+      url: new URL(specifier, parentURL).href,
     };
   }
 
@@ -37,9 +39,10 @@ export async function load(url, context, defaultLoad) {
         message: cryptMsg,
         privateKeys: privateKeys
       }))
-      .then(decripted => ({
+      .then(decrypted => ({
+        shortCircuit: true,
         format: "module",
-        source: decripted.data
+        source: decrypted.data
       }))
   }
 

pgp-loader/package.json

@@ -1,13 +1,13 @@
 {
   "name": "pgp-loader",
   "version": "0.1.0",
-  "description": "Load encripted packages",
+  "description": "Load encrypted packages",
   "type": "module",
   "scripts": {
     "start": "npm test",
     "test": "node --experimental-loader ./loader.js test.js",
     "env": "env",
-    "create-key-and-encript": "node create-key-and-encript.js"
+    "create-key-and-encrypt": "node create-key-and-encrypt.js"
   },
   "config": {
     "key_passwd": "Loo hoo se her"