jaypie 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaypie",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "author": "Finlayson Studio",
   "type": "module",
   "main": "src/index.js",
@@ -17,7 +17,7 @@
     "test:spec:mongoose.package": "vitest run ./src/__tests__/mongoose.package.spec.js"
   },
   "dependencies": {
-    "@jaypie/core": "^0.4.0"
+    "@jaypie/core": "^0.4.1"
   },
   "devDependencies": {
     "@jaypie/testkit": "^1.0.0",
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "@jaypie/aws": "^0.1.1",
-    "@jaypie/lambda": "^0.1.1",
+    "@jaypie/lambda": "^0.1.3",
     "@jaypie/mongoose": "^0.1.1"
   },
   "peerDependenciesMeta": {

package/src/__tests__/dynamicExport.function.spec.js

@@ -73,21 +73,31 @@ describe("Dynamic Export Function", () => {
     it("Returns an object", () => {
       expect(dynamicExport({ moduleImport: MOCK.MODULE })).toBeObject();
     });
-    it("Scalars are undefined when module is not found", async () => {
+    it("Exported functions throw if the real module is not installed", async () => {
+      const functions = ["default"];
+      const result = await dynamicExport({
+        functions,
+        moduleImport: MOCK.MODULE,
+      });
+      await expect(() => {
+        result.default();
+      }).toThrow();
+    });
+    it("Vars return null if the real module is not installed", async () => {
       const vars = ["scalar"];
       const result = await dynamicExport({
         vars,
         moduleImport: MOCK.MODULE,
       });
-      expect(result.scalar).toBeUndefined();
+      expect(result.scalar).toBeNull();
     });
-    it("Exported functions throw if the real module is not installed", async () => {
-      const functions = ["default"];
+    it("Vars that never existed are undefined", async () => {
+      const vars = ["scalar"];
       const result = await dynamicExport({
-        functions,
+        vars,
         moduleImport: MOCK.MODULE,
       });
-      await expect(result.default).toThrow();
+      expect(result.bogus).toBeUndefined();
     });
   });
   describe("Features", () => {

package/src/dynamicExport.function.js

@@ -56,37 +56,24 @@ export default async ({
       "Either `functions` or `vars` must be provided",
     );
   }
-  // Setup
-  let imported;
-  const returning = {};
-  // Preprocess
+  // Process
   try {
-    imported = await dynamicImport(moduleImport);
+    // Attempt to import the module
+    return await dynamicImport(moduleImport);
   } catch (error) {
     moduleLogger.trace(
       `[jaypie] ${moduleImport} could not be imported; continuing`,
     );
   }
-  // Process
-  for (const key of functions) {
-    if (imported) {
-      returning[key] = imported[key];
-    } else {
-      returning[key] = () => {
-        throw new ConfigurationError(
-          `Function ${key} cannot be called because ${moduleImport} is not installed`,
-        );
-      };
-    }
-  }
-  for (const key of vars) {
-    if (imported) {
-      returning[key] = imported[key];
-    } else {
-      // TODO: make the not found vars throw only _when accessed_
-      returning[key] = undefined;
-    }
-  }
   // Return
-  return returning;
+  const result = {};
+  functions.forEach((func) => {
+    result[func] = () => {
+      throw new ConfigurationError(`${moduleImport}.${func} is not available`);
+    };
+  });
+  vars.forEach((variable) => {
+    result[variable] = null;
+  });
+  return result;
 };