devextreme-internal-tools 16.0.0-beta.9 → 16.0.0

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

@@ -20,128 +20,21 @@ 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.generate = exports.mapWidget = exports.collectSubscribableRecursively = exports.collectIndependentEvents = exports.extractNestedComponents = exports.mapOption = exports.mapConfigComponentOption = exports.mapRootComponentOption = exports.isNestedOptionArray = exports.mapIndependentEvents = exports.mapSubscribableOption = exports.getComplexOptionType = exports.createCustomTypeResolver = exports.convertToBaseType = void 0;
+exports.generate = exports.mapWidget = exports.collectSubscribableRecursively = exports.collectIndependentEvents = exports.extractNestedComponents = exports.mapOption = exports.mapConfigComponentOption = exports.mapRootComponentOption = exports.mapIndependentEvents = exports.mapSubscribableOption = void 0;
 var fs_1 = require("fs");
 var path_1 = require("path");
-var defaultImportOverridesMetadata = require("./import-overrides.json");
-var index_generator_1 = require("./index-generator");
+var defaultImportOverridesMetadata = require("../components-generation/import-overrides.json");
+var index_generator_1 = require("../components-generation/index-generator");
 var component_generator_1 = require("./component-generator");
-var helpers_1 = require("./helpers");
+var helpers_1 = require("../components-generation/helpers");
 var common_reexports_generator_1 = require("../components-generation/common-reexports-generator");
-var BaseTypes;
-(function (BaseTypes) {
-    BaseTypes["Any"] = "any";
-    BaseTypes["String"] = "string";
-    BaseTypes["Date"] = "Date";
-    BaseTypes["Number"] = "number";
-    BaseTypes["Boolean"] = "boolean";
-    BaseTypes["Object"] = "Record<string, any>";
-    BaseTypes["RegExp"] = "RegExp";
-    BaseTypes["Null"] = "null";
-    BaseTypes["True"] = "true";
-    BaseTypes["False"] = "false";
-    BaseTypes["void"] = "void";
-})(BaseTypes || (BaseTypes = {}));
+var type_resolving_1 = require("../components-generation/type-resolving");
+var file_helpers_1 = require("../components-generation/file-helpers");
 var UNKNOWN_MODULE = 'UNKNOWN_MODULE';
-var LOCAL_MODULE = 'LOCAL_MODULE';
-function isFunctionDescriptor(typeDescriptor) {
-    return typeDescriptor.type === 'Function';
-}
-function isArrayDescriptor(typeDescriptor) {
-    return typeDescriptor.type === 'Array';
-}
-function isObjectDescriptor(typeDescriptor) {
-    return typeDescriptor.type === 'Object' && typeDescriptor.fields !== undefined;
-}
-function convertToBaseType(type) {
-    return BaseTypes[type];
-}
-exports.convertToBaseType = convertToBaseType;
-function createCustomTypeResolver(customTypeHash, importOverridesMetadata, resolveNameConflicts) {
-    if (resolveNameConflicts === void 0) { resolveNameConflicts = function (typeName) { return typeName; }; }
-    var customTypeModulesCollector = {};
-    return [function (typeDescriptor) {
-            var _a, _b, _c;
-            var resolvedType = ((_a = importOverridesMetadata.typeResolutions) === null || _a === void 0 ? void 0 : _a[typeDescriptor.type])
-                || typeDescriptor.type;
-            var customType = customTypeHash[resolvedType];
-            var moduleImport = typeDescriptor.type === resolvedType && typeDescriptor.isImportedType
-                ? typeDescriptor.importPath
-                : customType && customType.module;
-            var fullModuleImport = moduleImport ? "devextreme/".concat(moduleImport) : UNKNOWN_MODULE;
-            customTypeModulesCollector[resolvedType] = __spreadArray(__spreadArray([], (customTypeModulesCollector[resolvedType] || []), true), [
-                fullModuleImport,
-            ], false);
-            var resultingType = ((_b = importOverridesMetadata.nameConflictsResolutionNamespaces) === null || _b === void 0 ? void 0 : _b[resolvedType])
-                ? "".concat(importOverridesMetadata.nameConflictsResolutionNamespaces[resolvedType], ".").concat(resolvedType)
-                : resolveNameConflicts(resolvedType, fullModuleImport);
-            return ((_c = importOverridesMetadata.genericTypes) === null || _c === void 0 ? void 0 : _c[resultingType]) ? "".concat(resultingType, "<any>") : resultingType;
-        }, customTypeModulesCollector];
-}
-exports.createCustomTypeResolver = createCustomTypeResolver;
-function getComplexOptionType(types, resolveCustomType, _a) {
-    var trimTypeParams = _a.trimTypeParams;
-    function formatTypeDescriptor(typeDescriptor) {
-        function formatArrayDescriptor(arrayDescriptor) {
-            var _a;
-            var filteredDescriptors = (_a = arrayDescriptor.itemTypes) === null || _a === void 0 ? void 0 : _a.map(function (t) { return formatTypeDescriptor(t); }).filter(function (t) { return t !== undefined; });
-            var itemTypes = filteredDescriptors && filteredDescriptors.length
-                ? Array.from(new Set(filteredDescriptors)).join(' | ')
-                : BaseTypes.Any;
-            return "Array<".concat(itemTypes, ">");
-        }
-        function formatFunctionDescriptor(functionDescriptor) {
-            var _a;
-            var parameters = ((_a = functionDescriptor.params) === null || _a === void 0 ? void 0 : _a.map(function (p) {
-                var parameterType = getComplexOptionType(p.types, resolveCustomType, { trimTypeParams: trimTypeParams })
-                    || BaseTypes.Any;
-                return "".concat(p.name, ": ").concat(parameterType === BaseTypes.Object ? BaseTypes.Any : parameterType);
-            }).join(', ')) || '';
-            var returnType = functionDescriptor.returnValueTypes
-                ? functionDescriptor.returnValueTypes.map(function (t) { return formatTypeDescriptor(t); }).join(' | ')
-                : BaseTypes.Any;
-            return "(".concat(parameters, ") => ").concat(returnType);
-        }
-        function formatObjectDescriptor(objectDescriptor) {
-            var fields = objectDescriptor.fields.map(function (f) { return "".concat(f.name, ": ").concat(getComplexOptionType(f.types, resolveCustomType, { trimTypeParams: trimTypeParams }) || BaseTypes.Any); });
-            return fields ? "{ ".concat(fields.join(', '), " }") : BaseTypes.Object;
-        }
-        if (isArrayDescriptor(typeDescriptor)) {
-            return formatArrayDescriptor(typeDescriptor);
-        }
-        if (isFunctionDescriptor(typeDescriptor)) {
-            var result = formatFunctionDescriptor(typeDescriptor);
-            return "(".concat(result, ")");
-        }
-        if (isObjectDescriptor(typeDescriptor)) {
-            return formatObjectDescriptor(typeDescriptor);
-        }
-        if (typeDescriptor.acceptableValues !== undefined
-            && typeDescriptor.acceptableValues.length > 0) {
-            return Array.from(new Set(typeDescriptor.acceptableValues)).join(' | ');
-        }
-        if ((typeDescriptor.isCustomType || typeDescriptor.isImportedType) && resolveCustomType) {
-            var resolvedType = resolveCustomType(typeDescriptor);
-            if (typeDescriptor.typeParams && !trimTypeParams) {
-                var typeArguments = typeDescriptor.typeParams.length
-                    ? "<".concat(typeDescriptor.typeParams.join(', '), ">")
-                    : '';
-                return "".concat(resolvedType).concat(typeArguments);
-            }
-            return resolvedType;
-        }
-        return convertToBaseType(typeDescriptor.type);
-    }
-    return types && (0, helpers_1.isNotEmptyArray)(types) ? Array.from(new Set(types))
-        .map(function (t) { return formatTypeDescriptor(t); })
-        .filter(function (t) { return t !== undefined; })
-        .join(' | ') : undefined;
-}
-exports.getComplexOptionType = getComplexOptionType;
 function mapSubscribableOption(prop, typeResolver) {
     return {
         name: prop.name,
-        type: getComplexOptionType(prop.types, typeResolver, { trimTypeParams: false }) || BaseTypes.Any,
+        type: (0, type_resolving_1.getComplexOptionType)(prop.types, typeResolver, { trimTypeParams: false }) || type_resolving_1.BaseTypes.Any,
         isSubscribable: prop.isSubscribable || undefined,
     };
 }
@@ -152,10 +45,6 @@ function mapIndependentEvents(prop) {
     };
 }
 exports.mapIndependentEvents = mapIndependentEvents;
-function isNestedOptionArray(prop) {
-    return (0, helpers_1.isNotEmptyArray)(prop.types) && (prop.types[0].type === 'Array');
-}
-exports.isNestedOptionArray = isNestedOptionArray;
 function mapRootComponentOption(prop, typeResolver) {
     return mapOption(prop, false, typeResolver);
 }
@@ -168,15 +57,15 @@ function mapOption(prop, trimTypeParams, typeResolver) {
     return (0, helpers_1.isEmptyArray)(prop.props)
         ? {
             name: prop.name,
-            type: getComplexOptionType(prop.types, typeResolver, { trimTypeParams: trimTypeParams }) || BaseTypes.Any,
+            type: (0, type_resolving_1.getComplexOptionType)(prop.types, typeResolver, { trimTypeParams: trimTypeParams }) || type_resolving_1.BaseTypes.Any,
             isSubscribable: prop.isSubscribable || undefined,
         } : {
         name: prop.name,
         isSubscribable: prop.isSubscribable || undefined,
-        type: getComplexOptionType(prop.types, typeResolver, { trimTypeParams: trimTypeParams }),
+        type: (0, type_resolving_1.getComplexOptionType)(prop.types, typeResolver, { trimTypeParams: trimTypeParams }),
         nested: prop.props
             .map(function (p) { return mapOption(p, trimTypeParams, typeResolver); }),
-        isArray: isNestedOptionArray(prop),
+        isArray: (0, type_resolving_1.isNestedOptionArray)(prop),
     };
 }
 exports.mapOption = mapOption;
@@ -233,49 +122,18 @@ function mapWidget(raw, baseComponent, extensionComponent, configComponent, cust
     var _b, _c;
     var name = (0, helpers_1.removePrefix)(raw.name, 'dx');
     var _d = typeGenerationOptions || {}, importOverridesMetadata = _d.importOverridesMetadata, generateCustomTypes = _d.generateCustomTypes;
-    var existingTypes = Object.values(getWidgetComponentNames(raw.name, name, raw.complexOptions || [])).reduce(function (result, current) {
-        result[current] = [LOCAL_MODULE];
-        return result;
-    }, {});
-    var typeAliases = {};
-    var resolveGeneratedComponentNamesConflict = function (typeName, module) {
-        var _a;
-        if (module === void 0) { module = UNKNOWN_MODULE; }
-        var existingTypeEntry = existingTypes[typeName] || [];
-        var isModuleProcessed = existingTypeEntry.includes(module);
-        var isConflicted = existingTypeEntry.length && (existingTypeEntry[0] === LOCAL_MODULE || !isModuleProcessed);
-        if (!isModuleProcessed) {
-            existingTypeEntry.push(module);
-            existingTypes[typeName] = existingTypeEntry;
-        }
-        if (isConflicted) {
-            var typePrefix = module === UNKNOWN_MODULE || !module.length
-                ? 'Aliased'
-                : module
-                    .substring(module.lastIndexOf('/') + 1)
-                    .split(/[-_]+/)
-                    .map(function (s) { return (s.charAt(0).toUpperCase() + s.slice(1)); })
-                    .join('');
-            var aliasedTypeName = "".concat(typePrefix).concat(typeName);
-            var moduleKey = module && module.length ? module : UNKNOWN_MODULE;
-            typeAliases[typeName] = __assign(__assign({}, (typeAliases[typeName] || {})), (_a = {}, _a[moduleKey] = aliasedTypeName, _a));
-            return aliasedTypeName;
-        }
-        return typeName;
-    };
+    var nameClassMap = getWidgetComponentNames(raw.name, name, raw.complexOptions || []);
+    var _e = (0, type_resolving_1.createComponentNamesConflictResolver)(nameClassMap), resolveGeneratedComponentNamesConflict = _e[0], typeAliases = _e[1];
     var getTypeImportStatement = function (typeName, module) {
         var _a;
         if (module === void 0) { module = UNKNOWN_MODULE; }
         return (((_a = typeAliases[typeName]) === null || _a === void 0 ? void 0 : _a[module]) ? "".concat(typeName, " as ").concat(typeAliases[typeName][module]) : typeName);
     };
-    var customTypeHash = customTypes.reduce(function (result, type) {
-        result[type.name] = type;
-        return result;
-    }, {});
+    var customTypeHash = (0, type_resolving_1.createCustomTypeHash)(customTypes);
     var customTypeModules = {};
     var typeResolver;
     if (generateCustomTypes) {
-        _a = createCustomTypeResolver(customTypeHash, importOverridesMetadata || {}, resolveGeneratedComponentNamesConflict), typeResolver = _a[0], customTypeModules = _a[1];
+        _a = (0, type_resolving_1.createCustomTypeResolver)(customTypeHash, importOverridesMetadata || {}, resolveGeneratedComponentNamesConflict), typeResolver = _a[0], customTypeModules = _a[1];
     }
     var subscribableOptions = collectSubscribableRecursively(raw.options)
         .map(function (option) { return mapSubscribableOption(option, typeResolver); });
@@ -341,7 +199,7 @@ function mapWidget(raw, baseComponent, extensionComponent, configComponent, cust
 }
 exports.mapWidget = mapWidget;
 function generate(_a) {
-    var rawData = _a.metaData, _b = _a.components, baseComponent = _b.baseComponent, extensionComponent = _b.extensionComponent, configComponent = _b.configComponent, out = _a.out, widgetsPackage = _a.widgetsPackage, _c = _a.typeGenerationOptions, typeGenerationOptions = _c === void 0 ? {} : _c;
+    var rawData = _a.metaData, _b = _a.components, baseComponent = _b.baseComponent, extensionComponent = _b.extensionComponent, configComponent = _b.configComponent, out = _a.out, widgetsPackage = _a.widgetsPackage, _c = _a.typeGenerationOptions, typeGenerationOptions = _c === void 0 ? {} : _c, _d = _a.templatingOptions, templatingOptions = _d === void 0 ? { quotes: 'double', excplicitIndexInImports: false } : _d;
     var modulePaths = [];
     var generateReexports = typeGenerationOptions.generateReexports, generateCustomTypes = typeGenerationOptions.generateCustomTypes, importOverridesMetadata = typeGenerationOptions.importOverridesMetadata;
     rawData.widgets.forEach(function (data) {
@@ -357,12 +215,18 @@ function generate(_a) {
             path: "./".concat((0, helpers_1.removeExtension)((0, path_1.relative)(indexFileDir, widgetFilePath)).replace(path_1.sep, '/')),
         });
     });
-    (0, fs_1.writeFileSync)(out.indexFileName, (0, index_generator_1.default)(modulePaths), { encoding: 'utf8' });
+    (0, fs_1.writeFileSync)(out.indexFileName, (0, index_generator_1.default)(__spreadArray([
+        {
+            names: ['Template'],
+            path: './core/template',
+        }
+    ], modulePaths, true), templatingOptions), { encoding: 'utf8' });
     if (generateReexports && rawData.commonReexports) {
         (0, common_reexports_generator_1.generateCommonReexports)({
-            componentsDir: out.componentsDir,
-            widgetsPackage: widgetsPackage,
             commonReexports: rawData.commonReexports,
+            widgetsPackage: widgetsPackage,
+            templatingOptions: templatingOptions,
+            writeFile: (0, file_helpers_1.createSimpleFileWriter)({ outputDir: out.componentsDir }),
         });
     }
 }

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

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

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

@@ -1,3 +1,4 @@
+import { IImportedTypes } from './converter';
 interface IImport {
     name: string;
     path: string;
@@ -13,6 +14,7 @@ interface IComponent {
     prepareComponentConfigFn: IImport;
     prepareConfigurationComponentConfigFn: IImport;
     props?: IProp[];
+    importedTypes: IImportedTypes;
     hasModel?: boolean;
     hasExplicitTypes?: boolean;
     nestedComponents?: INestedComponent[];
@@ -29,7 +31,10 @@ interface INestedComponent {
 }
 interface IProp {
     name: string;
-    types?: string[];
+    types?: {
+        js: string[];
+        ts: string[];
+    };
     acceptableValues?: string[];
     acceptableValueType?: string;
     isArray?: boolean;

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

@@ -32,13 +32,15 @@ function generate(component, widgetsPackage, vueVersion, renderReexports) {
     }
     var componentModel = __assign(__assign({}, component), { widgetImport: component.widgetComponent, component: component.name, renderedProps: component.props
             ? renderProps(component.props)
-            : undefined, nestedComponents: nestedComponents, defaultExport: component.name, namedExports: namedExports, expectedChildren: formatExpectedChildren(component.expectedChildren), widgetsPackage: widgetsPackage, templatesRenderAsynchronously: !exports.USE_SYNC_TEMPLATES.has(component.name), isVue3: vueVersion === 3, renderReexports: renderReexports && component.containsReexports });
+            : undefined, renderedImportedTypes: getImportedTypesRender(component.importedTypes, widgetsPackage), nestedComponents: nestedComponents, defaultExport: component.name, namedExports: namedExports, expectedChildren: formatExpectedChildren(component.expectedChildren), widgetsPackage: widgetsPackage, templatesRenderAsynchronously: !exports.USE_SYNC_TEMPLATES.has(component.name), isVue3: vueVersion === 3, renderReexports: renderReexports && component.containsReexports });
     return renderComponent(componentModel);
 }
 function createNestedComponentModel(component) {
     var predefinedProps;
     if (component.predefinedProps) {
-        predefinedProps = Object.keys(component.predefinedProps).map(function (name) { return ({
+        predefinedProps = Object
+            .keys(component.predefinedProps)
+            .map(function (name) { return ({
             name: name,
             value: component.predefinedProps && component.predefinedProps[name],
         }); });
@@ -68,9 +70,11 @@ function formatExpectedChildren(dict) {
 var renderComponent = (0, template_1.createTemplate)("".concat('<#? it.hasExplicitTypes #>'
     + 'export { ExplicitTypes } from "<#= it.widgetsPackage #>/<#= it.widgetImport.path #>";\n'
     + '<#?#>'
-    + 'import <#= it.widgetImport.name #><#? it.props #>, { Properties }<#?#> from "<#= it.widgetsPackage #>/<#= it.widgetImport.path #>";\n'
+    + 'import { PropType } from "vue";\n'
     + 'import { <#= it.createComponentFn.name #> } from "<#= it.createComponentFn.path #>";\n'
     + 'import { <#= it.prepareComponentConfigFn.name #> } from "<#= it.prepareComponentConfigFn.path #>";\n'
+    + 'import <#= it.widgetImport.name #><#? it.props #>, { Properties }<#?#> from "<#= it.widgetsPackage #>/<#= it.widgetImport.path #>";\n'
+    + '<#= it.renderedImportedTypes #>'
     + '<#? it.nestedComponents #>'
     + 'import { <#= it.prepareConfigurationComponentConfigFn.name #> } from "<#= it.prepareConfigurationComponentConfigFn.path #>";\n'
     + '<#?#>'
@@ -147,21 +151,65 @@ function compareProps(a, b) {
 function getPropsList(props) {
     return props.map(function (item) { return item.name; });
 }
+var renderImportedTypes = (0, template_1.createTemplate)('<#~ [...it.importedTypes.keys()]: importPath #>'
+    + 'import <#? !it.isDefault #>{\n<#?#>'
+    + '<#~ [it.importedTypes.get(importPath)]: importTypes #>'
+    + '<#~ Object.keys(importTypes): typeName #>'
+    + ' <#= typeName #>'
+    + '<#? importTypes[typeName].prefix #>'
+    + ' as <#= importTypes[typeName].prefix #><#= typeName #>'
+    + '<#?#>'
+    + '<#? !it.isDefault #>'
+    + ',\n<#~#>'
+    + '<#?#>'
+    + '<#~#>'
+    + '<#? !it.isDefault #>}<#?#> from "<#= importPath #>";\n'
+    + '<#~#>');
+function getImportedTypesRender(importedTypes, widgetsPackage) {
+    return [
+        importedTypes.defaults,
+        importedTypes.named,
+        importedTypes.wildcards,
+    ].map(function (imports) {
+        if (imports.size) {
+            return renderImportedTypes({
+                importedTypes: imports,
+                widgetsPackage: widgetsPackage,
+                isDefault: imports !== importedTypes.named,
+            });
+        }
+        return '';
+    }).join('');
+}
 function renderProps(props) {
     return renderPropsTemplate(props.sort(compareProps));
 }
 exports.renderProps = renderProps;
-var renderPropsTemplate = (0, template_1.createTemplate)("<#~ it :prop #>".concat(template_1.TAB2, "<#? prop.types && prop.types.length > 0 && !prop.acceptableValues #>")
-    + '<#= prop.name #>: '
-    + '<#? prop.types.length > 1 #>' + '[' + '<#?#>'
-    + '<#= prop.types.join(\', \') #>'
-    + '<#? prop.types.length > 1 #>' + ']' + '<#?#>'
+var propTypeTemplate = ''
+    + '<#~ [prop.types]: types #>'
+    + '<#? types?.js #>'
+    + '<#? types.js.length > 1 #>[<#?#>'
+    + '<#= types.js.join(", ") #>'
+    + '<#? types.js.length > 1 #>]<#?#>'
+    + '<#? types.ts?.length > 0 #>'
+    + ' as PropType<'
+    + '<#~ types.ts: tsType: index #>'
+    + '<#? index > 0 #> | <#?#>'
+    + '<#? types.ts.length === 1 || !(tsType.includes("=>") || tsType.includes("|")) #>'
+    + '<#= tsType #>'
+    + '<#??#>'
+    + '(<#= tsType #>)'
+    + '<#?#>'
+    + '<#~#>'
+    + '>'
+    + '<#?#>'
+    + '<#?#>'
+    + '<#~#>';
+var renderPropsTemplate = (0, template_1.createTemplate)("<#~ it :prop #>".concat(template_1.TAB2, "<#? prop.types?.js?.length > 0 && !prop.acceptableValues #>")
+    + "<#= prop.name #>: ".concat(propTypeTemplate)
     + '<#??#>'
     + '<#= prop.name #>: {'
-    + "<#? prop.types #>".concat(template_1.L3, "type: ")
-    + '<#? prop.types.length > 1 #>' + '[' + '<#?#>'
-    + '<#= prop.types.join(\', \') #>'
-    + '<#? prop.types.length > 1 #>' + ']' + '<#?#>'
+    + "<#? prop.types?.js #>".concat(template_1.L3, "type: ").concat(propTypeTemplate)
     + '<#?#>'
     + '<#? prop.acceptableValues #>'
     + ",".concat(template_1.L3, "validator: (v) => ")

package/ts/vue-components-generator/component-generator.js.map

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

package/ts/vue-components-generator/converter.d.ts

@@ -1,3 +1,21 @@
 import { ICustomType, ITypeDescr } from '../../integration-data-model';
-declare function convertTypes(types: ITypeDescr[] | undefined | null, customTypes?: Record<string, ICustomType>): string[] | undefined;
+import { TypeResolver } from '../components-generation/type-resolving';
+export type IImportedType = Record<string, {
+    prefix: string;
+}>;
+export type IImportedTypesCollection = Map<string, IImportedType>;
+export type IImportedTypes = {
+    named: IImportedTypesCollection;
+    defaults: IImportedTypesCollection;
+    wildcards: IImportedTypesCollection;
+};
+export interface TypeConverterOptions {
+    customTypeHash: Record<string, ICustomType>;
+    typeResolver: TypeResolver;
+}
+export declare function getTypeNameResolver(importedTypes: IImportedTypes): (typeName: string, typeImportPath: string) => string;
+declare function convertTypes(types: ITypeDescr[] | undefined | null, { customTypeHash, typeResolver }: TypeConverterOptions): {
+    js: string[];
+    ts: string[] | undefined;
+} | undefined;
 export { convertTypes };

package/ts/vue-components-generator/converter.js

@@ -1,33 +1,91 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTypes = void 0;
-function convertTypes(types, customTypes) {
+exports.convertTypes = exports.getTypeNameResolver = void 0;
+var importOverridesMetadata = require("../components-generation/import-overrides.json");
+var type_resolving_1 = require("../components-generation/type-resolving");
+function hasAnotherTypeWithSameImportPath(type, importPath, importedTypes) {
+    return !!Array.from(importedTypes.named.entries())
+        .concat(Array.from(importedTypes.defaults.entries()))
+        .find(function (_a) {
+        var key = _a[0], types = _a[1];
+        return (Object.prototype.hasOwnProperty.call(types, type) && key !== importPath);
+    });
+}
+function getTypeNameResolver(importedTypes) {
+    return function (typeName, typeImportPath) {
+        var _a;
+        var defaultImportPath = importOverridesMetadata.defaultImports[typeName];
+        var importPath = defaultImportPath || typeImportPath;
+        if (importPath === type_resolving_1.UNKNOWN_MODULE) {
+            importPath = ((_a = importOverridesMetadata.importOverrides) === null || _a === void 0 ? void 0 : _a[typeName]) || type_resolving_1.UNKNOWN_MODULE;
+        }
+        if (importPath === type_resolving_1.UNKNOWN_MODULE) {
+            return 'Object';
+        }
+        var collection = defaultImportPath
+            ? importedTypes.defaults
+            : importedTypes.named;
+        var collectedImportPathData = collection.get(importPath);
+        if (!collectedImportPathData) {
+            collectedImportPathData = {};
+            collection.set(importPath, collectedImportPathData);
+        }
+        if (!collectedImportPathData[typeName]) {
+            var typePrefix = hasAnotherTypeWithSameImportPath(typeName, importPath, importedTypes)
+                ? (0, type_resolving_1.makeImportAliasPrefix)(importPath)
+                : '';
+            collectedImportPathData[typeName] = { prefix: typePrefix };
+        }
+        return collectedImportPathData[typeName].prefix + typeName;
+    };
+}
+exports.getTypeNameResolver = getTypeNameResolver;
+function convertTypes(types, _a) {
+    var customTypeHash = _a.customTypeHash, typeResolver = _a.typeResolver;
     if (types === undefined || types === null || types.length === 0) {
         return undefined;
     }
-    var actualTypes = customTypes
-        ? types.concat(expandTypes(types, customTypes))
+    var actualTypes = customTypeHash
+        ? types.concat(expandTypes(types, customTypeHash))
         : types;
-    var convertedTypes = new Set(actualTypes.map(convertType));
-    if (convertedTypes.has('Any')) {
+    var tsTypes = [];
+    var convertedTypes = actualTypes
+        .map(function (typeDescr) { return convertType(typeDescr); })
+        .filter(function (type) { return !['Undefined', 'Null'].includes(type); });
+    if (convertedTypes.includes('Any')) {
         return undefined;
     }
-    return Array.from(convertedTypes);
+    tsTypes = (0, type_resolving_1.getComplexOptionTypesAsArray)(actualTypes, typeResolver, { trimTypeParams: true, excludeTypes: ['undefined'] });
+    var isTsTypesSameAsJs = convertedTypes
+        .join('')
+        .toLowerCase() === tsTypes.join('').toLowerCase();
+    return {
+        js: Array.from(new Set(convertedTypes)),
+        ts: isTsTypesSameAsJs
+            ? undefined
+            : Array.from(new Set(tsTypes)),
+    };
 }
 exports.convertTypes = convertTypes;
 function expandTypes(types, customTypes) {
     var expandedTypes = [];
-    types.forEach(function (t) {
-        if (t.isCustomType) {
-            var aliases = customTypes[t.type].types;
-            if (aliases) {
-                expandedTypes.push.apply(expandedTypes, aliases);
+    if (customTypes) {
+        types.forEach(function (t) {
+            var _a;
+            if (t.isCustomType) {
+                var aliases = (_a = customTypes[t.type]) === null || _a === void 0 ? void 0 : _a.types;
+                if (aliases) {
+                    expandedTypes.push.apply(expandedTypes, aliases);
+                }
             }
-        }
-    });
+        });
+    }
     return expandedTypes;
 }
 function convertType(typeDescr) {
+    if (typeDescr.isCustomType || typeDescr.isImportedType) {
+        return typeDescr.acceptableValueType || 'Object';
+    }
     switch (typeDescr.type) {
         case 'String':
         case 'Date':
@@ -36,12 +94,11 @@ function convertType(typeDescr) {
         case 'Array':
         case 'Object':
         case 'Function':
+        case 'Null':
+        case 'Undefined':
         case 'RegExp':
             return typeDescr.type;
     }
-    if (typeDescr.isCustomType) {
-        return 'Object';
-    }
     return 'Any';
 }
 //# sourceMappingURL=converter.js.map

package/ts/vue-components-generator/converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../ts/vue-components-generator/converter.ts"],"names":[],"mappings":";;;AAEA,SAAS,YAAY,CACnB,KAAsC,EACtC,WAAyC;IAEzC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/D,OAAO,SAAS,CAAC;KAClB;IAED,IAAM,WAAW,GAAG,WAAW;QAC7B,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC,CAAC,KAAK,CAAC;IAEV,IAAM,cAAc,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC7B,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AACpC,CAAC;AAkCQ,oCAAY;AAhCrB,SAAS,WAAW,CAAC,KAAmB,EAAE,WAAwC;IAChF,IAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,CAAC,OAAO,CAAC,UAAC,CAAC;QACd,IAAI,CAAC,CAAC,YAAY,EAAE;YAClB,IAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;YAC1C,IAAI,OAAO,EAAE;gBACX,aAAa,CAAC,IAAI,OAAlB,aAAa,EAAS,OAAO,EAAE;aAChC;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,SAAS,WAAW,CAAC,SAAqB;IACxC,QAAQ,SAAS,CAAC,IAAI,EAAE;QACtB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC,IAAI,CAAC;KACzB;IAED,IAAI,SAAS,CAAC,YAAY,EAAE;QAC1B,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../ts/vue-components-generator/converter.ts"],"names":[],"mappings":"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"}

package/ts/vue-components-generator/generator.d.ts

@@ -1,9 +1,10 @@
 import { ICustomType, IModel, IWidget } from '../../integration-data-model';
 import { IImport, IComponent } from './component-generator';
+import { TemplatingOptions } from '../components-generation/template';
 declare function generate(rawData: IModel, { createComponentFn, prepareComponentConfigFn, prepareExtensionComponentConfigFn, prepareConfigurationComponentConfigFn, }: Record<string, IImport>, out: {
     componentsDir: string;
     indexFileName: string;
-}, widgetsPackage: string, vueVersion: number, generateReexports?: boolean): void;
+}, widgetsPackage: string, vueVersion: number, generateReexports?: boolean, templatingOptions?: TemplatingOptions): void;
 declare function mapWidget(raw: IWidget, createComponentFn: IImport, prepareComponentConfigFn: IImport, prepareConfigurationComponentConfigFn: IImport, customTypes: ICustomType[]): {
     fileName: string;
     component: IComponent;