chore: wip

glennmichael123 · glennmichael123 · commit 9ec3e089ccab · 2024-09-24T00:08:45.000+08:00
diff --git a/storage/framework/.biomelintrc-auto-import.json b/storage/framework/.biomelintrc-auto-import.json
@@ -349,4 +349,4 @@
       "whenever"
     ]
   }
-}
+}
diff --git a/storage/framework/core/orm/src/utils.ts b/storage/framework/core/orm/src/utils.ts
@@ -240,7 +240,7 @@ export function getFillableAttributes(attributes: Attributes | undefined): strin
     .map((attribute) => snakeCase(attribute))
 }
 
-export async function writeModelNames() {
+export async function writeModelNames(): Promise<void> {
   const models = globSync([path.userModelsPath('*.ts')], { absolute: true })
   let fileString = `export type ModelNames = `
 
@@ -265,7 +265,7 @@ export async function writeModelNames() {
   }
 }
 
-export async function writeModelRequest() {
+export async function writeModelRequest(): Promise<void> {
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
   const requestD = Bun.file(path.frameworkPath('types/requests.d.ts'))
 
@@ -354,9 +354,9 @@ export async function writeModelRequest() {
       `
     }
 
-    fieldString += `created_at?: string
-      updated_at?: string
-      deleted_at?: string`
+    fieldString += `created_at?: Date
+      updated_at?: Date
+      deleted_at?: Date`
 
     const requestFile = Bun.file(path.frameworkPath(`requests/${modelName}Request.ts`))
 
@@ -567,7 +567,7 @@ function parseRule(rule: string): FieldArrayElement | null {
   )
 }
 
-export async function generateApiRoutes(modelFiles: string[]) {
+export async function generateApiRoutes(modelFiles: string[]): Promise<void> {
   const file = Bun.file(path.frameworkPath(`orm/routes.ts`))
   const writer = file.writer()
   let routeString = `import { route } from '@stacksjs/router'\n\n\n`
@@ -610,10 +610,6 @@ export async function generateApiRoutes(modelFiles: string[]) {
 
                   const formattedApiRoute = apiRoute.charAt(0).toUpperCase() + apiRoute.slice(1)
 
-                  const pathAction = path.builtUserActionsPath(`src/${modelName}${formattedApiRoute}OrmAction.ts`, {
-                    relative: true,
-                  })
-
                   if (apiRoute === 'index')
                     routeString += `route.get('${uri}', '${modelName}${formattedApiRoute}OrmAction').middleware(['Api'])\n\n`
                   if (apiRoute === 'show')
@@ -684,7 +680,7 @@ export async function generateApiRoutes(modelFiles: string[]) {
   await writer.end()
 }
 
-export async function deleteExistingModels(modelStringFile?: string) {
+export async function deleteExistingModels(modelStringFile?: string): Promise<void> {
   const typePath = path.frameworkPath(`orm/src/types.ts`)
   if (fs.existsSync(typePath)) await fs.promises.unlink(typePath)
 
@@ -709,7 +705,7 @@ export async function deleteExistingModels(modelStringFile?: string) {
   return
 }
 
-export async function deleteExistingOrmActions(modelStringFile?: string) {
+export async function deleteExistingOrmActions(modelStringFile?: string): Promise<void> {
   if (modelStringFile) {
     const ormPath = path.builtUserActionsPath(`src/${modelStringFile}.ts`)
     if (fs.existsSync(ormPath)) await fs.promises.unlink(ormPath)
@@ -724,12 +720,12 @@ export async function deleteExistingOrmActions(modelStringFile?: string) {
   }
 }
 
-export async function deleteExistingModelNameTypes() {
+export async function deleteExistingModelNameTypes(): Promise<void> {
   const typeFile = path.corePath(`types/src/model-names.ts`)
   if (fs.existsSync(typeFile)) await fs.promises.unlink(typeFile)
 }
 
-export async function deleteExistingModelRequest(modelStringFile?: string) {
+export async function deleteExistingModelRequest(modelStringFile?: string): Promise<void> {
   const requestD = path.frameworkPath('types/requests.d.ts')
   if (fs.existsSync(requestD)) await fs.promises.unlink(requestD)
 
@@ -746,12 +742,12 @@ export async function deleteExistingModelRequest(modelStringFile?: string) {
   }
 }
 
-export async function deleteExistingOrmRoute() {
+export async function deleteExistingOrmRoute(): Promise<void> {
   const ormRoute = path.frameworkPath('orm/routes.ts')
   if (fs.existsSync(ormRoute)) await fs.promises.unlink(ormRoute)
 }
 
-export async function generateKyselyTypes() {
+export async function generateKyselyTypes(): Promise<void> {
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
   let text = ``
 
@@ -1091,14 +1087,14 @@ export async function generateModelString(
 
   if (useTimestamps) {
     fieldString += `
-      created_at?: string\n
-      updated_at?: string
+      created_at?: Date\n
+      updated_at?: Date
     `
   }
 
   if (useSoftDeletes) {
     fieldString += `
-      deleted_at?: string
+      deleted_at?: Date
     `
   }
 
diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -19,9 +19,9 @@ export interface PersonalAccessTokensTable {
   abilities?: string[]
   team_id?: number
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface AccessTokenResponse {
diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -22,9 +22,9 @@ export interface DeploymentsTable {
   terminal_output?: string
   user_id?: number
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface DeploymentResponse {
diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -17,9 +17,9 @@ export interface PostsTable {
   body?: string
   user_id?: number
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface PostResponse {
diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -17,9 +17,9 @@ export interface ProjectsTable {
   url?: string
   status?: string
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface ProjectResponse {
diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -14,9 +14,9 @@ export interface ReleasesTable {
   id: Generated<number>
   version?: string
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface ReleaseResponse {
diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -15,9 +15,9 @@ export interface SubscribersTable {
   subscribed?: boolean
   user_id?: number
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface SubscriberResponse {
diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -14,11 +14,11 @@ export interface SubscriberEmailsTable {
   id: Generated<number>
   email?: string
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 
-  deleted_at?: string
+  deleted_at?: Date
 }
 
 interface SubscriberEmailResponse {
diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -26,9 +26,9 @@ export interface TeamsTable {
   accesstoken_id?: number
   user_id?: number
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface TeamResponse {
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -28,9 +28,9 @@ export interface UsersTable {
   post_id?: number
   two_factor_secret?: string
 
-  created_at?: string
+  created_at?: Date
 
-  updated_at?: string
+  updated_at?: Date
 }
 
 interface UserResponse {
diff --git a/storage/framework/requests/AccessTokenRequest.ts b/storage/framework/requests/AccessTokenRequest.ts
@@ -20,9 +20,9 @@ interface RequestDataAccessToken {
   plain_text_token: string
   abilities: string[]
   team_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class AccessTokenRequest extends Request<RequestDataAccessToken> implements AccessTokenRequestType {
   public id = 1
diff --git a/storage/framework/requests/DeploymentRequest.ts b/storage/framework/requests/DeploymentRequest.ts
@@ -23,9 +23,9 @@ interface RequestDataDeployment {
   deploy_script: string
   terminal_output: string
   user_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class DeploymentRequest extends Request<RequestDataDeployment> implements DeploymentRequestType {
   public id = 1
diff --git a/storage/framework/requests/PostRequest.ts b/storage/framework/requests/PostRequest.ts
@@ -18,9 +18,9 @@ interface RequestDataPost {
   title: string
   body: string
   user_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class PostRequest extends Request<RequestDataPost> implements PostRequestType {
   public id = 1
diff --git a/storage/framework/requests/ProjectRequest.ts b/storage/framework/requests/ProjectRequest.ts
@@ -19,9 +19,9 @@ interface RequestDataProject {
   description: string
   url: string
   status: string
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class ProjectRequest extends Request<RequestDataProject> implements ProjectRequestType {
   public id = 1
diff --git a/storage/framework/requests/ReleaseRequest.ts b/storage/framework/requests/ReleaseRequest.ts
@@ -16,9 +16,9 @@ interface CustomAttributes {
 interface RequestDataRelease {
   id?: number
   version: string
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class ReleaseRequest extends Request<RequestDataRelease> implements ReleaseRequestType {
   public id = 1
diff --git a/storage/framework/requests/SubscriberEmailRequest.ts b/storage/framework/requests/SubscriberEmailRequest.ts
@@ -16,9 +16,9 @@ interface CustomAttributes {
 interface RequestDataSubscriberEmail {
   id?: number
   email: string
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class SubscriberEmailRequest extends Request<RequestDataSubscriberEmail> implements SubscriberEmailRequestType {
   public id = 1
diff --git a/storage/framework/requests/SubscriberRequest.ts b/storage/framework/requests/SubscriberRequest.ts
@@ -17,9 +17,9 @@ interface RequestDataSubscriber {
   id?: number
   subscribed: boolean
   user_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class SubscriberRequest extends Request<RequestDataSubscriber> implements SubscriberRequestType {
   public id = 1
diff --git a/storage/framework/requests/TeamRequest.ts b/storage/framework/requests/TeamRequest.ts
@@ -25,9 +25,9 @@ interface RequestDataTeam {
   is_personal: boolean
   accesstoken_id: number
   user_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class TeamRequest extends Request<RequestDataTeam> implements TeamRequestType {
   public id = 1
diff --git a/storage/framework/requests/UserRequest.ts b/storage/framework/requests/UserRequest.ts
@@ -22,9 +22,9 @@ interface RequestDataUser {
   team_id: number
   deployment_id: number
   post_id: number
-  created_at?: string
-  updated_at?: string
-  deleted_at?: string
+  created_at?: Date
+  updated_at?: Date
+  deleted_at?: Date
 }
 export class UserRequest extends Request<RequestDataUser> implements UserRequestType {
   public id = 1
diff --git a/storage/framework/types/requests.d.ts b/storage/framework/types/requests.d.ts

Original file line number	Diff line number	Diff line change
`@@ -349,4 +349,4 @@`
`349`	`349`	`"whenever"`
`350`	`350`	`]`
`351`	`351`	`}`
`352`		`-}`
	`352`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ export function getFillableAttributes(attributes: Attributes \| undefined): strin`
`240`	`240`	`.map((attribute) => snakeCase(attribute))`
`241`	`241`	`}`
`242`	`242`
`243`		`-export async function writeModelNames() {`
	`243`	`+export async function writeModelNames(): Promise<void> {`
`244`	`244`	`const models = globSync([path.userModelsPath('*.ts')], { absolute: true })`
`245`	`245`	let fileString = `export type ModelNames = `
`246`	`246`
`@@ -265,7 +265,7 @@ export async function writeModelNames() {`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
`268`		`-export async function writeModelRequest() {`
	`268`	`+export async function writeModelRequest(): Promise<void> {`
`269`	`269`	`const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })`
`270`	`270`	`const requestD = Bun.file(path.frameworkPath('types/requests.d.ts'))`
`271`	`271`
`@@ -354,9 +354,9 @@ export async function writeModelRequest() {`
`354`	`354`	`
`355`	`355`	`}`
`356`	`356`
`357`		- fieldString += `created_at?: string
`358`		`- updated_at?: string`
`359`		- deleted_at?: string`
	`357`	+ fieldString += `created_at?: Date
	`358`	`+ updated_at?: Date`
	`359`	+ deleted_at?: Date`
`360`	`360`
`361`	`361`	const requestFile = Bun.file(path.frameworkPath(`requests/${modelName}Request.ts`))
`362`	`362`
`@@ -567,7 +567,7 @@ function parseRule(rule: string): FieldArrayElement \| null {`
`567`	`567`	`)`
`568`	`568`	`}`
`569`	`569`
`570`		`-export async function generateApiRoutes(modelFiles: string[]) {`
	`570`	`+export async function generateApiRoutes(modelFiles: string[]): Promise<void> {`
`571`	`571`	const file = Bun.file(path.frameworkPath(`orm/routes.ts`))
`572`	`572`	`const writer = file.writer()`
`573`	`573`	let routeString = `import { route } from '@stacksjs/router'\n\n\n`
`@@ -610,10 +610,6 @@ export async function generateApiRoutes(modelFiles: string[]) {`
`610`	`610`
`611`	`611`	`const formattedApiRoute = apiRoute.charAt(0).toUpperCase() + apiRoute.slice(1)`
`612`	`612`
`613`		- const pathAction = path.builtUserActionsPath(`src/${modelName}${formattedApiRoute}OrmAction.ts`, {
`614`		`- relative: true,`
`615`		`- })`
`616`		`-`
`617`	`613`	`if (apiRoute === 'index')`
`618`	`614`	routeString += `route.get('${uri}', '${modelName}${formattedApiRoute}OrmAction').middleware(['Api'])\n\n`
`619`	`615`	`if (apiRoute === 'show')`
`@@ -684,7 +680,7 @@ export async function generateApiRoutes(modelFiles: string[]) {`
`684`	`680`	`await writer.end()`
`685`	`681`	`}`
`686`	`682`
`687`		`-export async function deleteExistingModels(modelStringFile?: string) {`
	`683`	`+export async function deleteExistingModels(modelStringFile?: string): Promise<void> {`
`688`	`684`	const typePath = path.frameworkPath(`orm/src/types.ts`)
`689`	`685`	`if (fs.existsSync(typePath)) await fs.promises.unlink(typePath)`
`690`	`686`
`@@ -709,7 +705,7 @@ export async function deleteExistingModels(modelStringFile?: string) {`
`709`	`705`	`return`
`710`	`706`	`}`
`711`	`707`
`712`		`-export async function deleteExistingOrmActions(modelStringFile?: string) {`
	`708`	`+export async function deleteExistingOrmActions(modelStringFile?: string): Promise<void> {`
`713`	`709`	`if (modelStringFile) {`
`714`	`710`	const ormPath = path.builtUserActionsPath(`src/${modelStringFile}.ts`)
`715`	`711`	`if (fs.existsSync(ormPath)) await fs.promises.unlink(ormPath)`
`@@ -724,12 +720,12 @@ export async function deleteExistingOrmActions(modelStringFile?: string) {`
`724`	`720`	`}`
`725`	`721`	`}`
`726`	`722`
`727`		`-export async function deleteExistingModelNameTypes() {`
	`723`	`+export async function deleteExistingModelNameTypes(): Promise<void> {`
`728`	`724`	const typeFile = path.corePath(`types/src/model-names.ts`)
`729`	`725`	`if (fs.existsSync(typeFile)) await fs.promises.unlink(typeFile)`
`730`	`726`	`}`
`731`	`727`
`732`		`-export async function deleteExistingModelRequest(modelStringFile?: string) {`
	`728`	`+export async function deleteExistingModelRequest(modelStringFile?: string): Promise<void> {`
`733`	`729`	`const requestD = path.frameworkPath('types/requests.d.ts')`
`734`	`730`	`if (fs.existsSync(requestD)) await fs.promises.unlink(requestD)`
`735`	`731`
`@@ -746,12 +742,12 @@ export async function deleteExistingModelRequest(modelStringFile?: string) {`
`746`	`742`	`}`
`747`	`743`	`}`
`748`	`744`
`749`		`-export async function deleteExistingOrmRoute() {`
	`745`	`+export async function deleteExistingOrmRoute(): Promise<void> {`
`750`	`746`	`const ormRoute = path.frameworkPath('orm/routes.ts')`
`751`	`747`	`if (fs.existsSync(ormRoute)) await fs.promises.unlink(ormRoute)`
`752`	`748`	`}`
`753`	`749`
`754`		`-export async function generateKyselyTypes() {`
	`750`	`+export async function generateKyselyTypes(): Promise<void> {`
`755`	`751`	`const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })`
`756`	`752`	let text = ``
`757`	`753`
`@@ -1091,14 +1087,14 @@ export async function generateModelString(`
`1091`	`1087`
`1092`	`1088`	`if (useTimestamps) {`
`1093`	`1089`	fieldString += `
`1094`		`- created_at?: string\n`
`1095`		`- updated_at?: string`
	`1090`	`+ created_at?: Date\n`
	`1091`	`+ updated_at?: Date`
`1096`	`1092`	`
`1097`	`1093`	`}`
`1098`	`1094`
`1099`	`1095`	`if (useSoftDeletes) {`
`1100`	`1096`	fieldString += `
`1101`		`- deleted_at?: string`
	`1097`	`+ deleted_at?: Date`
`1102`	`1098`	`
`1103`	`1099`	`}`
`1104`	`1100`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ export interface PersonalAccessTokensTable {`
`19`	`19`	`abilities?: string[]`
`20`	`20`	`team_id?: number`
`21`	`21`
`22`		`- created_at?: string`
	`22`	`+ created_at?: Date`
`23`	`23`
`24`		`- updated_at?: string`
	`24`	`+ updated_at?: Date`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`interface AccessTokenResponse {`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ export interface DeploymentsTable {`
`22`	`22`	`terminal_output?: string`
`23`	`23`	`user_id?: number`
`24`	`24`
`25`		`- created_at?: string`
	`25`	`+ created_at?: Date`
`26`	`26`
`27`		`- updated_at?: string`
	`27`	`+ updated_at?: Date`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`interface DeploymentResponse {`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ export interface PostsTable {`
`17`	`17`	`body?: string`
`18`	`18`	`user_id?: number`
`19`	`19`
`20`		`- created_at?: string`
	`20`	`+ created_at?: Date`
`21`	`21`
`22`		`- updated_at?: string`
	`22`	`+ updated_at?: Date`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`interface PostResponse {`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ export interface ProjectsTable {`
`17`	`17`	`url?: string`
`18`	`18`	`status?: string`
`19`	`19`
`20`		`- created_at?: string`
	`20`	`+ created_at?: Date`
`21`	`21`
`22`		`- updated_at?: string`
	`22`	`+ updated_at?: Date`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`interface ProjectResponse {`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ export interface ReleasesTable {`
`14`	`14`	`id: Generated<number>`
`15`	`15`	`version?: string`
`16`	`16`
`17`		`- created_at?: string`
	`17`	`+ created_at?: Date`
`18`	`18`
`19`		`- updated_at?: string`
	`19`	`+ updated_at?: Date`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`interface ReleaseResponse {`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ export interface SubscribersTable {`
`15`	`15`	`subscribed?: boolean`
`16`	`16`	`user_id?: number`
`17`	`17`
`18`		`- created_at?: string`
	`18`	`+ created_at?: Date`
`19`	`19`
`20`		`- updated_at?: string`
	`20`	`+ updated_at?: Date`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`interface SubscriberResponse {`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ export interface TeamsTable {`
`26`	`26`	`accesstoken_id?: number`
`27`	`27`	`user_id?: number`
`28`	`28`
`29`		`- created_at?: string`
	`29`	`+ created_at?: Date`
`30`	`30`
`31`		`- updated_at?: string`
	`31`	`+ updated_at?: Date`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`interface TeamResponse {`