@objectql/cli 4.0.6 → 4.2.0
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/README.md +47 -249
- package/dist/commands/doctor.d.ts +5 -1
- package/dist/commands/doctor.js +6 -13
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/migrate.js +3 -16
- package/dist/commands/migrate.js.map +1 -1
- package/dist/commands/repl.js +3 -18
- package/dist/commands/repl.js.map +1 -1
- package/dist/commands/sync.js +2 -19
- package/dist/commands/sync.js.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/register/database.js +2 -2
- package/dist/register/database.js.map +1 -1
- package/dist/register/lifecycle.js +14 -26
- package/dist/register/lifecycle.js.map +1 -1
- package/dist/register/tools.js +4 -3
- package/dist/register/tools.js.map +1 -1
- package/dist/utils/config-loader.d.ts +22 -0
- package/dist/utils/config-loader.js +98 -0
- package/dist/utils/config-loader.js.map +1 -0
- package/dist/{commands/serve.d.ts → utils/objectstack-cli.d.ts} +2 -7
- package/dist/utils/objectstack-cli.js +42 -0
- package/dist/utils/objectstack-cli.js.map +1 -0
- package/package.json +9 -12
- package/templates/hello-world/CHANGELOG.md +8 -0
- package/templates/hello-world/package.json +1 -1
- package/templates/starter/CHANGELOG.md +10 -0
- package/templates/starter/__mocks__/@objectstack/runtime.js +55 -0
- package/templates/starter/jest.setup.js +1 -0
- package/templates/starter/package.json +2 -5
- package/templates/starter/tsconfig.json +1 -1
- package/dist/commands/dev.d.ts +0 -18
- package/dist/commands/dev.js +0 -118
- package/dist/commands/dev.js.map +0 -1
- package/dist/commands/init.d.ts +0 -16
- package/dist/commands/init.js +0 -210
- package/dist/commands/init.js.map +0 -1
- package/dist/commands/serve.js +0 -218
- package/dist/commands/serve.js.map +0 -1
- package/dist/commands/start.d.ts +0 -19
- package/dist/commands/start.js +0 -144
- package/dist/commands/start.js.map +0 -1
- package/templates/starter/jest.config.js +0 -33
package/dist/commands/sync.js
CHANGED
|
@@ -48,6 +48,7 @@ const fs = __importStar(require("fs"));
|
|
|
48
48
|
const path = __importStar(require("path"));
|
|
49
49
|
const chalk_1 = __importDefault(require("chalk"));
|
|
50
50
|
const yaml = __importStar(require("js-yaml"));
|
|
51
|
+
const config_loader_1 = require("../utils/config-loader");
|
|
51
52
|
/**
|
|
52
53
|
* Sync database schema to ObjectQL .object.yml files
|
|
53
54
|
* Introspects existing SQL database and generates object definitions
|
|
@@ -267,25 +268,7 @@ function formatLabel(name) {
|
|
|
267
268
|
* Load ObjectQL instance from config file
|
|
268
269
|
*/
|
|
269
270
|
async function loadObjectQLInstance(configPath) {
|
|
270
|
-
const
|
|
271
|
-
// Try to load from config file
|
|
272
|
-
let configFile = configPath;
|
|
273
|
-
if (!configFile) {
|
|
274
|
-
const potentialFiles = ['objectql.config.ts', 'objectql.config.js'];
|
|
275
|
-
for (const file of potentialFiles) {
|
|
276
|
-
if (fs.existsSync(path.join(cwd, file))) {
|
|
277
|
-
configFile = path.join(cwd, file);
|
|
278
|
-
break;
|
|
279
|
-
}
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
else if (!path.isAbsolute(configFile)) {
|
|
283
|
-
// If configPath is provided but relative, make it absolute
|
|
284
|
-
configFile = path.join(cwd, configFile);
|
|
285
|
-
}
|
|
286
|
-
if (!configFile) {
|
|
287
|
-
throw new Error('No configuration file found (objectql.config.ts/js). Please create one with database connection.');
|
|
288
|
-
}
|
|
271
|
+
const configFile = (0, config_loader_1.resolveConfigFile)(configPath);
|
|
289
272
|
// Register ts-node for TypeScript support
|
|
290
273
|
if (configFile.endsWith('.ts')) {
|
|
291
274
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -8,16 +8,20 @@
|
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
const commander_1 = require("commander");
|
|
11
|
+
const node_fs_1 = require("node:fs");
|
|
12
|
+
const node_path_1 = require("node:path");
|
|
11
13
|
const lifecycle_1 = require("./register/lifecycle");
|
|
12
14
|
const scaffold_1 = require("./register/scaffold");
|
|
13
15
|
const database_1 = require("./register/database");
|
|
14
16
|
const tools_1 = require("./register/tools");
|
|
15
17
|
const i18n_1 = require("./register/i18n");
|
|
18
|
+
// Read version from package.json to keep in sync (ISS-010)
|
|
19
|
+
const { version } = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '../package.json'), 'utf8'));
|
|
16
20
|
const program = new commander_1.Command();
|
|
17
21
|
program
|
|
18
22
|
.name('objectql')
|
|
19
|
-
.description('ObjectQL CLI tool -
|
|
20
|
-
.version(
|
|
23
|
+
.description('ObjectQL CLI tool - Metadata, DB workflows, and local tooling (runtime via @objectstack/cli)')
|
|
24
|
+
.version(version);
|
|
21
25
|
// Register all command groups
|
|
22
26
|
(0, lifecycle_1.registerLifecycleCommands)(program);
|
|
23
27
|
(0, scaffold_1.registerScaffoldCommands)(program);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,yCAAoC;AACpC,oDAAiE;AACjE,kDAA+D;AAC/D,kDAA+D;AAC/D,4CAAyD;AACzD,0CAAuD;AAEvD,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,UAAU,CAAC;KAChB,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,yCAAoC;AACpC,qCAAuC;AACvC,yCAAoC;AACpC,oDAAiE;AACjE,kDAA+D;AAC/D,kDAA+D;AAC/D,4CAAyD;AACzD,0CAAuD;AAEvD,2DAA2D;AAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAE5F,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,UAAU,CAAC;KAChB,WAAW,CAAC,8FAA8F,CAAC;KAC3G,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,8BAA8B;AAC9B,IAAA,qCAAyB,EAAC,OAAO,CAAC,CAAC;AACnC,IAAA,mCAAwB,EAAC,OAAO,CAAC,CAAC;AAClC,IAAA,mCAAwB,EAAC,OAAO,CAAC,CAAC;AAClC,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;AAC/B,IAAA,2BAAoB,EAAC,OAAO,CAAC,CAAC;AAE9B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -29,7 +29,7 @@ function registerDatabaseCommands(program) {
|
|
|
29
29
|
dbCmd
|
|
30
30
|
.command('pull')
|
|
31
31
|
.description('Introspect database and generate metadata (Reverse Engineering)')
|
|
32
|
-
.option('-c, --config <path>', 'Path to
|
|
32
|
+
.option('-c, --config <path>', 'Path to objectstack.config.ts/js')
|
|
33
33
|
.option('-o, --output <path>', 'Output directory', './src/objects')
|
|
34
34
|
.option('-t, --tables <tables...>', 'Specific tables to sync')
|
|
35
35
|
.option('-f, --force', 'Overwrite existing files')
|
|
@@ -49,7 +49,7 @@ function registerDatabaseCommands(program) {
|
|
|
49
49
|
migrateCmd
|
|
50
50
|
.command('up')
|
|
51
51
|
.description('Run pending migrations')
|
|
52
|
-
.option('-c, --config <path>', 'Path to
|
|
52
|
+
.option('-c, --config <path>', 'Path to objectstack.config.ts/js')
|
|
53
53
|
.option('-d, --dir <path>', 'Migrations directory', './migrations')
|
|
54
54
|
.action(async (options) => {
|
|
55
55
|
await (0, migrate_1.migrate)(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/register/database.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAOH,4DA4DC;AAhED,2CAAgD;AAChD,6DAA0D;AAC1D,iDAA4E;AAE5E,SAAgB,wBAAwB,CAAC,OAAgB;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvE,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,8CAA8C,CAAC;SAC3D,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC;SACzC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,IAAI,CAAC;YACD,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC,CAAC,CAAC;IAEP,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,iEAAiE,CAAC;SAC9E,MAAM,CAAC,qBAAqB,EAAE
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/register/database.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAOH,4DA4DC;AAhED,2CAAgD;AAChD,6DAA0D;AAC1D,iDAA4E;AAE5E,SAAgB,wBAAwB,CAAC,OAAgB;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvE,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,8CAA8C,CAAC;SAC3D,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC;SACzC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,IAAI,CAAC;YACD,MAAM,IAAA,6BAAa,EAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC,CAAC,CAAC;IAEP,KAAK;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,iEAAiE,CAAC;SAC9E,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC;SACjE,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,EAAE,eAAe,CAAC;SAClE,MAAM,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;SAC7D,MAAM,CAAC,aAAa,EAAE,0BAA0B,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,IAAI,CAAC;YACD,gCAAgC;YAChC,MAAM,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,OAAO;SACrB,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,4BAA4B,CAAC,CAAC;IAE/C,UAAU;SACL,OAAO,CAAC,IAAI,CAAC;SACb,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC;SACjE,MAAM,CAAC,kBAAkB,EAAE,sBAAsB,EAAE,cAAc,CAAC;SAClE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEP,UAAU;SACL,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,6BAA6B,CAAC;SAC1C,MAAM,CAAC,kBAAkB,EAAE,sBAAsB,EAAE,cAAc,CAAC;SAClE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC5B,MAAM,IAAA,uBAAa,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEP,UAAU;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,uBAAuB,CAAC;SACpC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -12,36 +12,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.registerLifecycleCommands = registerLifecycleCommands;
|
|
14
14
|
const chalk_1 = __importDefault(require("chalk"));
|
|
15
|
-
const dev_1 = require("../commands/dev");
|
|
16
|
-
const start_1 = require("../commands/start");
|
|
17
15
|
const build_1 = require("../commands/build");
|
|
16
|
+
const objectstack_cli_1 = require("../utils/objectstack-cli");
|
|
18
17
|
function registerLifecycleCommands(program) {
|
|
19
18
|
program
|
|
20
19
|
.command('init')
|
|
21
|
-
.description('Create a new
|
|
20
|
+
.description('Create a new ObjectStack project (Delegated to @objectstack/cli)')
|
|
22
21
|
.action(async () => {
|
|
23
|
-
console.log(chalk_1.default.
|
|
24
|
-
|
|
25
|
-
console.log(chalk_1.default.cyan(' npm create @objectql@latest <my-app>'));
|
|
26
|
-
console.log('');
|
|
27
|
-
process.exit(1);
|
|
22
|
+
console.log(chalk_1.default.yellow('\n⚠️ The "objectql init" command is delegated to @objectstack/cli.'));
|
|
23
|
+
(0, objectstack_cli_1.forwardToObjectStack)('create');
|
|
28
24
|
});
|
|
29
25
|
program
|
|
30
26
|
.command('dev')
|
|
31
|
-
.description('Start development server
|
|
27
|
+
.description('Start development server (Delegated to @objectstack/cli)')
|
|
32
28
|
.option('-p, --port <number>', 'Port to listen on', '3000')
|
|
33
29
|
.option('-d, --dir <path>', 'Directory containing schema', '.')
|
|
34
|
-
.option('-c, --config <path>', 'Path to
|
|
30
|
+
.option('-c, --config <path>', 'Path to objectstack.config.ts/js')
|
|
35
31
|
.option('--modules <items>', 'Comma-separated list of modules to load')
|
|
36
32
|
.option('--no-watch', 'Disable file watching')
|
|
37
|
-
.action(async (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
dir: options.dir,
|
|
41
|
-
config: options.config,
|
|
42
|
-
modules: options.modules,
|
|
43
|
-
watch: options.watch
|
|
44
|
-
});
|
|
33
|
+
.action(async () => {
|
|
34
|
+
const args = process.argv.slice(3);
|
|
35
|
+
(0, objectstack_cli_1.forwardToObjectStack)('dev', args);
|
|
45
36
|
});
|
|
46
37
|
program
|
|
47
38
|
.command('build')
|
|
@@ -60,16 +51,13 @@ function registerLifecycleCommands(program) {
|
|
|
60
51
|
});
|
|
61
52
|
program
|
|
62
53
|
.command('start')
|
|
63
|
-
.description('Start production server')
|
|
54
|
+
.description('Start production server (Delegated to @objectstack/cli)')
|
|
64
55
|
.option('-p, --port <number>', 'Port to listen on', '3000')
|
|
65
56
|
.option('-d, --dir <path>', 'Directory containing schema', '.')
|
|
66
|
-
.option('-c, --config <path>', 'Path to
|
|
67
|
-
.action(async (
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
dir: options.dir,
|
|
71
|
-
config: options.config
|
|
72
|
-
});
|
|
57
|
+
.option('-c, --config <path>', 'Path to objectstack.config.ts/js')
|
|
58
|
+
.action(async () => {
|
|
59
|
+
const args = process.argv.slice(3);
|
|
60
|
+
(0, objectstack_cli_1.forwardToObjectStack)('serve', args);
|
|
73
61
|
});
|
|
74
62
|
}
|
|
75
63
|
//# sourceMappingURL=lifecycle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/register/lifecycle.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/register/lifecycle.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAOH,8DAgDC;AApDD,kDAA0B;AAC1B,6CAA0C;AAC1C,8DAAgE;AAEhE,SAAgB,yBAAyB,CAAC,OAAgB;IACtD,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,kEAAkE,CAAC;SAC/E,MAAM,CAAC,KAAK,IAAI,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,qEAAqE,CAAC,CAAC,CAAC;QACjG,IAAA,sCAAoB,EAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,CAAC;SAC1D,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,GAAG,CAAC;SAC9D,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC;SACjE,MAAM,CAAC,mBAAmB,EAAE,yCAAyC,CAAC;SACtE,MAAM,CAAC,YAAY,EAAE,uBAAuB,CAAC;SAC7C,MAAM,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,sCAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,8BAA8B,CAAC;SAC3C,MAAM,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,GAAG,CAAC;SACnD,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,EAAE,QAAQ,CAAC;SAC3D,MAAM,CAAC,YAAY,EAAE,iCAAiC,CAAC;SACvD,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC;SACnD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,aAAK,EAAC;YACR,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,yDAAyD,CAAC;SACtE,MAAM,CAAC,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,CAAC;SAC1D,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,GAAG,CAAC;SAC9D,MAAM,CAAC,qBAAqB,EAAE,kCAAkC,CAAC;SACjE,MAAM,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,sCAAoB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACX,CAAC"}
|
package/dist/register/tools.js
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.registerToolsCommands = registerToolsCommands;
|
|
11
11
|
const doctor_1 = require("../commands/doctor");
|
|
12
|
+
const objectstack_cli_1 = require("../utils/objectstack-cli");
|
|
12
13
|
const repl_1 = require("../commands/repl");
|
|
13
14
|
const test_1 = require("../commands/test");
|
|
14
15
|
const lint_1 = require("../commands/lint");
|
|
@@ -16,9 +17,9 @@ const format_1 = require("../commands/format");
|
|
|
16
17
|
function registerToolsCommands(program) {
|
|
17
18
|
program
|
|
18
19
|
.command('doctor')
|
|
19
|
-
.description('Check environment and configuration health')
|
|
20
|
+
.description('Check environment and configuration health (Delegated to @objectstack/cli)')
|
|
20
21
|
.action(async () => {
|
|
21
|
-
|
|
22
|
+
(0, objectstack_cli_1.forwardToObjectStack)('doctor');
|
|
22
23
|
});
|
|
23
24
|
program
|
|
24
25
|
.command('validate')
|
|
@@ -30,7 +31,7 @@ function registerToolsCommands(program) {
|
|
|
30
31
|
program
|
|
31
32
|
.command('repl')
|
|
32
33
|
.description('Start interactive REPL')
|
|
33
|
-
.option('-c, --config <path>', 'Path to
|
|
34
|
+
.option('-c, --config <path>', 'Path to objectstack.config.ts')
|
|
34
35
|
.action(async (options) => {
|
|
35
36
|
await (0, repl_1.startRepl)(options.config);
|
|
36
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/register/tools.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/register/tools.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAUH,sDAgDC;AAvDD,+CAAqD;AACrD,8DAAgE;AAChE,2CAA6C;AAC7C,2CAAwC;AACxC,2CAAwC;AACxC,+CAA4C;AAE5C,SAAgB,qBAAqB,CAAC,OAAgB;IAClD,OAAO;SACF,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,4EAA4E,CAAC;SACzF,MAAM,CAAC,KAAK,IAAI,EAAE;QACf,IAAA,sCAAoB,EAAC,QAAQ,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,6BAA6B,CAAC;SAC1C,MAAM,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,GAAG,CAAC;SACxD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,wBAAe,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC,qBAAqB,EAAE,+BAA+B,CAAC;SAC9D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,gBAAS,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,WAAW,CAAC;SACxB,MAAM,CAAC,aAAa,EAAE,yBAAyB,CAAC;SAChD,MAAM,CAAC,gBAAgB,EAAE,0BAA0B,CAAC;SACpD,MAAM,CAAC,uBAAuB,EAAE,qCAAqC,CAAC;SACtE,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,GAAG,CAAC;SAC9D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,WAAI,EAAC,OAAO,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,qBAAqB,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,WAAI,EAAC,OAAO,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,uBAAuB,CAAC;SACpC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACtB,MAAM,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ObjectQL
|
|
3
|
+
* Copyright (c) 2026-present ObjectStack Inc.
|
|
4
|
+
*
|
|
5
|
+
* This source code is licensed under the MIT license found in the
|
|
6
|
+
* LICENSE file in the root directory of this source tree.
|
|
7
|
+
*/
|
|
8
|
+
/**
|
|
9
|
+
* Resolve the absolute path to the project configuration file.
|
|
10
|
+
*
|
|
11
|
+
* - When `configPath` is provided, it is resolved relative to `cwd` (or used as-is if already absolute).
|
|
12
|
+
* - When omitted, the function searches the `cwd` for known config file names in priority order.
|
|
13
|
+
*
|
|
14
|
+
* @returns The absolute path to the config file.
|
|
15
|
+
* @throws If no config file can be located.
|
|
16
|
+
*/
|
|
17
|
+
export declare function resolveConfigFile(configPath?: string, cwd?: string): string;
|
|
18
|
+
/**
|
|
19
|
+
* Config file names used for doctor/validation checks.
|
|
20
|
+
* Includes sub-directory variants (src/).
|
|
21
|
+
*/
|
|
22
|
+
export declare const CONFIG_SEARCH_PATHS: readonly ["objectstack.config.ts", "objectstack.config.js", "objectql.config.ts", "objectql.config.js", "src/objectstack.config.ts", "src/objectstack.config.js", "src/objectql.config.ts", "src/objectql.config.js"];
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* ObjectQL
|
|
4
|
+
* Copyright (c) 2026-present ObjectStack Inc.
|
|
5
|
+
*
|
|
6
|
+
* This source code is licensed under the MIT license found in the
|
|
7
|
+
* LICENSE file in the root directory of this source tree.
|
|
8
|
+
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
42
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
|
+
exports.CONFIG_SEARCH_PATHS = void 0;
|
|
44
|
+
exports.resolveConfigFile = resolveConfigFile;
|
|
45
|
+
const path = __importStar(require("path"));
|
|
46
|
+
const fs = __importStar(require("fs"));
|
|
47
|
+
/**
|
|
48
|
+
* Config file search order:
|
|
49
|
+
* 1. objectstack.config.ts (canonical — matches @objectstack/cli)
|
|
50
|
+
* 2. objectstack.config.js
|
|
51
|
+
* 3. objectql.config.ts (legacy compat)
|
|
52
|
+
* 4. objectql.config.js
|
|
53
|
+
*/
|
|
54
|
+
const CONFIG_FILE_NAMES = [
|
|
55
|
+
'objectstack.config.ts',
|
|
56
|
+
'objectstack.config.js',
|
|
57
|
+
'objectql.config.ts',
|
|
58
|
+
'objectql.config.js',
|
|
59
|
+
];
|
|
60
|
+
/**
|
|
61
|
+
* Resolve the absolute path to the project configuration file.
|
|
62
|
+
*
|
|
63
|
+
* - When `configPath` is provided, it is resolved relative to `cwd` (or used as-is if already absolute).
|
|
64
|
+
* - When omitted, the function searches the `cwd` for known config file names in priority order.
|
|
65
|
+
*
|
|
66
|
+
* @returns The absolute path to the config file.
|
|
67
|
+
* @throws If no config file can be located.
|
|
68
|
+
*/
|
|
69
|
+
function resolveConfigFile(configPath, cwd = process.cwd()) {
|
|
70
|
+
if (configPath) {
|
|
71
|
+
const resolved = path.isAbsolute(configPath) ? configPath : path.join(cwd, configPath);
|
|
72
|
+
if (!fs.existsSync(resolved)) {
|
|
73
|
+
throw new Error(`Configuration file not found: ${resolved}`);
|
|
74
|
+
}
|
|
75
|
+
return resolved;
|
|
76
|
+
}
|
|
77
|
+
for (const fileName of CONFIG_FILE_NAMES) {
|
|
78
|
+
const candidate = path.join(cwd, fileName);
|
|
79
|
+
if (fs.existsSync(candidate)) {
|
|
80
|
+
return candidate;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
throw new Error('No configuration file found. Expected one of:\n' +
|
|
84
|
+
CONFIG_FILE_NAMES.map(f => ` - ${f}`).join('\n') +
|
|
85
|
+
'\n\nRun `objectstack create` to scaffold a new project.');
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Config file names used for doctor/validation checks.
|
|
89
|
+
* Includes sub-directory variants (src/).
|
|
90
|
+
*/
|
|
91
|
+
exports.CONFIG_SEARCH_PATHS = [
|
|
92
|
+
...CONFIG_FILE_NAMES,
|
|
93
|
+
'src/objectstack.config.ts',
|
|
94
|
+
'src/objectstack.config.js',
|
|
95
|
+
'src/objectql.config.ts',
|
|
96
|
+
'src/objectql.config.js',
|
|
97
|
+
];
|
|
98
|
+
//# sourceMappingURL=config-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/utils/config-loader.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BH,8CAqBC;AA/CD,2CAA6B;AAC7B,uCAAyB;AAEzB;;;;;;GAMG;AACH,MAAM,iBAAiB,GAAG;IACtB,uBAAuB;IACvB,uBAAuB;IACvB,oBAAoB;IACpB,oBAAoB;CACd,CAAC;AAEX;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,UAAmB,EAAE,MAAc,OAAO,CAAC,GAAG,EAAE;IAC9E,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CACX,iDAAiD;QACjD,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACjD,yDAAyD,CAC5D,CAAC;AACN,CAAC;AAED;;;GAGG;AACU,QAAA,mBAAmB,GAAG;IAC/B,GAAG,iBAAiB;IACpB,2BAA2B;IAC3B,2BAA2B;IAC3B,wBAAwB;IACxB,wBAAwB;CAClB,CAAC"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* ObjectQL
|
|
2
|
+
* ObjectQL CLI - ObjectStack CLI Delegation
|
|
3
3
|
* Copyright (c) 2026-present ObjectStack Inc.
|
|
4
4
|
*
|
|
5
5
|
* This source code is licensed under the MIT license found in the
|
|
6
6
|
* LICENSE file in the root directory of this source tree.
|
|
7
7
|
*/
|
|
8
|
-
export declare function
|
|
9
|
-
port: number;
|
|
10
|
-
dir: string;
|
|
11
|
-
config?: string;
|
|
12
|
-
modules?: string;
|
|
13
|
-
}): Promise<void>;
|
|
8
|
+
export declare function forwardToObjectStack(command: string, args?: string[]): never;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* ObjectQL CLI - ObjectStack CLI Delegation
|
|
4
|
+
* Copyright (c) 2026-present ObjectStack Inc.
|
|
5
|
+
*
|
|
6
|
+
* This source code is licensed under the MIT license found in the
|
|
7
|
+
* LICENSE file in the root directory of this source tree.
|
|
8
|
+
*/
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.forwardToObjectStack = forwardToObjectStack;
|
|
14
|
+
const node_child_process_1 = require("node:child_process");
|
|
15
|
+
const node_fs_1 = require("node:fs");
|
|
16
|
+
const node_path_1 = require("node:path");
|
|
17
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
18
|
+
const isWindows = process.platform === 'win32';
|
|
19
|
+
const getLocalObjectStackBin = () => {
|
|
20
|
+
const binName = isWindows ? 'objectstack.cmd' : 'objectstack';
|
|
21
|
+
return (0, node_path_1.resolve)(process.cwd(), 'node_modules', '.bin', binName);
|
|
22
|
+
};
|
|
23
|
+
function forwardToObjectStack(command, args = []) {
|
|
24
|
+
var _a;
|
|
25
|
+
const localBin = getLocalObjectStackBin();
|
|
26
|
+
const finalArgs = [command, ...args];
|
|
27
|
+
console.log(chalk_1.default.yellow(`\n↪ Delegating to @objectstack/cli: objectstack ${finalArgs.join(' ')}`));
|
|
28
|
+
let result;
|
|
29
|
+
if ((0, node_fs_1.existsSync)(localBin)) {
|
|
30
|
+
result = (0, node_child_process_1.spawnSync)(localBin, finalArgs, { stdio: 'inherit' });
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
const npxCmd = isWindows ? 'npx.cmd' : 'npx';
|
|
34
|
+
result = (0, node_child_process_1.spawnSync)(npxCmd, ['-y', '@objectstack/cli', ...finalArgs], { stdio: 'inherit' });
|
|
35
|
+
}
|
|
36
|
+
if (result.error) {
|
|
37
|
+
console.error(chalk_1.default.red(`Failed to run @objectstack/cli: ${result.error.message}`));
|
|
38
|
+
process.exit(1);
|
|
39
|
+
}
|
|
40
|
+
process.exit((_a = result.status) !== null && _a !== void 0 ? _a : 0);
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=objectstack-cli.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectstack-cli.js","sourceRoot":"","sources":["../../src/utils/objectstack-cli.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAcH,oDAqBC;AAjCD,2DAA+C;AAC/C,qCAAqC;AACrC,yCAAoC;AACpC,kDAA0B;AAE1B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AAE/C,MAAM,sBAAsB,GAAG,GAAG,EAAE;IAClC,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC9D,OAAO,IAAA,mBAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,SAAgB,oBAAoB,CAAC,OAAe,EAAE,OAAiB,EAAE;;IACvE,MAAM,QAAQ,GAAG,sBAAsB,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAErC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,mDAAmD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpG,IAAI,MAAoC,CAAC;IAEzC,IAAI,IAAA,oBAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,IAAA,8BAAS,EAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;QAC7C,MAAM,GAAG,IAAA,8BAAS,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,mCAAmC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,CAAC,CAAC,CAAC;AACnC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@objectql/cli",
|
|
3
|
-
"version": "4.0
|
|
4
|
-
"description": "Command-line interface for ObjectQL -
|
|
3
|
+
"version": "4.2.0",
|
|
4
|
+
"description": "Command-line interface for ObjectQL - metadata scaffolding, type generation, DB workflows, and local tooling",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"objectql",
|
|
7
7
|
"cli",
|
|
@@ -9,10 +9,8 @@
|
|
|
9
9
|
"codegen",
|
|
10
10
|
"migration",
|
|
11
11
|
"repl",
|
|
12
|
-
"ai",
|
|
13
12
|
"tools",
|
|
14
|
-
"development"
|
|
15
|
-
"studio"
|
|
13
|
+
"development"
|
|
16
14
|
],
|
|
17
15
|
"license": "MIT",
|
|
18
16
|
"main": "dist/index.js",
|
|
@@ -33,12 +31,11 @@
|
|
|
33
31
|
"prettier": "^3.0.0",
|
|
34
32
|
"ts-node": "^10.9.1",
|
|
35
33
|
"dotenv": "^16.4.5",
|
|
36
|
-
"@objectql/types": "4.0
|
|
37
|
-
"@objectql/core": "4.0
|
|
38
|
-
"@objectql/plugin-validator": "4.0
|
|
39
|
-
"@objectql/
|
|
40
|
-
"@objectql/
|
|
41
|
-
"@objectql/platform-node": "4.0.6"
|
|
34
|
+
"@objectql/types": "4.2.0",
|
|
35
|
+
"@objectql/core": "4.2.0",
|
|
36
|
+
"@objectql/plugin-validator": "4.2.0",
|
|
37
|
+
"@objectql/driver-sql": "4.2.0",
|
|
38
|
+
"@objectql/platform-node": "4.2.0"
|
|
42
39
|
},
|
|
43
40
|
"devDependencies": {
|
|
44
41
|
"typescript": "^5.0.0",
|
|
@@ -49,6 +46,6 @@
|
|
|
49
46
|
"build": "tsc && pnpm run copy-templates",
|
|
50
47
|
"copy-templates": "rm -rf templates && mkdir -p templates && rsync -av --exclude='node_modules' --exclude='dist' --exclude='__tests__' ../../../examples/quickstart/hello-world templates/ && rsync -av --exclude='node_modules' --exclude='dist' --exclude='__tests__' ../../../examples/showcase/project-tracker/ templates/starter",
|
|
51
48
|
"watch": "tsc -w",
|
|
52
|
-
"test": "
|
|
49
|
+
"test": "vitest run"
|
|
53
50
|
}
|
|
54
51
|
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
// Mock for @objectstack/core
|
|
2
|
+
// Used to bypass ESM/import.meta issues in Jest
|
|
3
|
+
|
|
4
|
+
const mockLogger = {
|
|
5
|
+
info: jest.fn(),
|
|
6
|
+
error: jest.fn(),
|
|
7
|
+
warn: jest.fn(),
|
|
8
|
+
debug: jest.fn(),
|
|
9
|
+
log: jest.fn(),
|
|
10
|
+
child: () => mockLogger
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
function DummyKernel(...args) {
|
|
14
|
+
const self = this || {};
|
|
15
|
+
self.args = args;
|
|
16
|
+
self.logger = mockLogger;
|
|
17
|
+
self.kernel = {};
|
|
18
|
+
self.bootstrap = jest.fn().mockResolvedValue(undefined);
|
|
19
|
+
self.start = jest.fn().mockResolvedValue(undefined);
|
|
20
|
+
self.use = jest.fn();
|
|
21
|
+
self.getEntry = jest.fn().mockReturnValue({});
|
|
22
|
+
|
|
23
|
+
return self;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
// Add prototype methods for class inheritance compatibility
|
|
27
|
+
DummyKernel.prototype.bootstrap = jest.fn().mockResolvedValue(undefined);
|
|
28
|
+
DummyKernel.prototype.start = jest.fn().mockResolvedValue(undefined);
|
|
29
|
+
DummyKernel.prototype.use = jest.fn();
|
|
30
|
+
|
|
31
|
+
const proxy = new Proxy({}, {
|
|
32
|
+
get: function(target, prop) {
|
|
33
|
+
if (prop === '__esModule') {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// Explicit exports
|
|
38
|
+
if (prop === 'createLogger') {
|
|
39
|
+
return () => mockLogger;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (prop === 'ObjectKernel' || prop === 'ObjectStack') {
|
|
43
|
+
return DummyKernel;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// For other exports, return a generic mock or DummyKernel if it looks like a class
|
|
47
|
+
if (typeof prop === 'string' && /^[A-Z]/.test(prop)) {
|
|
48
|
+
return DummyKernel;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return jest.fn();
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
module.exports = proxy;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@objectql/example-project-tracker",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.0",
|
|
4
4
|
"description": "ObjectQL Basic Example Project",
|
|
5
5
|
"private": true,
|
|
6
6
|
"keywords": [
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"codegen": "objectql types -s src -o src/types",
|
|
31
31
|
"build": "tsc && rsync -a --include '*/' --include '*.yml' --exclude '*' src/ dist/",
|
|
32
32
|
"repl": "objectql repl",
|
|
33
|
-
"test": "
|
|
33
|
+
"test": "vitest run"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
36
|
"@objectql/core": "workspace:*",
|
|
@@ -45,10 +45,7 @@
|
|
|
45
45
|
"@objectql/driver-sql": "workspace:*",
|
|
46
46
|
"@objectql/platform-node": "workspace:*",
|
|
47
47
|
"@objectql/types": "workspace:*",
|
|
48
|
-
"@types/jest": "^30.0.0",
|
|
49
48
|
"@types/node": "^20.0.0",
|
|
50
|
-
"jest": "^30.2.0",
|
|
51
|
-
"ts-jest": "^29.4.6",
|
|
52
49
|
"typescript": "^5.3.0"
|
|
53
50
|
}
|
|
54
51
|
}
|