@8ms/helpers 2.0.26 → 2.0.28

package/package.json

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

package/prisma/PrismaNamespace.js

@@ -35,22 +35,23 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrismaNamespace = void 0;
 const _class_1 = require("../_class");
+const getError_1 = require("../util/getError");
 class PrismaNamespace extends _class_1.BaseNamespace {
     constructor() {
         super(...arguments);
         // Async setup to only initialise where required
         this.ensureInit = async () => {
             if (!this.client) {
-                let adapter = null;
+                let planetScaleAdapter = null;
                 if (this.config.isPlanetScale) {
                     try {
                         const { PrismaPlanetScale } = await Promise.resolve().then(() => __importStar(require("@prisma/adapter-planetscale")));
-                        adapter = new PrismaPlanetScale({
+                        planetScaleAdapter = new PrismaPlanetScale({
                             url: this.config.url,
                         });
                     }
                     catch (e) {
-                        throw new Error("PlanetScale Client not installed");
+                        throw new Error(`PlanetScale Client not installed - ${(0, getError_1.getError)(e)}`);
                     }
                 }
                 try {
@@ -58,8 +59,8 @@ class PrismaNamespace extends _class_1.BaseNamespace {
                     // Show the full query if debugging
                     if (this.config.isDebug) {
                         this.client = new PrismaClient({
-                            adapter,
-                            datasourceUrl: this.config.url,
+                            adapter: planetScaleAdapter,
+                            datasourceUrl: planetScaleAdapter ? undefined : this.config.url,
                             log: [
                                 {
                                     emit: "event",
@@ -71,16 +72,17 @@ class PrismaNamespace extends _class_1.BaseNamespace {
                     // Standard prisma
                     else {
                         this.client = new PrismaClient({
-                            adapter,
-                            datasourceUrl: this.config.url,
+                            adapter: planetScaleAdapter,
+                            datasourceUrl: planetScaleAdapter ? undefined : this.config.url,
                         });
                     }
                 }
                 catch (e) {
-                    throw new Error("Prisma Client not installed");
+                    throw new Error(`Prisma Client not installed - ${(0, getError_1.getError)(e)}`);
                 }
             }
         };
     }
 }
 exports.PrismaNamespace = PrismaNamespace;
+;

package/util/getError.d.ts

@@ -0,0 +1 @@
+export declare const getError: (error: any) => string;

package/util/getError.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getError = void 0;
+const getError = (error) => {
+    let response = "";
+    if (typeof error === "string") {
+        response = error.toUpperCase();
+    }
+    else if (error instanceof Error) {
+        response = error.message;
+    }
+    return response;
+};
+exports.getError = getError;