@opra/cli 0.18.5 → 0.19.0

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

@@ -17,7 +17,8 @@ async function processTypes(targetDir = '') {
     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,6 +29,8 @@ 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;
@@ -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/esm/api-exporter/process-types.js

@@ -13,7 +13,8 @@ export async function processTypes(targetDir = '') {
     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,6 +24,8 @@ 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;
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.18.5",
+  "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"
@@ -64,4 +64,4 @@
     "tool",
     "oprimp"
   ]
-}
+}

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