Skip to content

Commit 2eb0d69

Browse files
Revert "chore: wip"
This reverts commit 5e71f72.
1 parent 5e71f72 commit 2eb0d69

File tree

10 files changed

+102
-120
lines changed

10 files changed

+102
-120
lines changed

bun.lock

Lines changed: 67 additions & 71 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
"stx": "./buddy"
5656
},
5757
"dependencies": {
58-
"bun-plugin-dotenvx": "^0.6.4",
59-
"bun-plugin-yml": "^0.3.1",
6058
"stacks": "workspace:*"
6159
},
6260
"config": {
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
// import process from 'node:process'
2-
// import { generateMigrations, runDatabaseMigration } from '@stacksjs/database'
3-
// import { log } from '@stacksjs/logging'
1+
import process from 'node:process'
2+
import { generateMigrations, runDatabaseMigration } from '@stacksjs/database'
3+
import { log } from '@stacksjs/logging'
44

5-
// // this is run and checks whether new created or update migrations need to be generated
6-
// const result = await generateMigrations()
5+
// this is run and checks whether new created or update migrations need to be generated
6+
const result = await generateMigrations()
77

8-
// if (result?.isErr()) {
9-
// console.error(result.error)
10-
// log.error('[stacks] generateMigrations failed', result.error)
11-
// process.exit(1)
12-
// }
8+
if (result?.isErr()) {
9+
console.error(result.error)
10+
log.error('[stacks] generateMigrations failed', result.error)
11+
process.exit(1)
12+
}
1313

14-
// const result2 = await runDatabaseMigration()
14+
const result2 = await runDatabaseMigration()
1515

16-
// if (result2.isErr()) {
17-
// log.error('runDatabaseMigration failed')
18-
// log.error(result2.error)
19-
// process.exit(1)
20-
// }
16+
if (result2.isErr()) {
17+
log.error('runDatabaseMigration failed')
18+
log.error(result2.error)
19+
process.exit(1)
20+
}
2121

22-
// process.exit(0)
22+
process.exit(0)
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import process from 'node:process'
2-
import { refreshDatabase } from '@stacksjs/database'
2+
import { generateMigrations, resetDatabase, runDatabaseMigration } from '@stacksjs/database'
33
import { log } from '@stacksjs/logging'
44

55
// first, reset the database, if it exists
6-
const result = await refreshDatabase()
6+
const result = await resetDatabase()
77

8-
// if (result?.isErr()) {
9-
// console.error(result.error)
10-
// log.error('generateMigrations failed', result.error)
11-
// process.exit(1)
12-
// }
8+
if (result?.isErr()) {
9+
console.error(result.error)
10+
log.error('generateMigrations failed', result.error)
11+
process.exit(1)
12+
}
1313

14-
// // then,generate the migrations
15-
// await generateMigrations()
14+
// then,generate the migrations
15+
await generateMigrations()
1616

17-
// // finally, migrate the database
18-
// await runDatabaseMigration()
17+
// finally, migrate the database
18+
await runDatabaseMigration()
1919

20-
// process.exit(0)
20+
process.exit(0)

storage/framework/core/browser/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,5 @@
3737
"devDependencies": {
3838
"@stacksjs/development": "workspace:*",
3939
"@stacksjs/utils": "workspace:*"
40-
},
41-
"dependencies": {
42-
"@stripe/stripe-js": "^8.0.0",
43-
"@vueuse/core": "^13.9.0",
44-
"vue": "^3.5.22"
4540
}
4641
}

storage/framework/core/buddy/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"prepublishOnly": "bun run build && bun run compile:all && bun run zip:all"
8484
},
8585
"dependencies": {
86-
"@aws-sdk/client-cloudfront": "^3.907.0",
8786
"@stacksjs/actions": "^0.70.23",
8887
"@stacksjs/ai": "^0.70.23",
8988
"@stacksjs/alias": "^0.70.23",

storage/framework/core/database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"dependencies": {
4646
"@aws-sdk/client-dynamodb": "^3.876.0",
4747
"@aws-sdk/lib-dynamodb": "^3.883.0",
48-
"bun-query-builder": "^0.1.5",
48+
"bun-query-builder": "^0.1.2",
4949
"dynamodb-toolbox": "^2.7.1"
5050
},
5151
"optionalDependencies": {
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
import { path } from '@stacksjs/path'
2-
import { resetDatabase } from 'bun-query-builder'
3-
4-
export function refreshDatabase(): void {
5-
const modelsPath = path.userModelsPath()
6-
7-
resetDatabase(modelsPath, 'postgres')
8-
}

storage/framework/core/error-handling/src/handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as process from 'node:process'
55
import { italic, stripAnsi } from '@stacksjs/cli'
66
import * as path from '@stacksjs/path'
77
import { ExitCode } from '@stacksjs/types'
8-
import { fs } from '@stacksjs/storage'
8+
import fs from 'fs-extra'
99

1010
type ErrorMessage = string
1111

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { Validator } from '@stacksjs/ts-validation'
12
import type {
23
Attribute,
34
AttributesElements,
@@ -17,9 +18,10 @@ import { italic, log } from '@stacksjs/cli'
1718
import { getTraitTables } from '@stacksjs/database'
1819
import { handleError } from '@stacksjs/error-handling'
1920
import { path } from '@stacksjs/path'
20-
import { fs, globSync } from '@stacksjs/storage'
21+
import { fs } from '@stacksjs/storage'
2122
import { camelCase, kebabCase, pascalCase, plural, singular, slugify, snakeCase } from '@stacksjs/strings'
2223
import { isString } from '@stacksjs/validation'
24+
import { globSync } from 'tinyglobby'
2325
import { generateModelString } from './generate'
2426
import { generateTraitRequestTypes, generateTraitTableInterfaces, traitInterfaces } from './generated/table-traits'
2527

@@ -977,7 +979,7 @@ export async function extractFields(model: Model, modelFile: string): Promise<Mo
977979
// Check if the field is required by parsing the validation rule
978980
const rule = rules[index] ?? ''
979981

980-
requiredValue = (fieldExist.validation?.rule as any).isRequired ?? false
982+
requiredValue = (fieldExist.validation?.rule as Validator<any>).isRequired ?? false
981983

982984
return {
983985
field,

0 commit comments

Comments
 (0)