Skip to content

Commit 2d1394b

Browse files
chore: wip
1 parent 1e15454 commit 2d1394b

File tree

4 files changed

+37
-2
lines changed

4 files changed

+37
-2
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
export { default as AccessToken } from '../../../orm/src/models/AccessToken'
2+
23
export { default as Deployment } from '../../../orm/src/models/Deployment'
4+
35
export { default as Error } from '../../../orm/src/models/Error'
6+
47
export { default as FailedJob } from '../../../orm/src/models/FailedJob'
8+
59
export { default as Job } from '../../../orm/src/models/Job'
10+
611
export { default as PaymentMethod } from '../../../orm/src/models/PaymentMethod'
12+
713
export { default as Post } from '../../../orm/src/models/Post'
14+
815
export { default as Product } from '../../../orm/src/models/Product'
16+
917
export { default as Project } from '../../../orm/src/models/Project'
18+
1019
export { default as Release } from '../../../orm/src/models/Release'
20+
1121
export { default as Subscriber } from '../../../orm/src/models/Subscriber'
22+
1223
export { default as SubscriberEmail } from '../../../orm/src/models/SubscriberEmail'
24+
1325
export { default as Subscription } from '../../../orm/src/models/Subscription'
26+
1427
export { default as Team } from '../../../orm/src/models/Team'
28+
1529
export { default as Transaction } from '../../../orm/src/models/Transaction'
30+
1631
export { default as User } from '../../../orm/src/models/User'

storage/framework/core/orm/src/utils.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2575,6 +2575,8 @@ export async function generateModelFiles(modelStringFile?: string): Promise<void
25752575
await generateApiRoutes(coreModelFiles)
25762576
log.success('Generated API Routes')
25772577

2578+
await writeModelOrmImports([...modelFiles, ...coreModelFiles])
2579+
25782580
for (const modelFile of modelFiles) {
25792581
if (modelStringFile && modelStringFile !== modelFile)
25802582
continue
@@ -2628,6 +2630,24 @@ export async function generateModelFiles(modelStringFile?: string): Promise<void
26282630
}
26292631
}
26302632

2633+
async function writeModelOrmImports(modelFiles: string[]): Promise<void> {
2634+
let ormImportString = ``
2635+
for (const modelFile of modelFiles) {
2636+
const model = (await import(modelFile)).default as Model
2637+
2638+
const modelName = getModelName(model, modelFile)
2639+
2640+
ormImportString += `export { default as ${modelName} } from '../../../orm/src/models/${modelName}'\n\n`
2641+
}
2642+
2643+
const file = Bun.file(path.frameworkPath(`core/orm/src/models.ts`))
2644+
const writer = file.writer()
2645+
2646+
writer.write(ormImportString)
2647+
2648+
await writer.end()
2649+
}
2650+
26312651
export async function extractAttributesFromModel(filePath: string): Promise<Attributes> {
26322652
// Read the TypeScript file
26332653
const content = fs.readFileSync(filePath, 'utf8')

storage/framework/core/router/src/router.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export class Router implements RouterInterface {
199199

200200
const prefix = options.prefix || '/'
201201
const formattedPrefix = prefix.startsWith('/') ? prefix : `/${prefix}`
202-
202+
203203
if (options.prefix) {
204204
r.path = formattedPrefix + r.uri
205205
r.uri = formattedPrefix + r.uri

storage/framework/core/scheduler/src/run.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { JobOptions } from '@stacksjs/types'
22
import { err, type Err, ok, type Ok } from '@stacksjs/error-handling'
3+
import { log } from '@stacksjs/logging'
34
import { path } from '@stacksjs/path'
45
import { fs, globSync } from '@stacksjs/storage'
56
import { snakeCase } from '@stacksjs/strings'
67
import { Every } from '@stacksjs/types'
7-
import { log } from '@stacksjs/logging'
88

99
interface JobSchedule {
1010
jobName: string

0 commit comments

Comments
 (0)