@develit-io/backend-sdk 5.8.2 → 5.9.0

package/dist/index.cjs

@@ -10,7 +10,7 @@ const consola = require('consola');
 const fs = require('fs');
 const crypto$1 = require('node:crypto');
 const path = require('path');
-const main_js = require('jsonc-parser/lib/esm/main.js');
+const commentJson = require('comment-json');
 const superjson = require('superjson');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -232,6 +232,21 @@ function createAuditLogWriter(table) {
   };
 }
 
+function first(rows) {
+  return rows.length > 0 ? rows[0] : void 0;
+}
+function firstOrError(rows) {
+  if (rows.length === 0) {
+    throw new Error("Query did not return any data.");
+  }
+  return rows[0];
+}
+const uuidv4 = () => crypto.randomUUID();
+const isRemoteEnvironment = () => {
+  const environment = process.env.ENVIRONMENT;
+  return environment && environment !== "localhost";
+};
+
 function durableObjectNamespaceIdFromName(uniqueKey, name) {
   const key = crypto__default.createHash("sha256").update(uniqueKey).digest();
   const nameHmac = crypto__default.createHmac("sha256", key).update(name).digest().subarray(0, 16);
@@ -242,11 +257,7 @@ const getDatabaseIdFromWrangler = () => {
   try {
     const wranglerPath = path__default.resolve("./wrangler.jsonc");
     const wranglerContent = fs__default.readFileSync(wranglerPath, "utf-8");
-    const errors = [];
-    const config = main_js.parse(wranglerContent, errors, { allowTrailingComma: true });
-    if (errors.length) {
-      throw new Error("Invalid JSONC in wrangler.jsonc");
-    }
+    const config = commentJson.parse(wranglerContent);
     const environment = process.env.ENVIRONMENT || "localhost";
     let databaseId;
     if (environment !== "localhost" && config.env?.[environment]) {
@@ -271,10 +282,6 @@ const getDatabaseIdFromWrangler = () => {
     );
   }
 };
-const isRemoteEnvironment = () => {
-  const environment = process.env.ENVIRONMENT;
-  return environment && environment !== "localhost";
-};
 const getLocalD1 = (databaseId) => {
   const name = durableObjectNamespaceIdFromName(
     "miniflare-D1DatabaseObject",
@@ -302,7 +309,11 @@ const getLocalD1 = (databaseId) => {
     }
   }
 };
-const getCredentials = () => {
+const getD1Credentials = () => {
+  const environment = process.env.ENVIRONMENT;
+  if (environment === "localhost") {
+    return {};
+  }
   const databaseId = getDatabaseIdFromWrangler() ?? "";
   if (isRemoteEnvironment()) {
     return {
@@ -325,7 +336,7 @@ const drizzleD1Config = {
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "sqlite",
-  ...getCredentials()
+  ...getD1Credentials()
 };
 
 class DatabaseTransaction {
@@ -390,24 +401,26 @@ const defineCommand = (handler) => {
   });
 };
 
-function first(rows) {
-  return rows.length > 0 ? rows[0] : void 0;
-}
-function firstOrError(rows) {
-  if (rows.length === 0) {
-    throw new Error("Query did not return any data.");
+const getPgCredentials = () => {
+  if (isRemoteEnvironment()) {
+    return {
+      dbCredentials: {
+        url: process.env.DATABASE_URL
+      }
+    };
+  } else {
+    return {
+      dbCredentials: {
+        url: `postgres://db_user:db_password@127.0.0.1:${process.env.DB_LOCAL_PORT}/db`
+      }
+    };
   }
-  return rows[0];
-}
-const uuidv4 = () => crypto.randomUUID();
-
+};
 const drizzlePgConfig = {
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "postgresql",
-  dbCredentials: {
-    url: process.env.DATABASE_URL
-  },
+  ...getPgCredentials(),
   migrations: {
     table: "__drizzle_migrations",
     schema: "public"

package/dist/index.d.cts

@@ -192,6 +192,12 @@ declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTabl
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
 declare const drizzleD1Config: {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -253,16 +259,16 @@ declare const createInternalError: (error: unknown, details?: {
 declare const isInternalError: (error: unknown) => error is InternalError;
 
 declare const drizzlePgConfig: {
-    schema: string;
-    out: string;
-    dialect: "postgresql";
-    dbCredentials: {
-        url: string;
-    };
     migrations: {
         table: string;
         schema: string;
     };
+    dbCredentials: {
+        url: string;
+    };
+    schema: string;
+    out: string;
+    dialect: "postgresql";
 };
 
 declare const calculateExponentialBackoff: (attempts: number, baseDelaySeconds: number) => number;

package/dist/index.d.mts

@@ -192,6 +192,12 @@ declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTabl
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
 declare const drizzleD1Config: {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -253,16 +259,16 @@ declare const createInternalError: (error: unknown, details?: {
 declare const isInternalError: (error: unknown) => error is InternalError;
 
 declare const drizzlePgConfig: {
-    schema: string;
-    out: string;
-    dialect: "postgresql";
-    dbCredentials: {
-        url: string;
-    };
     migrations: {
         table: string;
         schema: string;
     };
+    dbCredentials: {
+        url: string;
+    };
+    schema: string;
+    out: string;
+    dialect: "postgresql";
 };
 
 declare const calculateExponentialBackoff: (attempts: number, baseDelaySeconds: number) => number;

package/dist/index.d.ts

@@ -192,6 +192,12 @@ declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTabl
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
 declare const drizzleD1Config: {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -253,16 +259,16 @@ declare const createInternalError: (error: unknown, details?: {
 declare const isInternalError: (error: unknown) => error is InternalError;
 
 declare const drizzlePgConfig: {
-    schema: string;
-    out: string;
-    dialect: "postgresql";
-    dbCredentials: {
-        url: string;
-    };
     migrations: {
         table: string;
         schema: string;
     };
+    dbCredentials: {
+        url: string;
+    };
+    schema: string;
+    out: string;
+    dialect: "postgresql";
 };
 
 declare const calculateExponentialBackoff: (attempts: number, baseDelaySeconds: number) => number;

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { consola } from 'consola';
 import fs from 'fs';
 import crypto$1 from 'node:crypto';
 import path from 'path';
-import { parse } from 'jsonc-parser/lib/esm/main.js';
+import { parse } from 'comment-json';
 import superjson from 'superjson';
 
 const base = {
@@ -210,6 +210,21 @@ function createAuditLogWriter(table) {
   };
 }
 
+function first(rows) {
+  return rows.length > 0 ? rows[0] : void 0;
+}
+function firstOrError(rows) {
+  if (rows.length === 0) {
+    throw new Error("Query did not return any data.");
+  }
+  return rows[0];
+}
+const uuidv4 = () => crypto.randomUUID();
+const isRemoteEnvironment = () => {
+  const environment = process.env.ENVIRONMENT;
+  return environment && environment !== "localhost";
+};
+
 function durableObjectNamespaceIdFromName(uniqueKey, name) {
   const key = crypto$1.createHash("sha256").update(uniqueKey).digest();
   const nameHmac = crypto$1.createHmac("sha256", key).update(name).digest().subarray(0, 16);
@@ -220,11 +235,7 @@ const getDatabaseIdFromWrangler = () => {
   try {
     const wranglerPath = path.resolve("./wrangler.jsonc");
     const wranglerContent = fs.readFileSync(wranglerPath, "utf-8");
-    const errors = [];
-    const config = parse(wranglerContent, errors, { allowTrailingComma: true });
-    if (errors.length) {
-      throw new Error("Invalid JSONC in wrangler.jsonc");
-    }
+    const config = parse(wranglerContent);
     const environment = process.env.ENVIRONMENT || "localhost";
     let databaseId;
     if (environment !== "localhost" && config.env?.[environment]) {
@@ -249,10 +260,6 @@ const getDatabaseIdFromWrangler = () => {
     );
   }
 };
-const isRemoteEnvironment = () => {
-  const environment = process.env.ENVIRONMENT;
-  return environment && environment !== "localhost";
-};
 const getLocalD1 = (databaseId) => {
   const name = durableObjectNamespaceIdFromName(
     "miniflare-D1DatabaseObject",
@@ -280,7 +287,11 @@ const getLocalD1 = (databaseId) => {
     }
   }
 };
-const getCredentials = () => {
+const getD1Credentials = () => {
+  const environment = process.env.ENVIRONMENT;
+  if (environment === "localhost") {
+    return {};
+  }
   const databaseId = getDatabaseIdFromWrangler() ?? "";
   if (isRemoteEnvironment()) {
     return {
@@ -303,7 +314,7 @@ const drizzleD1Config = {
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "sqlite",
-  ...getCredentials()
+  ...getD1Credentials()
 };
 
 class DatabaseTransaction {
@@ -368,24 +379,26 @@ const defineCommand = (handler) => {
   });
 };
 
-function first(rows) {
-  return rows.length > 0 ? rows[0] : void 0;
-}
-function firstOrError(rows) {
-  if (rows.length === 0) {
-    throw new Error("Query did not return any data.");
+const getPgCredentials = () => {
+  if (isRemoteEnvironment()) {
+    return {
+      dbCredentials: {
+        url: process.env.DATABASE_URL
+      }
+    };
+  } else {
+    return {
+      dbCredentials: {
+        url: `postgres://db_user:db_password@127.0.0.1:${process.env.DB_LOCAL_PORT}/db`
+      }
+    };
   }
-  return rows[0];
-}
-const uuidv4 = () => crypto.randomUUID();
-
+};
 const drizzlePgConfig = {
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "postgresql",
-  dbCredentials: {
-    url: process.env.DATABASE_URL
-  },
+  ...getPgCredentials(),
   migrations: {
     table: "__drizzle_migrations",
     schema: "public"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-io/backend-sdk",
-  "version": "5.8.2",
+  "version": "5.9.0",
   "description": "Develit Backend SDK",
   "author": "Develit.io",
   "license": "ISC",
@@ -22,11 +22,6 @@
       "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     },
-    "./jsonc": {
-      "import": "./dist/jsonc.mjs",
-      "require": "./dist/jsonc.cjs",
-      "types": "./dist/jsonc.d.ts"
-    },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
@@ -34,12 +29,12 @@
   "files": ["dist"],
   "dependencies": {
     "@cloudflare/workers-types": "^4.20250722.0",
+    "comment-json": "^4.2.5",
     "consola": "^3.4.2",
     "drizzle-kit": "^0.31.4",
     "drizzle-orm": "^0.44.3",
     "h3": "^1.15.3",
     "http-status-codes": "2.3.0",
-    "jsonc-parser": "^3.3.1",
     "superjson": "^2.2.2"
   },
   "peerDependencies": {

package/dist/jsonc.cjs

@@ -1,16 +0,0 @@
-'use strict';
-
-const main_js = require('jsonc-parser/lib/esm/main.js');
-
-
-
-Object.prototype.hasOwnProperty.call(main_js, '__proto__') &&
-	!Object.prototype.hasOwnProperty.call(exports, '__proto__') &&
-	Object.defineProperty(exports, '__proto__', {
-		enumerable: true,
-		value: main_js['__proto__']
-	});
-
-Object.keys(main_js).forEach(function (k) {
-	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = main_js[k];
-});

package/dist/jsonc.d.cts

@@ -1 +0,0 @@
-export * from 'jsonc-parser/lib/esm/main.js';

package/dist/jsonc.d.mts

@@ -1 +0,0 @@
-export * from 'jsonc-parser/lib/esm/main.js';

package/dist/jsonc.d.ts

@@ -1 +0,0 @@
-export * from 'jsonc-parser/lib/esm/main.js';

package/dist/jsonc.mjs

@@ -1 +0,0 @@
-export * from 'jsonc-parser/lib/esm/main.js';