@opra/cli 1.22.2 → 1.22.4

package/bin/oprimp.mjs

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

package/oprimp-cli.js

@@ -7,7 +7,9 @@ import colors from 'ansi-colors';
 import { program } from 'commander';
 import { TsGenerator } from './ts-generator/ts-generator.js';
 const dirname = path.dirname(getStackFileName());
-const pkgJson = JSON.parse(fs.readFileSync(path.resolve(dirname, '../package.json'), 'utf-8'));
+const pkgJson = fs.existsSync(path.resolve(dirname, './package.json'))
+    ? JSON.parse(fs.readFileSync(path.resolve(dirname, './package.json'), 'utf-8'))
+    : JSON.parse(fs.readFileSync(path.resolve(dirname, '../package.json'), 'utf-8'));
 program
     .version(pkgJson.version)
     .argument('<serviceUrl>', 'OPRA service url')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.22.2",
+  "version": "1.22.4",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/client": "^1.22.2",
-    "@opra/common": "^1.22.2"
+    "@opra/client": "^1.22.4",
+    "@opra/common": "^1.22.4"
   },
   "type": "module",
   "module": "./index.js",

package/ts-generator/generators/generate-data-type.js

@@ -174,13 +174,10 @@ export async function _generateComplexTypeCode(currentFile, dataType, codeBlock,
         }
         fieldCode.header_end = ' */\n';
         if (field.type instanceof SimpleType && field.type.properties) {
-            let s = '';
             for (const [k, v] of Object.entries(field.type.properties)) {
                 if (v != null)
-                    s += ` *   ${k}: ${v}\n`;
+                    fieldCode.header += ` * @attribute ${k} ${v}\n`;
             }
-            if (s)
-                fieldCode.header += ' * Attributes:\n' + s;
         }
         // Print field name
         fieldCode.def = '';
@@ -327,14 +324,11 @@ export async function _generateMixinTypeCode(currentFile, dataType, codeBlock, i
  *
  */
 export async function _generateSimpleTypeCode(currentFile, dataType, codeBlock, intent) {
-    let s = '';
-    if (dataType.properties) {
+    if (intent !== 'typeDef' && dataType.properties) {
         for (const [k, v] of Object.entries(dataType.properties)) {
             if (v != null)
-                s += ` *   ${k}: ${v}\n`;
+                codeBlock.header += ` * @attribute ${k} ${v}\n`;
         }
-        if (s)
-            codeBlock.header += ' * Attributes:\n' + s;
     }
     let out = intent === 'root' ? `type ${dataType.name} = ` : '';
     const nameMapping = dataType.nameMappings.js || 'any';