Skip to content

Commit e3a01d7

Browse files
committed
chore: add default configuration for console apps
1 parent 620a32f commit e3a01d7

7 files changed

Lines changed: 46 additions & 102 deletions

File tree

express/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"@rollup/plugin-run": "^3.1.0",
4242
"@types/cors": "^2.8.19",
4343
"@types/express": "^5.0.6",
44-
"@types/jsonwebtoken": "^9.0.10",
4544
"@types/method-override": "^3.0.0",
4645
"@types/node": "^25.2.3",
4746
"@types/pg": "^8.16.0",

h3/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"detect-port": "^2.1.0",
3232
"dotenv": "^17.3.1",
3333
"h3": "2.0.1-rc.14",
34-
"jsonwebtoken": "^9.0.3",
3534
"kanun": "^0.1.8",
3635
"pg": "^8.18.0",
3736
"resora": "^0.2.15"

packages/console-slim/src/app.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import path, { isAbsolute, join } from 'node:path'
33

44
import { CliApp } from 'resora'
5+
import { defaultConfig } from './config'
56
import { existsSync } from 'node:fs'
67

78
interface Core {
@@ -54,6 +55,16 @@ export class ArkstackConsoleApp<TCore extends Core> extends CliApp {
5455
super()
5556
this.core = core
5657
this.options = options
58+
59+
// Recursively merge defaultConfig with config from resora.config.js
60+
this.config = {
61+
...defaultConfig,
62+
...this.config,
63+
stubs: {
64+
...defaultConfig.stubs,
65+
...this.config?.stubs,
66+
},
67+
}
5768
}
5869

5970
makeController = (name: string, opts: any) => {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export const defaultConfig = {
2+
resourcesDir: 'src/app/http/resources',
3+
localStubsDir: 'node_modules/@arkstack/driver-h3/stubs',
4+
stubs: {
5+
resource: 'resource.stub',
6+
collection: 'resource.collection.stub',
7+
controller: 'controller.stub',
8+
api: 'controller.api.stub',
9+
model: 'controller.model.stub',
10+
apiResource: 'controller.api.resource.stub',
11+
}
12+
}

packages/console/src/app.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import path, { isAbsolute, join } from 'node:path'
33

44
import { CliApp } from 'resora'
5+
import { defaultConfig } from './config'
56
import { existsSync } from 'node:fs'
67

78
interface Core {
@@ -54,6 +55,16 @@ export class ArkstackConsoleApp<TCore extends Core> extends CliApp {
5455
super()
5556
this.core = core
5657
this.options = options
58+
59+
// Recursively merge defaultConfig with config from resora.config.js
60+
this.config = {
61+
...defaultConfig,
62+
...this.config,
63+
stubs: {
64+
...defaultConfig.stubs,
65+
...this.config?.stubs,
66+
},
67+
}
5768
}
5869

5970
makeController = (name: string, opts: any) => {

packages/console/src/config.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export const defaultConfig = {
2+
resourcesDir: 'src/app/http/resources',
3+
localStubsDir: 'node_modules/@arkstack/driver-h3/stubs',
4+
stubs: {
5+
resource: 'resource.stub',
6+
collection: 'resource.collection.stub',
7+
controller: 'controller.stub',
8+
api: 'controller.api.stub',
9+
model: 'controller.model.stub',
10+
apiResource: 'controller.api.resource.stub',
11+
}
12+
}

pnpm-lock.yaml

Lines changed: 0 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)