@opra/cli 0.31.3 → 0.31.5

package/bin/bin/oprimp.mjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import '../esm/oprimp-cli.js';
+

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

@@ -74,22 +74,26 @@ export class ${className} {
     if (resource.actions.size) {
         tsFile.addImport('@opra/client', ['HttpRequestObservable']);
         for (const [action, endpoint] of resource.actions.entries()) {
-            const typeName = endpoint.returnType?.name || 'any';
+            let returnTypeDef = endpoint.returnType ?
+                await this.resolveTypeNameOrDef(tsFile, endpoint.returnType)
+                : 'any';
+            if (returnTypeDef.length > 40)
+                returnTypeDef = '\n\t\t' + returnTypeDef + '\n\b\b';
             const actionPath = resource.getFullPath() + '/' + action;
             let params = '';
             for (const prm of endpoint.parameters.values()) {
-                params += `      ${prm.name}: ${prm.type.name || 'any'}`;
+                params += `${prm.name}: ${prm.type.name || 'any'}`;
                 if (prm.isArray)
                     params += '[]';
                 params += ';\n';
             }
-            params = params ? '{\n' + params + '    }\n  ' : '{}';
+            params = params ? '\n\t\t\tparams: {\n\t' + params + '\b}\n\b\b' : '';
             tsFile.content += `
   /** 
    * ${(0, string_utils_js_1.wrapJSDocString)(endpoint.description || '')}
    */      
-  ${action}(params: ${params}): HttpRequestObservable<${typeName}> {  
-    return this[kClient].action('${actionPath}', params);
+  ${action}(${params}): HttpRequestObservable<${returnTypeDef}> {\b  
+    return this[kClient].action('${actionPath}'${params ? ', params' : ''});
   }    
 `;
         }

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

@@ -8,7 +8,6 @@ const string_utils_js_1 = require("../utils/string-utils.js");
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string'];
 /**
  *
- * @param targetDir
  */
 async function processTypes() {
     const { document } = this;
@@ -20,7 +19,6 @@ exports.processTypes = processTypes;
 /**
  *
  * @param dataType
- * @param targetDir
  */
 async function generateTypeFile(dataType) {
     const typeName = dataType.name;
@@ -119,7 +117,14 @@ async function generateComplexTypeDefinition(file, dataType, forInterface) {
         const baseDef = omitFields.length
             ? `Omit<${base}, ${omitFields.map(x => "'" + x + "'").join(' | ')}>`
             : `${base}`;
-        out += forInterface ? `extends ${baseDef} ` : `${baseDef} & `;
+        if (forInterface)
+            out += `extends ${baseDef} `;
+        else {
+            out += baseDef;
+            if (!dataType.own.fields.size)
+                return out;
+            out += ' & ';
+        }
     }
     out += '{\n\t';
     for (const field of dataType.own.fields.values()) {
@@ -175,8 +180,10 @@ async function generateSimpleTypeDefinition(file, dataType) {
         return 'string';
     if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
         return 'number';
-    if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
+    if (dataType.extendsFrom('date') || dataType.extendsFrom('datetime'))
         return 'Date';
+    if (dataType.extendsFrom('approxdate') || dataType.extendsFrom('approxdatetime'))
+        return 'string';
     if (dataType.extendsFrom('bigint'))
         return 'bigint';
     if (dataType.extendsFrom('object'))

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

@@ -70,22 +70,26 @@ export class ${className} {
     if (resource.actions.size) {
         tsFile.addImport('@opra/client', ['HttpRequestObservable']);
         for (const [action, endpoint] of resource.actions.entries()) {
-            const typeName = endpoint.returnType?.name || 'any';
+            let returnTypeDef = endpoint.returnType ?
+                await this.resolveTypeNameOrDef(tsFile, endpoint.returnType)
+                : 'any';
+            if (returnTypeDef.length > 40)
+                returnTypeDef = '\n\t\t' + returnTypeDef + '\n\b\b';
             const actionPath = resource.getFullPath() + '/' + action;
             let params = '';
             for (const prm of endpoint.parameters.values()) {
-                params += `      ${prm.name}: ${prm.type.name || 'any'}`;
+                params += `${prm.name}: ${prm.type.name || 'any'}`;
                 if (prm.isArray)
                     params += '[]';
                 params += ';\n';
             }
-            params = params ? '{\n' + params + '    }\n  ' : '{}';
+            params = params ? '\n\t\t\tparams: {\n\t' + params + '\b}\n\b\b' : '';
             tsFile.content += `
   /** 
    * ${wrapJSDocString(endpoint.description || '')}
    */      
-  ${action}(params: ${params}): HttpRequestObservable<${typeName}> {  
-    return this[kClient].action('${actionPath}', params);
+  ${action}(${params}): HttpRequestObservable<${returnTypeDef}> {\b  
+    return this[kClient].action('${actionPath}'${params ? ', params' : ''});
   }    
 `;
         }

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

@@ -4,7 +4,6 @@ import { wrapJSDocString } from '../utils/string-utils.js';
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string'];
 /**
  *
- * @param targetDir
  */
 export async function processTypes() {
     const { document } = this;
@@ -15,7 +14,6 @@ export async function processTypes() {
 /**
  *
  * @param dataType
- * @param targetDir
  */
 export async function generateTypeFile(dataType) {
     const typeName = dataType.name;
@@ -112,7 +110,14 @@ export async function generateComplexTypeDefinition(file, dataType, forInterface
         const baseDef = omitFields.length
             ? `Omit<${base}, ${omitFields.map(x => "'" + x + "'").join(' | ')}>`
             : `${base}`;
-        out += forInterface ? `extends ${baseDef} ` : `${baseDef} & `;
+        if (forInterface)
+            out += `extends ${baseDef} `;
+        else {
+            out += baseDef;
+            if (!dataType.own.fields.size)
+                return out;
+            out += ' & ';
+        }
     }
     out += '{\n\t';
     for (const field of dataType.own.fields.values()) {
@@ -167,8 +172,10 @@ export async function generateSimpleTypeDefinition(file, dataType) {
         return 'string';
     if (dataType.extendsFrom('number') || dataType.extendsFrom('integer'))
         return 'number';
-    if (dataType.extendsFrom('timestamp') || dataType.extendsFrom('date'))
+    if (dataType.extendsFrom('date') || dataType.extendsFrom('datetime'))
         return 'Date';
+    if (dataType.extendsFrom('approxdate') || dataType.extendsFrom('approxdatetime'))
+        return 'string';
     if (dataType.extendsFrom('bigint'))
         return 'bigint';
     if (dataType.extendsFrom('object'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -22,13 +22,14 @@
     "check": "madge --circular src/**",
     "test": "jest",
     "cover": "jest --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
+    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
-    "clean:dist": "rimraf ../../build/cli ../../build/client",
+    "clean:test": "ts-cleanup -s test --all",
+    "clean:dist": "rimraf ../../build/client",
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/client": "^0.31.2",
+    "@opra/client": "^0.31.5",
     "chalk": "^5.3.0",
     "commander": "^11.0.0",
     "js-string-escape": "^1.0.1",
@@ -60,4 +61,4 @@
     "tool",
     "oprimp"
   ]
-}
+}

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

@@ -3,13 +3,11 @@ import type { ApiExporter } from './api-exporter.js';
 import { TsFile } from './ts-file.js';
 /**
  *
- * @param targetDir
  */
 export declare function processTypes(this: ApiExporter): Promise<void>;
 /**
  *
  * @param dataType
- * @param targetDir
  */
 export declare function generateTypeFile(this: ApiExporter, dataType: DataType): Promise<TsFile | undefined>;
 /**