@admin-layout/gluestack-ui-mobile 12.2.4-alpha.0 → 12.2.4-alpha.12

package/src/index.ts

@@ -5,7 +5,7 @@ import { settingsReducer } from './redux/settings';
 import { useAfterInteractions } from './hooks/use-after-interactions';
 import useIsReady from './hooks/useIsReady';
 import routeConfigKeyReplace from './utils/routeConfigKeyReplace';
-import {getReplacedRouteConfig} from './utils/getReplacedRouteConfig'
+import { getReplacedRouteConfig } from './utils/getReplacedRouteConfig';
 import LayoutFeature, { ProLayout, AppFeatures, AppLayout } from './containers/layout/module';
 import { useLayoutSetting, LayoutSettingProps } from './hooks/useLayoutSetting';
 import i18next from './config/i18next';
@@ -21,7 +21,6 @@ export * from '@gluestack-ui/config';
 export * from '@gluestack-style/react';
 //............................gluestack-ui....///
 
-
 export {
     useLayoutSetting,
     LayoutSettingProps,

package/src/utils/generateMobileNavigations.ts

@@ -224,8 +224,10 @@ export class GenerateMobileNavigations {
         const outputFile = path.join(appDirPath, `/${mainRoutesFileName}`);
         const allFilteredRoutes = [];
         try {
-            const execResult = await this.#execPromise(tscCommand);
-            if (execResult && fs.existsSync(mainRoutesJsFile)) {
+            // Try to compile TypeScript if a compute.ts file exists, but don't fail
+            // the JSON generation if compilation fails and a compute.js is already present.
+            await this.#execPromise(tscCommand);
+            if (fs.existsSync(mainRoutesJsFile)) {
                 const jsFiledata = fs.readFileSync(mainRoutesJsFile, 'utf8');
                 const noCommentsData = jsFiledata
                     .replace(/\/\/.*$/gm, '') // Remove single-line comments
@@ -242,32 +244,39 @@ export class GenerateMobileNavigations {
                 } else {
                     const newFilePath = mainRoutesJsFile.replace('.js', '.mjs');
                     const renameFileResponse = await this.#renameFile(mainRoutesJsFile, newFilePath);
-                    if (renameFileResponse) {
-                        if (fs.existsSync(mainRoutesMjsFile)) {
-                            // Dynamically import the JS file assuming it exports filteredRoutes
-                            const module = await import(mainRoutesMjsFile); // file is already absolute
-                            if (module.filteredRoutes) {
-                                const newRoutes =
-                                    module?.filteredRoutes?.map((filteredRoute) => {
-                                        const routConfig: any = Object.values(filteredRoute)[0];
-                                        const importPath = routConfig.component
-                                            .toString()
-                                            .match(/import\(['"](.*)['"]\)/)[1];
-                                        // routConfig.componentPath = `../.${importPath}`;
+                    if (renameFileResponse && fs.existsSync(mainRoutesMjsFile)) {
+                        // Dynamically import the JS file assuming it exports filteredRoutes
+                        const module = await import(mainRoutesMjsFile); // file is already absolute
+                        if (module.filteredRoutes) {
+                            const newRoutes =
+                                module.filteredRoutes.map((filteredRoute) => {
+                                    // filteredRoute is of the form { [path]: routeConfig }
+                                    const routConfig: any = Object.values(filteredRoute)[0];
+                                    const importMatch = routConfig.component
+                                        ?.toString()
+                                        ?.match(/import\(['"](.*)['"]\)/);
+
+                                    if (importMatch && importMatch[1]) {
+                                        const importPath = importMatch[1]; // e.g. './pages/Home'
+                                        // Make the component path importable from files under `app/`
+                                        // (like `stack/index.js`), which live one level deeper.
+                                        // Example: '.././pages/Home.js'
                                         routConfig.componentPath = `.${importPath}.js`;
-                                        return { [routConfig.path]: routConfig };
-                                    }) ?? [];
-                                allFilteredRoutes.push(...newRoutes);
-                                try {
-                                    const writeFileResponse = await this.#writeFile(
-                                        outputFile,
-                                        JSON.stringify(allFilteredRoutes, null, 2),
-                                    );
-
-                                    if (writeFileResponse) fs.unlinkSync(mainRoutesMjsFile);
-                                } catch (error) {
-                                    console.log('Error creating main routes file', error);
-                                }
+                                    }
+
+                                    return { [routConfig.path]: routConfig };
+                                }) ?? [];
+
+                            allFilteredRoutes.push(...newRoutes);
+                            try {
+                                const writeFileResponse = await this.#writeFile(
+                                    outputFile,
+                                    JSON.stringify(allFilteredRoutes, null, 2),
+                                );
+
+                                if (writeFileResponse) fs.unlinkSync(mainRoutesMjsFile);
+                            } catch (error) {
+                                console.log('Error creating main routes file', error);
                             }
                         }
                     }
@@ -391,7 +400,7 @@ export class GenerateMobileNavigations {
     `.replace(/,(\s*)$/, ''); // Removes trailing comma
 
             // Use Prettier to format the code
-            classStructure = prettier.format(classStructure, { parser: 'babel' });
+            classStructure = await prettier.format(classStructure, { parser: 'babel' });
 
             const appFeatures = importStatements + '\n' + classStructure;
 
@@ -541,7 +550,7 @@ export class GenerateMobileNavigations {
     `.replace(/,(\s*)$/, ''); // Removes trailing comma
 
             // Use Prettier to format the code
-            classStructure = prettier.format(classStructure, { parser: 'babel' });
+            classStructure = await prettier.format(classStructure, { parser: 'babel' });
 
             const appFeatures = importStatements + '\n' + classStructure;
 
@@ -611,7 +620,7 @@ export class GenerateMobileNavigations {
     `.replace(/,(\s*)$/, ''); // Removes trailing comma
 
             // Use Prettier to format the code
-            classStructure = prettier.format(classStructure, { parser: 'babel' });
+            classStructure = await prettier.format(classStructure, { parser: 'babel' });
 
             const appFeatures = importStatements + '\n' + classStructure;
 
@@ -798,7 +807,7 @@ export class GenerateMobileNavigations {
         }
         stackNavigator = importStatements + '\n' + moduleRender;
         let stackNavigation = stackNavigator;
-        stackNavigation = prettier.format(stackNavigation, { parser: 'babel' });
+        stackNavigation = await prettier.format(stackNavigation, { parser: 'babel' });
         const stackDirName = path.dirname(stackDirPath);
         try {
             const isDirCreated = await this.#makeDir(stackDirName);
@@ -978,7 +987,7 @@ export class GenerateMobileNavigations {
         moduleNavigation = importStatements + '\n' + moduleRender;
         const drawerNavigator = moduleNavigation;
         let drawerNavigation = drawerNavigator;
-        drawerNavigation = prettier.format(drawerNavigation, { parser: 'babel' });
+        drawerNavigation = await prettier.format(drawerNavigation, { parser: 'babel' });
         const drawerDirName = path.dirname(drawerDirPath);
         try {
             const isDirCreated = await this.#makeDir(drawerDirName);
@@ -1248,7 +1257,7 @@ export class GenerateMobileNavigations {
         moduleNavigation = importStatements + '\n' + moduleRender;
         const bottomTabNavigator = moduleNavigation;
         let bottomTabNavigation = bottomTabNavigator;
-        bottomTabNavigation = prettier.format(bottomTabNavigation, { parser: 'babel' });
+        bottomTabNavigation = await prettier.format(bottomTabNavigation, { parser: 'babel' });
         const bottomDirName = path.dirname(bottomDirPath);
         try {
             const isDirCreated = await this.#makeDir(bottomDirName);
@@ -1675,7 +1684,7 @@ export class GenerateMobileNavigations {
          export default AppNavigations;
      `;
         appNavigation = importStatements + '\n' + rootComponent + '\n' + appComponent;
-        appNavigation = prettier.format(appNavigation, { parser: 'babel' });
+        appNavigation = await prettier.format(appNavigation, { parser: 'babel' });
         try {
             await this.#writeFile(navigationDirPath, appNavigation);
         } catch (error) {