@opra/cli 0.14.0 → 0.14.2
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.
|
@@ -16,33 +16,39 @@ const process_types_js_1 = require("./process-types.js");
|
|
|
16
16
|
async function generateService(config) {
|
|
17
17
|
const cwd = config.cwd || process.cwd();
|
|
18
18
|
const logger = config.logger || console_1.default;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
19
|
+
try {
|
|
20
|
+
console_1.default.log(chalk_1.default.yellow('Fetching service metadata from'), chalk_1.default.whiteBright(config.serviceUrl));
|
|
21
|
+
const client = await node_client_1.OpraHttpClient.create(config.serviceUrl);
|
|
22
|
+
const metadata = client.metadata;
|
|
23
|
+
console_1.default.log(chalk_1.default.yellow('Retrieved service info:'), chalk_1.default.whiteBright(metadata.info.title), '-', chalk_1.default.whiteBright(metadata.info.version));
|
|
24
|
+
console_1.default.log(chalk_1.default.yellow('Removing old files..'));
|
|
25
|
+
(0, delete_files_js_1.deleteFiles)(config.outDir);
|
|
26
|
+
let name = (metadata.info.title || 'Service1').replace(/[^\w_$]*/g, '');
|
|
27
|
+
name = name.charAt(0).toUpperCase() + name.substring(1);
|
|
28
|
+
const ctx = {
|
|
29
|
+
serviceUrl: config.serviceUrl,
|
|
30
|
+
document: client.metadata,
|
|
31
|
+
name,
|
|
32
|
+
logger,
|
|
33
|
+
cwd,
|
|
34
|
+
relativeDir: config.outDir,
|
|
35
|
+
absoluteDir: path_1.default.resolve(cwd, config.outDir),
|
|
36
|
+
fileHeader: config.fileHeader || '',
|
|
37
|
+
extension: config.extension,
|
|
38
|
+
writer: config.writer || new file_writer_js_1.FileWriter()
|
|
39
|
+
};
|
|
40
|
+
fs.mkdirSync(ctx.absoluteDir, { recursive: true });
|
|
41
|
+
await (0, process_types_js_1.processTypes)(ctx);
|
|
42
|
+
await (0, process_resoruces_js_1.processResources)(ctx);
|
|
43
|
+
const indexTs = new ts_file_js_1.TsFile();
|
|
44
|
+
indexTs.header = ctx.fileHeader;
|
|
45
|
+
indexTs.addExport('./' + ctx.name + ctx.extension);
|
|
46
|
+
indexTs.addExport('./types' + ctx.extension);
|
|
47
|
+
await indexTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'index.ts'));
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
logger.error(chalk_1.default.red(error.message));
|
|
51
|
+
process.exit(1);
|
|
52
|
+
}
|
|
47
53
|
}
|
|
48
54
|
exports.generateService = generateService;
|
|
@@ -32,7 +32,7 @@ export class ${ctx.name} {
|
|
|
32
32
|
*/`;
|
|
33
33
|
if (resource instanceof common_1.CollectionResourceInfo) {
|
|
34
34
|
serviceTs.addImport('@opra/client', 'HttpCollectionService');
|
|
35
|
-
serviceTs.addImport('
|
|
35
|
+
serviceTs.addImport('./types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
|
|
36
36
|
const methods = resource.getHandlerNames()
|
|
37
37
|
.filter(x => x !== 'count')
|
|
38
38
|
.map(x => `'${x}'`).join(' | ');
|
|
@@ -43,7 +43,7 @@ export class ${ctx.name} {
|
|
|
43
43
|
}
|
|
44
44
|
else if (resource instanceof common_1.SingletonResourceInfo) {
|
|
45
45
|
serviceTs.addImport('@opra/client', 'HttpSingletonService');
|
|
46
|
-
serviceTs.addImport('
|
|
46
|
+
serviceTs.addImport('./types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
|
|
47
47
|
const methods = resource.getHandlerNames()
|
|
48
48
|
.map(x => `'${x}'`).join(' | ');
|
|
49
49
|
serviceTs.content += `
|
|
@@ -30,7 +30,7 @@ async function processTypes(ctx) {
|
|
|
30
30
|
if (dataType.isBuiltin) {
|
|
31
31
|
if (!builtinsMap[dataType.name])
|
|
32
32
|
continue;
|
|
33
|
-
typesTs.addExport('./types/builtins.
|
|
33
|
+
typesTs.addExport('./types/builtins' + ctx.extension);
|
|
34
34
|
builtinsTs.content += `export type ${dataType.name} = ${builtinsMap[dataType.name]};\n`;
|
|
35
35
|
continue;
|
|
36
36
|
}
|
|
@@ -12,32 +12,38 @@ import { processTypes } from './process-types.js';
|
|
|
12
12
|
export async function generateService(config) {
|
|
13
13
|
const cwd = config.cwd || process.cwd();
|
|
14
14
|
const logger = config.logger || console;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
15
|
+
try {
|
|
16
|
+
console.log(chalk.yellow('Fetching service metadata from'), chalk.whiteBright(config.serviceUrl));
|
|
17
|
+
const client = await OpraHttpClient.create(config.serviceUrl);
|
|
18
|
+
const metadata = client.metadata;
|
|
19
|
+
console.log(chalk.yellow('Retrieved service info:'), chalk.whiteBright(metadata.info.title), '-', chalk.whiteBright(metadata.info.version));
|
|
20
|
+
console.log(chalk.yellow('Removing old files..'));
|
|
21
|
+
deleteFiles(config.outDir);
|
|
22
|
+
let name = (metadata.info.title || 'Service1').replace(/[^\w_$]*/g, '');
|
|
23
|
+
name = name.charAt(0).toUpperCase() + name.substring(1);
|
|
24
|
+
const ctx = {
|
|
25
|
+
serviceUrl: config.serviceUrl,
|
|
26
|
+
document: client.metadata,
|
|
27
|
+
name,
|
|
28
|
+
logger,
|
|
29
|
+
cwd,
|
|
30
|
+
relativeDir: config.outDir,
|
|
31
|
+
absoluteDir: path.resolve(cwd, config.outDir),
|
|
32
|
+
fileHeader: config.fileHeader || '',
|
|
33
|
+
extension: config.extension,
|
|
34
|
+
writer: config.writer || new FileWriter()
|
|
35
|
+
};
|
|
36
|
+
fs.mkdirSync(ctx.absoluteDir, { recursive: true });
|
|
37
|
+
await processTypes(ctx);
|
|
38
|
+
await processResources(ctx);
|
|
39
|
+
const indexTs = new TsFile();
|
|
40
|
+
indexTs.header = ctx.fileHeader;
|
|
41
|
+
indexTs.addExport('./' + ctx.name + ctx.extension);
|
|
42
|
+
indexTs.addExport('./types' + ctx.extension);
|
|
43
|
+
await indexTs.writeFile(ctx, path.join(ctx.absoluteDir, 'index.ts'));
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
logger.error(chalk.red(error.message));
|
|
47
|
+
process.exit(1);
|
|
48
|
+
}
|
|
43
49
|
}
|
|
@@ -28,7 +28,7 @@ export class ${ctx.name} {
|
|
|
28
28
|
*/`;
|
|
29
29
|
if (resource instanceof CollectionResourceInfo) {
|
|
30
30
|
serviceTs.addImport('@opra/client', 'HttpCollectionService');
|
|
31
|
-
serviceTs.addImport('
|
|
31
|
+
serviceTs.addImport('./types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
|
|
32
32
|
const methods = resource.getHandlerNames()
|
|
33
33
|
.filter(x => x !== 'count')
|
|
34
34
|
.map(x => `'${x}'`).join(' | ');
|
|
@@ -39,7 +39,7 @@ export class ${ctx.name} {
|
|
|
39
39
|
}
|
|
40
40
|
else if (resource instanceof SingletonResourceInfo) {
|
|
41
41
|
serviceTs.addImport('@opra/client', 'HttpSingletonService');
|
|
42
|
-
serviceTs.addImport('
|
|
42
|
+
serviceTs.addImport('./types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
|
|
43
43
|
const methods = resource.getHandlerNames()
|
|
44
44
|
.map(x => `'${x}'`).join(' | ');
|
|
45
45
|
serviceTs.content += `
|
|
@@ -26,7 +26,7 @@ export async function processTypes(ctx) {
|
|
|
26
26
|
if (dataType.isBuiltin) {
|
|
27
27
|
if (!builtinsMap[dataType.name])
|
|
28
28
|
continue;
|
|
29
|
-
typesTs.addExport('./types/builtins.
|
|
29
|
+
typesTs.addExport('./types/builtins' + ctx.extension);
|
|
30
30
|
builtinsTs.content += `export type ${dataType.name} = ${builtinsMap[dataType.name]};\n`;
|
|
31
31
|
continue;
|
|
32
32
|
}
|