adjust codemod to refactoring

Author: Lukas742

packages/base/package.json

@@ -47,15 +47,10 @@
       "types": "./dist/wrapper/withWebComponent.d.ts",
       "default": "./dist/wrapper/withWebComponent.js"
     },
-    "./utils": {
-      "types": "./dist/utils/index.d.ts",
-      "default": "./dist/utils/index.js"
-    },
     "./types": {
-      "types": "./dist/types/index.d.ts",
-      "default": "./dist/types/index.js"
+      "types": "./dist/types/index.d.ts"
     },
-    "./internal": "./dist/internal",
+    "./internal/*": "./dist/internal/*",
     "./internal/addCustomCSSWithScoping.js": "./dist/utils/addCustomCSSWithScoping.js"
   },
   "homepage": "https://ui5.github.io/webcomponents-react",

packages/cli/src/scripts/codemod/transforms/export-maps/main.cts

@@ -7,9 +7,42 @@ const basePackageName = '@ui5/webcomponents-react-base';
 const chartsPackageName = '@ui5/webcomponents-react-charts';
 const aiPackageName = '@ui5/webcomponents-ai-react';
 const compatPackageName = '@ui5/webcomponents-react-compat';
-
 const packageNames = [mainPackageName, basePackageName, chartsPackageName, aiPackageName, compatPackageName];
 
+function getFileNames(dir: string) {
+  let fileNames: string[] = [];
+  try {
+    fileNames = fs
+      .readdirSync(dir)
+      .filter(
+        (file) =>
+          (file.endsWith('.js') || file.endsWith('.ts')) && !file.endsWith('.d.ts') && !file.startsWith('index'),
+      )
+      .map((file) => path.basename(file, path.extname(file)));
+  } catch (e) {
+    console.warn(`⚠️ Could not read directory at ${dir}.`, e);
+  }
+
+  return fileNames;
+}
+
+function getExportNames(indexPath: string) {
+  let exportNames: string[] = [];
+  try {
+    const indexSource = fs.readFileSync(indexPath, 'utf-8');
+    const exportRegex = /export\s+(?:const|function|class|type|interface|{[^}]+})\s+([a-zA-Z0-9_]+)/g;
+    let match;
+    while ((match = exportRegex.exec(indexSource)) !== null) {
+      exportNames.push(match[1]);
+    }
+    exportNames = Array.from(new Set(exportNames)); // Remove duplicates
+  } catch (e) {
+    console.warn(`⚠️ Could not read index at ${indexPath}.`, e);
+  }
+
+  return exportNames;
+}
+
 // Enums for main package
 const libraryPath = require.resolve('@ui5/webcomponents-react/package.json');
 const enumsDir = path.join(path.dirname(libraryPath), 'dist', 'enums');
@@ -33,61 +66,46 @@ const hooksDir = path.join(
   'dist',
   'hooks',
 );
-let hookNames: string[] = [];
-try {
-  hookNames = fs
-    .readdirSync(hooksDir)
-    .filter(
-      (file) => (file.endsWith('.js') || file.endsWith('.ts')) && !file.endsWith('.d.ts') && !file.startsWith('index'),
-    )
-    .map((file) => path.basename(file, path.extname(file)));
-} catch (e) {
-  console.warn(`⚠️ Could not read hooks directory at ${hooksDir}.`, e);
-}
+const hookNames = getFileNames(hooksDir);
 
-const utilsDir = path.join(
+const internalHooksDir = path.join(
   path.dirname(require.resolve('@ui5/webcomponents-react-base/package.json')),
   'dist',
-  'utils',
+  'internal',
+  'hooks',
 );
-let utilNames: string[] = [];
-try {
-  utilNames = fs
-    .readdirSync(utilsDir)
-    .filter(
-      (file) => (file.endsWith('.js') || file.endsWith('.ts')) && !file.endsWith('.d.ts') && !file.startsWith('index'),
-    )
-    .map((file) => path.basename(file, path.extname(file)));
-} catch (e) {
-  console.warn(`⚠️ Could not read utils directory at ${utilsDir}.`, e);
-}
+const internalHookNames = getFileNames(internalHooksDir);
 
-const utilsIndexPath = path.join(utilsDir, 'index.js');
+const internalUtilsDir = path.join(
+  path.dirname(require.resolve('@ui5/webcomponents-react-base/package.json')),
+  'dist',
+  'internal',
+  'utils',
+);
+const internalUtilNames: string[] = getFileNames(internalUtilsDir);
+const utilsIndexPath = path.join(internalUtilsDir, 'index.js');
+internalUtilNames.push(...getExportNames(utilsIndexPath));
 
-try {
-  const indexSource = fs.readFileSync(utilsIndexPath, 'utf-8');
-  const exportRegex = /export\s+(?:const|function|class|type|interface|{[^}]+})\s+([a-zA-Z0-9_]+)/g;
-  let match;
-  while ((match = exportRegex.exec(indexSource)) !== null) {
-    utilNames.push(match[1]);
-  }
-  utilNames = Array.from(new Set(utilNames)); // Remove duplicates
-} catch (e) {
-  console.warn(`⚠️ Could not read utils index at ${utilsIndexPath}.`, e);
-}
+const internalTypeDir = path.join(
+  path.dirname(require.resolve('@ui5/webcomponents-react-base/package.json')),
+  'dist',
+  'internal',
+  'types',
+);
+const internalTypeNames: string[] = getFileNames(internalTypeDir);
+const internalTypesIndexPath = path.join(internalTypeDir, 'index.js');
+internalTypeNames.push(...getExportNames(internalTypesIndexPath));
 
 // Mapping functions
 function resolveBaseExport(importedName: string): string | undefined {
   const directMap: Record<string, string> = {
-    Device: `${basePackageName}/Device`,
-    hooks: `${basePackageName}/hooks`,
     VersionInfo: `${basePackageName}/VersionInfo`,
-    I18nStore: `${basePackageName}/I18nStore`,
-    StyleStore: `${basePackageName}/StyleStore`,
-    CssSizeVariables: `${basePackageName}/CssSizeVariables`,
+    I18nStore: `${basePackageName}/internal/stores/I18nStore.js`,
+    StyleStore: `${basePackageName}/internal/stores/StyleStore.js`,
+    CssSizeVariables: `${basePackageName}/internal/styling/CssSizeVariables.js`,
     ThemingParameters: `${basePackageName}/ThemingParameters`,
-    withWebComponent: `${basePackageName}/withWebComponent`,
-    utils: `${basePackageName}/utils`,
+    withWebComponent: `${basePackageName}/internal/wrapper/withWebComponent.js`,
+    utils: `${basePackageName}/internal/utils/index.js`,
     addCustomCSSWithScoping: `${basePackageName}/internal/addCustomCSSWithScoping.js`,
   };
 
@@ -97,12 +115,22 @@ function resolveBaseExport(importedName: string): string | undefined {
   if (hookNames.includes(importedName)) {
     return `${basePackageName}/hooks`;
   }
-  if (utilNames.includes(importedName)) {
-    return `${basePackageName}/utils`;
+  if (internalHookNames.includes(importedName)) {
+    return `${basePackageName}/internal/hooks/index.js`;
   }
-  if (importedName === 'default' || importedName === 'index') {
-    return basePackageName;
+  if (internalUtilNames.includes(importedName)) {
+    return `${basePackageName}/internal/utils/index.js`;
+  }
+  if (internalTypeNames.includes(importedName)) {
+    return `${basePackageName}/internal/types/index.js`;
   }
+  if (importedName === 'UI5WCSlotsNode') {
+    return `${basePackageName}/types`;
+  }
+  //todo: why is this required?
+  // if (importedName === 'default' || importedName === 'index') {
+  //   return basePackageName;
+  // }
   return undefined;
 }
 
@@ -161,7 +189,7 @@ export default function transform(file: FileInfo, api: API): string | undefined
               : enumNames.has(importedName)
                 ? `${mainPackageName}/enums/${importedName}`
                 : `${mainPackageName}/${importedName}`;
-        } else if (pkg === basePackageName) {
+        } else if (pkg === basePackageName && importedName !== 'Device' && importedName !== 'hooks') {
           newSource = resolveBaseExport(importedName) || basePackageName;
         } else if (pkg === chartsPackageName) {
           newSource = resolveChartsExport(componentName) || `${chartsPackageName}/${componentName}`;
@@ -178,6 +206,18 @@ export default function transform(file: FileInfo, api: API): string | undefined
           ],
           j.literal(newSource),
         );
+
+        // Namespace import deltas
+        if (pkg === basePackageName && ['Device', 'hooks'].includes(importedName)) {
+          const newImport = j.importDeclaration(
+            [j.importNamespaceSpecifier(j.identifier(spec.local?.name || importedName))],
+            j.literal(`${basePackageName}/${importedName}`),
+          );
+          j(importPath).insertBefore(newImport);
+          isDirty = true;
+          return;
+        }
+
         if ('importKind' in spec && spec.importKind === 'type') {
           newImport.importKind = 'type';
         }
@@ -188,6 +228,5 @@ export default function transform(file: FileInfo, api: API): string | undefined
     });
   });
 
-  //todo: 'use client' and other string expressions will receive two semicolons. This can be fixed by running prettier - is there a better option?
   return isDirty ? root.toSource() : undefined;
 }