@develit-io/backend-sdk 10.0.4 → 10.0.5

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as drizzle_orm from 'drizzle-orm';
-import { Table, AnyColumn } from 'drizzle-orm';
+import { Table, ExtractTablesWithRelations, DBQueryConfig, BuildQueryResult, AnyColumn } from 'drizzle-orm';
 import * as drizzle_orm_sqlite_core from 'drizzle-orm/sqlite-core';
 import { AnySQLiteTable } from 'drizzle-orm/sqlite-core';
 import { z as z$1, ZodObject, ZodType, ZodOptional } from 'zod';
@@ -944,6 +944,26 @@ type IdentityContextVariables = {
     };
 };
 
+/**
+ * Utility type to infer possible relation includes (`with`) for a given table.
+ * This helps define which relations (one-to-many, many-to-one) can be included in a query.
+ *
+ * @template Tables - The Drizzle ORM schema object.
+ * @template TableName - The table for which relations should be inferred.
+ */
+type IncludeRelation<Tables extends Record<string, unknown>, TableName extends keyof ExtractTablesWithRelations<Tables>> = DBQueryConfig<'one' | 'many', boolean, ExtractTablesWithRelations<Tables>, ExtractTablesWithRelations<Tables>[TableName]>['with'];
+/**
+ * Infers the result type of Drizzle ORM select query with optional relations.
+ * This ensures correct TypeScript inference when querying tables and their relations.
+ *
+ * @template Tables - The Drizzle ORM schema object.
+ * @template TableName - The table for which the query result is being inferred.
+ * @template With - (Optional) Specifies which relations should be included in the result.
+ */
+type InferResultType<Tables extends Record<string, unknown>, TableName extends keyof ExtractTablesWithRelations<Tables>, With extends IncludeRelation<Tables, TableName> | undefined = undefined> = BuildQueryResult<ExtractTablesWithRelations<Tables>, ExtractTablesWithRelations<Tables>[TableName], {
+    with: With;
+}>;
+
 interface RequestLog {
     method: string;
     path: string;
@@ -1117,8 +1137,11 @@ type AuditLogWriter<TAuditAction = string> = (logs: AuditLogPayload<TAuditAction
 declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTable): AuditLogWriter<TAuditAction>;
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
-declare const getLocalD1DatabaseIdFromWrangler: () => string | undefined;
-declare const getD1Credentials: () => Promise<{
+declare const getD1DatabaseIdFromWrangler: () => string | undefined;
+declare const getD1Credentials: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -1134,8 +1157,14 @@ declare const getD1Credentials: () => Promise<{
         token?: undefined;
     };
     driver?: undefined;
-}>;
-declare const getDrizzleD1Config: () => Promise<{
+};
+declare const getDrizzleD1Config: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -1157,7 +1186,7 @@ declare const getDrizzleD1Config: () => Promise<{
     schema: string;
     out: string;
     dialect: "sqlite";
-}>;
+};
 
 type Operator = 'like' | 'ilike';
 type Wrap = 'both' | 'prefix' | 'suffix' | 'none';
@@ -1310,5 +1339,5 @@ interface WithRetryCounterOptions {
 type AsyncMethod<TArgs extends unknown[] = unknown[], TResult = unknown> = (...args: TArgs) => Promise<TResult>;
 declare function cloudflareQueue<TArgs extends unknown[] = unknown[], TResult = unknown>(options: WithRetryCounterOptions): (target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<AsyncMethod<TArgs, TResult>>) => void;
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getDrizzleD1Config, getLocalD1DatabaseIdFromWrangler, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, uuidv4, uuidv5, workflowInstanceStatusSchema };
-export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, BankAccountMetadata, BaseEvent, BuildSearchOptions, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyContextVariables, IdentityContextVariables, InternalError, InternalErrorResponseStatus, Project, RequestLog, ResponseLog, StructuredAddress, UserRole, ValidatedInput, WorkflowInstanceStatus };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, uuidv4, uuidv5, workflowInstanceStatusSchema };
+export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, BankAccountMetadata, BaseEvent, BuildSearchOptions, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyContextVariables, IdentityContextVariables, IncludeRelation, InferResultType, InternalError, InternalErrorResponseStatus, Project, RequestLog, ResponseLog, StructuredAddress, UserRole, ValidatedInput, WorkflowInstanceStatus };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as drizzle_orm from 'drizzle-orm';
-import { Table, AnyColumn } from 'drizzle-orm';
+import { Table, ExtractTablesWithRelations, DBQueryConfig, BuildQueryResult, AnyColumn } from 'drizzle-orm';
 import * as drizzle_orm_sqlite_core from 'drizzle-orm/sqlite-core';
 import { AnySQLiteTable } from 'drizzle-orm/sqlite-core';
 import { z as z$1, ZodObject, ZodType, ZodOptional } from 'zod';
@@ -944,6 +944,26 @@ type IdentityContextVariables = {
     };
 };
 
+/**
+ * Utility type to infer possible relation includes (`with`) for a given table.
+ * This helps define which relations (one-to-many, many-to-one) can be included in a query.
+ *
+ * @template Tables - The Drizzle ORM schema object.
+ * @template TableName - The table for which relations should be inferred.
+ */
+type IncludeRelation<Tables extends Record<string, unknown>, TableName extends keyof ExtractTablesWithRelations<Tables>> = DBQueryConfig<'one' | 'many', boolean, ExtractTablesWithRelations<Tables>, ExtractTablesWithRelations<Tables>[TableName]>['with'];
+/**
+ * Infers the result type of Drizzle ORM select query with optional relations.
+ * This ensures correct TypeScript inference when querying tables and their relations.
+ *
+ * @template Tables - The Drizzle ORM schema object.
+ * @template TableName - The table for which the query result is being inferred.
+ * @template With - (Optional) Specifies which relations should be included in the result.
+ */
+type InferResultType<Tables extends Record<string, unknown>, TableName extends keyof ExtractTablesWithRelations<Tables>, With extends IncludeRelation<Tables, TableName> | undefined = undefined> = BuildQueryResult<ExtractTablesWithRelations<Tables>, ExtractTablesWithRelations<Tables>[TableName], {
+    with: With;
+}>;
+
 interface RequestLog {
     method: string;
     path: string;
@@ -1117,8 +1137,11 @@ type AuditLogWriter<TAuditAction = string> = (logs: AuditLogPayload<TAuditAction
 declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTable): AuditLogWriter<TAuditAction>;
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
-declare const getLocalD1DatabaseIdFromWrangler: () => string | undefined;
-declare const getD1Credentials: () => Promise<{
+declare const getD1DatabaseIdFromWrangler: () => string | undefined;
+declare const getD1Credentials: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -1134,8 +1157,14 @@ declare const getD1Credentials: () => Promise<{
         token?: undefined;
     };
     driver?: undefined;
-}>;
-declare const getDrizzleD1Config: () => Promise<{
+};
+declare const getDrizzleD1Config: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
@@ -1157,7 +1186,7 @@ declare const getDrizzleD1Config: () => Promise<{
     schema: string;
     out: string;
     dialect: "sqlite";
-}>;
+};
 
 type Operator = 'like' | 'ilike';
 type Wrap = 'both' | 'prefix' | 'suffix' | 'none';
@@ -1310,5 +1339,5 @@ interface WithRetryCounterOptions {
 type AsyncMethod<TArgs extends unknown[] = unknown[], TResult = unknown> = (...args: TArgs) => Promise<TResult>;
 declare function cloudflareQueue<TArgs extends unknown[] = unknown[], TResult = unknown>(options: WithRetryCounterOptions): (target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<AsyncMethod<TArgs, TResult>>) => void;
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getDrizzleD1Config, getLocalD1DatabaseIdFromWrangler, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, uuidv4, uuidv5, workflowInstanceStatusSchema };
-export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, BankAccountMetadata, BaseEvent, BuildSearchOptions, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyContextVariables, IdentityContextVariables, InternalError, InternalErrorResponseStatus, Project, RequestLog, ResponseLog, StructuredAddress, UserRole, ValidatedInput, WorkflowInstanceStatus };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, uuidv4, uuidv5, workflowInstanceStatusSchema };
+export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, BankAccountMetadata, BaseEvent, BuildSearchOptions, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyContextVariables, IdentityContextVariables, IncludeRelation, InferResultType, InternalError, InternalErrorResponseStatus, Project, RequestLog, ResponseLog, StructuredAddress, UserRole, ValidatedInput, WorkflowInstanceStatus };

package/dist/index.mjs

@@ -6,11 +6,11 @@ import { createInsertSchema as createInsertSchema$1 } from 'drizzle-zod';
 export { createSelectSchema } from 'drizzle-zod';
 import { z as z$1 } from 'zod';
 import * as z from 'zod/v4/core';
-import Cloudflare from 'cloudflare';
-import { parse } from 'comment-json';
-import crypto$1 from 'node:crypto';
+import 'cloudflare';
 import fs from 'node:fs';
+import crypto$1 from 'node:crypto';
 import path from 'node:path';
+import { parse } from 'comment-json';
 import superjson from 'superjson';
 
 const ENVIRONMENT = ["dev", "test", "staging", "production"];
@@ -470,42 +470,41 @@ function derivePortFromId(id, base = 4e3, range = 1e4) {
   return base + hash % range;
 }
 
-const readWranglerConfig = () => {
-  try {
-    const content = fs.readFileSync(path.resolve("./wrangler.jsonc"), "utf-8");
-    return parse(content);
-  } catch (err) {
-    console.warn(`Warning: Could not read wrangler.jsonc: ${err}`);
-  }
-};
 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);
   const hmac = crypto$1.createHmac("sha256", key).update(nameHmac).digest().subarray(0, 16);
   return Buffer.concat([nameHmac, hmac]).toString("hex");
 }
-const getD1DatabaseId = async (instanceName) => {
-  const cloudflare = new Cloudflare({
-    apiToken: process.env.CLOUDFLARE_API_TOKEN
-  });
-  const databases = cloudflare.d1.database.list({
-    account_id: process.env.CLOUDFLARE_ACCOUNT_ID
-  });
-  for await (const db of databases) {
-    if (db.name === instanceName) {
-      return db.uuid;
+const getD1DatabaseIdFromWrangler = () => {
+  try {
+    const wranglerPath = path.resolve("./wrangler.jsonc");
+    const wranglerContent = fs.readFileSync(wranglerPath, "utf-8");
+    const config = parse(wranglerContent);
+    const environment = process.env.ENVIRONMENT || "localhost";
+    let databaseId;
+    if (environment !== "localhost" && config.env?.[environment]) {
+      databaseId = config.env[environment].d1_databases?.[0]?.database_id;
+      console.log(
+        `Using database_id for environment '${environment}': ${databaseId}`
+      );
+    }
+    if (!databaseId) {
+      databaseId = config.d1_databases?.[0]?.database_id;
+      console.log(
+        `Using default database_id for environment '${environment}': ${databaseId}`
+      );
     }
+    if (!databaseId) {
+      throw new Error("database_id not found in wrangler.jsonc");
+    }
+    return databaseId;
+  } catch (err) {
+    console.warn(
+      `Warning: Could not read database_id from wrangler.jsonc: ${err}`
+    );
   }
 };
-const getLocalD1DatabaseIdFromWrangler = () => {
-  const databaseId = readWranglerConfig()?.d1_databases?.[0]?.database_id;
-  if (!databaseId) {
-    console.warn("Warning: database_id not found in wrangler.jsonc");
-    return;
-  }
-  console.log(`Using local database_id: ${databaseId}`);
-  return databaseId;
-};
 const getLocalD1 = (databaseId) => {
   const name = durableObjectNamespaceIdFromName(
     "miniflare-D1DatabaseObject",
@@ -533,12 +532,13 @@ const getLocalD1 = (databaseId) => {
     }
   }
 };
-const getD1Credentials = async () => {
+const getD1Credentials = () => {
   const environment = process.env.ENVIRONMENT;
+  if (environment === "localhost") {
+    return {};
+  }
+  const databaseId = getD1DatabaseIdFromWrangler() ?? "";
   if (isRemoteEnvironment()) {
-    const workerName = readWranglerConfig()?.name ?? "";
-    const instanceName = environment === "production" ? workerName : `${workerName}-${environment}`;
-    const databaseId = await getD1DatabaseId(instanceName) ?? "";
     return {
       driver: "d1-http",
       dbCredentials: {
@@ -547,18 +547,19 @@ const getD1Credentials = async () => {
         token: process.env.CLOUDFLARE_API_TOKEN
       }
     };
+  } else {
+    return {
+      dbCredentials: {
+        url: getLocalD1(databaseId)
+      }
+    };
   }
-  return {
-    dbCredentials: {
-      url: getLocalD1(getLocalD1DatabaseIdFromWrangler() ?? "")
-    }
-  };
 };
-const getDrizzleD1Config = async () => ({
+const getDrizzleD1Config = () => ({
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "sqlite",
-  ...await getD1Credentials()
+  ...getD1Credentials()
 });
 
 const buildSearchConditions = (search, columns, opts = {}) => {
@@ -794,9 +795,24 @@ function develitWorker(Worker) {
   class DevelitWorker extends Worker {
     name = "not-set";
     action = "not-set";
+    // public db!: DatabaseTransaction<string>
     async fetch() {
       return new Response("Service is up and running!");
     }
+    // initializeDB<TAuditAction = string>(
+    //   database: D1Database,
+    //   schema: Record<string, unknown>,
+    //   auditLogWriter?: AuditLogWriter<TAuditAction>,
+    // ): void {
+    //   const drizzleInstance = drizzle(database, {
+    //     schema,
+    //   }) as DrizzleD1Database<Record<string, unknown>>
+    //   this.db = new DatabaseTransaction<TAuditAction>(
+    //     drizzleInstance,
+    //     this.name,
+    //     auditLogWriter,
+    //   ) as unknown as DatabaseTransaction<string>
+    // }
     handleInput({
       input,
       schema
@@ -863,17 +879,15 @@ function develitWorker(Worker) {
         `${this.name}:${this.action}:error`
       );
     }
-    async pushToQueue(queue, message) {
+    pushToQueue(queue, message) {
       if (!queue) {
         throw new Error(
           "[pushToQueue] Queue binding is undefined \u2014 check your wrangler config"
         );
       }
-      if (!Array.isArray(message)) {
-        await queue.send(message, { contentType: "v8" });
-        return;
-      }
-      await queue.sendBatch(
+      if (!Array.isArray(message))
+        return queue.send(message, { contentType: "v8" });
+      return queue.sendBatch(
         message.map((m) => ({
           body: m,
           contentType: "v8"
@@ -891,4 +905,4 @@ function develitWorker(Worker) {
   return DevelitWorker;
 }
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getDrizzleD1Config, getLocalD1DatabaseIdFromWrangler, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, workflowInstanceStatusSchema };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, asNonEmpty, bankAccount, bankAccountMetadataSchema, base, bicSchema, buildMultiFilterConditions, buildRangeFilterConditions, buildSearchConditions, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInsertSchema, createInternalError, createPatchSchema, createUpdateSchema, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, ibanSchema, isInternalError, nullToOptional, optionalToNull, paginationQuerySchema, paginationSchema, resolveColumn, service, structuredAddressSchema, useFetch, useResult, useResultSync, workflowInstanceStatusSchema };

package/dist/middlewares.mjs

@@ -2,10 +2,10 @@ import { createMiddleware } from 'hono/factory';
 import { HTTPException } from 'hono/http-exception';
 import { z } from 'zod';
 import 'cloudflare';
-import 'comment-json';
-import 'node:crypto';
 import 'node:fs';
+import 'node:crypto';
 import 'node:path';
+import 'comment-json';
 import 'drizzle-orm';
 import { u as uuidv4 } from './shared/backend-sdk.D_gzDKeC.mjs';
 import { verifyPayloadSignature } from './utils/signature.util.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-io/backend-sdk",
-  "version": "10.0.4",
+  "version": "10.0.5",
   "description": "Develit Backend SDK",
   "author": "Develit.io",
   "license": "ISC",
@@ -41,8 +41,8 @@
   },
   "peerDependencies": {
     "@develit-io/general-codes": "^1.19.0",
-    "drizzle-orm": "1.0.0-rc.1",
-    "drizzle-zod": "1.0.0-rc.1",
+    "drizzle-orm": "^0.45.1",
+    "drizzle-zod": "^0.8.3",
     "hono": "^4.12.7",
     "zod": "^4.3.6"
   },