@opra/cli 1.19.7 → 1.21.0

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

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDataType = generateDataType;
 exports._generateTypeCode = _generateTypeCode;
-exports._generateEnumTypeCode = _generateEnumTypeCode;
+exports._generateArrayTypeCode = _generateArrayTypeCode;
 exports._generateComplexTypeCode = _generateComplexTypeCode;
-exports._generateSimpleTypeCode = _generateSimpleTypeCode;
-exports._generateMixinTypeCode = _generateMixinTypeCode;
+exports._generateEnumTypeCode = _generateEnumTypeCode;
 exports._generateMappedTypeCode = _generateMappedTypeCode;
+exports._generateMixinTypeCode = _generateMixinTypeCode;
+exports._generateSimpleTypeCode = _generateSimpleTypeCode;
+exports._generateUnionTypeCode = _generateUnionTypeCode;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
@@ -85,14 +87,14 @@ async function _generateTypeCode(currentFile, dataType, intent) {
     if (intent === 'root' && !dataType.name) {
         throw new TypeError(`Name required to generate data type code to root intent`);
     }
-    if (dataType instanceof common_1.EnumType) {
-        return await this._generateEnumTypeCode(currentFile, dataType, intent);
+    if (dataType instanceof common_1.ArrayType) {
+        return await this._generateArrayTypeCode(currentFile, dataType, intent);
     }
     if (dataType instanceof common_1.ComplexType) {
         return await this._generateComplexTypeCode(currentFile, dataType, intent);
     }
-    if (dataType instanceof common_1.SimpleType) {
-        return await this._generateSimpleTypeCode(currentFile, dataType, intent);
+    if (dataType instanceof common_1.EnumType) {
+        return await this._generateEnumTypeCode(currentFile, dataType, intent);
     }
     if (dataType instanceof common_1.MappedType) {
         return await this._generateMappedTypeCode(currentFile, dataType, intent);
@@ -100,36 +102,34 @@ async function _generateTypeCode(currentFile, dataType, intent) {
     if (dataType instanceof common_1.MixinType) {
         return await this._generateMixinTypeCode(currentFile, dataType, intent);
     }
+    if (dataType instanceof common_1.SimpleType) {
+        return await this._generateSimpleTypeCode(currentFile, dataType, intent);
+    }
+    if (dataType instanceof common_1.UnionType) {
+        return await this._generateUnionTypeCode(currentFile, dataType, intent);
+    }
     /* istanbul ignore next */
     throw new TypeError(`${dataType.kind} data types can not be directly exported`);
 }
 /**
  *
  */
-async function _generateEnumTypeCode(currentFile, dataType, intent) {
-    if (intent === 'root') {
-        let out = `enum ${dataType.name} {\n\t`;
-        for (const [value, info] of Object.entries(dataType.attributes)) {
-            // Print JSDoc
-            let jsDoc = '';
-            if (dataType.attributes[value].description)
-                jsDoc += ` * ${dataType.attributes[value].description}\n`;
-            if (jsDoc)
-                out += `/**\n${jsDoc} */\n`;
-            out +=
-                `${info.alias || value} = ` +
-                    (typeof value === 'number'
-                        ? value
-                        : "'" + String(value).replace("'", "\\'") + "'");
-            out += ',\n\n';
-        }
-        return out + '\b}';
+async function _generateArrayTypeCode(currentFile, dataType, intent) {
+    if (intent === 'extends')
+        throw new TypeError('Array types can not be extended');
+    let out = '';
+    const x = await this.generateDataType(dataType.type, 'typeDef', currentFile);
+    if (x.kind === 'embedded') {
+        out =
+            x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code;
     }
-    return ('(' +
-        Object.keys(dataType.attributes)
-            .map(t => `'${t}'`)
-            .join(' | ') +
-        ')');
+    else
+        out = x.typeName;
+    if (intent === 'root')
+        return `type ${dataType.name} = ${out}[]`;
+    return `${out}[]`;
 }
 /**
  *
@@ -189,7 +189,7 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
             const x = await this.generateDataType(field.type, 'typeDef', currentFile);
             typ = x.kind === 'embedded' ? x.code : x.typeName;
         }
-        if (field.isArray) {
+        if (field.isArray && !(field.type instanceof common_1.ArrayType)) {
             out += /[a-zA-Z]\w*/.test(typ) ? typ + '[];\n' : '(' + typ + ')[];\n';
         }
         else
@@ -202,30 +202,30 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
 /**
  *
  */
-async function _generateSimpleTypeCode(currentFile, dataType, intent) {
-    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
-    const nameMapping = dataType.nameMappings.js || 'any';
-    out += nameMapping === 'Date' ? 'string' : nameMapping;
-    return intent === 'root' ? out + ';' : out;
-}
-/**
- *
- */
-async function _generateMixinTypeCode(currentFile, dataType, intent) {
-    const outArray = [];
-    for (const t of dataType.types) {
-        const x = await this.generateDataType(t, 'typeDef', currentFile);
-        if (x.kind === 'embedded') {
-            outArray.push(x.code.includes('|') ? '(' + x.code + ')' : x.code);
+async function _generateEnumTypeCode(currentFile, dataType, intent) {
+    if (intent === 'root') {
+        let out = `enum ${dataType.name} {\n\t`;
+        for (const [value, info] of Object.entries(dataType.attributes)) {
+            // Print JSDoc
+            let jsDoc = '';
+            if (dataType.attributes[value].description)
+                jsDoc += ` * ${dataType.attributes[value].description}\n`;
+            if (jsDoc)
+                out += `/**\n${jsDoc} */\n`;
+            out +=
+                `${info.alias || value} = ` +
+                    (typeof value === 'number'
+                        ? value
+                        : "'" + String(value).replace("'", "\\'") + "'");
+            out += ',\n\n';
         }
-        else
-            outArray.push(x.typeName);
+        return out + '\b}';
     }
-    if (intent === 'root')
-        return `type ${dataType.name} = ${outArray.join(' & ')}`;
-    if (intent === 'extends')
-        return outArray.join(', ');
-    return outArray.join(' & ');
+    return ('(' +
+        Object.keys(dataType.attributes)
+            .map(t => `'${t}'`)
+            .join(' | ') +
+        ')');
 }
 /**
  *
@@ -285,3 +285,54 @@ async function _generateMappedTypeCode(currentFile, dataType, intent) {
     }
     return out;
 }
+/**
+ *
+ */
+async function _generateMixinTypeCode(currentFile, dataType, intent) {
+    const outArray = [];
+    for (const t of dataType.types) {
+        const x = await this.generateDataType(t, 'typeDef', currentFile);
+        if (x.kind === 'embedded') {
+            outArray.push(x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code);
+        }
+        else
+            outArray.push(x.typeName);
+    }
+    if (intent === 'root')
+        return `type ${dataType.name} = ${outArray.join(' & ')}`;
+    if (intent === 'extends')
+        return outArray.join(', ');
+    return outArray.join(' & ');
+}
+/**
+ *
+ */
+async function _generateSimpleTypeCode(currentFile, dataType, intent) {
+    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
+    const nameMapping = dataType.nameMappings.js || 'any';
+    out += nameMapping === 'Date' ? 'string' : nameMapping;
+    return intent === 'root' ? out + ';' : out;
+}
+/**
+ *
+ */
+async function _generateUnionTypeCode(currentFile, dataType, intent) {
+    if (intent === 'extends')
+        throw new TypeError('Union types can not be extended');
+    const outArray = [];
+    for (const t of dataType.types) {
+        const x = await this.generateDataType(t, 'typeDef', currentFile);
+        if (x.kind === 'embedded') {
+            outArray.push(x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code);
+        }
+        else
+            outArray.push(x.typeName);
+    }
+    if (intent === 'root')
+        return `type ${dataType.name} = ${outArray.join(' | ')}`;
+    return outArray.join(' | ');
+}

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

@@ -105,11 +105,13 @@ exports.TsGenerator = TsGenerator;
     TsGenerator.prototype.generateDocument = generate_document_js_1.generateDocument;
     TsGenerator.prototype.generateDataType = generate_data_type_js_1.generateDataType;
     TsGenerator.prototype._generateTypeCode = generate_data_type_js_1._generateTypeCode;
-    TsGenerator.prototype._generateEnumTypeCode = generate_data_type_js_1._generateEnumTypeCode;
+    TsGenerator.prototype._generateArrayTypeCode = generate_data_type_js_1._generateArrayTypeCode;
     TsGenerator.prototype._generateComplexTypeCode = generate_data_type_js_1._generateComplexTypeCode;
-    TsGenerator.prototype._generateSimpleTypeCode = generate_data_type_js_1._generateSimpleTypeCode;
+    TsGenerator.prototype._generateEnumTypeCode = generate_data_type_js_1._generateEnumTypeCode;
     TsGenerator.prototype._generateMappedTypeCode = generate_data_type_js_1._generateMappedTypeCode;
     TsGenerator.prototype._generateMixinTypeCode = generate_data_type_js_1._generateMixinTypeCode;
+    TsGenerator.prototype._generateSimpleTypeCode = generate_data_type_js_1._generateSimpleTypeCode;
+    TsGenerator.prototype._generateUnionTypeCode = generate_data_type_js_1._generateUnionTypeCode;
     TsGenerator.prototype.generateHttpApi = generate_http_api_js_1.generateHttpApi;
     TsGenerator.prototype.generateHttpController = generate_http_controller_js_1.generateHttpController;
 })();

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

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { ComplexType, EnumType, MappedType, MixinType, SimpleType, } from '@opra/common';
+import { ArrayType, ComplexType, EnumType, MappedType, MixinType, SimpleType, UnionType, } from '@opra/common';
 import { CodeBlock } from '../../code-block.js';
 import { wrapJSDocString } from '../utils/string-utils.js';
 const internalTypeNames = [
@@ -75,14 +75,14 @@ export async function _generateTypeCode(currentFile, dataType, intent) {
     if (intent === 'root' && !dataType.name) {
         throw new TypeError(`Name required to generate data type code to root intent`);
     }
-    if (dataType instanceof EnumType) {
-        return await this._generateEnumTypeCode(currentFile, dataType, intent);
+    if (dataType instanceof ArrayType) {
+        return await this._generateArrayTypeCode(currentFile, dataType, intent);
     }
     if (dataType instanceof ComplexType) {
         return await this._generateComplexTypeCode(currentFile, dataType, intent);
     }
-    if (dataType instanceof SimpleType) {
-        return await this._generateSimpleTypeCode(currentFile, dataType, intent);
+    if (dataType instanceof EnumType) {
+        return await this._generateEnumTypeCode(currentFile, dataType, intent);
     }
     if (dataType instanceof MappedType) {
         return await this._generateMappedTypeCode(currentFile, dataType, intent);
@@ -90,36 +90,34 @@ export async function _generateTypeCode(currentFile, dataType, intent) {
     if (dataType instanceof MixinType) {
         return await this._generateMixinTypeCode(currentFile, dataType, intent);
     }
+    if (dataType instanceof SimpleType) {
+        return await this._generateSimpleTypeCode(currentFile, dataType, intent);
+    }
+    if (dataType instanceof UnionType) {
+        return await this._generateUnionTypeCode(currentFile, dataType, intent);
+    }
     /* istanbul ignore next */
     throw new TypeError(`${dataType.kind} data types can not be directly exported`);
 }
 /**
  *
  */
-export async function _generateEnumTypeCode(currentFile, dataType, intent) {
-    if (intent === 'root') {
-        let out = `enum ${dataType.name} {\n\t`;
-        for (const [value, info] of Object.entries(dataType.attributes)) {
-            // Print JSDoc
-            let jsDoc = '';
-            if (dataType.attributes[value].description)
-                jsDoc += ` * ${dataType.attributes[value].description}\n`;
-            if (jsDoc)
-                out += `/**\n${jsDoc} */\n`;
-            out +=
-                `${info.alias || value} = ` +
-                    (typeof value === 'number'
-                        ? value
-                        : "'" + String(value).replace("'", "\\'") + "'");
-            out += ',\n\n';
-        }
-        return out + '\b}';
+export async function _generateArrayTypeCode(currentFile, dataType, intent) {
+    if (intent === 'extends')
+        throw new TypeError('Array types can not be extended');
+    let out = '';
+    const x = await this.generateDataType(dataType.type, 'typeDef', currentFile);
+    if (x.kind === 'embedded') {
+        out =
+            x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code;
     }
-    return ('(' +
-        Object.keys(dataType.attributes)
-            .map(t => `'${t}'`)
-            .join(' | ') +
-        ')');
+    else
+        out = x.typeName;
+    if (intent === 'root')
+        return `type ${dataType.name} = ${out}[]`;
+    return `${out}[]`;
 }
 /**
  *
@@ -179,7 +177,7 @@ export async function _generateComplexTypeCode(currentFile, dataType, intent) {
             const x = await this.generateDataType(field.type, 'typeDef', currentFile);
             typ = x.kind === 'embedded' ? x.code : x.typeName;
         }
-        if (field.isArray) {
+        if (field.isArray && !(field.type instanceof ArrayType)) {
             out += /[a-zA-Z]\w*/.test(typ) ? typ + '[];\n' : '(' + typ + ')[];\n';
         }
         else
@@ -192,30 +190,30 @@ export async function _generateComplexTypeCode(currentFile, dataType, intent) {
 /**
  *
  */
-export async function _generateSimpleTypeCode(currentFile, dataType, intent) {
-    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
-    const nameMapping = dataType.nameMappings.js || 'any';
-    out += nameMapping === 'Date' ? 'string' : nameMapping;
-    return intent === 'root' ? out + ';' : out;
-}
-/**
- *
- */
-export async function _generateMixinTypeCode(currentFile, dataType, intent) {
-    const outArray = [];
-    for (const t of dataType.types) {
-        const x = await this.generateDataType(t, 'typeDef', currentFile);
-        if (x.kind === 'embedded') {
-            outArray.push(x.code.includes('|') ? '(' + x.code + ')' : x.code);
+export async function _generateEnumTypeCode(currentFile, dataType, intent) {
+    if (intent === 'root') {
+        let out = `enum ${dataType.name} {\n\t`;
+        for (const [value, info] of Object.entries(dataType.attributes)) {
+            // Print JSDoc
+            let jsDoc = '';
+            if (dataType.attributes[value].description)
+                jsDoc += ` * ${dataType.attributes[value].description}\n`;
+            if (jsDoc)
+                out += `/**\n${jsDoc} */\n`;
+            out +=
+                `${info.alias || value} = ` +
+                    (typeof value === 'number'
+                        ? value
+                        : "'" + String(value).replace("'", "\\'") + "'");
+            out += ',\n\n';
         }
-        else
-            outArray.push(x.typeName);
+        return out + '\b}';
     }
-    if (intent === 'root')
-        return `type ${dataType.name} = ${outArray.join(' & ')}`;
-    if (intent === 'extends')
-        return outArray.join(', ');
-    return outArray.join(' & ');
+    return ('(' +
+        Object.keys(dataType.attributes)
+            .map(t => `'${t}'`)
+            .join(' | ') +
+        ')');
 }
 /**
  *
@@ -275,3 +273,54 @@ export async function _generateMappedTypeCode(currentFile, dataType, intent) {
     }
     return out;
 }
+/**
+ *
+ */
+export async function _generateMixinTypeCode(currentFile, dataType, intent) {
+    const outArray = [];
+    for (const t of dataType.types) {
+        const x = await this.generateDataType(t, 'typeDef', currentFile);
+        if (x.kind === 'embedded') {
+            outArray.push(x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code);
+        }
+        else
+            outArray.push(x.typeName);
+    }
+    if (intent === 'root')
+        return `type ${dataType.name} = ${outArray.join(' & ')}`;
+    if (intent === 'extends')
+        return outArray.join(', ');
+    return outArray.join(' & ');
+}
+/**
+ *
+ */
+export async function _generateSimpleTypeCode(currentFile, dataType, intent) {
+    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
+    const nameMapping = dataType.nameMappings.js || 'any';
+    out += nameMapping === 'Date' ? 'string' : nameMapping;
+    return intent === 'root' ? out + ';' : out;
+}
+/**
+ *
+ */
+export async function _generateUnionTypeCode(currentFile, dataType, intent) {
+    if (intent === 'extends')
+        throw new TypeError('Union types can not be extended');
+    const outArray = [];
+    for (const t of dataType.types) {
+        const x = await this.generateDataType(t, 'typeDef', currentFile);
+        if (x.kind === 'embedded') {
+            outArray.push(x.code.includes('|') || x.code.includes('&')
+                ? '(' + x.code + ')'
+                : x.code);
+        }
+        else
+            outArray.push(x.typeName);
+    }
+    if (intent === 'root')
+        return `type ${dataType.name} = ${outArray.join(' | ')}`;
+    return outArray.join(' | ');
+}

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

@@ -5,7 +5,7 @@ import process from 'node:process';
 import colors from 'ansi-colors';
 import { FileWriter } from '../file-writer.js';
 import { cleanDirectory } from './generators/clean-directory.js';
-import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType, } from './generators/generate-data-type.js';
+import { _generateArrayTypeCode, _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, _generateUnionTypeCode, 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';
@@ -100,11 +100,13 @@ export class TsGenerator extends EventEmitter {
     TsGenerator.prototype.generateDocument = generateDocument;
     TsGenerator.prototype.generateDataType = generateDataType;
     TsGenerator.prototype._generateTypeCode = _generateTypeCode;
-    TsGenerator.prototype._generateEnumTypeCode = _generateEnumTypeCode;
+    TsGenerator.prototype._generateArrayTypeCode = _generateArrayTypeCode;
     TsGenerator.prototype._generateComplexTypeCode = _generateComplexTypeCode;
-    TsGenerator.prototype._generateSimpleTypeCode = _generateSimpleTypeCode;
+    TsGenerator.prototype._generateEnumTypeCode = _generateEnumTypeCode;
     TsGenerator.prototype._generateMappedTypeCode = _generateMappedTypeCode;
     TsGenerator.prototype._generateMixinTypeCode = _generateMixinTypeCode;
+    TsGenerator.prototype._generateSimpleTypeCode = _generateSimpleTypeCode;
+    TsGenerator.prototype._generateUnionTypeCode = _generateUnionTypeCode;
     TsGenerator.prototype.generateHttpApi = generateHttpApi;
     TsGenerator.prototype.generateHttpController = generateHttpController;
 })();

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@opra/cli",
-  "version": "1.19.7",
+  "version": "1.21.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@browsery/type-is": "^2.0.1",
     "ansi-colors": "^4.1.3",
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
     "putil-varhelpers": "^1.6.5",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/client": "^1.19.7",
-    "@opra/common": "^1.19.7"
+    "@opra/client": "^1.21.0",
+    "@opra/common": "^1.21.0"
   },
   "type": "module",
   "exports": {

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

@@ -1,4 +1,4 @@
-import { ComplexType, DataType, EnumType, MappedType, MixinType, SimpleType } from '@opra/common';
+import { ArrayType, ComplexType, DataType, EnumType, MappedType, MixinType, SimpleType, UnionType } from '@opra/common';
 import { TsFile } from '../ts-file.js';
 import type { TsGenerator } from '../ts-generator';
 type Intent = 'root' | 'extends' | 'typeDef';
@@ -21,7 +21,7 @@ export declare function _generateTypeCode(this: TsGenerator, currentFile: TsFile
 /**
  *
  */
-export declare function _generateEnumTypeCode(this: TsGenerator, currentFile: TsFile, dataType: EnumType, intent?: Intent): Promise<string>;
+export declare function _generateArrayTypeCode(this: TsGenerator, currentFile: TsFile, dataType: ArrayType, intent?: Intent): Promise<string>;
 /**
  *
  */
@@ -29,7 +29,11 @@ export declare function _generateComplexTypeCode(this: TsGenerator, currentFile:
 /**
  *
  */
-export declare function _generateSimpleTypeCode(this: TsGenerator, currentFile: TsFile, dataType: SimpleType, intent?: Intent): Promise<string>;
+export declare function _generateEnumTypeCode(this: TsGenerator, currentFile: TsFile, dataType: EnumType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateMappedTypeCode(this: TsGenerator, currentFile: TsFile, dataType: MappedType, intent?: Intent): Promise<string>;
 /**
  *
  */
@@ -37,5 +41,9 @@ export declare function _generateMixinTypeCode(this: TsGenerator, currentFile: T
 /**
  *
  */
-export declare function _generateMappedTypeCode(this: TsGenerator, currentFile: TsFile, dataType: MappedType, intent?: Intent): Promise<string>;
+export declare function _generateSimpleTypeCode(this: TsGenerator, currentFile: TsFile, dataType: SimpleType, intent?: Intent): Promise<string>;
+/**
+ *
+ */
+export declare function _generateUnionTypeCode(this: TsGenerator, currentFile: TsFile, dataType: UnionType, intent?: Intent): Promise<string>;
 export {};

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

@@ -3,7 +3,7 @@ import { ApiDocument } from '@opra/common';
 import type { IFileWriter } from '../interfaces/file-writer.interface.js';
 import type { ILogger } from '../interfaces/logger.interface.js';
 import { cleanDirectory } from './generators/clean-directory.js';
-import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType } from './generators/generate-data-type.js';
+import { _generateArrayTypeCode, _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, _generateUnionTypeCode, 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';
@@ -31,11 +31,13 @@ export declare class TsGenerator extends EventEmitter {
     protected generateDocument: typeof generateDocument;
     protected generateDataType: typeof generateDataType;
     protected _generateTypeCode: typeof _generateTypeCode;
-    protected _generateEnumTypeCode: typeof _generateEnumTypeCode;
+    protected _generateArrayTypeCode: typeof _generateArrayTypeCode;
     protected _generateComplexTypeCode: typeof _generateComplexTypeCode;
-    protected _generateSimpleTypeCode: typeof _generateSimpleTypeCode;
+    protected _generateEnumTypeCode: typeof _generateEnumTypeCode;
     protected _generateMappedTypeCode: typeof _generateMappedTypeCode;
     protected _generateMixinTypeCode: typeof _generateMixinTypeCode;
+    protected _generateSimpleTypeCode: typeof _generateSimpleTypeCode;
+    protected _generateUnionTypeCode: typeof _generateUnionTypeCode;
     protected generateHttpApi: typeof generateHttpApi;
     protected generateHttpController: typeof generateHttpController;
     protected _documentRoot: string;