@opra/cli 1.0.0-alpha.7 → 1.0.0-alpha.9

package/cjs/oprimp-cli.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const common_1 = require("@opra/common");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const commander_1 = require("commander");
 const console = tslib_1.__importStar(require("console"));
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const process = tslib_1.__importStar(require("process"));
-const common_1 = require("@opra/common");
 const ts_generator_js_1 = require("./ts-generator/ts-generator.js");
 const dirname = path_1.default.dirname((0, common_1.getStackFileName)());
 const pkgJson = JSON.parse(fs.readFileSync(path_1.default.resolve(dirname, '../package.json'), 'utf-8'));

package/cjs/ts-generator/processors/clean-directory.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanDirectory = void 0;
 const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 function cleanDirectory(dirname) {
     const rootDir = dirname;
     const _cleanDirectory = (targetDir) => {

package/cjs/ts-generator/processors/process-data-types.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveTypeNameOrDef = exports.generateMappedTypeDefinition = exports.generateMixinTypeDefinition = exports.generateSimpleTypeDefinition = exports.generateComplexTypeDefinition = exports.generateEnumTypeDefinition = exports.processDataType = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
 const common_1 = require("@opra/common");
+const path_1 = tslib_1.__importDefault(require("path"));
 const code_block_js_1 = require("../../code-block.js");
 const string_utils_js_1 = require("../utils/string-utils.js");
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];
@@ -47,14 +47,18 @@ async function processDataType(dataType) {
 export `;
     if (dataType instanceof common_1.EnumType)
         codeBlock.typeDef = await this.generateEnumTypeDefinition(dataType, 'scope');
-    else if (dataType instanceof common_1.ComplexType)
+    else if (dataType instanceof common_1.ComplexType) {
         codeBlock.typeDef = await this.generateComplexTypeDefinition(dataType, file, 'scope');
-    else if (dataType instanceof common_1.SimpleType)
+    }
+    else if (dataType instanceof common_1.SimpleType) {
         codeBlock.typeDef = await this.generateSimpleTypeDefinition(dataType, 'scope');
-    else if (dataType instanceof common_1.MappedType)
+    }
+    else if (dataType instanceof common_1.MappedType) {
         codeBlock.typeDef = await this.generateMappedTypeDefinition(dataType, file, 'scope');
-    else if (dataType instanceof common_1.MixinType)
+    }
+    else if (dataType instanceof common_1.MixinType) {
         codeBlock.typeDef = await this.generateMixinTypeDefinition(dataType, file, 'scope');
+    }
     else
         throw new TypeError(`${dataType.kind} data type (${typeName}) can not be directly exported`);
     typesIndexTs.addExport(file.filename);
@@ -65,12 +69,13 @@ exports.processDataType = processDataType;
  *
  */
 async function generateEnumTypeDefinition(dataType, intent) {
-    if (intent === 'field')
+    if (intent === 'field') {
         return ('(' +
             Object.keys(dataType.attributes)
                 .map(t => `'${t}'`)
                 .join(' | ') +
             ')');
+    }
     if (intent !== 'scope')
         throw new TypeError(`Can't generate EnumType for "${intent}" intent`);
     if (!dataType.name)
@@ -94,8 +99,9 @@ exports.generateEnumTypeDefinition = generateEnumTypeDefinition;
  *
  */
 async function generateComplexTypeDefinition(dataType, file, intent) {
-    if (intent === 'scope' && !dataType.name)
+    if (intent === 'scope' && !dataType.name) {
         throw new TypeError(`Name required to generate ComplexType for "${intent}" intent`);
+    }
     let out = intent === 'scope' ? `interface ${dataType.name} ` : '';
     const ownFields = [...dataType.fields.values()].filter(f => f.origin === dataType);
     if (dataType.base) {
@@ -130,8 +136,9 @@ async function generateComplexTypeDefinition(dataType, file, intent) {
             out += ` * @readonly\n`;
         if (field.writeonly)
             out += ` * @writeonly\n`;
-        if (field.deprecated)
+        if (field.deprecated) {
             out += ` * @deprecated ` + (typeof field.deprecated === 'string' ? field.deprecated : '') + '\n';
+        }
         out += ' */\n';
         // Print field name
         if (field.readonly)
@@ -154,8 +161,9 @@ exports.generateComplexTypeDefinition = generateComplexTypeDefinition;
  *
  */
 async function generateSimpleTypeDefinition(dataType, intent) {
-    if (intent === 'scope' && !dataType.name)
+    if (intent === 'scope' && !dataType.name) {
         throw new TypeError(`Name required to generate SimpleType for "${intent}" intent`);
+    }
     let out = intent === 'scope' ? `type ${dataType.name} = ` : '';
     out += dataType.nameMappings.js || 'any';
     return intent === 'scope' ? out + ';' : out;
@@ -203,7 +211,7 @@ async function generateMappedTypeDefinition(dataType, file, intent) {
     else if (omit)
         out += 'Omit<';
     out += typeDef;
-    if (omit || pick)
+    if (omit || pick) {
         out +=
             ', ' +
                 (omit || pick)
@@ -211,14 +219,16 @@ async function generateMappedTypeDefinition(dataType, file, intent) {
                     .map(x => `'${x}'`)
                     .join(' | ') +
                 '>';
+    }
     if (partial) {
-        if (Array.isArray(partial))
+        if (Array.isArray(partial)) {
             out +=
                 ', ' +
                     partial
                         .filter(x => !!x)
                         .map(x => `'${x}'`)
                         .join(' | ');
+        }
         out += '>';
     }
     return out;

package/cjs/ts-generator/processors/process-document.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processDocument = void 0;
 const tslib_1 = require("tslib");
+const client_1 = require("@opra/client");
+const common_1 = require("@opra/common");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
-const client_1 = require("@opra/client");
-const common_1 = require("@opra/common");
 async function processDocument(document, options) {
     if (!document || typeof document === 'string') {
         if (document) {

package/cjs/ts-generator/ts-generator.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TsGenerator = void 0;
 const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_events_1 = require("node:events");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_process_1 = tslib_1.__importDefault(require("node:process"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const file_writer_js_1 = require("../file-writer.js");
 const clean_directory_js_1 = require("./processors/clean-directory.js");
 const process_data_types_js_1 = require("./processors/process-data-types.js");

package/cjs/ts-generator/utils/locate-named-type.js

@@ -10,7 +10,8 @@ function locateNamedType(type) {
     if (type instanceof common_1.SimpleType ||
         type instanceof common_1.ComplexType ||
         type instanceof common_1.EnumType ||
-        type instanceof common_1.MappedType)
+        type instanceof common_1.MappedType) {
         return locateNamedType(type.base);
+    }
 }
 exports.locateNamedType = locateNamedType;

package/esm/oprimp-cli.js

@@ -1,10 +1,10 @@
+import { getStackFileName } from '@opra/common';
 import chalk from 'chalk';
 import { program } from 'commander';
 import * as console from 'console';
 import * as fs from 'fs';
 import path from 'path';
 import * as process from 'process';
-import { getStackFileName } from '@opra/common';
 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'));

package/esm/ts-generator/processors/clean-directory.js

@@ -1,6 +1,6 @@
-import chalk from 'chalk';
 import fs from 'node:fs';
 import path from 'node:path';
+import chalk from 'chalk';
 export function cleanDirectory(dirname) {
     const rootDir = dirname;
     const _cleanDirectory = (targetDir) => {

package/esm/ts-generator/processors/process-data-types.js

@@ -1,5 +1,5 @@
-import path from 'path';
 import { ComplexType, EnumType, MappedType, MixinType, SimpleType } from '@opra/common';
+import path from 'path';
 import { CodeBlock } from '../../code-block.js';
 import { wrapJSDocString } from '../utils/string-utils.js';
 const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];
@@ -43,14 +43,18 @@ export async function processDataType(dataType) {
 export `;
     if (dataType instanceof EnumType)
         codeBlock.typeDef = await this.generateEnumTypeDefinition(dataType, 'scope');
-    else if (dataType instanceof ComplexType)
+    else if (dataType instanceof ComplexType) {
         codeBlock.typeDef = await this.generateComplexTypeDefinition(dataType, file, 'scope');
-    else if (dataType instanceof SimpleType)
+    }
+    else if (dataType instanceof SimpleType) {
         codeBlock.typeDef = await this.generateSimpleTypeDefinition(dataType, 'scope');
-    else if (dataType instanceof MappedType)
+    }
+    else if (dataType instanceof MappedType) {
         codeBlock.typeDef = await this.generateMappedTypeDefinition(dataType, file, 'scope');
-    else if (dataType instanceof MixinType)
+    }
+    else if (dataType instanceof MixinType) {
         codeBlock.typeDef = await this.generateMixinTypeDefinition(dataType, file, 'scope');
+    }
     else
         throw new TypeError(`${dataType.kind} data type (${typeName}) can not be directly exported`);
     typesIndexTs.addExport(file.filename);
@@ -60,12 +64,13 @@ export `;
  *
  */
 export async function generateEnumTypeDefinition(dataType, intent) {
-    if (intent === 'field')
+    if (intent === 'field') {
         return ('(' +
             Object.keys(dataType.attributes)
                 .map(t => `'${t}'`)
                 .join(' | ') +
             ')');
+    }
     if (intent !== 'scope')
         throw new TypeError(`Can't generate EnumType for "${intent}" intent`);
     if (!dataType.name)
@@ -88,8 +93,9 @@ export async function generateEnumTypeDefinition(dataType, intent) {
  *
  */
 export async function generateComplexTypeDefinition(dataType, file, intent) {
-    if (intent === 'scope' && !dataType.name)
+    if (intent === 'scope' && !dataType.name) {
         throw new TypeError(`Name required to generate ComplexType for "${intent}" intent`);
+    }
     let out = intent === 'scope' ? `interface ${dataType.name} ` : '';
     const ownFields = [...dataType.fields.values()].filter(f => f.origin === dataType);
     if (dataType.base) {
@@ -124,8 +130,9 @@ export async function generateComplexTypeDefinition(dataType, file, intent) {
             out += ` * @readonly\n`;
         if (field.writeonly)
             out += ` * @writeonly\n`;
-        if (field.deprecated)
+        if (field.deprecated) {
             out += ` * @deprecated ` + (typeof field.deprecated === 'string' ? field.deprecated : '') + '\n';
+        }
         out += ' */\n';
         // Print field name
         if (field.readonly)
@@ -147,8 +154,9 @@ export async function generateComplexTypeDefinition(dataType, file, intent) {
  *
  */
 export async function generateSimpleTypeDefinition(dataType, intent) {
-    if (intent === 'scope' && !dataType.name)
+    if (intent === 'scope' && !dataType.name) {
         throw new TypeError(`Name required to generate SimpleType for "${intent}" intent`);
+    }
     let out = intent === 'scope' ? `type ${dataType.name} = ` : '';
     out += dataType.nameMappings.js || 'any';
     return intent === 'scope' ? out + ';' : out;
@@ -194,7 +202,7 @@ export async function generateMappedTypeDefinition(dataType, file, intent) {
     else if (omit)
         out += 'Omit<';
     out += typeDef;
-    if (omit || pick)
+    if (omit || pick) {
         out +=
             ', ' +
                 (omit || pick)
@@ -202,14 +210,16 @@ export async function generateMappedTypeDefinition(dataType, file, intent) {
                     .map(x => `'${x}'`)
                     .join(' | ') +
                 '>';
+    }
     if (partial) {
-        if (Array.isArray(partial))
+        if (Array.isArray(partial)) {
             out +=
                 ', ' +
                     partial
                         .filter(x => !!x)
                         .map(x => `'${x}'`)
                         .join(' | ');
+        }
         out += '>';
     }
     return out;

package/esm/ts-generator/processors/process-document.js

@@ -1,8 +1,8 @@
+import { OpraHttpClient } from '@opra/client';
+import { HttpApi } from '@opra/common';
 import chalk from 'chalk';
 import path from 'path';
 import { pascalCase } from 'putil-varhelpers';
-import { OpraHttpClient } from '@opra/client';
-import { HttpApi } from '@opra/common';
 export async function processDocument(document, options) {
     if (!document || typeof document === 'string') {
         if (document) {

package/esm/ts-generator/ts-generator.js

@@ -1,8 +1,8 @@
-import chalk from 'chalk';
 import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
+import chalk from 'chalk';
 import { FileWriter } from '../file-writer.js';
 import { cleanDirectory } from './processors/clean-directory.js';
 import { generateComplexTypeDefinition, generateEnumTypeDefinition, generateMappedTypeDefinition, generateMixinTypeDefinition, generateSimpleTypeDefinition, processDataType, resolveTypeNameOrDef, } from './processors/process-data-types.js';

package/esm/ts-generator/utils/locate-named-type.js

@@ -7,6 +7,7 @@ export function locateNamedType(type) {
     if (type instanceof SimpleType ||
         type instanceof ComplexType ||
         type instanceof EnumType ||
-        type instanceof MappedType)
+        type instanceof MappedType) {
         return locateNamedType(type.base);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -19,8 +19,9 @@
     "copy:files": "cp README.md package.json ../../LICENSE ../../build/cli && cp ../../package.cjs.json ../../build/cli/cjs/package.json",
     "copy:bin": "cp -R bin ../../build/cli/bin",
     "lint": "eslint . --max-warnings=0",
-    "check": "madge --circular src/**",
+    "lint:fix": "eslint . --max-warnings=0 --fix",
     "format": "prettier . --write --log-level=warn",
+    "check": "madge --circular src/**",
     "test": "jest --passWithNoTests",
     "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
@@ -30,8 +31,8 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/client": "^1.0.0-alpha.7",
-    "@opra/common": "^1.0.0-alpha.7",
+    "@opra/client": "^1.0.0-alpha.9",
+    "@opra/common": "^1.0.0-alpha.9",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",