devextreme-internal-tools 12.0.0-beta.8 → 14.0.0-beta.1

package/ts/angular-components-generator/templates/component.tst

@@ -1,5 +1,5 @@
 /* tslint:disable:max-line-length */
-<# 
+<#
 var collectionProperties = it.properties.filter(item => item.isCollection).map(item => item.name);
 var collectionNestedComponents = it.nestedComponents.filter(item => item.isCollection && item.root);
 var baseClass = it.isExtension ? 'DxComponentExtension' : 'DxComponent';
@@ -91,7 +91,7 @@ const CUSTOM_VALUE_ACCESSOR_PROVIDER = {
     ]
 })
 export class <#= it.className #>Component<#= componentTypeParams #> extends <#= baseClass #> <#? implementedInterfaces.length #>implements <#= implementedInterfaces.join(', ') #> <#?#>{
-    instance: <#= it.className #><#= instanceTypeParams #>;
+    instance: <#= it.className #><#= instanceTypeParams #> = null;
 <#~ it.properties :prop:i #>
     /**
      * [descr:<#= prop.docID #>]

package/ts/common/ts-utils.d.ts

@@ -5,6 +5,10 @@ export declare function isUnionOrIntersectionTypeNode(node: Node): node is Union
 export declare function isTypeReference(type: Type): type is TypeReference;
 export declare function isObjectType(type: Type): type is ObjectType;
 export declare function isSubstitutionType(type: Type): type is SubstitutionType;
+export declare const BUILT_IN_TYPES: {
+    Promise: string;
+};
+export declare function isPromiseType(symbol: Symbol): boolean;
 export declare function isEnumTypeNode(node: Node): boolean;
 type NodeWithType = GetAccessorDeclaration | ParameterDeclaration | PropertyDeclaration | PropertySignature | TypeAliasDeclaration | VariableDeclaration;
 export declare function isNodeWithType(node: Node): node is NodeWithType;

package/ts/common/ts-utils.js

@@ -9,7 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStatementWithModifiers = exports.getJSDocTagInfoValue = exports.getJSDocTagValue = exports.hasFlag = exports.isTypeDeclaration = exports.isTypeLikeDeclaration = exports.isReadonlyMember = exports.isOptionalMember = exports.getNumberLiteralValue = exports.getReferencedNodes = exports.getGenericParameterDeclaration = exports.getModule = exports.createProgram = exports.isDefaultExportStatement = exports.getSymbolDecalartions = exports.getAliasSymbol = exports.getValueType = exports.getNestedSymbols = exports.getTypeSymbol = exports.getTypeSymbols = exports.isOptional = exports.isNamedDeclaration = exports.isNodeWithType = exports.isEnumTypeNode = exports.isSubstitutionType = exports.isObjectType = exports.isTypeReference = exports.isUnionOrIntersectionTypeNode = exports.isUnionOrIntersectionType = exports.isStructuredType = void 0;
+exports.isStatementWithModifiers = exports.getJSDocTagInfoValue = exports.getJSDocTagValue = exports.hasFlag = exports.isTypeDeclaration = exports.isTypeLikeDeclaration = exports.isReadonlyMember = exports.isOptionalMember = exports.getNumberLiteralValue = exports.getReferencedNodes = exports.getGenericParameterDeclaration = exports.getModule = exports.createProgram = exports.isDefaultExportStatement = exports.getSymbolDecalartions = exports.getAliasSymbol = exports.getValueType = exports.getNestedSymbols = exports.getTypeSymbol = exports.getTypeSymbols = exports.isOptional = exports.isNamedDeclaration = exports.isNodeWithType = exports.isEnumTypeNode = exports.isPromiseType = exports.BUILT_IN_TYPES = exports.isSubstitutionType = exports.isObjectType = exports.isTypeReference = exports.isUnionOrIntersectionTypeNode = exports.isUnionOrIntersectionType = exports.isStructuredType = void 0;
 var path_1 = require("path");
 var typescript_1 = require("typescript");
 var utils_1 = require("./utils");
@@ -38,6 +38,13 @@ function isSubstitutionType(type) {
     return !!(type.flags & typescript_1.TypeFlags.Substitution);
 }
 exports.isSubstitutionType = isSubstitutionType;
+exports.BUILT_IN_TYPES = {
+    Promise: 'Promise',
+};
+function isPromiseType(symbol) {
+    return symbol.getEscapedName() === exports.BUILT_IN_TYPES.Promise;
+}
+exports.isPromiseType = isPromiseType;
 function isEnumTypeNode(node) {
     function isEnumNode(typeNode) {
         if (!(0, typescript_1.isUnionTypeNode)(typeNode)) {

package/ts/common/ts-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-utils.js","sourceRoot":"","sources":["../../../ts/common/ts-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ts-utils.js","sourceRoot":"","sources":["../../../ts/common/ts-utils.ts"],"names":[],"mappings":"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"}

package/ts/common/type-resolving.js

@@ -113,6 +113,9 @@ function getFullTypeName(symbol, typeName, checker, baseDir, typeArguments) {
     var parameterizedBy = (typeArguments === null || typeArguments === void 0 ? void 0 : typeArguments.length)
         ? "<".concat(typeArguments.map(function (t) { return t === null || t === void 0 ? void 0 : t.id; }).join(sep), ">")
         : '';
+    if (!isBuiltInType(symbol, checker) && parameterizedBy) {
+        return typeName;
+    }
     if ((0, common_resolving_1.hasDocId)(symbol, checker) || (0, ts_type_resolving_1.isExternalDeclaration)(symbol.declarations[0])) {
         return "".concat(typeName).concat(parameterizedBy);
     }
@@ -120,6 +123,10 @@ function getFullTypeName(symbol, typeName, checker, baseDir, typeArguments) {
     return "{".concat(module, ".").concat(typeName).concat(parameterizedBy, "}");
 }
 exports.getFullTypeName = getFullTypeName;
+function isBuiltInType(symbol, checker) {
+    var isArrayType = checker.isArrayType(checker.getDeclaredTypeOfSymbol(symbol));
+    return isArrayType || (0, ts_utils_1.isPromiseType)(symbol);
+}
 function resolveUnionType(typeNode, checker, baseDir) {
     if ((0, ts_utils_1.isUnionOrIntersectionTypeNode)(typeNode)) {
         var types = typeNode.types

package/ts/common/type-resolving.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-resolving.js","sourceRoot":"","sources":["../../../ts/common/type-resolving.ts"],"names":[],"mappings":";;;AAAA,yCAqBoB;AACpB,iCAAwD;AACxD,uCAWoB;AACpB,sCAAiC;AACjC,uDAM4B;AAC5B,yDAI6B;AAI7B,uDAA8D;AAC9D,2BAAqC;AAyCrC,SAAgB,yBAAyB,CACvC,IAAuB;IAEvB,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC;AAC9B,CAAC;AAJD,8DAIC;AAED,SAAgB,yBAAyB,CACvC,IAAuB;IAEvB,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC;AAC9B,CAAC;AAJD,8DAIC;AAMD,SAAgB,oBAAoB,CAAC,UAAsB;IACzD,IAAM,IAAI,GAAG,UAAgC,CAAC;IAC9C,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC5D,CAAC;AAHD,oDAGC;AAED,SAAgB,mBAAmB,CACjC,UAAsB;IAEtB,OAAQ,UAAgE,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/F,CAAC;AAJD,kDAIC;AAED,SAAgB,qBAAqB,CAAC,UAAsB;IAC1D,OAAO,CAAC,CAAE,UAAkC,CAAC,iBAAiB,CAAC;AACjE,CAAC;AAFD,sDAEC;AAED,SAAS,mBAAmB,CAAC,QAAc,EAAE,OAAoB,EAAE,OAAe;IAEhF,IAAI,IAAA,+BAAkB,EAAC,QAAQ,CAAC;WAC3B,IAAA,kCAAqB,EAAC,QAAQ,CAAC;WAC/B,IAAA,gCAAmB,EAAC,QAAQ,CAAC;WAC7B,IAAA,8BAAiB,EAAC,QAAQ,CAAC,EAAE;QAChC,IAAM,YAAY,GAAG,QAAQ,CAAC,UAAU;aACrC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC;aAClB,MAAM,CAAC,yBAAY,CAAC;aACpB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAxB,CAAwB,CAAC;aACpC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,IAAM,QAAQ,GAAG,IAAA,gCAAmB,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QACtF,OAAO;YACL,EAAE,EAAE,UAAG,QAAQ,cAAI,YAAY,MAAG;YAClC,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAzC,CAAyC,CAAC;YACzF,kBAAkB,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAE;YAClC,UAAU,EAAE,IAAA,+BAAkB,EAAC,QAAQ,CAAC;SACzC,CAAC;KACH;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,kBAAkB,CAAC,QAAc;IAC/C,IAAI,IAAA,8BAAiB,EAAC,QAAQ,CAAC,EAAE;QAC/B,IAAI,IAAA,4BAAe,EAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACvD;QAED,IAAM,WAAW,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;SAC7C;QAED,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAU,CAAC,WAAW,EAAE;YACpD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;SACvB;QAED,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAU,CAAC,WAAW,EAAE;YACpD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;SACvB;QAED,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,uBAAU,CAAC,YAAY,EAAE;YACrD,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;SACxB;QAED,MAAM,KAAK,CAAC,yCAAkC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAE,CAAC,CAAC;KAC7E;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AA3BD,gDA2BC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,OAAoB,EACpB,OAAe;;IAEf,IAAI,CAAC,IAAA,gCAAmB,EAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IAED,IAAM,gBAAgB,GAAG,IAAA,yCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvE,IAAI,gBAAgB,EAAE;QACpB,OAAO,gBAAgB,CAAC,OAAO,IAAI,IAAA,gCAAmB,EAAC,gBAAgB,CAAC,OAAO,CAAC;YAC9E,CAAC,CAAC,EAAE,EAAE,EAAE,WAAI,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,MAAG,EAAE;YACpF,CAAC,CAAC,QAAQ,EAAE,CAAC;KAChB;IAED,IAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,aAAa,0CACpC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAApC,CAAoC,CAAC,0CAChD,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,EAAD,CAAC,CAAC,CAAC;IAErB,IAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IACxF,IAAI,IAAA,yBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC/B,IAAM,SAAS,GAAG,MAAA,WAAW,CAAC,eAAe,EAAE,0CAAG,CAAC,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,IAAI,IAAA,yBAAc,EAAC,SAAS,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3F,OAAO;gBACL,EAAE,EAAE,gBAAS,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,cAAc,EAAE,mCAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAE;aACxE,CAAC;SACH;KACF;IACD,IAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC;QAC1C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI;QACpB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAE5B,IAAM,YAAY,GAAG,eAAe,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC7F,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM;QAC1B,CAAC,CAAC;YACA,EAAE,EAAE,YAAY;YAChB,aAAa,eAAA;SACd;QACD,CAAC,CAAC;YACA,EAAE,EAAE,YAAY;SACjB,CAAC;AACN,CAAC;AAED,SAAgB,eAAe,CAC7B,MAAc,EACd,QAAgB,EAChB,OAAoB,EACpB,OAAe,EACf,aAA2B;IAE3B,IAAM,GAAG,GAAG,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,IAAM,eAAe,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM;QAC3C,CAAC,CAAC,WAAI,aAAa,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,EAAE,EAAL,CAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAG;QAClD,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,IAAA,2BAAQ,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,IAAA,yCAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;QAC9E,OAAO,UAAG,QAAQ,SAAG,eAAe,CAAE,CAAC;KACxC;IACD,IAAM,MAAM,GAAG,IAAA,oBAAS,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,WAAI,MAAM,cAAI,QAAQ,SAAG,eAAe,MAAG,CAAC;AACrD,CAAC;AAjBD,0CAiBC;AAED,SAAS,gBAAgB,CAAC,QAAc,EAAE,OAAoB,EAAE,OAAe;IAE7E,IAAI,IAAA,wCAA6B,EAAC,QAAQ,CAAC,EAAE;QAC3C,IAAM,KAAK,GAAG,QAAQ,CAAC,KAAK;aACzB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAApC,CAAoC,CAAC;aAChD,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,EAAE,EAAL,CAAK,CAAC,CAAC;QACxB,IAAM,MAAM,GAAG;YACb,EAAE,EAAE,IAAA,gBAAQ,EAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,EAAJ,CAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAC9C,aAAa,EAAE,KAAK;SACrB,CAAC;QACF,OAAO,MAAM,CAAC;KACf;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAA+B,EAC/B,OAAoB,EACpB,OAAe;IAEf,IAAI,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QAChC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;YACnB,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;SACtD;QACD,IAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,IAAM,qBAAqB,GAAG,IAAA,gCAAmB,EAAC,SAAS,CAAC,IAAI,CAAC;eAC5D,IAAA,6CAAyB,EAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExD,OAAO;YACL,EAAE,EAAE,UAAG,SAAS,CAAC,IAAI,CAAC,WAAW,cAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,EAAE,CAAE;YACpD,MAAM,EAAE,CAAC,qBAAqB;gBAC5B,CAAC,CAAC,IAAA,2BAAmB,EAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC3E,CAAC,CAAC,SAAS;SACd,CAAC;KACH;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,kBAAkB,CAAC,SAAmB,EAAE,OAAoB,EAAE,OAAe;;IAEpF,IAAI,IAAA,8BAAiB,EAAC,SAAS,CAAC,EAAE;QAChC,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM;;YAClC,IAAI,IAAA,gCAAmB,EAAC,MAAM,CAAC,IAAI,IAAA,yBAAY,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5D,OAAO;oBACL,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,CAAC,WAAW,0CAAE,QAAQ,EAAE;oBACzC,IAAI,EAAE,MAAA,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,0CAAE,EAAE;oBACxD,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC;iBAC9B,CAAC;aACH;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC,MAAM,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,KAAK,SAAS,EAAnB,CAAmB,CAAC,CAAC;KAC3C;IAED,IAAI,IAAA,wCAA6B,EAAC,SAAS,CAAC,IAAI,IAAA,gCAAqB,EAAC,SAAS,CAAC,EAAE;QAChF,IAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAChD,IAAM,UAAU,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;QAEtC,IAAM,MAAM,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CACrB,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,yCAAqB,CAAC,EAA9C,CAA8C,CAAC,0CAChE,GAAG,CAAC,UAAC,IAAI;YACT,IAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,IAAM,MAAM,GAAG,IAAA,+BAAW,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACrE,IAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAEpC,IAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEvE,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;gBACjC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,UAAG,QAAQ,cAAI,SAAS,MAAG,CAAC,CAAC,CAAC,QAAQ;aACzD,CAAC;QACJ,CAAC,CAAC,CAAC;QACL,OAAO,MAAM,CAAC;KACf;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAc;IAC7C,OAAO,eAAe,IAAI,IAAI,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CAAC,WAAwB,EAAE,OAAoB,EAAE,OAAe;;IAEnF,IAAI,CAAC,IAAA,gCAAmB,EAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAExD,IAAI,WAAW,CAAC,IAAI,IAAI,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACjE,IAAM,QAAQ,GAAG,MAAA,WAAW,CAAC,IAAI,CAAC,aAAa,0CAAG,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAChC,IAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/D,OAAO,MAAA,UAAU,CAAC,aAAa,0CAAE,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,EAAE,EAAN,CAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;KACjE;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB,EAAE,OAAoB;IAC9D,IAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI,IAAA,gCAAmB,EAAC,WAAW,CAAC,IAAI,IAAA,gCAAmB,EAAC,WAAW,CAAC,IAAI,CAAC,EAC3E;QACA,OAAO,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KAC/D;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;;IAChC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,uBAAU,CAAC,KAAK;YACnB,OAAO,MAAM,CAAC,EAAE,CAAC;QACnB,KAAK,uBAAU,CAAC,SAAS;YACvB,IAAI,MAAM,CAAC,QAAQ;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;YAC5C,OAAO,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAI,MAAM,CAAC,EAAE,MAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QAChE,KAAK,uBAAU,CAAC,eAAe;YAC7B,OAAO,MAAA,MAAM,CAAC,QAAQ,mCAAI,MAAM,CAAC,EAAE,CAAC;QACtC,KAAK,uBAAU,CAAC,QAAQ;YACtB,OAAO,UAAU,CAAC;QACpB,KAAK,uBAAU,CAAC,YAAY;YAC1B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,UAAU,CAAC,CAAC,CAAC,EAAb,CAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,KAAK,uBAAU,CAAC,KAAK;YACnB,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,UAAU,CAAC,CAAC,CAAC,EAAb,CAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,KAAK,uBAAU,CAAC,OAAO;YACrB,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjC;YAEE,IAAM,CAAC,GAAU,MAAM,CAAC;YACxB,OAAO,CAAC,CAAC;KACZ;AACH,CAAC;AAID,SAAS,cAAc,CAAC,WAAwB;IAC9C,IAAM,KAAK,GAAG,EAAE,CAAC;IACjB,IAAI,IAAA,2BAAgB,EAAC,WAAW,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,IAAA,2BAAgB,EAAC,WAAW,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAoB,EAAE,OAAe;IAEzE,IAAI,CAAC,IAAA,4BAAe,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,IAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO;QACL,EAAE,EAAE,gBAAS,WAAW,CAAC,EAAE,MAAG;QAC9B,aAAa,EAAE,WAAW,CAAC,aAAa;KACzC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAAoB;;IACvD,IAAI,CAAC,IAAA,2BAAc,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,IAAM,WAAW,GAAG,MAAA,MAAA,MAAA,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,0CAAE,SAAS,EAAE,0CAAE,eAAe,EAAE,0CAAG,CAAC,CAAC,CAAC;IACzF,IAAM,IAAI,GAAG,WAAW,IAAI,IAAA,kBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC,CAAC,CAAC;QACZ,EAAE,EAAE,IAAI;KACT,CAAC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAoB,EAAE,OAAe;IAE/E,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,IAAA,mCAAgB,EAAC,IAAI,CAAC;eACxB,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;eAC3C,eAAe,CAAC,IAAA,uCAAoB,EAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;eAC7D,kBAAkB,CAAC,IAAI,CAAC;eACxB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;eAC5C,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;eACxC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;eACxC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;eAC9B,IAAA,sCAAmB,EAAC,IAAI,CAAC;eACzB,IAAA,0CAAuB,EAAC,IAAI,CAAC,CAAC;KACpC;IAAC,OAAO,CAAC,EAAE;QACV,IAAA,aAAG,EAAC,6BAA6B,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AApBD,0CAoBC;AAED,SAAS,QAAQ;IACf,OAAO;QACL,EAAE,EAAE,IAAA,uBAAY,EAAC,uBAAU,CAAC,UAAU,CAAC;KACxC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"type-resolving.js","sourceRoot":"","sources":["../../../ts/common/type-resolving.ts"],"names":[],"mappings":"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"}

package/ts/components-generation/template.d.ts

@@ -15,8 +15,9 @@ declare const L1: string;
 declare const L2: string;
 declare const L3: string;
 declare const L4: string;
+declare const L5: string;
 declare const TAB1: string;
 declare const TAB2: string;
 declare const TAB3: string;
 declare const TAB4: string;
-export { commonTemplateSettings, createTemplate, L0, L1, L2, L3, L4, TAB1, TAB2, TAB3, TAB4, };
+export { commonTemplateSettings, createTemplate, L0, L1, L2, L3, L4, L5, TAB1, TAB2, TAB3, TAB4, };

package/ts/components-generation/template.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TAB4 = exports.TAB3 = exports.TAB2 = exports.TAB1 = exports.L4 = exports.L3 = exports.L2 = exports.L1 = exports.L0 = exports.createTemplate = exports.commonTemplateSettings = void 0;
+exports.TAB4 = exports.TAB3 = exports.TAB2 = exports.TAB1 = exports.L5 = exports.L4 = exports.L3 = exports.L2 = exports.L1 = exports.L0 = exports.createTemplate = exports.commonTemplateSettings = void 0;
 var dot_1 = require("dot");
 var commonTemplateSettings = {
     conditional: /\<#\?(\?)?\s*([\s\S]*?)\s*#\>/g,
@@ -46,6 +46,8 @@ var L3 = "\n".concat(tab(3));
 exports.L3 = L3;
 var L4 = "\n".concat(tab(4));
 exports.L4 = L4;
+var L5 = "\n".concat(tab(5));
+exports.L5 = L5;
 var TAB1 = tab(1);
 exports.TAB1 = TAB1;
 var TAB2 = tab(2);

package/ts/components-generation/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../ts/components-generation/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,2BAAiD;AAEjD,IAAM,sBAAsB,GAAG;IAC7B,WAAW,EAAE,gCAAgC;IAC7C,MAAM,EAAE,4CAA4C;IACpD,MAAM,EAAE,oBAAoB;IAC5B,QAAQ,EAAE,mBAAmB;IAC7B,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,uEAAuE;IAChF,KAAK,EAAE,KAAK;IACZ,GAAG,EAAE,oBAAoB;IACzB,OAAO,EAAE,IAAI;CACd,CAAC;AA+BA,wDAAsB;AA7BxB,IAAM,eAAe,yBAChB,sBAAgB,GAChB,sBAAsB,CAC1B,CAAC;AAEF,IAAM,cAAc,GAAG,UAAC,WAAmB;IACzC,IAAM,YAAY,GAAG,IAAA,cAAQ,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE5D,OAAO,UAAC,KAAU,IAAK,OAAC,YAAY,CAAC,KAAK,CAAY;SACnD,OAAO,CAAC,qDAAqD,EAAE,EAAE,CAAC;SAClE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAFC,CAED,CAAC;AACzB,CAAC,CAAC;AAmBA,wCAAc;AAjBhB,SAAS,GAAG,CAAC,CAAS;IACpB,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,IAAM,EAAE,GAAG,IAAI,CAAC;AAcd,gBAAE;AAbJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAcvB,gBAAE;AAbJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAcvB,gBAAE;AAbJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAcvB,gBAAE;AAbJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAcvB,gBAAE;AAZJ,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAa1B,oBAAI;AAZN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAa1B,oBAAI;AAZN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAa1B,oBAAI;AAZN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAa1B,oBAAI"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../ts/components-generation/template.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,2BAAiD;AAEjD,IAAM,sBAAsB,GAAG;IAC7B,WAAW,EAAE,gCAAgC;IAC7C,MAAM,EAAE,4CAA4C;IACpD,MAAM,EAAE,oBAAoB;IAC5B,QAAQ,EAAE,mBAAmB;IAC7B,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,uEAAuE;IAChF,KAAK,EAAE,KAAK;IACZ,GAAG,EAAE,oBAAoB;IACzB,OAAO,EAAE,IAAI;CACd,CAAC;AAgCA,wDAAsB;AA9BxB,IAAM,eAAe,yBAChB,sBAAgB,GAChB,sBAAsB,CAC1B,CAAC;AAEF,IAAM,cAAc,GAAG,UAAC,WAAmB;IACzC,IAAM,YAAY,GAAG,IAAA,cAAQ,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE5D,OAAO,UAAC,KAAU,IAAK,OAAC,YAAY,CAAC,KAAK,CAAY;SACnD,OAAO,CAAC,qDAAqD,EAAE,EAAE,CAAC;SAClE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAFC,CAED,CAAC;AACzB,CAAC,CAAC;AAoBA,wCAAc;AAlBhB,SAAS,GAAG,CAAC,CAAS;IACpB,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,IAAM,EAAE,GAAG,IAAI,CAAC;AAed,gBAAE;AAdJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAevB,gBAAE;AAdJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAevB,gBAAE;AAdJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAevB,gBAAE;AAdJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAevB,gBAAE;AAdJ,IAAM,EAAE,GAAG,YAAK,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC;AAevB,gBAAE;AAbJ,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAc1B,oBAAI;AAbN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAc1B,oBAAI;AAbN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAc1B,oBAAI;AAbN,IAAM,IAAI,GAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAc1B,oBAAI"}

package/ts/react-components-generator/component-generator.d.ts

@@ -8,7 +8,6 @@ type IComponent = {
     subscribableOptions?: ISubscribableOption[];
     independentEvents?: IIndependentEvents[];
     templates?: string[];
-    propTypings?: IPropTyping[];
     optionsTypeParams?: string[];
 } & {
     nestedComponents?: INestedComponent[];
@@ -17,7 +16,7 @@ type IComponent = {
     narrowedEvents?: IOption[];
 };
 interface INestedComponent {
-    className: string;
+    componentName: string;
     optionName: string;
     owners: string[];
     options: IOption[];
@@ -46,12 +45,6 @@ type IOption = {
     type?: undefined;
     nested: IOption[];
 });
-interface IPropTyping {
-    propName: string;
-    types: string[];
-    acceptableType?: string;
-    acceptableValues?: string[];
-}
 interface IExpectedChild {
     componentName: string;
     optionName: string;
@@ -59,4 +52,4 @@ interface IExpectedChild {
 }
 declare function generate(component: IComponent, generateReexports?: boolean, customTypeImports?: Record<string, Array<string>>, defaultTypeImports?: Record<string, string>, wildcardTypeImports?: Record<string, string>): string;
 export default generate;
-export { IComponent, IIndependentEvents, INestedComponent, IOption, ISubscribableOption, IPropTyping, };
+export { IComponent, IIndependentEvents, INestedComponent, IOption, ISubscribableOption, };

package/ts/react-components-generator/component-generator.js

@@ -22,7 +22,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var template_1 = require("../components-generation/template");
 var helpers_1 = require("./helpers");
-var TYPE_KEY_FN = '(data: any) => string';
 var TYPE_RENDER = '(...params: any) => React.ReactNode';
 var TYPE_COMPONENT = 'React.ComponentType<any>';
 var PORTAL_COMPONENTS = new Set([
@@ -43,7 +42,7 @@ var USE_REQUEST_ANIMATION_FRAME = new Set([
 function getIndent(indent) {
     return Array(indent * 2 + 1).join(' ');
 }
-var renderObjectEntry = (0, template_1.createTemplate)("\n    <#= it.key #>: \"<#= it.value #>\"\n".trimRight());
+var renderObjectEntry = (0, template_1.createTemplate)("\n<#= it.indent #><#= it.key #>: \"<#= it.value #>\"\n".trimRight());
 function renderObject(props, baseIndent) {
     var result = '{';
     var indent = baseIndent + 1;
@@ -78,17 +77,10 @@ function renderNarrowedEvents(events, typeParams) {
     result += "\n".concat(getIndent(indent), "}");
     return result;
 }
-var renderTemplateOption = (0, template_1.createTemplate)("\n  {\n    tmplOption: \"<#= it.actualOptionName #>\",\n    render: \"<#= it.render #>\",\n    component: \"<#= it.component #>\",\n    keyFn: \"<#= it.keyFn #>\"\n  }\n".trim());
+var renderTemplateOption = (0, template_1.createTemplate)("\n{\n    <#= it.additionalIndent #>tmplOption: \"<#= it.actualOptionName #>\",\n    <#= it.additionalIndent #>render: \"<#= it.render #>\",\n    <#= it.additionalIndent #>component: \"<#= it.component #>\"\n<#= it.additionalIndent #>  }\n".trim());
 var renderStringEntry = (0, template_1.createTemplate)('"<#= it #>"');
-var renderPropTyping = (0, template_1.createTemplate)('  <#= it.propName #>: '
-    + '<#? it.renderedTypes.length === 1 #>'
-    + '<#= it.renderedTypes[0] #>'
-    + '<#??#>'
-    + 'PropTypes.oneOfType([\n'
-    + '    <#= it.renderedTypes.join(\',\\n    \') #>\n'
-    + '  ])'
-    + '<#?#>');
-var renderModule = (0, template_1.createTemplate)('<#= it.renderedImports #>\n'
+var renderModule = (0, template_1.createTemplate)('"use client"\n'
+    + '<#= it.renderedImports #>\n'
     + '<#? it.renderedOptionsInterface #>'
     + '<#= it.renderedOptionsInterface #>\n\n'
     + '<#?#>'
@@ -106,17 +98,16 @@ var renderModule = (0, template_1.createTemplate)('<#= it.renderedImports #>\n'
 var renderImports = (0, template_1.createTemplate)('<#? it.hasExplicitTypes #>'
     + 'export { ExplicitTypes } from "<#= it.dxExportPath #>";\n'
     + '<#?#>'
+    + 'import * as React from "react";\n'
+    + 'import { memo, forwardRef, useImperativeHandle, useRef, useMemo, ForwardedRef, Ref, ReactElement } from "react";\n'
     + 'import <#= it.widgetName #>, {\n'
     + '    Properties\n'
     + '} from "<#= it.dxExportPath #>";\n\n'
-    + '<#? it.hasPropTypings #>'
-    + 'import * as PropTypes from "prop-types";\n'
-    + '<#?#>'
     + '<#? it.htmlOptionsPath === it.baseComponentPath #>'
-    + 'import { <#= it.baseComponentName #> as BaseComponent, IHtmlOptions } from "<#= it.baseComponentPath #>";\n'
+    + 'import { <#= it.baseComponentName #> as BaseComponent, IHtmlOptions, ComponentRef<#? it.configComponentPath #>, IElementDescriptor<#?#> } from "<#= it.baseComponentPath #>";\n'
     + '<#??#>'
     + 'import { <#= it.baseComponentName #> as BaseComponent } from "<#= it.baseComponentPath #>";\n'
-    + 'import { IHtmlOptions } from "<#= it.htmlOptionsPath #>";\n'
+    + 'import { IHtmlOptions, ComponentRef<#? it.configComponentPath #>, IElementDescriptor<#?#> } from "<#= it.htmlOptionsPath #>";\n'
     + '<#?#>'
     + '<#? it.configComponentPath #>'
     + 'import NestedOption from "<#= it.configComponentPath #>";\n'
@@ -138,28 +129,29 @@ var renderImports = (0, template_1.createTemplate)('<#? it.hasExplicitTypes #>'
     + 'import type * as <#= it.wildcardTypeImports[wildcardImportModule] #> from "<#= wildcardImportModule #>";\n'
     + '<#~#>'
     + '<#?#>');
-var renderNestedComponent = (0, template_1.createTemplate)("".concat('// owners:\n'
+var renderNestedComponent = (0, template_1.createTemplate)('// owners:\n'
     + '<#~ it.owners : owner #>'
     + '// <#= owner #>\n'
     + '<#~#>'
     + 'type <#= it.propsType #> = React.PropsWithChildren<<#= it.renderedType #>>\n'
-    + 'class <#= it.className #> extends NestedOption<<#= it.propsType #>> {').concat(template_1.L1, "public static OptionName = \"<#= it.optionName #>\";")
-    + "<#? it.isCollectionItem #>".concat(template_1.L1, "public static IsCollectionItem = true;")
+    + 'const _component<#= it.componentName #> = memo('
+    + "\n  (props: <#= it.propsType #>) => {\n    return React.createElement(NestedOption<<#= it.propsType #>>, { ...props });\n  }\n);\n\nconst <#= it.componentName #>: typeof _component<#= it.componentName #> & IElementDescriptor = Object.assign(_component<#= it.componentName #>, {\n  OptionName: \"<#= it.optionName #>\","
+    + "<#? it.isCollectionItem #>".concat(template_1.L1, "IsCollectionItem: true,")
     + '<#?#>'
-    + "<#? it.renderedSubscribableOptions #>".concat(template_1.L1, "public static DefaultsProps = {<#= it.renderedSubscribableOptions.join(',') #>").concat(template_1.L1, "};")
+    + "<#? it.renderedSubscribableOptions #>".concat(template_1.L1, "DefaultsProps: {<#= it.renderedSubscribableOptions.join(',') #>").concat(template_1.L1, "},")
     + '<#?#>'
-    + "<#? it.expectedChildren #>".concat(template_1.L1, "public static ExpectedChildren = {")
+    + "<#? it.expectedChildren #>".concat(template_1.L1, "ExpectedChildren: {")
     + "<#~ it.expectedChildren : child #>".concat(template_1.L2, "<#= child.componentName #>:")
     + ' { optionName: "<#= child.optionName #>", isCollectionItem: <#= !!child.isCollectionItem #> },'
-    + "<#~#>\b".concat(template_1.L1, "};")
+    + "<#~#>\b".concat(template_1.L1, "},")
     + '<#?#>'
-    + "<#? it.renderedTemplateProps #>".concat(template_1.L1, "public static TemplateProps = [<#= it.renderedTemplateProps.join(', ') #>];")
+    + "<#? it.renderedTemplateProps #>".concat(template_1.L1, "TemplateProps: [<#= it.renderedTemplateProps.join(', ') #>],")
     + '<#?#>'
-    + "<#? it.predefinedProps #>".concat(template_1.L1, "public static PredefinedProps = {")
+    + "<#? it.predefinedProps #>".concat(template_1.L1, "PredefinedProps: {")
     + "<#~ it.predefinedProps : prop #>".concat(template_1.L2, "<#= prop.name #>: \"<#= prop.value #>\",")
-    + "<#~#>\b".concat(template_1.L1, "};")
+    + "<#~#>\b".concat(template_1.L1, "},")
     + '<#?#>'
-    + '\n}');
+    + '\n})');
 var TYPE_PARAMS = '<#? it.typeParams #>'
     + '<<#= it.typeParams.join(", ") #>>'
     + '<#?#>';
@@ -181,7 +173,6 @@ var renderOptionsInterface = (0, template_1.createTemplate)('<#? it.renderedNarr
     + '<#~ it.templates :template #>'
     + "  <#= template.render #>?: ".concat(TYPE_RENDER, ";\n")
     + "  <#= template.component #>?: ".concat(TYPE_COMPONENT, ";\n")
-    + "  <#= template.keyFn #>?: ".concat(TYPE_KEY_FN, ";\n")
     + '<#~#>'
     + '<#~ it.defaultProps :prop #>'
     + '  <#= prop.name #>?: <#= prop.type #>;\n'
@@ -192,28 +183,43 @@ var renderOptionsInterface = (0, template_1.createTemplate)('<#? it.renderedNarr
     + '}'
     + '<#?#>'
     + '>');
-var renderComponent = (0, template_1.createTemplate)("class <#= it.className #>".concat(TYPE_PARAMS_WITH_DEFAULTS, " extends BaseComponent<React.PropsWithChildren<<#= it.optionsName #>").concat(TYPE_PARAMS, ">> {\n\n  public get instance(): <#= it.widgetName #>").concat(TYPE_PARAMS, " {\n    return this._instance;\n  }\n\n  protected _WidgetClass = <#= it.widgetName #>;\n")
-    + "<#? it.useRequestAnimationFrameFlag #>".concat(template_1.L1, "protected useRequestAnimationFrameFlag = true;\n")
+var renderComponent = (0, template_1.createTemplate)("interface <#= it.refName #>".concat(TYPE_PARAMS_WITH_DEFAULTS, " {\n  instance: () => <#= it.widgetName #>").concat(TYPE_PARAMS, ";\n}\n\nconst <#? it.isExtension #>_component<#= it.componentName #><#??#><#= it.componentName #><#?#> = memo(\n  forwardRef(\n    ").concat(TYPE_PARAMS_WITH_DEFAULTS, "(props: React.PropsWithChildren<<#= it.optionsName #>").concat(TYPE_PARAMS, ">, ref: ForwardedRef<<#= it.refName #>").concat(TYPE_PARAMS, ">) => {\n      const baseRef = useRef<ComponentRef>(null);\n\n      useImperativeHandle(ref, () => (\n        {\n          instance() {\n            return baseRef.current?.getInstance();\n          }\n        }\n      ), [baseRef.current]);\n")
+    + "<#? it.subscribableOptions #>".concat(template_1.L3, "const subscribableOptions = useMemo(() => ([<#= it.subscribableOptions.join(',') #>]), []);")
     + '<#?#>'
-    + "<#? it.isPortalComponent #>".concat(template_1.L1, "protected isPortalComponent = true;\n")
+    + "<#? it.independentEvents #>".concat(template_1.L3, "const independentEvents = useMemo(() => ([<#= it.independentEvents.join(',') #>]), []);\n")
     + '<#?#>'
-    + "<#? it.subscribableOptions #>".concat(template_1.L1, "protected subscribableOptions = [<#= it.subscribableOptions.join(',') #>];\n")
+    + "<#? it.renderedDefaultProps #>".concat(template_1.L3, "const defaults = useMemo(() => ({")
+    + '<#~ it.renderedDefaultProps : defaultProp #>'
+    + '<#= defaultProp #>,'
+    + "<#~#>".concat(template_1.L3, "}), []);\n")
     + '<#?#>'
-    + "<#? it.independentEvents #>".concat(template_1.L1, "protected independentEvents = [<#= it.independentEvents.join(',') #>];\n")
+    + "<#? it.expectedChildren #>".concat(template_1.L3, "const expectedChildren = useMemo(() => ({")
+    + "<#~ it.expectedChildren : child #>".concat(template_1.L4, "<#= child.componentName #>:")
+    + ' { optionName: "<#= child.optionName #>", isCollectionItem: <#= !!child.isCollectionItem #> },'
+    + "<#~#>\b".concat(template_1.L3, "}), []);\n")
     + '<#?#>'
-    + "<#? it.renderedDefaultProps #>".concat(template_1.L1, "protected _defaults = {<#= it.renderedDefaultProps.join(',') #>").concat(template_1.L1, "};\n")
+    + "<#? it.renderedTemplateProps #>".concat(template_1.L3, "const templateProps = useMemo(() => ([")
+    + "<#~ it.renderedTemplateProps : templateProp #>".concat(template_1.L4, "<#= templateProp #>,")
+    + "<#~#>".concat(template_1.L3, "]), []);\n")
     + '<#?#>'
-    + "<#? it.expectedChildren #>".concat(template_1.L1, "protected _expectedChildren = {")
-    + "<#~ it.expectedChildren : child #>".concat(template_1.L2, "<#= child.componentName #>:")
-    + ' { optionName: "<#= child.optionName #>", isCollectionItem: <#= !!child.isCollectionItem #> },'
-    + "<#~#>\b".concat(template_1.L1, "};\n")
+    + "".concat(template_1.L3, "return (\n        React.createElement(BaseComponent<React.PropsWithChildren<<#= it.optionsName #>").concat(TYPE_PARAMS, ">>, {\n          WidgetClass: <#= it.widgetName #>,\n          ref: baseRef,")
+    + "<#? it.useRequestAnimationFrameFlag #>".concat(template_1.L5, "useRequestAnimationFrameFlag: true,")
     + '<#?#>'
-    + "<#? it.renderedTemplateProps #>\n  protected _templateProps = [<#= it.renderedTemplateProps.join(', ') #>];\n<#?#>}\n"
-    + '<#? it.renderedPropTypings #>'
-    + '(<#= it.className #> as any).propTypes = {\n'
-    + '<#= it.renderedPropTypings.join(\',\\n\') #>\n'
-    + '};\n'
-    + '<#?#>');
+    + "<#? it.isPortalComponent #>".concat(template_1.L5, "isPortalComponent: true,")
+    + '<#?#>'
+    + "<#? it.subscribableOptions #>".concat(template_1.L5, "subscribableOptions,")
+    + '<#?#>'
+    + "<#? it.independentEvents #>".concat(template_1.L5, "independentEvents,")
+    + '<#?#>'
+    + "<#? it.renderedDefaultProps #>".concat(template_1.L5, "defaults,")
+    + '<#?#>'
+    + "<#? it.expectedChildren #>".concat(template_1.L5, "expectedChildren,")
+    + '<#?#>'
+    + "<#? it.renderedTemplateProps #>".concat(template_1.L5, "templateProps,")
+    + '<#?#>'
+    + "".concat(template_1.L5, "...props,")
+    + "".concat(template_1.L4, "})").concat(template_1.L3, ");").concat(template_1.L2, "},").concat(template_1.L1, "),").concat(template_1.L0, ") as ").concat(TYPE_PARAMS_WITH_DEFAULTS, "(props: React.PropsWithChildren<<#= it.optionsName #>").concat(TYPE_PARAMS, "> & { ref?: Ref<<#= it.refName #>").concat(TYPE_PARAMS, "> }) => ReactElement | null;\n")
+    + "<#? it.isExtension #>\nconst <#= it.componentName #>: typeof _component<#= it.componentName #> & { isExtensionComponent: boolean } = Object.assign(_component<#= it.componentName #>, {\n  isExtensionComponent: true,\n});\n<#?#>");
 function renderExports(exportsNames) {
     return exportsNames
         .map(function (exportName) { return getIndent(1) + exportName; })
@@ -226,40 +232,25 @@ function renderReExports(componentName, exportPath) {
 function formatTemplatePropName(name, suffix) {
     return (0, helpers_1.lowercaseFirst)(name.replace(/template$/i, suffix));
 }
-function createTemplateDto(templates) {
+function createTemplateDto(templates, indent) {
     return templates
         ? templates.map(function (actualOptionName) { return ({
             actualOptionName: actualOptionName,
             render: formatTemplatePropName(actualOptionName, 'Render'),
             component: formatTemplatePropName(actualOptionName, 'Component'),
-            keyFn: formatTemplatePropName(actualOptionName, 'KeyFn'),
+            additionalIndent: indent,
         }); })
         : undefined;
 }
-function buildPropsTypeName(className) {
-    return "I".concat(className, "Props");
-}
-function acceptableTypes(acceptableType, acceptableValues) {
-    var indent = acceptableType ? template_1.L3 : template_1.L2;
-    var acceptableTemplate = "PropTypes.oneOf([".concat(indent).concat(acceptableValues.join(",".concat(indent)), "])");
-    return acceptableType ? "PropTypes.oneOfType([\n    PropTypes.".concat(acceptableType, ",\n    ").concat(acceptableTemplate, "\n  ])") : acceptableTemplate;
-}
-function createPropTypingModel(typing) {
-    var types = typing.types.map(function (t) { return "PropTypes.".concat(t); });
-    if (typing.acceptableValues && (0, helpers_1.isNotEmptyArray)(typing.acceptableValues)) {
-        types.push(acceptableTypes(typing.acceptableType, typing.acceptableValues));
-    }
-    return {
-        propName: typing.propName,
-        renderedTypes: types,
-    };
+function buildPropsTypeName(componentName) {
+    return "I".concat(componentName, "Props");
 }
 function generate(component, generateReexports, customTypeImports, defaultTypeImports, wildcardTypeImports) {
     var _a, _b, _c, _d, _e, _f;
     if (generateReexports === void 0) { generateReexports = false; }
     var nestedComponents = component.nestedComponents
         ? component.nestedComponents
-            .sort((0, helpers_1.createKeyComparator)(function (o) { return o.className; }))
+            .sort((0, helpers_1.createKeyComparator)(function (o) { return o.componentName; }))
             .map(function (c) {
             var options = __spreadArray([], c.options, true);
             var nestedSubscribableOptions = options.filter(function (o) { return o.isSubscribable; });
@@ -274,9 +265,10 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
                 renderedSubscribableOptions = nestedSubscribableOptions.map(function (o) { return renderObjectEntry({
                     key: "default".concat((0, helpers_1.uppercaseFirst)(o.name)),
                     value: o.name,
+                    indent: template_1.TAB2,
                 }); });
             }
-            var nestedTemplates = createTemplateDto(c.templates);
+            var nestedTemplates = createTemplateDto(c.templates, '');
             if (nestedTemplates) {
                 nestedTemplates.forEach(function (t) {
                     options.push({
@@ -285,9 +277,6 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
                     }, {
                         name: t.component,
                         type: TYPE_COMPONENT,
-                    }, {
-                        name: t.keyFn,
-                        type: TYPE_KEY_FN,
                     });
                 });
             }
@@ -303,8 +292,8 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
                 }
             }
             return {
-                className: c.className,
-                propsType: buildPropsTypeName(c.className),
+                componentName: c.componentName,
+                propsType: buildPropsTypeName(c.componentName),
                 optionName: c.optionName,
                 ownerName: c.owners,
                 renderedType: renderObject(options, 0),
@@ -318,17 +307,19 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
         })
         : undefined;
     var optionsName = "I".concat(component.name, "Options");
+    var refName = "".concat(component.name, "Ref");
     var exportNames = [
         component.name,
         optionsName,
+        refName,
     ];
     if (component.nestedComponents && (0, helpers_1.isNotEmptyArray)(component.nestedComponents)) {
         component.nestedComponents.forEach(function (c) {
-            exportNames.push(c.className);
-            exportNames.push(buildPropsTypeName(c.className));
+            exportNames.push(c.componentName);
+            exportNames.push(buildPropsTypeName(c.componentName));
         });
     }
-    var templates = createTemplateDto(component.templates);
+    var templates = createTemplateDto(component.templates, template_1.TAB3);
     var firstLevelSubscribableOptions = (_a = component.subscribableOptions) === null || _a === void 0 ? void 0 : _a.filter(function (_a) {
         var name = _a.name;
         return !name.includes('.');
@@ -348,11 +339,6 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
         }); })
         : undefined;
     var widgetName = "dx".concat((0, helpers_1.uppercaseFirst)(component.name));
-    var renderedPropTypings = component.propTypings
-        ? component.propTypings
-            .sort((0, helpers_1.createKeyComparator)(function (p) { return p.propName; }))
-            .map(function (t) { return renderPropTyping(createPropTypingModel(t)); })
-        : undefined;
     var hasExplicitTypes = !!((_b = component.optionsTypeParams) === null || _b === void 0 ? void 0 : _b.length);
     var typeParams = ((_c = component.optionsTypeParams) === null || _c === void 0 ? void 0 : _c.length) ? component.optionsTypeParams : undefined;
     return renderModule({
@@ -364,7 +350,6 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
                 : component.baseComponentPath,
             baseComponentName: component.isExtension ? 'ExtensionComponent' : 'Component',
             widgetName: widgetName,
-            hasPropTypings: (0, helpers_1.isNotEmptyArray)(renderedPropTypings),
             hasExplicitTypes: hasExplicitTypes,
             configComponentPath: (0, helpers_1.isNotEmptyArray)(nestedComponents)
                 ? component.configComponentPath
@@ -383,8 +368,9 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
                 ? renderNarrowedEvents(component.narrowedEvents, typeParams) : undefined,
         }),
         renderedComponent: renderComponent({
-            className: component.name,
+            componentName: component.name,
             widgetName: widgetName,
+            refName: refName,
             optionsName: optionsName,
             subscribableOptions: (_d = component.subscribableOptions) === null || _d === void 0 ? void 0 : _d.map(function (o) { return renderStringEntry(o.name); }),
             independentEvents: (_e = component.independentEvents) === null || _e === void 0 ? void 0 : _e.map(function (f) { return renderStringEntry(f.name); }),
@@ -392,12 +378,13 @@ function generate(component, generateReexports, customTypeImports, defaultTypeIm
             renderedDefaultProps: defaultProps && defaultProps.map(function (o) { return renderObjectEntry({
                 key: o.name,
                 value: o.actualOptionName,
+                indent: template_1.TAB4,
             }); }),
-            renderedPropTypings: renderedPropTypings,
             expectedChildren: component.expectedChildren,
             useRequestAnimationFrameFlag: USE_REQUEST_ANIMATION_FRAME.has(widgetName),
             isPortalComponent: PORTAL_COMPONENTS.has(widgetName),
             typeParams: ((_f = component.optionsTypeParams) === null || _f === void 0 ? void 0 : _f.length) ? component.optionsTypeParams : undefined,
+            isExtension: component.isExtension,
         }),
         renderedNestedComponents: nestedComponents && nestedComponents.map(renderNestedComponent),
         defaultExport: component.name,