@objectql/cli 1.3.1 → 1.5.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/CHANGELOG.md +35 -0
- package/LICENSE +21 -0
- package/dist/commands/generate.js +22 -21
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/studio.d.ts +5 -0
- package/dist/commands/studio.js +279 -0
- package/dist/commands/studio.js.map +1 -0
- package/dist/index.js +15 -0
- package/dist/index.js.map +1 -1
- package/package.json +7 -6
- package/src/commands/generate.ts +22 -18
- package/src/commands/studio.ts +264 -0
- package/src/index.ts +16 -0
- package/tsconfig.json +7 -1
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,40 @@
|
|
|
1
1
|
# @objectql/cli
|
|
2
2
|
|
|
3
|
+
## 1.5.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- Minor version release - 1.5.0
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
- @objectql/core@1.5.0
|
|
13
|
+
- @objectql/driver-knex@1.5.0
|
|
14
|
+
- @objectql/server@1.5.0
|
|
15
|
+
- @objectql/types@1.5.0
|
|
16
|
+
|
|
17
|
+
## 1.4.0
|
|
18
|
+
|
|
19
|
+
### Minor Changes
|
|
20
|
+
|
|
21
|
+
- Release version 1.4.0 with new features and enhancements:
|
|
22
|
+
- Added complete REST API implementation with CRUD operations
|
|
23
|
+
- Enhanced error handling with standardized error codes and HTTP status mapping
|
|
24
|
+
- Added AI context support for tracking intent and use cases
|
|
25
|
+
- Enhanced metadata API with detailed field information and action listing
|
|
26
|
+
- Improved JSON-RPC API with better error categorization
|
|
27
|
+
- Added hooks and actions validation and implementation
|
|
28
|
+
- Updated documentation and examples
|
|
29
|
+
|
|
30
|
+
### Patch Changes
|
|
31
|
+
|
|
32
|
+
- Updated dependencies
|
|
33
|
+
- @objectql/core@1.4.0
|
|
34
|
+
- @objectql/driver-knex@1.4.0
|
|
35
|
+
- @objectql/server@1.4.0
|
|
36
|
+
- @objectql/types@1.4.0
|
|
37
|
+
|
|
3
38
|
## 1.3.1
|
|
4
39
|
|
|
5
40
|
### Patch Changes
|
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 ObjectQL Contributors
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
@@ -32,23 +32,23 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
36
|
exports.generateTypes = generateTypes;
|
|
40
37
|
const fs = __importStar(require("fs"));
|
|
41
38
|
const path = __importStar(require("path"));
|
|
42
|
-
const
|
|
43
|
-
const yaml = __importStar(require("js-yaml"));
|
|
39
|
+
const core_1 = require("@objectql/core");
|
|
44
40
|
async function generateTypes(sourceDir, outputDir) {
|
|
45
41
|
console.log(`Searching for objects in ${sourceDir}...`);
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
42
|
+
// Use Loader to get Merged Objects (Flat list)
|
|
43
|
+
let schemas;
|
|
44
|
+
try {
|
|
45
|
+
schemas = (0, core_1.loadObjectConfigs)(sourceDir);
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
console.error('Failed to load object configs:', e);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (Object.keys(schemas).length === 0) {
|
|
52
52
|
console.log('No object files found.');
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
@@ -57,21 +57,22 @@ async function generateTypes(sourceDir, outputDir) {
|
|
|
57
57
|
fs.mkdirSync(outputDir, { recursive: true });
|
|
58
58
|
}
|
|
59
59
|
const indexContent = [];
|
|
60
|
-
for (const
|
|
61
|
-
const content = fs.readFileSync(file, 'utf8');
|
|
60
|
+
for (const [name, schema] of Object.entries(schemas)) {
|
|
62
61
|
try {
|
|
63
|
-
const
|
|
64
|
-
if (!schema || !schema.name)
|
|
65
|
-
continue;
|
|
66
|
-
const typeName = toPascalCase(schema.name);
|
|
62
|
+
const typeName = toPascalCase(name);
|
|
67
63
|
const typeDefinition = generateInterface(typeName, schema);
|
|
68
|
-
|
|
64
|
+
// Generate flat files based on Object Name
|
|
65
|
+
// e.g. User.ts, CrmContact.ts
|
|
66
|
+
// We lose original directory structure but gain correct merged types.
|
|
67
|
+
// This is arguably better for "Generated Types" which are usually a flat library.
|
|
68
|
+
const fileName = `${name}.ts`;
|
|
69
|
+
const outPath = path.join(outputDir, fileName);
|
|
69
70
|
fs.writeFileSync(outPath, typeDefinition);
|
|
70
|
-
console.log(`Generated ${
|
|
71
|
-
indexContent.push(`export * from './${
|
|
71
|
+
console.log(`Generated ${fileName}`);
|
|
72
|
+
indexContent.push(`export * from './${name}';`);
|
|
72
73
|
}
|
|
73
74
|
catch (e) {
|
|
74
|
-
console.error(`Failed to
|
|
75
|
+
console.error(`Failed to generate type for ${name}:`, e);
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
// Generate index.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,279 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.startStudio = startStudio;
|
|
40
|
+
const server_1 = require("@objectql/server");
|
|
41
|
+
const http_1 = require("http");
|
|
42
|
+
const path = __importStar(require("path"));
|
|
43
|
+
const fs = __importStar(require("fs"));
|
|
44
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
45
|
+
const child_process_1 = require("child_process");
|
|
46
|
+
const ts_node_1 = require("ts-node");
|
|
47
|
+
const fast_glob_1 = __importDefault(require("fast-glob"));
|
|
48
|
+
const SWAGGER_HTML = `
|
|
49
|
+
<!DOCTYPE html>
|
|
50
|
+
<html lang="en">
|
|
51
|
+
<head>
|
|
52
|
+
<meta charset="utf-8" />
|
|
53
|
+
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
54
|
+
<title>ObjectQL Swagger UI</title>
|
|
55
|
+
<link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.11.0/swagger-ui.css" />
|
|
56
|
+
<style>
|
|
57
|
+
body { margin: 0; padding: 0; }
|
|
58
|
+
</style>
|
|
59
|
+
</head>
|
|
60
|
+
<body>
|
|
61
|
+
<div id="swagger-ui"></div>
|
|
62
|
+
<script src="https://unpkg.com/swagger-ui-dist@5.11.0/swagger-ui-bundle.js" crossorigin></script>
|
|
63
|
+
<script>
|
|
64
|
+
window.onload = () => {
|
|
65
|
+
window.ui = SwaggerUIBundle({
|
|
66
|
+
url: '/openapi.json',
|
|
67
|
+
dom_id: '#swagger-ui',
|
|
68
|
+
});
|
|
69
|
+
};
|
|
70
|
+
</script>
|
|
71
|
+
</body>
|
|
72
|
+
</html>
|
|
73
|
+
`;
|
|
74
|
+
function openBrowser(url) {
|
|
75
|
+
const start = (process.platform == 'darwin' ? 'open' : process.platform == 'win32' ? 'start' : 'xdg-open');
|
|
76
|
+
(0, child_process_1.exec)(`${start} ${url}`);
|
|
77
|
+
}
|
|
78
|
+
async function startStudio(options) {
|
|
79
|
+
const port = options.port || 3000;
|
|
80
|
+
const rootDir = path.resolve(process.cwd(), options.dir || '.');
|
|
81
|
+
console.log(chalk_1.default.blue('Starting ObjectQL Studio...'));
|
|
82
|
+
console.log(chalk_1.default.gray(`Project Root: ${rootDir}`));
|
|
83
|
+
// Register ts-node
|
|
84
|
+
(0, ts_node_1.register)({
|
|
85
|
+
transpileOnly: true,
|
|
86
|
+
compilerOptions: {
|
|
87
|
+
module: "commonjs"
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
let app;
|
|
91
|
+
const configTs = path.join(rootDir, 'objectql.config.ts');
|
|
92
|
+
const configJs = path.join(rootDir, 'objectql.config.js');
|
|
93
|
+
if (fs.existsSync(configTs)) {
|
|
94
|
+
console.log(chalk_1.default.gray(`Loading config from ${configTs}`));
|
|
95
|
+
const mod = require(configTs);
|
|
96
|
+
app = mod.default || mod;
|
|
97
|
+
}
|
|
98
|
+
else if (fs.existsSync(configJs)) {
|
|
99
|
+
console.log(chalk_1.default.gray(`Loading config from ${configJs}`));
|
|
100
|
+
const mod = require(configJs);
|
|
101
|
+
app = mod.default || mod;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
console.error(chalk_1.default.red('\n❌ Error: Configuration file (objectql.config.ts) not found.'));
|
|
105
|
+
process.exit(1);
|
|
106
|
+
}
|
|
107
|
+
if (!app) {
|
|
108
|
+
console.error(chalk_1.default.red('\n❌ Error: No default export found in configuration file.'));
|
|
109
|
+
process.exit(1);
|
|
110
|
+
}
|
|
111
|
+
// 2. Load Schema & Init
|
|
112
|
+
try {
|
|
113
|
+
await app.init();
|
|
114
|
+
}
|
|
115
|
+
catch (e) {
|
|
116
|
+
console.error(chalk_1.default.red('❌ Failed to initialize application:'), e.message);
|
|
117
|
+
process.exit(1);
|
|
118
|
+
}
|
|
119
|
+
// 3. Setup HTTP Server
|
|
120
|
+
const nodeHandler = (0, server_1.createNodeHandler)(app);
|
|
121
|
+
const studioHandler = (0, server_1.createStudioHandler)();
|
|
122
|
+
const metadataHandler = (0, server_1.createMetadataHandler)(app);
|
|
123
|
+
const server = (0, http_1.createServer)(async (req, res) => {
|
|
124
|
+
// CORS
|
|
125
|
+
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
126
|
+
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
|
|
127
|
+
res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
|
|
128
|
+
if (req.method === 'OPTIONS') {
|
|
129
|
+
res.writeHead(200);
|
|
130
|
+
res.end();
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (req.url === '/openapi.json') {
|
|
134
|
+
return nodeHandler(req, res);
|
|
135
|
+
}
|
|
136
|
+
if (req.url === '/swagger') {
|
|
137
|
+
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
138
|
+
res.end(SWAGGER_HTML);
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
// Routing
|
|
142
|
+
if (req.url?.startsWith('/studio')) {
|
|
143
|
+
return studioHandler(req, res);
|
|
144
|
+
}
|
|
145
|
+
if (req.url?.startsWith('/api/schema/files')) {
|
|
146
|
+
// List all .object.yml files
|
|
147
|
+
try {
|
|
148
|
+
// Find all object.yml files relative to rootDir
|
|
149
|
+
// Note: User might have configured objectql with specific source paths.
|
|
150
|
+
// We ignore common build folders to avoid duplicates/editing compiled files.
|
|
151
|
+
const files = await (0, fast_glob_1.default)('**/*.object.yml', {
|
|
152
|
+
cwd: rootDir,
|
|
153
|
+
ignore: ['node_modules/**', 'dist/**', 'build/**', 'out/**', '.git/**', '.next/**']
|
|
154
|
+
});
|
|
155
|
+
res.setHeader('Content-Type', 'application/json');
|
|
156
|
+
res.end(JSON.stringify({ files }));
|
|
157
|
+
}
|
|
158
|
+
catch (e) {
|
|
159
|
+
res.statusCode = 500;
|
|
160
|
+
res.end(JSON.stringify({ error: e.message }));
|
|
161
|
+
}
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
if (req.url?.startsWith('/api/schema/content')) {
|
|
165
|
+
const urlObj = new URL(req.url, `http://${req.headers.host}`);
|
|
166
|
+
const file = urlObj.searchParams.get('file');
|
|
167
|
+
if (!file) {
|
|
168
|
+
res.statusCode = 400;
|
|
169
|
+
res.end(JSON.stringify({ error: 'Missing file parameter' }));
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
const filePath = path.join(rootDir, file);
|
|
173
|
+
// Security check
|
|
174
|
+
if (!filePath.startsWith(rootDir)) {
|
|
175
|
+
res.statusCode = 403;
|
|
176
|
+
res.end(JSON.stringify({ error: 'Access denied' }));
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
if (req.method === 'GET') {
|
|
180
|
+
try {
|
|
181
|
+
const content = fs.readFileSync(filePath, 'utf-8');
|
|
182
|
+
res.setHeader('Content-Type', 'text/plain'); // Plain text (YAML)
|
|
183
|
+
res.end(content);
|
|
184
|
+
}
|
|
185
|
+
catch (e) {
|
|
186
|
+
res.statusCode = 404;
|
|
187
|
+
res.end(JSON.stringify({ error: 'File not found' }));
|
|
188
|
+
}
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
if (req.method === 'POST') {
|
|
192
|
+
let body = '';
|
|
193
|
+
req.on('data', chunk => body += chunk);
|
|
194
|
+
req.on('end', () => {
|
|
195
|
+
try {
|
|
196
|
+
fs.writeFileSync(filePath, body, 'utf-8');
|
|
197
|
+
res.statusCode = 200;
|
|
198
|
+
res.end(JSON.stringify({ success: true }));
|
|
199
|
+
}
|
|
200
|
+
catch (e) {
|
|
201
|
+
res.statusCode = 500;
|
|
202
|
+
res.end(JSON.stringify({ error: e.message }));
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
if (req.url?.startsWith('/api/schema/find')) {
|
|
209
|
+
const urlObj = new URL(req.url, `http://${req.headers.host}`);
|
|
210
|
+
const objectName = urlObj.searchParams.get('object');
|
|
211
|
+
if (!objectName) {
|
|
212
|
+
res.statusCode = 400;
|
|
213
|
+
res.end(JSON.stringify({ error: 'Missing object parameter' }));
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
try {
|
|
217
|
+
// Find all object.yml files
|
|
218
|
+
const files = await (0, fast_glob_1.default)('**/*.object.yml', {
|
|
219
|
+
cwd: rootDir,
|
|
220
|
+
ignore: ['node_modules/**', 'dist/**', 'build/**', 'out/**', '.git/**', '.next/**']
|
|
221
|
+
});
|
|
222
|
+
let foundFile = null;
|
|
223
|
+
// Naive parsing to find the object definition
|
|
224
|
+
// We don't use the FULL parser, just checks if "name: objectName" is present
|
|
225
|
+
for (const file of files) {
|
|
226
|
+
const content = fs.readFileSync(path.join(rootDir, file), 'utf-8');
|
|
227
|
+
// Simple check: name: <objectName> or name: "<objectName>"
|
|
228
|
+
// This creates a regex that looks for `name:` followed by the objectName
|
|
229
|
+
// Handles spaces, quotes
|
|
230
|
+
const regex = new RegExp(`^\\s*name:\\s*["']?${objectName}["']?\\s*$`, 'm');
|
|
231
|
+
if (regex.test(content)) {
|
|
232
|
+
foundFile = file;
|
|
233
|
+
break;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
if (foundFile) {
|
|
237
|
+
res.setHeader('Content-Type', 'application/json');
|
|
238
|
+
res.end(JSON.stringify({ file: foundFile }));
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
res.statusCode = 404;
|
|
242
|
+
res.end(JSON.stringify({ error: 'Object definition file not found' }));
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
catch (e) {
|
|
246
|
+
res.statusCode = 500;
|
|
247
|
+
res.end(JSON.stringify({ error: e.message }));
|
|
248
|
+
}
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
if (req.url?.startsWith('/api/metadata')) {
|
|
252
|
+
return metadataHandler(req, res);
|
|
253
|
+
}
|
|
254
|
+
if (req.url?.startsWith('/api')) {
|
|
255
|
+
// Strip /api prefix if needed by the handler,
|
|
256
|
+
// but ObjectQL node handler usually expects full path or depends on internal routing.
|
|
257
|
+
// Actually createNodeHandler handles /objectql/v1/ etc?
|
|
258
|
+
// Let's assume standard behavior: pass to handler
|
|
259
|
+
return nodeHandler(req, res);
|
|
260
|
+
}
|
|
261
|
+
// Redirect root to studio
|
|
262
|
+
if (req.url === '/') {
|
|
263
|
+
res.writeHead(302, { 'Location': '/studio' });
|
|
264
|
+
res.end();
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
res.statusCode = 404;
|
|
268
|
+
res.end('Not Found');
|
|
269
|
+
});
|
|
270
|
+
server.listen(port, () => {
|
|
271
|
+
const url = `http://localhost:${port}/studio`;
|
|
272
|
+
console.log(chalk_1.default.green(`\n🚀 Studio running at: ${chalk_1.default.bold(url)}`));
|
|
273
|
+
console.log(chalk_1.default.gray(` API endpoint: http://localhost:${port}/api`));
|
|
274
|
+
if (options.open) {
|
|
275
|
+
openBrowser(url);
|
|
276
|
+
}
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
//# sourceMappingURL=studio.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"studio.js","sourceRoot":"","sources":["../../src/commands/studio.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,7 @@ const commander_1 = require("commander");
|
|
|
4
4
|
const generate_1 = require("./commands/generate");
|
|
5
5
|
const repl_1 = require("./commands/repl");
|
|
6
6
|
const serve_1 = require("./commands/serve");
|
|
7
|
+
const studio_1 = require("./commands/studio");
|
|
7
8
|
const program = new commander_1.Command();
|
|
8
9
|
program
|
|
9
10
|
.name('objectql')
|
|
@@ -41,5 +42,19 @@ program
|
|
|
41
42
|
.action(async (options) => {
|
|
42
43
|
await (0, serve_1.serve)({ port: parseInt(options.port), dir: options.dir });
|
|
43
44
|
});
|
|
45
|
+
program
|
|
46
|
+
.command('studio')
|
|
47
|
+
.alias('ui')
|
|
48
|
+
.description('Start the ObjectQL Studio')
|
|
49
|
+
.option('-p, --port <number>', 'Port to listen on', '3000')
|
|
50
|
+
.option('-d, --dir <path>', 'Directory containing schema', '.')
|
|
51
|
+
.option('--no-open', 'Do not open browser automatically')
|
|
52
|
+
.action(async (options) => {
|
|
53
|
+
await (0, studio_1.startStudio)({
|
|
54
|
+
port: parseInt(options.port),
|
|
55
|
+
dir: options.dir,
|
|
56
|
+
open: options.open
|
|
57
|
+
});
|
|
58
|
+
});
|
|
44
59
|
program.parse();
|
|
45
60
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,kDAAoD;AACpD,0CAA4C;AAC5C,4CAAyC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,kDAAoD;AACpD,0CAA4C;AAC5C,4CAAyC;AACzC,8CAAgD;AAEhD,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,UAAU,CAAC;KAChB,WAAW,CAAC,mBAAmB,CAAC;KAChC,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO;KACF,OAAO,CAAC,UAAU,CAAC;KACnB,KAAK,CAAC,GAAG,CAAC;KACV,WAAW,CAAC,2DAA2D,CAAC;KACxE,MAAM,CAAC,qBAAqB,EAAE,0CAA0C,EAAE,GAAG,CAAC;KAC9E,MAAM,CAAC,qBAAqB,EAAE,sCAAsC,EAAE,iBAAiB,CAAC;KACxF,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtB,IAAI,CAAC;QACD,MAAM,IAAA,wBAAa,EAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,MAAM,CAAC;KACf,KAAK,CAAC,GAAG,CAAC;KACV,WAAW,CAAC,yDAAyD,CAAC;KACtE,MAAM,CAAC,qBAAqB,EAAE,+BAA+B,CAAC;KAC9D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtB,MAAM,IAAA,gBAAS,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,OAAO,CAAC;KAChB,KAAK,CAAC,GAAG,CAAC;KACV,WAAW,CAAC,4BAA4B,CAAC;KACzC,MAAM,CAAC,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,CAAC;KAC1D,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,GAAG,CAAC;KAC9D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtB,MAAM,IAAA,aAAK,EAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,QAAQ,CAAC;KACjB,KAAK,CAAC,IAAI,CAAC;KACX,WAAW,CAAC,2BAA2B,CAAC;KACxC,MAAM,CAAC,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,CAAC;KAC1D,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,GAAG,CAAC;KAC9D,MAAM,CAAC,WAAW,EAAE,mCAAmC,CAAC;KACxD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtB,MAAM,IAAA,oBAAW,EAAC;QACd,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;KACrB,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEP,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@objectql/cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"bin": {
|
|
6
6
|
"objectql": "./bin/objectql"
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
"js-yaml": "^4.1.0",
|
|
14
14
|
"prettier": "^3.0.0",
|
|
15
15
|
"ts-node": "^10.9.1",
|
|
16
|
-
"@objectql/types": "1.
|
|
17
|
-
"@objectql/core": "1.
|
|
18
|
-
"@objectql/server": "1.
|
|
19
|
-
"@objectql/driver-knex": "1.
|
|
16
|
+
"@objectql/types": "1.5.0",
|
|
17
|
+
"@objectql/core": "1.5.0",
|
|
18
|
+
"@objectql/server": "1.5.0",
|
|
19
|
+
"@objectql/driver-knex": "1.5.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"typescript": "^5.0.0",
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"scripts": {
|
|
27
27
|
"build": "tsc",
|
|
28
|
-
"watch": "tsc -w"
|
|
28
|
+
"watch": "tsc -w",
|
|
29
|
+
"studio": "node dist/index.js studio"
|
|
29
30
|
}
|
|
30
31
|
}
|
package/src/commands/generate.ts
CHANGED
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import * as fs from 'fs';
|
|
2
2
|
import * as path from 'path';
|
|
3
|
-
import
|
|
4
|
-
import * as yaml from 'js-yaml';
|
|
3
|
+
import { loadObjectConfigs } from '@objectql/core';
|
|
5
4
|
import { ObjectConfig, FieldConfig } from '@objectql/types';
|
|
6
5
|
|
|
7
6
|
export async function generateTypes(sourceDir: string, outputDir: string) {
|
|
8
7
|
console.log(`Searching for objects in ${sourceDir}...`);
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
})
|
|
9
|
+
// Use Loader to get Merged Objects (Flat list)
|
|
10
|
+
let schemas: Record<string, ObjectConfig>;
|
|
11
|
+
try {
|
|
12
|
+
schemas = loadObjectConfigs(sourceDir);
|
|
13
|
+
} catch (e) {
|
|
14
|
+
console.error('Failed to load object configs:', e);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
15
17
|
|
|
16
|
-
if (
|
|
18
|
+
if (Object.keys(schemas).length === 0) {
|
|
17
19
|
console.log('No object files found.');
|
|
18
20
|
return;
|
|
19
21
|
}
|
|
@@ -25,22 +27,24 @@ export async function generateTypes(sourceDir: string, outputDir: string) {
|
|
|
25
27
|
|
|
26
28
|
const indexContent: string[] = [];
|
|
27
29
|
|
|
28
|
-
for (const
|
|
29
|
-
const content = fs.readFileSync(file, 'utf8');
|
|
30
|
+
for (const [name, schema] of Object.entries(schemas)) {
|
|
30
31
|
try {
|
|
31
|
-
const
|
|
32
|
-
if (!schema || !schema.name) continue;
|
|
33
|
-
|
|
34
|
-
const typeName = toPascalCase(schema.name);
|
|
32
|
+
const typeName = toPascalCase(name);
|
|
35
33
|
const typeDefinition = generateInterface(typeName, schema);
|
|
36
34
|
|
|
37
|
-
|
|
35
|
+
// Generate flat files based on Object Name
|
|
36
|
+
// e.g. User.ts, CrmContact.ts
|
|
37
|
+
// We lose original directory structure but gain correct merged types.
|
|
38
|
+
// This is arguably better for "Generated Types" which are usually a flat library.
|
|
39
|
+
|
|
40
|
+
const fileName = `${name}.ts`;
|
|
41
|
+
const outPath = path.join(outputDir, fileName);
|
|
38
42
|
fs.writeFileSync(outPath, typeDefinition);
|
|
39
|
-
console.log(`Generated ${
|
|
43
|
+
console.log(`Generated ${fileName}`);
|
|
40
44
|
|
|
41
|
-
indexContent.push(`export * from './${
|
|
45
|
+
indexContent.push(`export * from './${name}';`);
|
|
42
46
|
} catch (e) {
|
|
43
|
-
console.error(`Failed to
|
|
47
|
+
console.error(`Failed to generate type for ${name}:`, e);
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
50
|
|