jaypie 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaypie",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "author": "Finlayson Studio",
   "type": "module",
   "main": "src/index.js",

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

@@ -87,7 +87,7 @@ describe("Dynamic Export Function", () => {
         functions,
         moduleImport: MOCK.MODULE,
       });
-      await expect(result.default()).rejects.toThrow();
+      await expect(result.default).toThrow();
     });
   });
   describe("Features", () => {

package/src/__tests__/mongoose.package.spec.js

@@ -9,7 +9,7 @@ import {
 } from "vitest";
 
 // Subject
-import { connectFromSecretEnv, disconnect } from "../mongoose.package.js";
+// * Subject is imported dynamically to allow `vi.resetModules()` to apply different mocks
 
 //
 //
@@ -41,6 +41,16 @@ afterEach(() => {
 //
 
 describe("Mongoose Package", () => {
+  let connectFromSecretEnv;
+  let disconnect;
+  beforeAll(async () => {
+    const {
+      connectFromSecretEnv: _connectFromSecretEnv,
+      disconnect: _disconnect,
+    } = await import("../mongoose.package.js");
+    connectFromSecretEnv = _connectFromSecretEnv;
+    disconnect = _disconnect;
+  });
   it("Works", () => {
     expect(connectFromSecretEnv).toBeFunction();
     expect(disconnect).toBeFunction();
@@ -58,7 +68,8 @@ describe("Mongoose Package", () => {
   describe("Features", () => {
     const mockConnectFromSecretEnv = vi.fn();
     const mockDisconnect = vi.fn();
-    beforeAll(() => {
+    beforeAll(async () => {
+      // Setup mock of mongoose
       vi.doMock("@jaypie/mongoose", () => {
         return {
           connectFromSecretEnv: mockConnectFromSecretEnv,
@@ -68,6 +79,15 @@ describe("Mongoose Package", () => {
           },
         };
       });
+      // Preprocess
+      vi.resetModules();
+      const {
+        connectFromSecretEnv: _connectFromSecretEnv,
+        disconnect: _disconnect,
+      } = await import("../mongoose.package.js");
+      // Return
+      connectFromSecretEnv = _connectFromSecretEnv;
+      disconnect = _disconnect;
     });
     it("Calls @jaypie/mongoose for connectFromSecretEnv", async () => {
       await connectFromSecretEnv();

package/src/dynamicExport.function.js

@@ -57,15 +57,9 @@ export default async ({
     );
   }
   // Setup
+  let imported;
   const returning = {};
-  // Process
-  for (const key of functions) {
-    returning[key] = async () => {
-      const imported = await dynamicImport(moduleImport);
-      return await imported[key]();
-    };
-  }
-  let imported = {};
+  // Preprocess
   try {
     imported = await dynamicImport(moduleImport);
   } catch (error) {
@@ -73,8 +67,25 @@ export default async ({
       `[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) {
-    returning[key] = imported[key];
+    if (imported) {
+      returning[key] = imported[key];
+    } else {
+      // TODO: make the not found vars throw only _when accessed_
+      returning[key] = undefined;
+    }
   }
   // Return
   return returning;