@opra/cli 1.0.0-alpha.12 → 1.0.0-alpha.14

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

@@ -4,11 +4,11 @@ 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, generateTypeDefinition, processDataType, } from './processors/process-data-types.js';
-import { processDocument } from './processors/process-document.js';
-import { processHttpApi } from './processors/process-http-api.js';
-import { processHttpController } from './processors/process-http-controller.js';
+import { cleanDirectory } from './generators/clean-directory.js';
+import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType, } from './generators/generate-data-type.js';
+import { generateDocument } from './generators/generate-document.js';
+import { generateHttpApi } from './generators/generate-http-api.js';
+import { generateHttpController } from './generators/generate-http-controller.js';
 import { TsFile } from './ts-file.js';
 /**
  * @class TsGenerator
@@ -45,7 +45,7 @@ export class TsGenerator extends EventEmitter {
             this.emit('log', chalk.cyan('Removing old files..'));
             this.cleanDirectory(this.outDir);
             this._apiPath = '/api';
-            await this.processDocument();
+            await this.generateDocument();
             const { importExt } = this.options;
             // Write files
             for (const file of Object.values(this._files)) {
@@ -90,15 +90,14 @@ export class TsGenerator extends EventEmitter {
 }
 (() => {
     TsGenerator.prototype.cleanDirectory = cleanDirectory;
-    TsGenerator.prototype.processDocument = processDocument;
-    TsGenerator.prototype.processDataType = processDataType;
-    TsGenerator.prototype.processHttpApi = processHttpApi;
-    TsGenerator.prototype.processHttpController = processHttpController;
-    TsGenerator.prototype.generateTypeDefinition = generateTypeDefinition;
-    TsGenerator.prototype.generateEnumTypeDefinition = generateEnumTypeDefinition;
-    TsGenerator.prototype.generateComplexTypeDefinition = generateComplexTypeDefinition;
-    TsGenerator.prototype.generateSimpleTypeDefinition = generateSimpleTypeDefinition;
-    TsGenerator.prototype.generateMappedTypeDefinition = generateMappedTypeDefinition;
-    TsGenerator.prototype.generateMixinTypeDefinition = generateMixinTypeDefinition;
-    // TsGenerator.prototype.resolveTypeNameOrDef = resolveTypeNameOrDef;
+    TsGenerator.prototype.generateDocument = generateDocument;
+    TsGenerator.prototype.generateDataType = generateDataType;
+    TsGenerator.prototype._generateTypeCode = _generateTypeCode;
+    TsGenerator.prototype._generateEnumTypeCode = _generateEnumTypeCode;
+    TsGenerator.prototype._generateComplexTypeCode = _generateComplexTypeCode;
+    TsGenerator.prototype._generateSimpleTypeCode = _generateSimpleTypeCode;
+    TsGenerator.prototype._generateMappedTypeCode = _generateMappedTypeCode;
+    TsGenerator.prototype._generateMixinTypeCode = _generateMixinTypeCode;
+    TsGenerator.prototype.generateHttpApi = generateHttpApi;
+    TsGenerator.prototype.generateHttpController = generateHttpController;
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.12",
+  "version": "1.0.0-alpha.14",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -31,8 +31,9 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/client": "^1.0.0-alpha.12",
-    "@opra/common": "^1.0.0-alpha.12",
+    "@browsery/type-is": "^1.6.18-r3",
+    "@opra/client": "^1.0.0-alpha.14",
+    "@opra/common": "^1.0.0-alpha.14",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",

package/types/ts-generator/generators/clean-directory.d.ts

@@ -0,0 +1,2 @@
+import type { TsGenerator } from '../ts-generator';
+export declare function cleanDirectory(this: TsGenerator, dirname: string): void;

package/types/ts-generator/generators/generate-data-type.d.ts

@@ -0,0 +1,41 @@
+import { ComplexType, DataType, EnumType, MappedType, MixinType, SimpleType } from '@opra/common';
+import { TsFile } from '../ts-file.js';
+import type { TsGenerator } from '../ts-generator';
+type Intent = 'root' | 'extends' | 'typeDef';
+export type generateDataTypeResult = {
+    kind: 'internal';
+    typeName: string;
+} | {
+    kind: 'named';
+    typeName: string;
+    file: TsFile;
+} | {
+    kind: 'embedded';
+    code: string;
+};
+export declare function generateDataType(this: TsGenerator, dataType: DataType, intent: Intent, currentFile?: TsFile): Promise<generateDataTypeResult>;
+/**
+ *
+ */
+export declare function _generateTypeCode(this: TsGenerator, currentFile: TsFile, dataType: DataType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateEnumTypeCode(this: TsGenerator, currentFile: TsFile, dataType: EnumType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateComplexTypeCode(this: TsGenerator, currentFile: TsFile, dataType: ComplexType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateSimpleTypeCode(this: TsGenerator, currentFile: TsFile, dataType: SimpleType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateMixinTypeCode(this: TsGenerator, currentFile: TsFile, dataType: MixinType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateMappedTypeCode(this: TsGenerator, currentFile: TsFile, dataType: MappedType, intent?: Intent): Promise<string>;
+export {};

package/types/ts-generator/generators/generate-document.d.ts

@@ -0,0 +1,8 @@
+import { ApiDocument } from '@opra/common';
+import type { TsGenerator } from '../ts-generator';
+export declare function generateDocument(this: TsGenerator, document?: string | ApiDocument, options?: {
+    typesOnly?: boolean;
+}): Promise<{
+    document: ApiDocument;
+    generator: TsGenerator;
+}>;

package/types/ts-generator/generators/generate-http-api.d.ts

@@ -0,0 +1,3 @@
+import { HttpApi } from '@opra/common';
+import type { TsGenerator } from '../ts-generator';
+export declare function generateHttpApi(this: TsGenerator, api: HttpApi): Promise<import("../ts-file.js").TsFile>;

package/types/ts-generator/generators/generate-http-controller.d.ts

@@ -0,0 +1,3 @@
+import { HttpController } from '@opra/common';
+import type { TsGenerator } from '../ts-generator';
+export declare function generateHttpController(this: TsGenerator, controller: HttpController): Promise<import("../ts-file.js").TsFile>;

package/types/ts-generator/ts-generator.d.ts

@@ -3,11 +3,11 @@ import { EventEmitter } from 'node:events';
 import { ApiDocument } from '@opra/common';
 import { IFileWriter } from '../interfaces/file-writer.interface.js';
 import { ILogger } from '../interfaces/logger.interface.js';
-import { cleanDirectory } from './processors/clean-directory.js';
-import { generateComplexTypeDefinition, generateEnumTypeDefinition, generateMappedTypeDefinition, generateMixinTypeDefinition, generateSimpleTypeDefinition, generateTypeDefinition, processDataType } from './processors/process-data-types.js';
-import { processDocument } from './processors/process-document.js';
-import { processHttpApi } from './processors/process-http-api.js';
-import { processHttpController } from './processors/process-http-controller.js';
+import { cleanDirectory } from './generators/clean-directory.js';
+import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType } from './generators/generate-data-type.js';
+import { generateDocument } from './generators/generate-document.js';
+import { generateHttpApi } from './generators/generate-http-api.js';
+import { generateHttpController } from './generators/generate-http-controller.js';
 import { TsFile } from './ts-file.js';
 /**
  * @namespace TsGenerator
@@ -28,16 +28,16 @@ export declare namespace TsGenerator {
  */
 export declare class TsGenerator extends EventEmitter {
     protected cleanDirectory: typeof cleanDirectory;
-    protected processDocument: typeof processDocument;
-    protected processDataType: typeof processDataType;
-    protected generateTypeDefinition: typeof generateTypeDefinition;
-    protected generateEnumTypeDefinition: typeof generateEnumTypeDefinition;
-    protected generateComplexTypeDefinition: typeof generateComplexTypeDefinition;
-    protected generateSimpleTypeDefinition: typeof generateSimpleTypeDefinition;
-    protected generateMappedTypeDefinition: typeof generateMappedTypeDefinition;
-    protected generateMixinTypeDefinition: typeof generateMixinTypeDefinition;
-    protected processHttpApi: typeof processHttpApi;
-    protected processHttpController: typeof processHttpController;
+    protected generateDocument: typeof generateDocument;
+    protected generateDataType: typeof generateDataType;
+    protected _generateTypeCode: typeof _generateTypeCode;
+    protected _generateEnumTypeCode: typeof _generateEnumTypeCode;
+    protected _generateComplexTypeCode: typeof _generateComplexTypeCode;
+    protected _generateSimpleTypeCode: typeof _generateSimpleTypeCode;
+    protected _generateMappedTypeCode: typeof _generateMappedTypeCode;
+    protected _generateMixinTypeCode: typeof _generateMixinTypeCode;
+    protected generateHttpApi: typeof generateHttpApi;
+    protected generateHttpController: typeof generateHttpController;
     protected _started: boolean;
     protected _document?: ApiDocument;
     protected _documentRoot: string;