@opra/cli 0.18.4 → 0.19.0

package/cjs/api-exporter/api-exporter.js

@@ -27,6 +27,7 @@ class ApiExporter {
         this.fileHeader = config.fileHeader || '';
         this.writer = config.writer || new file_writer_js_1.FileWriter();
         this.serviceClassName = config.name;
+        this.importExt = config.importExt;
         // this.nsMap = nsMap || new ResponsiveMap(); // implement references later
     }
     async execute() {
@@ -46,11 +47,12 @@ class ApiExporter {
         node_fs_1.default.mkdirSync(this.outDir, { recursive: true });
         await this.processTypes();
         await this.processResources();
+        const { importExt } = this;
         // Write files
         for (const file of Object.values(this.files)) {
             const targetDir = node_path_1.default.dirname(file.filename);
             node_fs_1.default.mkdirSync(targetDir, { recursive: true });
-            await this.writer.writeFile(file.filename, file.generate());
+            await this.writer.writeFile(file.filename, file.generate({ importExt }));
         }
     }
     getFile(filePath) {

package/cjs/api-exporter/process-resources.js

@@ -15,7 +15,7 @@ async function processResources(targetDir = '') {
     const { document } = this;
     const serviceTs = this.addFile(node_path_1.default.join(targetDir, this.serviceClassName + '.ts'));
     serviceTs.addImportPackage('@opra/client', ['HttpServiceBase']);
-    const indexTs = this.addFile('/index.d.ts', true);
+    const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(serviceTs.filename);
     serviceTs.content = `\nexport class ${this.serviceClassName} extends HttpServiceBase {\n`;
     for (const resource of document.resources.values()) {

package/cjs/api-exporter/process-types.js

@@ -14,10 +14,11 @@ const internalTypeNames = ['boolean', 'bigint', 'number', 'null', 'string'];
 async function processTypes(targetDir = '') {
     this.logger.log(chalk_1.default.yellow('Processing types'));
     const { document } = this;
-    const typesTs = this.addFile(node_path_1.default.join(targetDir, 'types.d.ts'));
+    const typesTs = this.addFile(node_path_1.default.join(targetDir, 'types.ts'));
     for (const dataType of document.types.values()) {
         const expFile = await this.generateTypeFile(dataType, targetDir);
-        typesTs.addExportFile(expFile.filename);
+        if (expFile)
+            typesTs.addExportFile(expFile.filename);
     }
 }
 exports.processTypes = processTypes;
@@ -28,15 +29,17 @@ exports.processTypes = processTypes;
  */
 async function generateTypeFile(dataType, targetDir = '') {
     const typeName = dataType.name;
+    if (typeName === 'any')
+        return;
     if (!typeName)
         throw new TypeError(`DataType has no name`);
     let filePath;
     if (dataType instanceof common_1.SimpleType)
-        filePath = '/simple-types.d.ts';
+        filePath = '/simple-types.ts';
     else if (dataType instanceof common_1.ComplexType)
-        filePath = `/types/${typeName}-type.d.ts`;
+        filePath = `/types/${typeName}-type.ts`;
     else if (dataType instanceof common_1.EnumType) {
-        filePath = `/enums/${typeName}-enum.d.ts`;
+        filePath = `/enums/${typeName}-enum.ts`;
     }
     else
         throw new TypeError(`Unimplemented DataType (${dataType.kind})`);
@@ -44,7 +47,7 @@ async function generateTypeFile(dataType, targetDir = '') {
     if (file.exportTypes.includes(typeName))
         return file;
     file.exportTypes.push(typeName);
-    const indexTs = this.addFile('/index.d.ts', true);
+    const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(file.filename);
     file.content += `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(dataType.description || typeName)}
  * @interface ${typeName}
@@ -74,6 +77,8 @@ async function resolveTypeNameOrDef(file, dataType, forInterface) {
         if (internalTypeNames.includes(dataType.name))
             return dataType.name;
         const f = await this.generateTypeFile(dataType);
+        if (!f)
+            return '';
         file.addImportFile(f.filename, [dataType.name]);
         return dataType.name;
     }
@@ -87,7 +92,7 @@ async function resolveTypeNameOrDef(file, dataType, forInterface) {
         return this.generateUnionTypeDefinition(file, dataType, forInterface);
     if (dataType instanceof common_1.MappedType)
         return this.generateMappedTypeDefinition(file, dataType, forInterface);
-    return 'xxx';
+    return '';
 }
 exports.resolveTypeNameOrDef = resolveTypeNameOrDef;
 /**
@@ -138,16 +143,16 @@ exports.generateComplexTypeDefinition = generateComplexTypeDefinition;
  * @param dataType
  */
 async function generateSimpleTypeDefinition(file, dataType) {
-    if (dataType.ctor === Boolean)
+    if (dataType.extendsFrom('boolean'))
         return 'boolean';
-    if (dataType.ctor === String)
+    if (dataType.extendsFrom('string'))
         return 'string';
-    if (dataType.ctor === Number)
+    if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
         return 'number';
-    if (dataType.ctor === Date)
+    if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
         return 'Date';
     if (dataType.extendsFrom('bigint'))
-        return 'Date';
+        return 'bigint';
     if (dataType.extendsFrom('object'))
         return 'object';
     return 'any';

package/cjs/api-exporter/ts-file.js

@@ -45,7 +45,7 @@ class TsFile {
         };
         this.dirname = path_1.default.dirname(filename);
     }
-    generate() {
+    generate(options) {
         const dirname = path_1.default.dirname(this.filename);
         let output = '/* #!oprimp_auto_generated!# !! Do NOT remove this line */\n' +
             (this.header ? (0, putil_flattentext_1.default)(this.header) + '\n\n' : '\n');
@@ -54,8 +54,11 @@ class TsFile {
             .map(filename => {
             const types = this.importFiles[filename];
             let relFile = filename;
-            if (path_1.default.isAbsolute(filename))
+            if (path_1.default.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
+                if (options?.importExt)
+                    relFile += '.js';
+            }
             return `import ${types.length ? '{ ' + types.join(', ') + ' } from ' : ''}'${relFile}';`;
         })
             .join('\n');
@@ -67,8 +70,11 @@ class TsFile {
             .map(filename => {
             const types = this.exportFiles[filename];
             let relFile = filename;
-            if (path_1.default.isAbsolute(filename))
+            if (path_1.default.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
+                if (options?.importExt)
+                    relFile += '.js';
+            }
             return `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'} from '${relFile}';`;
         })
             .join('\n');

package/cjs/oprimp-cli.js

@@ -16,6 +16,7 @@ commander_1.program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--name <name>', 'Name of the service')
+    .option('--ext', 'Adds js extension to imports')
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
@@ -25,6 +26,7 @@ commander_1.program
         logger: console,
         outDir,
         name: options.name,
+        importExt: options.ext,
         fileHeader: '/* Generated by OPRA Service Generator, Version ' + pkgJson.version + '*/\n' +
             '/* eslint-disable import/extensions,simple-import-sort/imports */\n'
     });

package/esm/api-exporter/api-exporter.js

@@ -23,6 +23,7 @@ export class ApiExporter {
         this.fileHeader = config.fileHeader || '';
         this.writer = config.writer || new FileWriter();
         this.serviceClassName = config.name;
+        this.importExt = config.importExt;
         // this.nsMap = nsMap || new ResponsiveMap(); // implement references later
     }
     async execute() {
@@ -42,11 +43,12 @@ export class ApiExporter {
         fs.mkdirSync(this.outDir, { recursive: true });
         await this.processTypes();
         await this.processResources();
+        const { importExt } = this;
         // Write files
         for (const file of Object.values(this.files)) {
             const targetDir = path.dirname(file.filename);
             fs.mkdirSync(targetDir, { recursive: true });
-            await this.writer.writeFile(file.filename, file.generate());
+            await this.writer.writeFile(file.filename, file.generate({ importExt }));
         }
     }
     getFile(filePath) {

package/esm/api-exporter/process-resources.js

@@ -11,7 +11,7 @@ export async function processResources(targetDir = '') {
     const { document } = this;
     const serviceTs = this.addFile(path.join(targetDir, this.serviceClassName + '.ts'));
     serviceTs.addImportPackage('@opra/client', ['HttpServiceBase']);
-    const indexTs = this.addFile('/index.d.ts', true);
+    const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(serviceTs.filename);
     serviceTs.content = `\nexport class ${this.serviceClassName} extends HttpServiceBase {\n`;
     for (const resource of document.resources.values()) {

package/esm/api-exporter/process-types.js

@@ -10,10 +10,11 @@ const internalTypeNames = ['boolean', 'bigint', 'number', 'null', 'string'];
 export async function processTypes(targetDir = '') {
     this.logger.log(chalk.yellow('Processing types'));
     const { document } = this;
-    const typesTs = this.addFile(path.join(targetDir, 'types.d.ts'));
+    const typesTs = this.addFile(path.join(targetDir, 'types.ts'));
     for (const dataType of document.types.values()) {
         const expFile = await this.generateTypeFile(dataType, targetDir);
-        typesTs.addExportFile(expFile.filename);
+        if (expFile)
+            typesTs.addExportFile(expFile.filename);
     }
 }
 /**
@@ -23,15 +24,17 @@ export async function processTypes(targetDir = '') {
  */
 export async function generateTypeFile(dataType, targetDir = '') {
     const typeName = dataType.name;
+    if (typeName === 'any')
+        return;
     if (!typeName)
         throw new TypeError(`DataType has no name`);
     let filePath;
     if (dataType instanceof SimpleType)
-        filePath = '/simple-types.d.ts';
+        filePath = '/simple-types.ts';
     else if (dataType instanceof ComplexType)
-        filePath = `/types/${typeName}-type.d.ts`;
+        filePath = `/types/${typeName}-type.ts`;
     else if (dataType instanceof EnumType) {
-        filePath = `/enums/${typeName}-enum.d.ts`;
+        filePath = `/enums/${typeName}-enum.ts`;
     }
     else
         throw new TypeError(`Unimplemented DataType (${dataType.kind})`);
@@ -39,7 +42,7 @@ export async function generateTypeFile(dataType, targetDir = '') {
     if (file.exportTypes.includes(typeName))
         return file;
     file.exportTypes.push(typeName);
-    const indexTs = this.addFile('/index.d.ts', true);
+    const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(file.filename);
     file.content += `\n/**\n * ${wrapJSDocString(dataType.description || typeName)}
  * @interface ${typeName}
@@ -68,6 +71,8 @@ export async function resolveTypeNameOrDef(file, dataType, forInterface) {
         if (internalTypeNames.includes(dataType.name))
             return dataType.name;
         const f = await this.generateTypeFile(dataType);
+        if (!f)
+            return '';
         file.addImportFile(f.filename, [dataType.name]);
         return dataType.name;
     }
@@ -81,7 +86,7 @@ export async function resolveTypeNameOrDef(file, dataType, forInterface) {
         return this.generateUnionTypeDefinition(file, dataType, forInterface);
     if (dataType instanceof MappedType)
         return this.generateMappedTypeDefinition(file, dataType, forInterface);
-    return 'xxx';
+    return '';
 }
 /**
  *
@@ -130,16 +135,16 @@ export async function generateComplexTypeDefinition(file, dataType, forInterface
  * @param dataType
  */
 export async function generateSimpleTypeDefinition(file, dataType) {
-    if (dataType.ctor === Boolean)
+    if (dataType.extendsFrom('boolean'))
         return 'boolean';
-    if (dataType.ctor === String)
+    if (dataType.extendsFrom('string'))
         return 'string';
-    if (dataType.ctor === Number)
+    if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
         return 'number';
-    if (dataType.ctor === Date)
+    if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
         return 'Date';
     if (dataType.extendsFrom('bigint'))
-        return 'Date';
+        return 'bigint';
     if (dataType.extendsFrom('object'))
         return 'object';
     return 'any';

package/esm/api-exporter/ts-file.js

@@ -41,7 +41,7 @@ export class TsFile {
         };
         this.dirname = path.dirname(filename);
     }
-    generate() {
+    generate(options) {
         const dirname = path.dirname(this.filename);
         let output = '/* #!oprimp_auto_generated!# !! Do NOT remove this line */\n' +
             (this.header ? flattenText(this.header) + '\n\n' : '\n');
@@ -50,8 +50,11 @@ export class TsFile {
             .map(filename => {
             const types = this.importFiles[filename];
             let relFile = filename;
-            if (path.isAbsolute(filename))
+            if (path.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
+                if (options?.importExt)
+                    relFile += '.js';
+            }
             return `import ${types.length ? '{ ' + types.join(', ') + ' } from ' : ''}'${relFile}';`;
         })
             .join('\n');
@@ -63,8 +66,11 @@ export class TsFile {
             .map(filename => {
             const types = this.exportFiles[filename];
             let relFile = filename;
-            if (path.isAbsolute(filename))
+            if (path.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
+                if (options?.importExt)
+                    relFile += '.js';
+            }
             return `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'} from '${relFile}';`;
         })
             .join('\n');

package/esm/oprimp-cli.js

@@ -13,6 +13,7 @@ program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--name <name>', 'Name of the service')
+    .option('--ext', 'Adds js extension to imports')
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
@@ -22,6 +23,7 @@ program
         logger: console,
         outDir,
         name: options.name,
+        importExt: options.ext,
         fileHeader: '/* Generated by OPRA Service Generator, Version ' + pkgJson.version + '*/\n' +
             '/* eslint-disable import/extensions,simple-import-sort/imports */\n'
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.18.4",
+  "version": "0.19.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -28,9 +28,9 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/client": "^0.18.4",
+    "@opra/client": "^0.19.0",
     "chalk": "^5.2.0",
-    "commander": "^10.0.1",
+    "commander": "^11.0.0",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
     "putil-varhelpers": "^1.6.5"

package/types/api-exporter/api-exporter.d.ts

@@ -14,6 +14,7 @@ export declare namespace ApiExporter {
         logger?: ILogger;
         writer?: IFileWriter;
         fileHeader?: string;
+        importExt?: boolean;
     }
 }
 export declare class ApiExporter {
@@ -26,6 +27,7 @@ export declare class ApiExporter {
     protected fileHeader: string;
     protected writer: IFileWriter;
     protected files: Record<string, TsFile>;
+    protected importExt?: boolean;
     protected processResources: typeof processResources;
     protected processTypes: typeof processTypes;
     protected generateTypeFile: typeof generateTypeFile;

package/types/api-exporter/process-types.d.ts

@@ -11,7 +11,7 @@ export declare function processTypes(this: ApiExporter, targetDir?: string): Pro
  * @param dataType
  * @param targetDir
  */
-export declare function generateTypeFile(this: ApiExporter, dataType: DataType, targetDir?: string): Promise<TsFile>;
+export declare function generateTypeFile(this: ApiExporter, dataType: DataType, targetDir?: string): Promise<TsFile | undefined>;
 /**
  *
  * @param file

package/types/api-exporter/ts-file.d.ts

@@ -10,6 +10,8 @@ export declare class TsFile {
     addImportPackage: (name: string, types?: string[]) => void;
     addImportFile: (filename: string, types?: string[]) => void;
     addExportFile: (filename: string, types?: string[]) => void;
-    generate(): string;
+    generate(options?: {
+        importExt?: boolean;
+    }): string;
 }
 export declare function relativePath(from: string, to: string): string;