@devexpress/analytics-core-cli 23.2.1-alpha-23254-1700 → 23.2.2-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devexpress/analytics-core-cli",
-  "version": "23.2.1-alpha-23254-1700",
+  "version": "23.2.2-beta",
   "homepage": "https://www.devexpress.com/",
   "bugs": "https://www.devexpress.com/support/",
   "author": "Developer Express Inc.",
@@ -16,7 +16,7 @@
     "inquirer": "^8.0.0"
   },
   "peerDependencies": {
-    "@devexpress/analytics-core": "23.2.1-alpha-23254-1700"
+    "@devexpress/analytics-core": "23.2.2-beta"
   },
   "peerDependenciesMeta": {
     "@devexpress/analytics-core": {

package/utils/_processBindings.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress Analytics CLI (utils\_processBindings.js)
-* Version:  23.2.1-alpha-23254-1700
-* Build date: Sep 11, 2023
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/utils/processBindings.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress Analytics CLI (utils\processBindings.js)
-* Version:  23.2.1-alpha-23254-1700
-* Build date: Sep 11, 2023
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/utils/theme-builder.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress Analytics CLI (utils\theme-builder.js)
-* Version:  23.2.1-alpha-23254-1700
-* Build date: Sep 11, 2023
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/utils/typeResolver.js

@@ -1,19 +1,18 @@
 /**
 * DevExpress Analytics CLI (utils\typeResolver.js)
-* Version:  23.2.1-alpha-23254-1700
-* Build date: Sep 11, 2023
+* Version:  23.2.2-beta
+* Build date: Nov 13, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
 const ts = require('typescript');
 const fs = require('fs');
 
-
-function resolveTypingsInFile(filePath) {
+function resolveTypingsInFile(filePath, typeReplacements) {
     const compilerOptions = {};
     const compilerHost = ts.createCompilerHost(compilerOptions);
     const program = ts.createProgram([filePath], compilerOptions, compilerHost);
-    
+
     const sourceFile = program.getSourceFile(filePath);
     const renameAllAddIdentifiersToRenamedAdd = (context) => (rootNode) => {
         const visit = (node) => {
@@ -22,6 +21,8 @@ function resolveTypingsInFile(filePath) {
                 const imports = {};
                 fillImports(node, imports);
                 newNode = replaceTypes(node, imports, context);
+                if(typeReplacements)
+                    newNode = processNodeRecoursive(newNode, typeReplacements, context);
             } else {
                 newNode = ts.visitEachChild(node, visit, context);
             }
@@ -40,6 +41,39 @@ function resolveTypingsInFile(filePath) {
     fs.writeFileSync(filePath, updatedCode, 'utf-8');
 }
 
+function processNodeRecoursive(node, typeReplacements, context) {
+    var typesToReplace = Object.keys(typeReplacements);
+    if(ts.isModuleDeclaration(node)) {
+        if(node.body && ts.isModuleBlock(node.body)) {
+            for(const statement of node.body.statements) {
+                const typeName = statement.name?.escapedText;
+                if(typeName && ts.isTypeAliasDeclaration(statement) && typesToReplace.indexOf(typeName) != -1) {
+                    const newTypeString = typeReplacements[typeName];
+                    const newTypeNode = ts.factory.createTypeReferenceNode(newTypeString, []);
+
+                    //in case of some artifacts or side effects use createTypeAliasDeclaration from newTypeNode instead of updateTypeAliasDeclaration
+                    const newPropStatement = ts.factory.updateTypeAliasDeclaration(
+                        statement,
+                        statement.decorators,
+                        statement.modifiers,
+                        statement.name,
+                        statement.typeParameters,
+                        newTypeNode
+                    );
+
+                    node.body = ts.factory.updateModuleBlock(node.body, [
+                        ...node.body.statements.filter((x) => x !== statement),
+                        newPropStatement,
+                    ]);
+                }
+            }
+        } else {
+            node.body = processNodeRecoursive(node.body, typeReplacements, context);
+        }
+    }
+    return node;
+}
+
 function fillImports(node, imports) {
     if(ts.isImportEqualsDeclaration(node)) {
         let name = node.name.escapedText;
@@ -81,5 +115,5 @@ function getFullTypeName(node) {
 }
 
 module.exports = {
-    resolveTypingsInFile: resolveTypingsInFile 
+    resolveTypingsInFile: resolveTypingsInFile
 }