@8ms/helpers 2.0.8 → 2.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.0.8",
+	"version": "2.0.9",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/prisma/PrismaNamespace.js

@@ -41,19 +41,25 @@ class PrismaNamespace extends _class_1.BaseNamespace {
         // Async setup to only initialise where required
         this.ensureInit = async () => {
             if (!this.client) {
-                try {
-                    const { PrismaClient } = await Promise.resolve().then(() => __importStar(require("@prisma/client")));
-                    let adapter;
-                    if (this.config.isPlanetScale) {
+                let adapter;
+                if (this.config.isPlanetScale) {
+                    try {
                         const { PrismaPlanetScale } = await Promise.resolve().then(() => __importStar(require("@prisma/adapter-planetscale")));
                         adapter = new PrismaPlanetScale({
                             url: this.config.url,
                         });
                     }
+                    catch (e) {
+                        throw new Error("PlanetScale Client not installed");
+                    }
+                }
+                try {
+                    const { PrismaClient } = await Promise.resolve().then(() => __importStar(require("@prisma/client")));
                     // Show the full query if debugging
                     if (this.config.isDebug) {
                         this.client = new PrismaClient({
                             adapter,
+                            datasourceUrl: this.config.url,
                             log: [
                                 {
                                     emit: "event",
@@ -64,11 +70,14 @@ class PrismaNamespace extends _class_1.BaseNamespace {
                     }
                     // Standard prisma
                     else {
-                        this.client = new PrismaClient({ adapter });
+                        this.client = new PrismaClient({
+                            adapter,
+                            datasourceUrl: this.config.url,
+                        });
                     }
                 }
                 catch (e) {
-                    throw new Error("Prisma / PlanetScale Client not installed");
+                    throw new Error("Prisma Client not installed");
                 }
             }
         };

package/prisma/server.js

@@ -21,6 +21,7 @@ const prismaClient = async (key = "default", config) => {
         }
     }
     const namespace = new PrismaNamespace_1.PrismaNamespace(key, config);
+    await namespace.ensureInit();
     prismaNamespaces.set(key, namespace);
     return namespace;
 };