create-catalyst-app 0.1.0-beta.1 → 0.1.0-beta.3

package/codemod/new-route/index.js

@@ -1,21 +1,34 @@
 const fs = require("fs")
 const path = require("path")
 const pc = require("picocolors")
-const prompts = require('prompts');
-const { program } = require('commander');
-
-const { createNewComponent, createRTKReducerFile, createReduxActionFile, createReduxReducerFile } = require("./template")
-const { validateComponentName, validatePath, discardChanges, createDirectory, createReducerEntryInStore, createNewRoute, toCamelCase, checkIfRoutePathExist } = require("./utils")
+const prompts = require("prompts")
+const { program } = require("commander")
+
+const {
+    createNewComponent,
+    createRTKReducerFile,
+    createReduxActionFile,
+    createReduxReducerFile,
+} = require("./template")
+const {
+    validateComponentName,
+    validatePath,
+    discardChanges,
+    createDirectory,
+    createReducerEntryInStore,
+    createNewRoute,
+    toCamelCase,
+    checkIfRoutePathExist,
+} = require("./utils")
 
 // Configure commander to accept CLI options
 program
-    .option('-p, --path <path>', 'Path for the new route')
-    .option('-c, --component <component>', 'Component name for the new route')
-    .parse(process.argv);
-
+    .option("-p, --path <path>", "Path for the new route")
+    .option("-c, --component <component>", "Component name for the new route")
+    .parse(process.argv)
 
 async function main() {
-    let { routePath, templateType, componentName } = program;
+    let { routePath, templateType, componentName } = program
 
     // If all options are not provided, prompt the user for input
     if (!routePath || !componentName || !templateType) {
@@ -31,40 +44,44 @@ async function main() {
                 ],
             },
             {
-                type: routePath ? null : 'text',
-                name: 'routePath',
+                type: routePath ? null : "text",
+                name: "routePath",
                 message: "Enter the route path",
-                validate: validatePath
+                validate: validatePath,
             },
             {
-                type: componentName ? null : 'text',
-                name: 'componentName',
-                message: 'Enter the component name for new route',
-                validate: validateComponentName
-            }
-        ]);
+                type: componentName ? null : "text",
+                name: "componentName",
+                message: "Enter the component name for new route",
+                validate: validateComponentName,
+            },
+        ])
 
-        routePath = routePath || response.routePath;
+        routePath = routePath || response.routePath
         templateType = templateType || response.templateType
-        componentName = componentName || response.componentName;
+        componentName = componentName || response.componentName
     }
 
-
     // Code transformations
     if (componentName && routePath && templateType) {
-
         const reducerName = toCamelCase(componentName)
-        const containersDir = 'src/js/containers';
-        const routeTransformerPath = path.join(__dirname, "./", 'transformers/createRoute.js')
-        const reducerTransformerPath = path.join(__dirname, "./", 'transformers/createReducer.js');
-
-        const funcArgs = { containersDir, componentName, routePath, reducerName, templateType, reducerTransformerPath, routeTransformerPath }
+        const containersDir = "src/js/containers"
+        const routeTransformerPath = path.join(__dirname, "./", "transformers/createRoute.js")
+        const reducerTransformerPath = path.join(__dirname, "./", "transformers/createReducer.js")
+
+        const funcArgs = {
+            containersDir,
+            componentName,
+            routePath,
+            reducerName,
+            templateType,
+            reducerTransformerPath,
+            routeTransformerPath,
+        }
 
-        // create directory 
+        // create directory
         if (createDirectory(funcArgs)) {
-
             try {
-
                 checkIfRoutePathExist(funcArgs)
 
                 if (templateType === "none") {
@@ -84,15 +101,13 @@ async function main() {
                     createReducerEntryInStore(funcArgs)
                 }
 
-                createNewRoute(funcArgs);
-
+                createNewRoute(funcArgs)
             } catch (e) {
                 discardChanges(funcArgs)
                 console.log(pc.red(`\n${e}`))
             }
         }
-
     }
 }
 
-main();
+main()

package/codemod/new-route/template.js

@@ -4,8 +4,7 @@ const pc = require("picocolors")
 
 // Function to create component using given input
 function createNewComponent({ componentName, containersDir }) {
-
-    const componentPath = path.join(containersDir, `${componentName}/${componentName}.js`);
+    const componentPath = `${containersDir}${path.sep}${componentName}${path.sep}${componentName}.js`
 
     // Component template
     const componentTemplate = `import React from 'react';
@@ -20,16 +19,15 @@ function createNewComponent({ componentName, containersDir }) {
   };
   
   export default ${componentName};
-  `;
+  `
 
-    fs.writeFileSync(componentPath, componentTemplate, 'utf8');
-    console.log(`\n${pc.cyan(componentName)} component created at ${pc.gray(componentPath)}`);
+    fs.writeFileSync(componentPath, componentTemplate, "utf8")
+    console.log(`\n${pc.cyan(componentName)} component created at ${pc.gray(componentPath)}`)
 }
 
-
 // Function to create rtk reducer file using given input
 function createRTKReducerFile({ componentName, containersDir, reducerName }) {
-    const reducerPath = path.join(containersDir, `${componentName}/reducer.js`);
+    const reducerPath = `${containersDir}${path.sep}${componentName}${path.sep}reducer.js`
 
     // rtk reducer template
     const reducerTemplate = `import { createSlice } from "@reduxjs/toolkit"
@@ -50,16 +48,15 @@ export const appSlice = createSlice({
 
 export const { reduxTest } = appSlice.actions
 export const ${reducerName}Reducer = appSlice.reducer
-`;
+`
 
-    fs.writeFileSync(reducerPath, reducerTemplate, 'utf8');
-    console.log(`\n${pc.cyan("reducer.js")} file created at ${pc.gray(reducerPath)} `);
+    fs.writeFileSync(reducerPath, reducerTemplate, "utf8")
+    console.log(`\n${pc.cyan("reducer.js")} file created at ${pc.gray(reducerPath)} `)
 }
 
-
 // Function to create redux action file using given input
 function createReduxActionFile({ componentName, containersDir, reducerName }) {
-    const actionsPath = path.join(containersDir, `${componentName}/actions.js`);
+    const actionsPath = `${containersDir}${path.sep}${componentName}${path.sep}actions.js`
 
     // redux action template
     const actionTemplate = `const createActionTypes = (prefix, actionTypeList = []) => {
@@ -79,16 +76,15 @@ export const reduxTest = () => {
         type: ${reducerName}Actions.REDUX_TEST,
     }
 }
-`;
-
-    fs.writeFileSync(actionsPath, actionTemplate, 'utf8');
-    console.log(`\n${pc.cyan("action.js")} file created at ${pc.gray(actionsPath)} `);
+`
 
+    fs.writeFileSync(actionsPath, actionTemplate, "utf8")
+    console.log(`\n${pc.cyan("action.js")} file created at ${pc.gray(actionsPath)} `)
 }
 
 // Function to create redux reducer file using given input
 function createReduxReducerFile({ componentName, containersDir, reducerName }) {
-    const reducerPath = path.join(containersDir, `${componentName}/reducer.js`);
+    const reducerPath = `${containersDir}${path.sep}${componentName}${path.sep}reducer.js`
 
     // redux reducer template
     const reducerTemplate = `import { ${reducerName}Actions } from "./actions"
@@ -110,10 +106,10 @@ export const ${reducerName}Reducer = (state = defaultState, action) => {
             return state
     }
 }
-`;
+`
 
-    fs.writeFileSync(reducerPath, reducerTemplate, 'utf8');
-    console.log(`\n${pc.cyan("reducer.js")} file created at ${pc.gray(reducerPath)} `);
+    fs.writeFileSync(reducerPath, reducerTemplate, "utf8")
+    console.log(`\n${pc.cyan("reducer.js")} file created at ${pc.gray(reducerPath)} `)
 }
 
-module.exports = { createNewComponent, createRTKReducerFile, createReduxActionFile, createReduxReducerFile }
+module.exports = { createNewComponent, createRTKReducerFile, createReduxActionFile, createReduxReducerFile }

package/codemod/new-route/transformers/createReducer.js

@@ -1,38 +1,38 @@
 const pc = require("picocolors")
 
 module.exports = function (fileInfo, api, options) {
-    const jscodeshift = api.jscodeshift;
-    const root = jscodeshift(fileInfo.source);
+    const jscodeshift = api.jscodeshift
+    const root = jscodeshift(fileInfo.source)
 
-    const { componentName, reducerName } = options;
+    const { componentName, reducerName } = options
 
     // Insert the node at the top of the file
-    root.find(jscodeshift.Program).get('body', 0).insertBefore(`import { ${reducerName}Reducer } from '@containers/${componentName}/reducer.js'`);
+    root.find(jscodeshift.Program)
+        .get("body", 0)
+        .insertBefore(`import { ${reducerName}Reducer } from '@containers/${componentName}/reducer.js'`)
 
     root.find(jscodeshift.CallExpression, {
         callee: {
-            name: 'combineReducers'
-        }
-    }).forEach(path => {
-        const args = path.value.arguments;
-        if (args.length > 0 && args[0].type === 'ObjectExpression') {
+            name: "combineReducers",
+        },
+    }).forEach((path) => {
+        const args = path.value.arguments
+        if (args.length > 0 && args[0].type === "ObjectExpression") {
             args[0].properties.push(
                 jscodeshift.property(
-                    'init',
+                    "init",
                     jscodeshift.identifier(`${reducerName}Reducer`),
                     jscodeshift.identifier(`${reducerName}Reducer`)
                 )
-            );
-            args[0].properties.forEach(property => {
+            )
+            args[0].properties.forEach((property) => {
                 if (property.key.name === property.value.name) {
-                    property.shorthand = true;
+                    property.shorthand = true
                 }
-            });
+            })
         }
     })
 
-    console.log(`\nReducer added in ${pc.gray("src/js/store/index.js")}`);
-    return root.toSource();
-
-};
-
+    console.log(`\nReducer added in ${pc.gray("src/js/store/index.js")}`)
+    return root.toSource()
+}

package/codemod/new-route/transformers/createRoute.js

@@ -1,10 +1,10 @@
 const pc = require("picocolors")
 
 module.exports = function (fileInfo, api, options) {
-    const jscodeshift = api.jscodeshift;
-    const root = jscodeshift(fileInfo.source);
+    const jscodeshift = api.jscodeshift
+    const root = jscodeshift(fileInfo.source)
 
-    const { routePath, componentName } = options;
+    const { routePath, componentName } = options
 
     // Create a new route object using a template expression
     const newObject = jscodeshift.template.expression`
@@ -13,21 +13,20 @@ module.exports = function (fileInfo, api, options) {
         end: true,
         component: ${componentName}
     }
-    `;
+    `
 
     // Insert the node at the top of the file
-    root.find(jscodeshift.Program).get('body', 0).insertBefore(`import ${componentName} from '@containers/${componentName}/${componentName}'`);
-
-    root.find(jscodeshift.VariableDeclarator, { id: { name: 'routes' } })
-        .forEach(path => {
-            // Ensure we are modifying the top-level array expression
-            if (path.value.init.type === 'ArrayExpression') {
-                path.value.init.elements.push(newObject);
-            }
-        });
-
-    console.log(pc.green('\nNew route added successfully.'));
-    return root.toSource();
-
-};
-
+    root.find(jscodeshift.Program)
+        .get("body", 0)
+        .insertBefore(`import ${componentName} from '@containers/${componentName}/${componentName}'`)
+
+    root.find(jscodeshift.VariableDeclarator, { id: { name: "routes" } }).forEach((path) => {
+        // Ensure we are modifying the top-level array expression
+        if (path.value.init.type === "ArrayExpression") {
+            path.value.init.elements.push(newObject)
+        }
+    })
+
+    console.log(pc.green("\nNew route added successfully."))
+    return root.toSource()
+}

package/codemod/new-route/utils.js

@@ -1,41 +1,45 @@
 const fs = require("fs")
 const path = require("path")
 const pc = require("picocolors")
-const { execSync } = require('child_process');
+const { execFileSync } = require("child_process")
+
+const executable = (command) => (process.platform === "win32" ? `${command}.cmd` : command)
 
 // validates router path
 function validatePath(path) {
-    const pathPattern = /^\/[a-zA-Z0-9-_]+(?:\/:[a-zA-Z0-9-_]+)?(?:\?[a-zA-Z0-9-_=]*)?$/;
+    const pathPattern = /^\/[a-zA-Z0-9-_]+(?:\/:[a-zA-Z0-9-_]+)?(?:\?[a-zA-Z0-9-_=]*)?$/
 
-    if (!path.startsWith('/')) {
-        return "The path must start with a forward slash (`/`).";
+    if (!path.startsWith("/")) {
+        return "The path must start with a forward slash (`/`)."
     }
     if (!pathPattern.test(path)) {
         if (!/^[\/a-zA-Z0-9-_]+/.test(path)) {
             s
-            return "Only letters, digits, hyphens, and underscores are allowed after the initial slash.";
+            return "Only letters, digits, hyphens, and underscores are allowed after the initial slash."
         }
         if (/\/[^:][a-zA-Z0-9-_]+/.test(path)) {
-            return "Parameters must start with a slash and a colon, followed by valid characters.";
+            return "Parameters must start with a slash and a colon, followed by valid characters."
         }
         if (/\?[^a-zA-Z0-9-_=]*$/.test(path)) {
-            return "Query strings must start with a question mark and contain valid characters.";
+            return "Query strings must start with a question mark and contain valid characters."
         }
-        return "The path is incorrectly formatted.";
+        return "The path is incorrectly formatted."
     }
-    return true;
+    return true
 }
 
 // validates component name
 function validateComponentName(name) {
-    return /^[A-Z][a-zA-Z0-9]*$/.test(name) || "Component name should start with an uppercase letter and may contain alphanumeric characters";
+    return (
+        /^[A-Z][a-zA-Z0-9]*$/.test(name) ||
+        "Component name should start with an uppercase letter and may contain alphanumeric characters"
+    )
 }
 
-
 // discard changes if anything breaks
 function discardChanges({ componentName, containersDir }) {
     if (fs.existsSync(`${containersDir}/${componentName}`)) {
-        fs.rmSync(`${containersDir}/${componentName}`, { recursive: true, force: true });
+        fs.rmSync(`${containersDir}/${componentName}`, { recursive: true, force: true })
     }
 }
 
@@ -44,14 +48,13 @@ function createDirectory({ componentName, containersDir }) {
     try {
         // directory check
         if (fs.existsSync(`${containersDir}/${componentName}`)) {
-            throw new Error("directory with similar name already exist");
+            throw new Error("directory with similar name already exist")
         }
 
         fs.mkdirSync(`${containersDir}/${componentName}`)
-        console.log(`\n${pc.cyan(componentName)} directory created at ${pc.gray(containersDir)}`);
+        console.log(`\n${pc.cyan(componentName)} directory created at ${pc.gray(containersDir)}`)
 
         return true
-
     } catch (e) {
         console.log(pc.red(`\nError: ${e}`))
     }
@@ -59,24 +62,50 @@ function createDirectory({ componentName, containersDir }) {
 
 // adds route object inside src/js/route/index.js file
 function createNewRoute({ componentName, routePath, routeTransformerPath }) {
-    const command = `jscodeshift --silent -t ${routeTransformerPath} --routePath ${routePath} --componentName ${componentName} src/js/routes/index.js`;
-    execSync(command, { stdio: 'inherit' });
+    execFileSync(
+        executable("jscodeshift"),
+        [
+            "--silent",
+            "-t",
+            routeTransformerPath,
+            "--routePath",
+            routePath,
+            "--componentName",
+            componentName,
+            "src/js/routes/index.js",
+        ],
+        { stdio: "inherit" }
+    )
 }
 
 // adds newly created reducer into src/js/store/index.js file
 function createReducerEntryInStore({ componentName, routePath, reducerTransformerPath, reducerName }) {
-    const command = `jscodeshift --silent -t ${reducerTransformerPath} --reducerName ${reducerName} --routePath ${routePath} --componentName ${componentName} src/js/store/index.js`;
-    execSync(command, { stdio: 'inherit' });
+    execFileSync(
+        executable("jscodeshift"),
+        [
+            "--silent",
+            "-t",
+            reducerTransformerPath,
+            "--reducerName",
+            reducerName,
+            "--routePath",
+            routePath,
+            "--componentName",
+            componentName,
+            "src/js/store/index.js",
+        ],
+        { stdio: "inherit" }
+    )
 }
 
 // converts string to camel case
 function toCamelCase(str) {
-    return str.toLowerCase().replace(/[^a-zA-Z0-9]+(.)/g, (match, chr) => chr.toUpperCase());
+    return str.toLowerCase().replace(/[^a-zA-Z0-9]+(.)/g, (match, chr) => chr.toUpperCase())
 }
 
-function checkIfRoutePathExist({routePath, componentName}) {
-    const routeIndexPath = "src/js/routes/index.js";
-    const data = fs.readFileSync(routeIndexPath, 'utf8')
+function checkIfRoutePathExist({ routePath, componentName }) {
+    const routeIndexPath = "src/js/routes/index.js"
+    const data = fs.readFileSync(routeIndexPath, "utf8")
     // Check if the file content includes routePath
     if (data.includes(routePath)) {
         throw new Error(`${routePath} path already exist in src/js/routes/index.js`)
@@ -87,4 +116,13 @@ function checkIfRoutePathExist({routePath, componentName}) {
     }
 }
 
-module.exports = { validatePath, validateComponentName, discardChanges, createReducerEntryInStore, createNewRoute, createDirectory, toCamelCase, checkIfRoutePathExist }
+module.exports = {
+    validatePath,
+    validateComponentName,
+    discardChanges,
+    createReducerEntryInStore,
+    createNewRoute,
+    createDirectory,
+    toCamelCase,
+    checkIfRoutePathExist,
+}

package/package.json

@@ -1,17 +1,25 @@
 {
     "name": "create-catalyst-app",
     "bin": "scripts/cli.cjs",
-    "version": "0.1.0-beta.1",
+    "version": "0.1.0-beta.3",
     "description": "cli package to scaffold Catalyst application",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/tata1mg/catalyst-core.git",
+        "directory": "packages/create-catalyst-app"
+    },
+    "scripts": {
+        "prettify": "prettier . --write"
+    },
     "dependencies": {
         "commander": "^8.2.0",
         "fs": "^0.0.1-security",
         "https": "^1.0.0",
+        "jscodeshift": "^0.16.0",
         "picocolors": "^0.1.0",
         "prompts": "^2.4.0",
-        "tar": "^6.2.1",
-        "validate-npm-package-name": "^5.0.0",
-        "jscodeshift": "^0.16.0"
+        "tar": "^7.5.15",
+        "validate-npm-package-name": "^5.0.0"
     },
     "devDependencies": {
         "prettier": "^3.2.5"

package/scripts/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { execSync } = require("child_process")
+const { execFileSync, execSync } = require("child_process")
 const Commander = require("commander")
 const { Option } = require("commander")
 const prompts = require("prompts")
@@ -9,6 +9,8 @@ const path = require("path")
 const fs = require("fs")
 var validate = require("validate-npm-package-name")
 const packageJson = require("../package.json")
+const packageRoot = path.join(__dirname, "..")
+const executable = (command) => (process.platform === "win32" ? `${command}.cmd` : command)
 
 let projectName = null
 const program = new Commander.Command()
@@ -141,7 +143,13 @@ const program = new Commander.Command()
                     console.log(` ${cyan("cd")} ${projectName} && ${cyan("npm start")} \n\n`)
 
                     if (mcpSupport) {
-                        const newMcpDir = path.join(process.cwd(), projectName, "node_modules/catalyst-core/mcp_v2")
+                        const newMcpDir = path.join(
+                            process.cwd(),
+                            projectName,
+                            "node_modules",
+                            "catalyst-core",
+                            "mcp_v2"
+                        )
                         runMcpSetup(newMcpDir, path.join(process.cwd(), projectName))
                     }
                 } catch (error) {
@@ -153,17 +161,26 @@ const program = new Commander.Command()
             })()
             function packNpmPackage(packageName, packageVersion, tempDir) {
                 const tarballFileName = `${packageName}-${packageVersion}.tgz`
-                const tarballFilePath = path.join(tempDir, tarballFileName)
+                const tarballFilePath = `${tempDir}${path.sep}${tarballFileName}`
 
                 try {
-                    execSync(`npm pack ${packageName}@${packageVersion} --silent`, {
-                        cwd: tempDir,
-                    })
-
-                    // to test locally, comment the upper execSync and uncomment this one.
-                    // execSync(`npm pack --pack-destination=${tempDir} --silent`, {
-                    //     cwd: process.cwd(),
-                    // })
+                    if (process.env.CREATE_CATALYST_APP_PACK_SOURCE === "local") {
+                        execFileSync(
+                            executable("npm"),
+                            ["pack", `--pack-destination=${tempDir}`, "--silent"],
+                            {
+                                cwd: packageRoot,
+                            }
+                        )
+                    } else {
+                        execFileSync(
+                            executable("npm"),
+                            ["pack", `${packageName}@${packageVersion}`, "--silent"],
+                            {
+                                cwd: tempDir,
+                            }
+                        )
+                    }
 
                     return tarballFilePath
                 } catch (error) {
@@ -185,22 +202,20 @@ const program = new Commander.Command()
                     tar.extract({
                         file: packageFilePath,
                         sync: true,
-                        filter: (path, entry) => {
-                            return subDirectoriesToExtract.reduce((acc, item) => {
-                                return acc || path.startsWith(item)
-                            }, false)
-                        },
                         cwd: path.join(process.cwd()),
-                        onentry: (entry) => {
+                        filter: (entryPath, entry) => {
+                            const shouldExtract = subDirectoriesToExtract.reduce((acc, item) => {
+                                return acc || entryPath.startsWith(item)
+                            }, false)
+                            if (!shouldExtract) return false
                             if (entry.path.startsWith(commonCodeDirectory)) {
                                 entry.path = entry.path.replace(commonCodeDirectory, extractionDestination)
-                            }
-                            if (entry.path.startsWith(selectedTemplateCode)) {
+                            } else if (entry.path.startsWith(selectedTemplateCode)) {
                                 entry.path = entry.path.replace(selectedTemplateCode, extractionDestination)
-                            }
-                            if (entry.path.startsWith(tailwindCodeDirectory)) {
+                            } else if (entry.path.startsWith(tailwindCodeDirectory)) {
                                 entry.path = entry.path.replace(tailwindCodeDirectory, extractionDestination)
                             }
+                            return true
                         },
                     })
                 } catch (e) {
@@ -221,20 +236,24 @@ program
     .description("Set up MCP server in an existing catalyst project")
     .action(() => {
         try {
-            const mcpDir = path.join(process.cwd(), "node_modules/catalyst-core/mcp_v2")
+            const mcpDir = path.join(process.cwd(), "node_modules", "catalyst-core", "mcp_v2")
             const setupPath = path.join(mcpDir, "setup.js")
 
             if (!fs.existsSync(setupPath)) {
                 console.log(cyan("mcp_v2 not found in catalyst-core. Downloading from GitHub..."))
-                const catalystCoreDir = path.join(process.cwd(), "node_modules/catalyst-core")
+                const catalystCoreDir = path.join(process.cwd(), "node_modules", "catalyst-core")
                 const tarballUrl = "https://github.com/tata1mg/catalyst-core/archive/refs/heads/main.tar.gz"
                 const tarballPath = path.join(catalystCoreDir, "_mcp_v2_tarball.tar.gz")
+                const repoMcpDir = "catalyst-core-main/packages/catalyst-core/mcp_v2"
                 execSync(`curl -fsSL "${tarballUrl}" -o "${tarballPath}"`, { stdio: "inherit" })
                 fs.mkdirSync(mcpDir, { recursive: true })
-                execSync(
-                    `tar -xzf "${tarballPath}" -C "${mcpDir}" --strip-components=2 "catalyst-core-main/mcp_v2"`,
-                    { stdio: "inherit" }
-                )
+                tar.extract({
+                    file: tarballPath,
+                    cwd: mcpDir,
+                    sync: true,
+                    strip: 4,
+                    filter: (entryPath) => entryPath === repoMcpDir || entryPath.startsWith(`${repoMcpDir}/`),
+                })
                 fs.unlinkSync(tarballPath)
                 console.log(cyan("mcp_v2 downloaded successfully."))
             }
@@ -249,12 +268,12 @@ program
 program.parse(process.argv)
 
 function runMcpSetup(mcpDir, cwd = process.cwd()) {
-    const pkgPath = path.join(mcpDir, "package.json")
+    const pkgPath = `${mcpDir}${path.sep}package.json`
     const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"))
     pkg.dependencies["better-sqlite3"] = "^12.8.0"
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
 
-    const mcpNodeModules = path.join(mcpDir, "node_modules")
+    const mcpNodeModules = `${mcpDir}${path.sep}node_modules`
     let needsInstall = !fs.existsSync(mcpNodeModules)
 
     if (!needsInstall) {
@@ -272,7 +291,7 @@ function runMcpSetup(mcpDir, cwd = process.cwd()) {
         execSync("npm install", { cwd: mcpDir, stdio: "inherit" })
     }
 
-    execSync(`node ${path.join(mcpDir, "setup.js")}`, { cwd, stdio: "inherit" })
+    execFileSync(process.execPath, [`${mcpDir}${path.sep}setup.js`], { cwd, stdio: "inherit" })
 }
 
 async function promptStateManagement() {
@@ -385,7 +404,7 @@ function validateOptions(cmd) {
 function deleteDirectory(dirPath) {
     if (dirPath && fs.existsSync(dirPath)) {
         fs.readdirSync(dirPath).forEach((file) => {
-            const currentPath = path.join(dirPath, file)
+            const currentPath = `${dirPath}${path.sep}${file}`
             if (fs.lstatSync(currentPath).isDirectory()) {
                 deleteDirectory(currentPath)
             } else {
@@ -400,7 +419,7 @@ function deleteDirectory(dirPath) {
 function createGitignore(projectName) {
     const gitiIgnorePatterns = ["node_modules", "build", "logs"]
 
-    const gitignorePath = path.join(process.cwd(), projectName, ".gitignore")
+    const gitignorePath = `${process.cwd()}${path.sep}${projectName}${path.sep}.gitignore`
 
     if (fs.existsSync(gitignorePath)) {
         console.log(".gitignore already exists. Please rename or remove it before running the script.")

package/templates/common/api.js

@@ -4,13 +4,12 @@ const fetchFunction = (url, options) => {
 
     // Request Interceptor -  modify request here
 
-    return fetch(finalUrl, options)
-        .then(response => {
-            return response.json().then(parsedResponse => {
-                // Response Interceptor -  modify response here
-                return parsedResponse
-            })
+    return fetch(finalUrl, options).then((response) => {
+        return response.json().then((parsedResponse) => {
+            // Response Interceptor -  modify response here
+            return parsedResponse
         })
+    })
 }
 
 export default fetchFunction

package/templates/none-js/package.json

@@ -26,7 +26,7 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1"
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",

package/templates/none-ts/package.json

@@ -27,7 +27,7 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1"
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",

package/templates/redux-js/package.json

@@ -27,9 +27,9 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1",
         "@reduxjs/toolkit": "1.9.3",
-        "react-redux": "^8.1.3"
+        "react-redux": "^8.1.3",
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",

package/templates/redux-ts/package.json

@@ -28,9 +28,9 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1",
         "@reduxjs/toolkit": "1.9.3",
-        "react-redux": "^8.1.3"
+        "react-redux": "^8.1.3",
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",

package/templates/rtk-js/package.json

@@ -27,9 +27,9 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1",
         "@reduxjs/toolkit": "1.9.3",
-        "react-redux": "^8.1.3"
+        "react-redux": "^8.1.3",
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",

package/templates/rtk-ts/package.json

@@ -28,9 +28,9 @@
     "dependencies": {
         "@loadable/component": "^5.16.3",
         "@tata1mg/router": "0.0.1-beta.7",
-        "catalyst-core": "0.1.0-beta.1",
         "@reduxjs/toolkit": "1.9.3",
-        "react-redux": "^8.1.3"
+        "react-redux": "^8.1.3",
+        "catalyst-core": "0.1.0-beta.3"
     },
     "devDependencies": {
         "eslint": "^8.26.0",