fragment-ts 1.1.2 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changes/2.md +71 -0
- package/dist/cli/commands/build.command.d.ts.map +1 -1
- package/dist/cli/commands/build.command.js +0 -5
- package/dist/cli/commands/build.command.js.map +1 -1
- package/dist/cli/commands/env.command.d.ts +2 -0
- package/dist/cli/commands/env.command.d.ts.map +1 -1
- package/dist/cli/commands/env.command.js +46 -23
- package/dist/cli/commands/env.command.js.map +1 -1
- package/dist/cli/commands/init.command.d.ts.map +1 -1
- package/dist/cli/commands/init.command.js +48 -10
- package/dist/cli/commands/init.command.js.map +1 -1
- package/dist/shared/config.utils.d.ts.map +1 -1
- package/dist/shared/config.utils.js +46 -4
- package/dist/shared/config.utils.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/commands/build.command.ts +0 -6
- package/src/cli/commands/env.command.ts +51 -26
- package/src/cli/commands/init.command.ts +48 -10
- package/src/shared/config.utils.ts +65 -4
package/changes/2.md
ADDED
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
All notable changes to the Fragment Framework will be documented in this file.
|
|
4
|
+
|
|
5
|
+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
6
|
+
|
|
7
|
+
---
|
|
8
|
+
|
|
9
|
+
## [1.0.0] - 2026-01-10
|
|
10
|
+
|
|
11
|
+
### ✨ Features
|
|
12
|
+
|
|
13
|
+
- **Unified Environment Management**: Replaced complex dev/prod config sections with a simple flat `fragment.json` structure
|
|
14
|
+
- **CLI Environment Commands**: Added `fragment env:use`, `env:list`, `env:current`, `env:diff`, and `env:init` for managing `.env` files
|
|
15
|
+
- **Automatic Env Loading**: CLI now auto-loads `.env` → `.env.local` at startup; `fragment build` loads `.env.prod` if present
|
|
16
|
+
- **NODE_ENV Awareness**: All commands respect `NODE_ENV=production` vs `development`:
|
|
17
|
+
- `fragment serve` delegates to `npm start` in production
|
|
18
|
+
- `fragment test` and `migrate` use `dist/` in production, `src/` in development
|
|
19
|
+
- **Windows Support**: Full compatibility for Windows (CMD, PowerShell) in all CLI commands
|
|
20
|
+
- **Simplified Configuration**: `fragment.json` now uses a single top-level `database` object with `${VAR}` interpolation
|
|
21
|
+
|
|
22
|
+
### 🛠️ Breaking Changes
|
|
23
|
+
|
|
24
|
+
- **Config Structure**: `fragment.json` no longer supports `development`/`production` sections. Use flat structure:
|
|
25
|
+
```json
|
|
26
|
+
{
|
|
27
|
+
"database": {
|
|
28
|
+
"host": "${DB_HOST}",
|
|
29
|
+
"entities": ["src/**/*.entity.ts"]
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
```
|
|
33
|
+
- **Removed Flags**:
|
|
34
|
+
- Removed `--db <environment>` from all migration commands
|
|
35
|
+
- Removed `--env <mode>` from test and diagnostics commands
|
|
36
|
+
- **CLI Entry Point**: Users must now manage environments via `.env` files instead of framework modes
|
|
37
|
+
|
|
38
|
+
### 🐛 Fixes
|
|
39
|
+
|
|
40
|
+
- Fixed Windows path handling in glob patterns (`src/**/*.ts` → normalized to forward slashes)
|
|
41
|
+
- Resolved `execSync` shell compatibility issues on Windows
|
|
42
|
+
- Fixed TypeScript compilation errors in CLI commands
|
|
43
|
+
- Corrected environment variable interpolation in database config
|
|
44
|
+
- Improved process cleanup on Windows during server restarts
|
|
45
|
+
|
|
46
|
+
### 📦 Dependencies
|
|
47
|
+
|
|
48
|
+
- Added `dotenv` for environment loading
|
|
49
|
+
- Added `diff` for `fragment env:diff` command
|
|
50
|
+
- Updated TypeORM and reflect-metadata peer dependencies
|
|
51
|
+
|
|
52
|
+
### 🧪 Testing
|
|
53
|
+
|
|
54
|
+
- Added comprehensive test coverage for CLI environment switching
|
|
55
|
+
- Verified cross-platform compatibility (Windows, macOS, Linux)
|
|
56
|
+
- Validated production build workflow with `.env.prod`
|
|
57
|
+
|
|
58
|
+
---
|
|
59
|
+
|
|
60
|
+
## [0.9.0] - 2025-12-15
|
|
61
|
+
|
|
62
|
+
### ✨ Features
|
|
63
|
+
|
|
64
|
+
- Initial public release of Fragment Framework
|
|
65
|
+
- Dependency injection with `@Autowired`
|
|
66
|
+
- REST controllers with route decorators
|
|
67
|
+
- TypeORM integration with repository pattern
|
|
68
|
+
- Enhancement pipeline (middleware, guards, interceptors, filters)
|
|
69
|
+
- Basic CLI commands for scaffolding and migrations
|
|
70
|
+
|
|
71
|
+
---
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/build.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"build.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/build.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;WAW1B,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDjD,OAAO,CAAC,MAAM,CAAC,OAAO;IAgBtB,OAAO,CAAC,MAAM,CAAC,YAAY;CAoC5B"}
|
|
@@ -43,7 +43,6 @@ const fs = __importStar(require("fs"));
|
|
|
43
43
|
const chalk_1 = __importDefault(require("chalk"));
|
|
44
44
|
const ora_1 = __importDefault(require("ora"));
|
|
45
45
|
const tsconfig_utils_1 = require("../../shared/tsconfig.utils");
|
|
46
|
-
const dotenv = __importStar(require("dotenv"));
|
|
47
46
|
class BuildCommand {
|
|
48
47
|
static register(program) {
|
|
49
48
|
program
|
|
@@ -58,10 +57,6 @@ class BuildCommand {
|
|
|
58
57
|
static async execute(options) {
|
|
59
58
|
const spinner = (0, ora_1.default)("Building project...").start();
|
|
60
59
|
try {
|
|
61
|
-
const envProdPath = path.join(process.cwd(), ".env.prod");
|
|
62
|
-
if (fs.existsSync(envProdPath)) {
|
|
63
|
-
dotenv.config({ path: envProdPath });
|
|
64
|
-
}
|
|
65
60
|
const tscPath = this.findTsc();
|
|
66
61
|
if (!tscPath) {
|
|
67
62
|
spinner.fail("TypeScript compiler not found");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.command.js","sourceRoot":"","sources":["../../../src/cli/commands/build.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAAyC;AACzC,2CAA6B;AAC7B,uCAAyB;AACzB,kDAA0B;AAC1B,8CAAsB;AACtB,gEAA4D;
|
|
1
|
+
{"version":3,"file":"build.command.js","sourceRoot":"","sources":["../../../src/cli/commands/build.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ import { Command } from "commander";
|
|
|
2
2
|
export declare class EnvCommand {
|
|
3
3
|
static register(program: Command): void;
|
|
4
4
|
private static useEnv;
|
|
5
|
+
private static getEnvNameFromFile;
|
|
6
|
+
private static getEnvNameFromContent;
|
|
5
7
|
private static listEnvs;
|
|
6
8
|
private static currentEnv;
|
|
7
9
|
private static diffEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/env.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"env.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/env.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAwCvC,OAAO,CAAC,MAAM,CAAC,MAAM;IA6CrB,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAKjC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAcpC,OAAO,CAAC,MAAM,CAAC,QAAQ;IAwBvB,OAAO,CAAC,MAAM,CAAC,UAAU;IAkBzB,OAAO,CAAC,MAAM,CAAC,OAAO;IA6CtB,OAAO,CAAC,MAAM,CAAC,OAAO;CAuBvB"}
|
|
@@ -46,18 +46,21 @@ class EnvCommand {
|
|
|
46
46
|
program
|
|
47
47
|
.command("env:use <envFile>")
|
|
48
48
|
.description("Activate an environment by copying it to .env")
|
|
49
|
+
.alias("env:u")
|
|
49
50
|
.action((envFile) => {
|
|
50
51
|
this.useEnv(envFile);
|
|
51
52
|
});
|
|
52
53
|
program
|
|
53
54
|
.command("env:list")
|
|
54
55
|
.description("List all available .env files")
|
|
56
|
+
.alias("env:ls")
|
|
55
57
|
.action(() => {
|
|
56
58
|
this.listEnvs();
|
|
57
59
|
});
|
|
58
60
|
program
|
|
59
61
|
.command("env:current")
|
|
60
62
|
.description("Show the currently active environment")
|
|
63
|
+
.alias("env:c")
|
|
61
64
|
.action(() => {
|
|
62
65
|
this.currentEnv();
|
|
63
66
|
});
|
|
@@ -78,22 +81,56 @@ class EnvCommand {
|
|
|
78
81
|
const cwd = process.cwd();
|
|
79
82
|
const sourcePath = path.join(cwd, envFile);
|
|
80
83
|
const targetPath = path.join(cwd, ".env");
|
|
84
|
+
// Prevent self-copy
|
|
85
|
+
if (envFile === ".env") {
|
|
86
|
+
console.log(chalk_1.default.yellow("⚠️ Already using .env. No action needed."));
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
81
89
|
if (!fs.existsSync(sourcePath)) {
|
|
82
90
|
console.error(chalk_1.default.red(`❌ Source file not found: ${envFile}`));
|
|
91
|
+
console.log(chalk_1.default.gray("\nAvailable files:"));
|
|
92
|
+
this.listEnvs();
|
|
83
93
|
process.exit(1);
|
|
84
94
|
}
|
|
85
|
-
|
|
95
|
+
const prevEnvName = this.getEnvNameFromContent(fs.existsSync(targetPath) ? fs.readFileSync(targetPath, "utf8") : "");
|
|
96
|
+
const newEnvName = this.getEnvNameFromFile(envFile);
|
|
97
|
+
// Backup only if content differs
|
|
86
98
|
if (fs.existsSync(targetPath)) {
|
|
87
99
|
const sourceContent = fs.readFileSync(sourcePath, "utf8");
|
|
88
100
|
const targetContent = fs.readFileSync(targetPath, "utf8");
|
|
89
101
|
if (sourceContent !== targetContent) {
|
|
90
|
-
|
|
91
|
-
|
|
102
|
+
const backupPath = path.join(cwd, ".env.backup");
|
|
103
|
+
fs.copyFileSync(targetPath, backupPath);
|
|
104
|
+
console.log(chalk_1.default.gray(`📎 Backed up current .env to .env.backup`));
|
|
92
105
|
}
|
|
93
106
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
107
|
+
// Atomic write
|
|
108
|
+
const tempPath = `${targetPath}.tmp`;
|
|
109
|
+
fs.writeFileSync(tempPath, fs.readFileSync(sourcePath, "utf8"), "utf8");
|
|
110
|
+
fs.renameSync(tempPath, targetPath);
|
|
111
|
+
console.log(chalk_1.default.green(`✅ Switched environment:`));
|
|
112
|
+
console.log(chalk_1.default.gray(` From: ${prevEnvName || "none"}`));
|
|
113
|
+
console.log(chalk_1.default.gray(` To: ${newEnvName}`));
|
|
114
|
+
console.log(chalk_1.default.gray(` File: ${envFile} → .env`));
|
|
115
|
+
}
|
|
116
|
+
static getEnvNameFromFile(filePath) {
|
|
117
|
+
const match = path.basename(filePath).match(/^\.env\.(.+)$/);
|
|
118
|
+
return match ? match[1] : "custom";
|
|
119
|
+
}
|
|
120
|
+
static getEnvNameFromContent(content) {
|
|
121
|
+
if (!content.trim())
|
|
122
|
+
return "none";
|
|
123
|
+
const cwd = process.cwd();
|
|
124
|
+
const envFiles = fs.readdirSync(cwd).filter((f) => /^\.env\..+$/.test(f));
|
|
125
|
+
for (const file of envFiles) {
|
|
126
|
+
try {
|
|
127
|
+
if (fs.readFileSync(path.join(cwd, file), "utf8") === content) {
|
|
128
|
+
return this.getEnvNameFromFile(file);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
catch { }
|
|
132
|
+
}
|
|
133
|
+
return "modified";
|
|
97
134
|
}
|
|
98
135
|
static listEnvs() {
|
|
99
136
|
const cwd = process.cwd();
|
|
@@ -124,23 +161,9 @@ class EnvCommand {
|
|
|
124
161
|
console.log(chalk_1.default.yellow("No .env file found. Run `fragment env:init` to create one."));
|
|
125
162
|
return;
|
|
126
163
|
}
|
|
127
|
-
const
|
|
128
|
-
const
|
|
129
|
-
|
|
130
|
-
const fullPath = path.join(cwd, file);
|
|
131
|
-
try {
|
|
132
|
-
const content = fs.readFileSync(fullPath, "utf8");
|
|
133
|
-
if (content === envContent) {
|
|
134
|
-
const name = file.replace(/\.env\./, "");
|
|
135
|
-
console.log(chalk_1.default.green(`Active environment: ${chalk_1.default.bold(name)}`));
|
|
136
|
-
return;
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
catch {
|
|
140
|
-
// skip
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
console.log(chalk_1.default.gray("Active environment: custom/local (modified)"));
|
|
164
|
+
const content = fs.readFileSync(envPath, "utf8");
|
|
165
|
+
const envName = this.getEnvNameFromContent(content);
|
|
166
|
+
console.log(chalk_1.default.green(`Active environment: ${chalk_1.default.bold(envName)}`));
|
|
144
167
|
}
|
|
145
168
|
static diffEnv(envFile) {
|
|
146
169
|
const cwd = process.cwd();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.command.js","sourceRoot":"","sources":["../../../src/cli/commands/env.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAC/B,2CAA6B;AAC7B,kDAA0B;AAC1B,+BAAiC;AAEjC,MAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,OAAgB;QAC9B,OAAO;aACJ,OAAO,CAAC,mBAAmB,CAAC;aAC5B,WAAW,CAAC,+CAA+C,CAAC;aAC5D,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEL,OAAO;aACJ,OAAO,CAAC,UAAU,CAAC;aACnB,WAAW,CAAC,+BAA+B,CAAC;aAC5C,MAAM,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;QAEL,OAAO;aACJ,OAAO,CAAC,aAAa,CAAC;aACtB,WAAW,CAAC,uCAAuC,CAAC;aACpD,MAAM,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;QAEL,OAAO;aACJ,OAAO,CAAC,oBAAoB,CAAC;aAC7B,WAAW,CAAC,4DAA4D,CAAC;aACzE,MAAM,CAAC,CAAC,OAAO,GAAG,cAAc,EAAE,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEL,OAAO;aACJ,OAAO,CAAC,UAAU,CAAC;aACnB,WAAW,CAAC,8CAA8C,CAAC;aAC3D,MAAM,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,OAAe;QACnC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC,CAAC;YAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED
|
|
1
|
+
{"version":3,"file":"env.command.js","sourceRoot":"","sources":["../../../src/cli/commands/env.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;WAe1B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;mBAsF/C,wBAAwB;mBAgDxB,iBAAiB;
|
|
1
|
+
{"version":3,"file":"init.command.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;WAe1B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;mBAsF/C,wBAAwB;mBAgDxB,iBAAiB;mBAqIjB,gBAAgB;mBA+BhB,yBAAyB;mBA6BzB,sBAAsB;mBAmBtB,qBAAqB;mBA8BrB,iBAAiB;mBAgDjB,mBAAmB;CA4BzC"}
|
|
@@ -183,8 +183,9 @@ class InitCommand {
|
|
|
183
183
|
"migrate:revert": "fragment migrate:revert",
|
|
184
184
|
},
|
|
185
185
|
dependencies: {
|
|
186
|
-
"fragment-ts": "^1.1.
|
|
186
|
+
"fragment-ts": "^1.1.3",
|
|
187
187
|
"reflect-metadata": "^0.1.13",
|
|
188
|
+
sqlite3: "^5.1.7",
|
|
188
189
|
},
|
|
189
190
|
devDependencies: {
|
|
190
191
|
typescript: "^5.3.3",
|
|
@@ -224,8 +225,8 @@ class InitCommand {
|
|
|
224
225
|
database: "${DATABASE_FILE}",
|
|
225
226
|
synchronize: true,
|
|
226
227
|
logging: false,
|
|
227
|
-
entities: ["
|
|
228
|
-
migrations: ["
|
|
228
|
+
entities: ["${ENTITIES}"],
|
|
229
|
+
migrations: ["${MIGRATIONS}"],
|
|
229
230
|
};
|
|
230
231
|
}
|
|
231
232
|
await fs.writeJSON(path.join(projectPath, "fragment.json"), fragmentConfig, { spaces: 2 });
|
|
@@ -233,14 +234,51 @@ class InitCommand {
|
|
|
233
234
|
PORT=3000
|
|
234
235
|
JWT_SECRET=${process.env.JWT_SECRET ?? "your-secret-key-change-this"}
|
|
235
236
|
${features.includes("database") ? "DATABASE_FILE=database.sqlite" : ""}
|
|
237
|
+
${features.includes("database") ? "ENTITIES=src/**/*.entity.ts" : ""}
|
|
238
|
+
${features.includes("database") ? "MIGRATIONS=src/migrations/**/*.ts" : ""}
|
|
236
239
|
`;
|
|
237
|
-
await fs.writeFile(path.join(projectPath, ".env"), envContent);
|
|
238
|
-
await fs.writeFile(path.join(projectPath, ".gitignore"),
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
240
|
+
await fs.writeFile(path.join(projectPath, ".env.example"), envContent);
|
|
241
|
+
await fs.writeFile(path.join(projectPath, ".gitignore"), `# Dependencies
|
|
242
|
+
node_modules/
|
|
243
|
+
|
|
244
|
+
# Build output
|
|
245
|
+
dist/
|
|
246
|
+
build/
|
|
247
|
+
coverage/
|
|
248
|
+
|
|
249
|
+
# Environment files
|
|
250
|
+
.env
|
|
251
|
+
.env.local
|
|
252
|
+
.env.development.local
|
|
253
|
+
.env.test.local
|
|
254
|
+
.env.production.local
|
|
255
|
+
.env.backup
|
|
256
|
+
.env.prod
|
|
257
|
+
|
|
258
|
+
# Logs
|
|
259
|
+
logs/
|
|
260
|
+
*.log
|
|
261
|
+
npm-debug.log*
|
|
262
|
+
yarn-debug.log*
|
|
263
|
+
yarn-error.log*
|
|
264
|
+
.pnpm-debug.log
|
|
265
|
+
|
|
266
|
+
# Database
|
|
267
|
+
*.sqlite
|
|
268
|
+
*.db
|
|
269
|
+
|
|
270
|
+
# Editors
|
|
271
|
+
.idea/
|
|
272
|
+
.vscode/
|
|
273
|
+
*.suo
|
|
274
|
+
*.ntvs*
|
|
275
|
+
*.njsproj
|
|
276
|
+
*.sw?
|
|
277
|
+
.DS_Store
|
|
278
|
+
|
|
279
|
+
# Misc
|
|
280
|
+
.DS_Store
|
|
281
|
+
`);
|
|
244
282
|
}
|
|
245
283
|
static async generateMainFile(projectPath, config) {
|
|
246
284
|
const content = `import 'reflect-metadata';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.command.js","sourceRoot":"","sources":["../../../src/cli/commands/init.command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"init.command.js","sourceRoot":"","sources":["../../../src/cli/commands/init.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.utils.d.ts","sourceRoot":"","sources":["../../src/shared/config.utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.utils.d.ts","sourceRoot":"","sources":["../../src/shared/config.utils.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,sBAAsB,CAAC;CACnC;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,WAAW,CAA+B;IAEzD,OAAO,CAAC,MAAM,CAAC,UAAU;IAqBzB,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IAsB1C,MAAM,CAAC,iBAAiB,IAAI,sBAAsB;IAqElD,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC;IAOnE,MAAM,CAAC,aAAa,IAAI,cAAc;IAItC,MAAM,CAAC,iBAAiB,IAAI,OAAO;IAInC,MAAM,CAAC,UAAU,IAAI,IAAI;CAG1B"}
|
|
@@ -38,6 +38,7 @@ exports.ConfigUtils = void 0;
|
|
|
38
38
|
const fs = __importStar(require("fs"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
40
|
const env_utils_1 = require("./env.utils");
|
|
41
|
+
const tsconfig_utils_1 = require("./tsconfig.utils");
|
|
41
42
|
class ConfigUtils {
|
|
42
43
|
static loadConfig() {
|
|
43
44
|
if (this.configCache)
|
|
@@ -78,13 +79,54 @@ class ConfigUtils {
|
|
|
78
79
|
}
|
|
79
80
|
return value;
|
|
80
81
|
}
|
|
81
|
-
// ✅ ONLY use top-level `database`
|
|
82
82
|
static getDatabaseConfig() {
|
|
83
83
|
const config = this.loadConfig();
|
|
84
|
-
if (config.database) {
|
|
85
|
-
return
|
|
84
|
+
if (!config.database) {
|
|
85
|
+
return {};
|
|
86
86
|
}
|
|
87
|
-
|
|
87
|
+
let dbConfig = this.interpolateEnvVars(config.database);
|
|
88
|
+
const isProduction = env_utils_1.EnvUtils.getEnvironmentMode() === "production";
|
|
89
|
+
if (Array.isArray(dbConfig.entities)) {
|
|
90
|
+
dbConfig.entities = dbConfig.entities.map((pattern) => isProduction
|
|
91
|
+
? pattern
|
|
92
|
+
.replace(/src/g, tsconfig_utils_1.TsConfigUtils.getOutDir()
|
|
93
|
+
.replace(/\\/g, "/")
|
|
94
|
+
.split("/")
|
|
95
|
+
.pop() || "dist")
|
|
96
|
+
.replace(/\.ts$/, ".js")
|
|
97
|
+
: pattern.replace(/dist/g, tsconfig_utils_1.TsConfigUtils.getRootDir().replace(/\\/g, "/").split("/").pop() ||
|
|
98
|
+
"src"));
|
|
99
|
+
}
|
|
100
|
+
else if (!dbConfig.entities) {
|
|
101
|
+
dbConfig.entities = isProduction
|
|
102
|
+
? [
|
|
103
|
+
`${tsconfig_utils_1.TsConfigUtils.getOutDir().replace(/\\/g, "/")}/entities/**/*.entity.js`,
|
|
104
|
+
]
|
|
105
|
+
: [
|
|
106
|
+
`${tsconfig_utils_1.TsConfigUtils.getRootDir().replace(/\\/g, "/")}/entities/**/*.entity.ts`,
|
|
107
|
+
];
|
|
108
|
+
}
|
|
109
|
+
if (Array.isArray(dbConfig.migrations)) {
|
|
110
|
+
dbConfig.migrations = dbConfig.migrations.map((pattern) => isProduction
|
|
111
|
+
? pattern
|
|
112
|
+
.replace(/src/g, tsconfig_utils_1.TsConfigUtils.getOutDir()
|
|
113
|
+
.replace(/\\/g, "/")
|
|
114
|
+
.split("/")
|
|
115
|
+
.pop() || "dist")
|
|
116
|
+
.replace(/\.ts$/, ".js")
|
|
117
|
+
: pattern.replace(/dist/g, tsconfig_utils_1.TsConfigUtils.getRootDir().replace(/\\/g, "/").split("/").pop() ||
|
|
118
|
+
"src"));
|
|
119
|
+
}
|
|
120
|
+
else if (!dbConfig.migrations) {
|
|
121
|
+
dbConfig.migrations = isProduction
|
|
122
|
+
? [
|
|
123
|
+
`${tsconfig_utils_1.TsConfigUtils.getOutDir().replace(/\\/g, "/")}/migrations/**/*.js`,
|
|
124
|
+
]
|
|
125
|
+
: [
|
|
126
|
+
`${tsconfig_utils_1.TsConfigUtils.getRootDir().replace(/\\/g, "/")}/migrations/**/*.ts`,
|
|
127
|
+
];
|
|
128
|
+
}
|
|
129
|
+
return dbConfig;
|
|
88
130
|
}
|
|
89
131
|
static getDatabaseProperty(property, defaultValue) {
|
|
90
132
|
const dbConfig = this.getDatabaseConfig();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.utils.js","sourceRoot":"","sources":["../../src/shared/config.utils.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,uCAAyB;AACzB,2CAA6B;AAC7B,2CAAuC;
|
|
1
|
+
{"version":3,"file":"config.utils.js","sourceRoot":"","sources":["../../src/shared/config.utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,6 @@ import * as fs from "fs";
|
|
|
5
5
|
import chalk from "chalk";
|
|
6
6
|
import ora from "ora";
|
|
7
7
|
import { TsConfigUtils } from "../../shared/tsconfig.utils";
|
|
8
|
-
import * as dotenv from "dotenv";
|
|
9
8
|
|
|
10
9
|
export class BuildCommand {
|
|
11
10
|
static register(program: Command): void {
|
|
@@ -23,11 +22,6 @@ export class BuildCommand {
|
|
|
23
22
|
const spinner = ora("Building project...").start();
|
|
24
23
|
|
|
25
24
|
try {
|
|
26
|
-
const envProdPath = path.join(process.cwd(), ".env.prod");
|
|
27
|
-
if (fs.existsSync(envProdPath)) {
|
|
28
|
-
dotenv.config({ path: envProdPath });
|
|
29
|
-
}
|
|
30
|
-
|
|
31
25
|
const tscPath = this.findTsc();
|
|
32
26
|
if (!tscPath) {
|
|
33
27
|
spinner.fail("TypeScript compiler not found");
|
|
@@ -9,6 +9,7 @@ export class EnvCommand {
|
|
|
9
9
|
program
|
|
10
10
|
.command("env:use <envFile>")
|
|
11
11
|
.description("Activate an environment by copying it to .env")
|
|
12
|
+
.alias("env:u")
|
|
12
13
|
.action((envFile) => {
|
|
13
14
|
this.useEnv(envFile);
|
|
14
15
|
});
|
|
@@ -16,6 +17,7 @@ export class EnvCommand {
|
|
|
16
17
|
program
|
|
17
18
|
.command("env:list")
|
|
18
19
|
.description("List all available .env files")
|
|
20
|
+
.alias("env:ls")
|
|
19
21
|
.action(() => {
|
|
20
22
|
this.listEnvs();
|
|
21
23
|
});
|
|
@@ -23,6 +25,7 @@ export class EnvCommand {
|
|
|
23
25
|
program
|
|
24
26
|
.command("env:current")
|
|
25
27
|
.description("Show the currently active environment")
|
|
28
|
+
.alias("env:c")
|
|
26
29
|
.action(() => {
|
|
27
30
|
this.currentEnv();
|
|
28
31
|
});
|
|
@@ -47,26 +50,63 @@ export class EnvCommand {
|
|
|
47
50
|
const sourcePath = path.join(cwd, envFile);
|
|
48
51
|
const targetPath = path.join(cwd, ".env");
|
|
49
52
|
|
|
53
|
+
// Prevent self-copy
|
|
54
|
+
if (envFile === ".env") {
|
|
55
|
+
console.log(chalk.yellow("⚠️ Already using .env. No action needed."));
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
|
|
50
59
|
if (!fs.existsSync(sourcePath)) {
|
|
51
60
|
console.error(chalk.red(`❌ Source file not found: ${envFile}`));
|
|
61
|
+
console.log(chalk.gray("\nAvailable files:"));
|
|
62
|
+
this.listEnvs();
|
|
52
63
|
process.exit(1);
|
|
53
64
|
}
|
|
54
65
|
|
|
55
|
-
|
|
66
|
+
const prevEnvName = this.getEnvNameFromContent(
|
|
67
|
+
fs.existsSync(targetPath) ? fs.readFileSync(targetPath, "utf8") : "",
|
|
68
|
+
);
|
|
69
|
+
const newEnvName = this.getEnvNameFromFile(envFile);
|
|
70
|
+
|
|
71
|
+
// Backup only if content differs
|
|
56
72
|
if (fs.existsSync(targetPath)) {
|
|
57
73
|
const sourceContent = fs.readFileSync(sourcePath, "utf8");
|
|
58
74
|
const targetContent = fs.readFileSync(targetPath, "utf8");
|
|
59
75
|
if (sourceContent !== targetContent) {
|
|
60
|
-
|
|
61
|
-
|
|
76
|
+
const backupPath = path.join(cwd, ".env.backup");
|
|
77
|
+
fs.copyFileSync(targetPath, backupPath);
|
|
78
|
+
console.log(chalk.gray(`📎 Backed up current .env to .env.backup`));
|
|
62
79
|
}
|
|
63
80
|
}
|
|
64
81
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
);
|
|
69
|
-
|
|
82
|
+
// Atomic write
|
|
83
|
+
const tempPath = `${targetPath}.tmp`;
|
|
84
|
+
fs.writeFileSync(tempPath, fs.readFileSync(sourcePath, "utf8"), "utf8");
|
|
85
|
+
fs.renameSync(tempPath, targetPath);
|
|
86
|
+
|
|
87
|
+
console.log(chalk.green(`✅ Switched environment:`));
|
|
88
|
+
console.log(chalk.gray(` From: ${prevEnvName || "none"}`));
|
|
89
|
+
console.log(chalk.gray(` To: ${newEnvName}`));
|
|
90
|
+
console.log(chalk.gray(` File: ${envFile} → .env`));
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
private static getEnvNameFromFile(filePath: string): string {
|
|
94
|
+
const match = path.basename(filePath).match(/^\.env\.(.+)$/);
|
|
95
|
+
return match ? match[1] : "custom";
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
private static getEnvNameFromContent(content: string): string {
|
|
99
|
+
if (!content.trim()) return "none";
|
|
100
|
+
const cwd = process.cwd();
|
|
101
|
+
const envFiles = fs.readdirSync(cwd).filter((f) => /^\.env\..+$/.test(f));
|
|
102
|
+
for (const file of envFiles) {
|
|
103
|
+
try {
|
|
104
|
+
if (fs.readFileSync(path.join(cwd, file), "utf8") === content) {
|
|
105
|
+
return this.getEnvNameFromFile(file);
|
|
106
|
+
}
|
|
107
|
+
} catch {}
|
|
108
|
+
}
|
|
109
|
+
return "modified";
|
|
70
110
|
}
|
|
71
111
|
|
|
72
112
|
private static listEnvs(): void {
|
|
@@ -106,24 +146,9 @@ export class EnvCommand {
|
|
|
106
146
|
return;
|
|
107
147
|
}
|
|
108
148
|
|
|
109
|
-
const
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
for (const file of files) {
|
|
113
|
-
const fullPath = path.join(cwd, file);
|
|
114
|
-
try {
|
|
115
|
-
const content = fs.readFileSync(fullPath, "utf8");
|
|
116
|
-
if (content === envContent) {
|
|
117
|
-
const name = file.replace(/\.env\./, "");
|
|
118
|
-
console.log(chalk.green(`Active environment: ${chalk.bold(name)}`));
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
} catch {
|
|
122
|
-
// skip
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
console.log(chalk.gray("Active environment: custom/local (modified)"));
|
|
149
|
+
const content = fs.readFileSync(envPath, "utf8");
|
|
150
|
+
const envName = this.getEnvNameFromContent(content);
|
|
151
|
+
console.log(chalk.green(`Active environment: ${chalk.bold(envName)}`));
|
|
127
152
|
}
|
|
128
153
|
|
|
129
154
|
private static diffEnv(envFile: string): void {
|
|
@@ -176,8 +176,9 @@ export class InitCommand {
|
|
|
176
176
|
"migrate:revert": "fragment migrate:revert",
|
|
177
177
|
},
|
|
178
178
|
dependencies: {
|
|
179
|
-
"fragment-ts": "^1.1.
|
|
179
|
+
"fragment-ts": "^1.1.3",
|
|
180
180
|
"reflect-metadata": "^0.1.13",
|
|
181
|
+
sqlite3: "^5.1.7",
|
|
181
182
|
},
|
|
182
183
|
devDependencies: {
|
|
183
184
|
typescript: "^5.3.3",
|
|
@@ -221,8 +222,8 @@ export class InitCommand {
|
|
|
221
222
|
database: "${DATABASE_FILE}",
|
|
222
223
|
synchronize: true,
|
|
223
224
|
logging: false,
|
|
224
|
-
entities: ["
|
|
225
|
-
migrations: ["
|
|
225
|
+
entities: ["${ENTITIES}"],
|
|
226
|
+
migrations: ["${MIGRATIONS}"],
|
|
226
227
|
};
|
|
227
228
|
}
|
|
228
229
|
|
|
@@ -236,18 +237,55 @@ export class InitCommand {
|
|
|
236
237
|
PORT=3000
|
|
237
238
|
JWT_SECRET=${process.env.JWT_SECRET ?? "your-secret-key-change-this"}
|
|
238
239
|
${features.includes("database") ? "DATABASE_FILE=database.sqlite" : ""}
|
|
240
|
+
${features.includes("database") ? "ENTITIES=src/**/*.entity.ts" : ""}
|
|
241
|
+
${features.includes("database") ? "MIGRATIONS=src/migrations/**/*.ts" : ""}
|
|
239
242
|
`;
|
|
240
243
|
|
|
241
|
-
await fs.writeFile(path.join(projectPath, ".env"), envContent);
|
|
244
|
+
await fs.writeFile(path.join(projectPath, ".env.example"), envContent);
|
|
242
245
|
|
|
243
246
|
await fs.writeFile(
|
|
244
247
|
path.join(projectPath, ".gitignore"),
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
248
|
+
`# Dependencies
|
|
249
|
+
node_modules/
|
|
250
|
+
|
|
251
|
+
# Build output
|
|
252
|
+
dist/
|
|
253
|
+
build/
|
|
254
|
+
coverage/
|
|
255
|
+
|
|
256
|
+
# Environment files
|
|
257
|
+
.env
|
|
258
|
+
.env.local
|
|
259
|
+
.env.development.local
|
|
260
|
+
.env.test.local
|
|
261
|
+
.env.production.local
|
|
262
|
+
.env.backup
|
|
263
|
+
.env.prod
|
|
264
|
+
|
|
265
|
+
# Logs
|
|
266
|
+
logs/
|
|
267
|
+
*.log
|
|
268
|
+
npm-debug.log*
|
|
269
|
+
yarn-debug.log*
|
|
270
|
+
yarn-error.log*
|
|
271
|
+
.pnpm-debug.log
|
|
272
|
+
|
|
273
|
+
# Database
|
|
274
|
+
*.sqlite
|
|
275
|
+
*.db
|
|
276
|
+
|
|
277
|
+
# Editors
|
|
278
|
+
.idea/
|
|
279
|
+
.vscode/
|
|
280
|
+
*.suo
|
|
281
|
+
*.ntvs*
|
|
282
|
+
*.njsproj
|
|
283
|
+
*.sw?
|
|
284
|
+
.DS_Store
|
|
285
|
+
|
|
286
|
+
# Misc
|
|
287
|
+
.DS_Store
|
|
288
|
+
`,
|
|
251
289
|
);
|
|
252
290
|
}
|
|
253
291
|
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import * as fs from "fs";
|
|
4
4
|
import * as path from "path";
|
|
5
5
|
import { EnvUtils } from "./env.utils";
|
|
6
|
+
import { TsConfigUtils } from "./tsconfig.utils";
|
|
6
7
|
|
|
7
8
|
// Flat structure only
|
|
8
9
|
export interface FragmentDatabaseConfig {
|
|
@@ -73,13 +74,73 @@ export class ConfigUtils {
|
|
|
73
74
|
return value;
|
|
74
75
|
}
|
|
75
76
|
|
|
76
|
-
// ✅ ONLY use top-level `database`
|
|
77
77
|
static getDatabaseConfig(): FragmentDatabaseConfig {
|
|
78
78
|
const config = this.loadConfig();
|
|
79
|
-
if (config.database) {
|
|
80
|
-
return
|
|
79
|
+
if (!config.database) {
|
|
80
|
+
return {};
|
|
81
81
|
}
|
|
82
|
-
|
|
82
|
+
|
|
83
|
+
let dbConfig = this.interpolateEnvVars(config.database);
|
|
84
|
+
|
|
85
|
+
const isProduction = EnvUtils.getEnvironmentMode() === "production";
|
|
86
|
+
|
|
87
|
+
if (Array.isArray(dbConfig.entities)) {
|
|
88
|
+
dbConfig.entities = dbConfig.entities.map((pattern: any) =>
|
|
89
|
+
isProduction
|
|
90
|
+
? pattern
|
|
91
|
+
.replace(
|
|
92
|
+
/src/g,
|
|
93
|
+
TsConfigUtils.getOutDir()
|
|
94
|
+
.replace(/\\/g, "/")
|
|
95
|
+
.split("/")
|
|
96
|
+
.pop() || "dist",
|
|
97
|
+
)
|
|
98
|
+
.replace(/\.ts$/, ".js")
|
|
99
|
+
: pattern.replace(
|
|
100
|
+
/dist/g,
|
|
101
|
+
TsConfigUtils.getRootDir().replace(/\\/g, "/").split("/").pop() ||
|
|
102
|
+
"src",
|
|
103
|
+
),
|
|
104
|
+
);
|
|
105
|
+
} else if (!dbConfig.entities) {
|
|
106
|
+
dbConfig.entities = isProduction
|
|
107
|
+
? [
|
|
108
|
+
`${TsConfigUtils.getOutDir().replace(/\\/g, "/")}/entities/**/*.entity.js`,
|
|
109
|
+
]
|
|
110
|
+
: [
|
|
111
|
+
`${TsConfigUtils.getRootDir().replace(/\\/g, "/")}/entities/**/*.entity.ts`,
|
|
112
|
+
];
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
if (Array.isArray(dbConfig.migrations)) {
|
|
116
|
+
dbConfig.migrations = dbConfig.migrations.map((pattern: any) =>
|
|
117
|
+
isProduction
|
|
118
|
+
? pattern
|
|
119
|
+
.replace(
|
|
120
|
+
/src/g,
|
|
121
|
+
TsConfigUtils.getOutDir()
|
|
122
|
+
.replace(/\\/g, "/")
|
|
123
|
+
.split("/")
|
|
124
|
+
.pop() || "dist",
|
|
125
|
+
)
|
|
126
|
+
.replace(/\.ts$/, ".js")
|
|
127
|
+
: pattern.replace(
|
|
128
|
+
/dist/g,
|
|
129
|
+
TsConfigUtils.getRootDir().replace(/\\/g, "/").split("/").pop() ||
|
|
130
|
+
"src",
|
|
131
|
+
),
|
|
132
|
+
);
|
|
133
|
+
} else if (!dbConfig.migrations) {
|
|
134
|
+
dbConfig.migrations = isProduction
|
|
135
|
+
? [
|
|
136
|
+
`${TsConfigUtils.getOutDir().replace(/\\/g, "/")}/migrations/**/*.js`,
|
|
137
|
+
]
|
|
138
|
+
: [
|
|
139
|
+
`${TsConfigUtils.getRootDir().replace(/\\/g, "/")}/migrations/**/*.ts`,
|
|
140
|
+
];
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
return dbConfig;
|
|
83
144
|
}
|
|
84
145
|
|
|
85
146
|
static getDatabaseProperty<T>(property: string, defaultValue: T): T {
|