chore: wip

Author: glennmichael123

storage/framework/core/cache/src/drivers/dynamodb.ts

@@ -1,4 +1,5 @@
 import type { CacheDriver } from '@stacksjs/types'
+import type { GetOptions } from 'bentocache/types'
 import process from 'node:process'
 import { BentoCache, bentostore } from 'bentocache'
 import { dynamoDbDriver } from 'bentocache/drivers/dynamodb'
@@ -50,15 +51,18 @@ export const dynamodb: CacheDriver = {
       value,
     })
   },
-  async get(key: string): Promise<string | undefined | null> {
-    const items = await client.get<string>(key)
+  async get<T>(key: GetOptions<T>): Promise<T> {
+    const items = await client.get<T>(key)
 
     return items
   },
-  async getOrSet(key: string, value: string): Promise<string | undefined | null> {
-    const items = await client.getOrSet(key, () => value)
+  async getOrSet<T>(key: string, value: T): Promise<T> {
+    const result = await client.getOrSet<T>({
+      key,
+      factory: async () => value,
+    })
 
-    return items
+    return result
   },
   async del(key: string): Promise<void> {
     await client.delete({ key })

storage/framework/core/email/src/email.ts

@@ -1,80 +1,85 @@
-// import { SES } from '@aws-sdk/client-ses'
-// import { log } from '@stacksjs/logging'
-// import type { RenderOptions } from './template'
-// import { template } from './template'
-// import type { Message, SendEmailParams } from './types'
-
-// export class Email {
-//   private client: SES
-
-//   constructor(private message: Message) {
-//     this.client = new SES({ region: 'us-east-1' })
-//     this.message = message
-//   }
-
-//   public async send(options?: RenderOptions): Promise<{ message: string }> {
-//     log.info('Sending email...')
-//     const path = this.message.template
-
-//     try {
-//       const templ = await template(path, options)
-
-//       const params: SendEmailParams = {
-//         Source: this.message.from?.address || '',
-
-//         Destination: {
-//           ToAddresses: [this.message.to],
-//         },
-
-//         Message: {
-//           Body: {
-//             Html: {
-//               Charset: 'UTF-8',
-//               Data: templ.html,
-//             },
-//           },
-
-//           Subject: {
-//             Charset: 'UTF-8',
-//             Data: this.message.subject,
-//           },
-//         },
-//       }
-
-//       await this.client.sendEmail(params)
-
-//       let returnMsg: { message: string } = { message: 'Email sent' }
-
-//       if (this.message.handle) returnMsg = await this.message.handle()
-
-//       await this.onSuccess()
-
-//       return returnMsg
-//     } catch (error) {
-//       return this.onError(error as Error)
-//     }
-//   }
-
-//   public async onError(error: Error) {
-//     log.error(error)
-
-//     if (!this.message.onError) return
-
-//     return await this.message.onError(error)
-//   }
-
-//   // public onSuccess() {
-//   //   try {
-//   //     if (!this.message.onSuccess) return
-
-//   //     this.message.onSuccess()
-//   //   } catch (error) {
-//   //     return this.onError(error as Error)
-//   //   }
-//   // }
-// }
-
-// export type { Message }
-
-// // export const email = (options: Message) => new Email(options)
-// export default Email
+import type { RenderOptions } from './template'
+import type { Message, SendEmailParams } from './types'
+import { SES } from '@aws-sdk/client-ses'
+import { log } from '@stacksjs/logging'
+import { template } from './template'
+
+export class Email {
+  private client: SES
+
+  constructor(private message: Message) {
+    this.client = new SES({ region: 'us-east-1' })
+    this.message = message
+  }
+
+  public async send(options?: RenderOptions): Promise<{ message: string }> {
+    log.info('Sending email...')
+    const path = this.message.template
+
+    try {
+      const templ = await template(path, options)
+
+      const params: SendEmailParams = {
+        Source: this.message.from?.address || '',
+
+        Destination: {
+          ToAddresses: [this.message.to],
+        },
+
+        Message: {
+          Body: {
+            Html: {
+              Charset: 'UTF-8',
+              Data: templ,
+            },
+          },
+
+          Subject: {
+            Charset: 'UTF-8',
+            Data: this.message.subject,
+          },
+        },
+      }
+
+      await this.client.sendEmail(params)
+
+      let returnMsg: { message: string } = { message: 'Email sent' }
+
+      if (this.message.handle)
+        returnMsg = await this.message.handle()
+
+      await this.onSuccess()
+
+      return returnMsg
+    }
+    catch (error) {
+      return this.onError(error as Error)
+    }
+  }
+
+  public async onError(error: Error) {
+    log.error(error)
+
+    if (!this.message.onError)
+      return
+
+    return await this.message.onError(error)
+  }
+
+  public onSuccess() {
+    try {
+      if (!this.message.onSuccess)
+        return
+
+      this.message.onSuccess()
+    }
+    catch (error) {
+      return this.onError(error as Error)
+    }
+  }
+}
+
+export type { Message }
+
+// export const email = (options: Message) => new Email(options)
+export default Email

storage/framework/core/types/src/cache.ts

@@ -1,4 +1,5 @@
 import type { BentoCache } from 'bentocache'
+import type { GetOptions } from 'bentocache/types'
 
 export interface CacheOptions {
   /**
@@ -108,8 +109,8 @@ export type CacheConfig = Partial<CacheOptions>
 export interface CacheDriver {
   set: (key: string, value: string, ttl?: number) => Promise<void>
   setForever: (key: string, value: string, ttl?: number) => Promise<void>
-  get: (key: string) => Promise<string | undefined | null>
-  getOrSet: (key: string, value: string) => Promise<string | undefined | null>
+  get: <T> (key: GetOptions<T>) => Promise<T>
+  getOrSet: <T> (key: string, value: T) => Promise<T>
   remove: (key: string) => Promise<void>
   has: (key: string) => Promise<boolean>
   missing: (key: string) => Promise<boolean>

storage/framework/server-auto-imports.json

@@ -164,4 +164,4 @@
     "transactionRequest": true,
     "userRequest": true
   }
-}
+}