blend-r 1.1.6 → 1.1.7

package/dist/helper/ApiHelper.js

@@ -112,18 +112,19 @@ Authorization: localStorage.getItem("authToken")||""
         return code;
     }
     generateRolesGetterCode() {
+        var _a, _b;
         const code = `
         import type { RootState } from "@/redux/store/store";
-        import type { Role } from "./type";
-        export const selectRoles = (state: RootState) => state.roles.roles;
 
-// Generic checker
+${(((_b = (_a = this.basicProjectContent) === null || _a === void 0 ? void 0 : _a.frontend) === null || _b === void 0 ? void 0 : _b.roleList) || []).length > 0 ? `// Generic checker
+    import type { Role } from "./type";
+        export const selectRoles = (state: RootState) => state.roles.roles;
 export const hasRole = (role: Role) => (state: RootState) =>
   state.roles.roles.includes(role);
 export const hasAnyRole = (roles: Role[]) => (state: RootState) =>
-  roles.some(role => state.roles.roles.includes(role));
+  roles.some(role => state.roles.roles.includes(role));` : ''}
 
-${this.basicProjectContent.frontend.roleList.reduce((acc, role) => {
+${(this.basicProjectContent.frontend.roleList || []).reduce((acc, role) => {
             acc = acc + `
         export const has${role}Role = (state: RootState) =>
   state.roles.roles.includes("${role}");
@@ -134,10 +135,11 @@ ${this.basicProjectContent.frontend.roleList.reduce((acc, role) => {
         return code;
     }
     generateRolesTypeCode() {
-        const code = `
-        export type Role = ${this.basicProjectContent.frontend.roleList.map(role => `"${role}"`).join(' | ')};
-        `;
-        return this.basicProjectContent.frontend.roleList.length > 0 ? code : '';
+        const code = (this.basicProjectContent.frontend.roleList || []).length > 0 ? `
+        export type Role = ${(this.basicProjectContent.frontend.roleList || []).map(role => `"${role}"`).join(' | ')};
+        ` : `export type Role = 'admin';`;
+        // return (this.basicProjectContent.frontend.roleList||[]).length>0?code:'';
+        return code;
     }
     generateRoleRelatedFiles() {
         const roleSliceCode = this.generateRoleSliceCode();
@@ -171,7 +173,7 @@ ${this.basicProjectContent.frontend.roleList.reduce((acc, role) => {
                 const sliceCode = this.generateSliceCode(apiSection);
                 const dataCode = this.generateApiDatacode(apiSection);
                 const actionCode = this.generateApiActioncode(apiSection, expressSection);
-                const selectorCode = this.generateApiSelectorCode(apiSection);
+                const selectorCode = this.generateApiSelectorCode(expressSection, apiSection);
                 // const sagaCode = this.generateSagaCode(apiSection);
                 fileHelper_1.FileHelper.writeFile(apiSectionSlicePath, sliceCode);
                 fileHelper_1.FileHelper.writeFile(apiSectionSelectorPath, selectorCode);
@@ -195,19 +197,24 @@ import * as ${apiSection.name}Selector from "src-gen/redux/${expressSection.name
             const outputKeyList = Object.keys(api.output);
             return inputKeyList.length > 0 || outputKeyList.length > 0;
         });
+        const inputStoreApis = apiSection.apiList.filter(api => api.inputStore && Object.keys(api.input).length > 0);
         const code = `
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import {${apiSection.apiList.reduce((acc, curVal) => {
             acc = acc + `${curVal.name}AsyncThunk,`;
             return acc;
-        }, '')}} from './action';
+        }, '')}${inputStoreApis.reduce((acc, curVal) => {
+            acc = acc + `set${this.capitalizeFirstLetter(curVal.name)}Input,`;
+            return acc;
+        }, '')}
+} from './action';
 
 ${filteredApiListForData.length > 0 ? `import { ${filteredApiListForData.reduce((acc, curVal) => {
             const inputKeyList = Object.keys(curVal.input);
             const outputKeyList = Object.keys(curVal.output);
-            // const inputDataTypeName: string = (`${apiSection.name}_${curVal.name}_Input`).toUpperCase();
+            const inputDataTypeName = (`${apiSection.name}_${curVal.name}_Input`).toUpperCase();
             const outputDataTypeName = (`${apiSection.name}_${curVal.name}_Output`).toUpperCase();
-            // acc = acc + `${inputKeyList.length > 0 ? inputDataTypeName + `,I_${inputDataTypeName}`+ ',' : ''}`;
+            acc = acc + `${curVal.inputStore && inputKeyList.length > 0 ? `I_${inputDataTypeName},` : ''}`;
             acc = acc + `${outputKeyList.length > 0 ? outputDataTypeName + `,I_${outputDataTypeName}` + ',' : ''}`;
             return acc;
         }, '')} } from "./data";` : ''}
@@ -216,14 +223,13 @@ ${filteredApiListForData.length > 0 ? `import { ${filteredApiListForData.reduce(
             var _a, _b, _c;
             if ((_a = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _a === void 0 ? void 0 : _a.name) {
                 const [moduleName, dataName] = (_c = (_b = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.split("->");
-                console.log(dataName, moduleName, "DataName...........");
                 if (dataName) {
                     const dataTypeName = `${dataName === null || dataName === void 0 ? void 0 : dataName.replace("[]", "")}`;
                     acc = acc + `import {${dataTypeName},I_${dataTypeName}} from "../../../data/${moduleName}";`;
                 }
             }
             return acc;
-        }, '')}         
+        }, '')}
 
 
 import { ApiStatus } from "../../../data/common";
@@ -231,12 +237,16 @@ interface ${apiSection.name}State {
     ${apiSection.apiList.reduce((acc, curVal) => {
             var _a, _b;
             const [moduleName, dataName] = ((_b = (_a = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.split("->")) || [];
+            const inputDataTypeName = (`${apiSection.name}_${curVal.name}_Input`).toUpperCase();
             acc = acc + `${curVal.name}: {
             data: ${Object.keys(curVal.output).length > 0 ? `I_${apiSection.name.toUpperCase()}_${curVal.name.toUpperCase()}_OUTPUT` : dataName ? `I_${dataName}` : "any"},\n
             status: ApiStatus,
             error:string|null
         }
         `;
+            if (curVal.inputStore && Object.keys(curVal.input).length > 0) {
+                acc = acc + `${curVal.name}Input: I_${inputDataTypeName} | null\n`;
+            }
             return acc;
         }, "")}
 }
@@ -251,6 +261,9 @@ const initialState: ${apiSection.name}State = {
             status: ApiStatus.Idle,
             error: null
         },\n`;
+            if (curVal.inputStore && Object.keys(curVal.input).length > 0) {
+                acc = acc + `${curVal.name}Input: null,\n`;
+            }
             return acc;
         }, "")}
 }
@@ -260,7 +273,7 @@ export const ${apiSection.name}Slice = createSlice({
     initialState,
     reducers: {
         reset${apiSection.name}Reducer: () => initialState
-    }, 
+    },
     extraReducers: (builder) =>{
         builder.
         ${apiSection.apiList.reduce((acc, curVal, currentIndex) => {
@@ -274,12 +287,14 @@ export const ${apiSection.name}Slice = createSlice({
             })\n\t\t.addCase(${curVal.name}AsyncThunk.rejected, (state, action) => {
                 state.${curVal.name}.status = ApiStatus.Failed;
                 state.${curVal.name}.error = action.payload as string;
-                })\n\t\t${currentIndex < apiSection.apiList.length - 1 ? '.' : ''}`;
+                })\n\t\t${curVal.inputStore && Object.keys(curVal.input).length > 0 ? `.addCase(set${this.capitalizeFirstLetter(curVal.name)}Input, (state, action) => {
+                state.${curVal.name}Input = action.payload;
+            })\n\t\t` : ''}${currentIndex < apiSection.apiList.length - 1 ? '.' : ''}`;
             return acc;
         }, "")}
     }
 });
-        
+
 export const {reset${apiSection.name}Reducer} = ${apiSection.name}Slice.actions;
 export default ${apiSection.name}Slice.reducer;
         `;
@@ -326,7 +341,6 @@ export default ${apiSection.name}Slice.reducer;
     generateReducersCode(apiSectionList) {
         const code = `
         ${apiSectionList.reduce((acc, curVal) => {
-            console.log(curVal.name, "APINAME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
             acc = acc + `
     import ${curVal.name}Reducer from './${curVal.sectionName}/${curVal.name}/${curVal.name}Slice';\n`;
             return acc;
@@ -334,7 +348,7 @@ export default ${apiSection.name}Slice.reducer;
 
 export const GeneratedReducers = {
     ${apiSectionList.reduce((acc, curVal) => {
-            acc = acc + `${curVal.name.toLowerCase()}: ${curVal.name}Reducer,`;
+            acc = acc + `${curVal.sectionName}_${curVal.name.toLowerCase()}: ${curVal.name}Reducer,`;
             return acc;
         }, '')}
 }
@@ -347,8 +361,9 @@ export const GeneratedReducers = {
             const outputKeyList = Object.keys(api.output);
             return inputKeyList.length > 0 || outputKeyList.length > 0;
         });
+        const inputStoreApis = apiSection.apiList.filter(api => api.inputStore && Object.keys(api.input).length > 0);
         const code = `
-        import { createAsyncThunk } from "@reduxjs/toolkit";
+        import { createAsyncThunk${inputStoreApis.length > 0 ? ', createAction' : ''} } from "@reduxjs/toolkit";
         import axios, { AxiosError } from 'axios';
         import {${expressSection.name}Api} from "../../../../src/remote-api-point";
         ${filteredApiListForData.length > 0 ? `import { ${filteredApiListForData.reduce((acc, curVal) => {
@@ -365,19 +380,14 @@ export const GeneratedReducers = {
             var _a, _b, _c;
             if ((_a = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _a === void 0 ? void 0 : _a.name) {
                 const [moduleName, dataName] = (_c = (_b = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.split("->");
-                // console.log(dataName,moduleName,"DataName...........")
                 if (dataName) {
                     acc = acc + `import * as ${moduleName} from "../../../data/${moduleName}";`;
                 }
             }
             return acc;
-        }, '')}  
-
-     
-        
-      
+        }, '')}
 
-         const showError = (err: AxiosError) => {
+        const showError = (err: AxiosError) => {
             const errorResponse: any = err.response?.data;
             if (errorResponse) {
               return {status: err.status,data: errorResponse}
@@ -387,10 +397,14 @@ export const GeneratedReducers = {
             }
           }
 
+        ${inputStoreApis.reduce((acc, curVal) => {
+            const inputDataTypeName = (`${apiSection.name}_${curVal.name}_Input`).toUpperCase();
+            acc = acc + `
+export const set${this.capitalizeFirstLetter(curVal.name)}Input = createAction<${inputDataTypeName} | null>('${apiSection.name}/set${this.capitalizeFirstLetter(curVal.name)}Input');
+            `;
+            return acc;
+        }, '')}
 
-  
-
-  
         ${apiSection.apiList.reduce((acc, curVal) => {
             var _a, _b;
             const inputKeyList = Object.keys(curVal.input);
@@ -398,13 +412,15 @@ export const GeneratedReducers = {
             const inputDataTypeName = (`${apiSection.name}_${curVal.name}_Input`).toUpperCase();
             const outputDataTypeName = (`${apiSection.name}_${curVal.name}_Output`).toUpperCase();
             const [moduleName, dataName] = ((_b = (_a = curVal === null || curVal === void 0 ? void 0 : curVal.directOutput) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.split("->")) || [];
+            const hasInputStore = curVal.inputStore && inputKeyList.length > 0;
             acc = acc + `
-        
+
 
               export const ${curVal.name}Api = async (${inputKeyList.length > 0 ? `input: ${inputDataTypeName},` : ``} ) => {
                   return ${expressSection.name}Api.${curVal.type.toLowerCase()}('${curVal.url}',${inputKeyList.length > 0 ? `${curVal.type == 'POST' ? 'input' : '{params: input.toJSON()}'}` : ''});
               }
-                   export const ${curVal.name}AsyncThunk = createAsyncThunk<${outputKeyList.length > 0 ? outputDataTypeName : dataName ? `${moduleName}.${dataName}` : 'any'},${inputKeyList.length > 0 ? `${inputDataTypeName}` : `void`},any>('${apiSection.name}/${curVal.name}', async (${inputKeyList.length > 0 ? `input: ${inputDataTypeName}` : `_`}, { rejectWithValue }) => {
+                   export const ${curVal.name}AsyncThunk = createAsyncThunk<${outputKeyList.length > 0 ? outputDataTypeName : dataName ? `${moduleName}.${dataName}` : 'any'},${inputKeyList.length > 0 ? `${inputDataTypeName}` : `void`},any>('${apiSection.name}/${curVal.name}', async (${inputKeyList.length > 0 ? `input: ${inputDataTypeName}` : `_`}, { rejectWithValue${hasInputStore ? ', dispatch' : ''} }) => {
+                ${hasInputStore ? `dispatch(set${this.capitalizeFirstLetter(curVal.name)}Input(input.toJSON()));` : ''}
                 return call${this.capitalizeFirstLetter(curVal.name)}Api(${inputKeyList.length > 0 ? `input,` : ''} output => {
                     return output
                   },error=> {
@@ -415,30 +431,43 @@ export const GeneratedReducers = {
 
             export const call${this.capitalizeFirstLetter(curVal.name)}Api = async (${inputKeyList.length > 0 ? `input: ${inputDataTypeName},` : ``} output: (output: ${outputKeyList.length > 0 ? outputDataTypeName : dataName ? `${moduleName}.${dataName}` : 'any'}) => any,error?: (errMsg: any) => void) => {
                 try {
-                  //const { data } = await ${expressSection.name}Api.${curVal.type.toLowerCase()}('${this.getApiName(apiSection.name)}/${this.getApiName(curVal.name)}',${inputKeyList.length > 0 ? `${curVal.type == 'POST' ? 'input' : '{params: input.toJSON()}'}` : ''});
                   const { data } = await ${curVal.name}Api(${inputKeyList.length > 0 ? `${curVal.type == 'POST' ? 'input' : 'input'}` : ''});
                   return output(data);
                 } catch (err: any) {
                  if(error) {
                  return error(showError(err));
                  }
-                    
+
                 }
               }
+
+              ${(inputKeyList.length > 0 && inputKeyList.length < 5) ?
+                `export const call${this.capitalizeFirstLetter(curVal.name)}ApiWithParams = async (${inputKeyList.length > 0 ? `${inputKeyList.reduce((acc, inputCurVal) => {
+                    const inputCurValType = curVal.input[inputCurVal].type;
+                    acc = acc + `${inputCurVal}: ${['string', 'number', 'boolean'].indexOf(inputCurValType) !== -1 ? inputCurValType : 'any'},`;
+                    return acc;
+                }, "")}` : ``} output: (output: ${outputKeyList.length > 0 ? outputDataTypeName : dataName ? `${moduleName}.${dataName}` : 'any'}) => any,error?: (errMsg: any) => void) => {
+                return call${this.capitalizeFirstLetter(curVal.name)}Api(${inputDataTypeName}.fromJSON({${inputKeyList.reduce((acc, cur) => { acc = acc + cur + ','; return acc; }, "")}}), output, error);
+              }` : ''}
+              
             `;
             return acc;
         }, '')}
-        
+
         `;
         return code;
     }
-    generateApiSelectorCode(apiSection) {
+    generateApiSelectorCode(expressSection, apiSection) {
         const code = `
 import { RootState } from "@/redux/store/store";
 
         ${apiSection.apiList.reduce((acc, curVal) => {
             acc = acc +
-                `export const select${this.capitalizeFirstLetter(curVal.name)}Data = (state: RootState) => state.${apiSection.name.toLocaleLowerCase()}.${curVal.name}.data;\n`;
+                `export const select${this.capitalizeFirstLetter(curVal.name)}Data = (state: RootState) => state.${expressSection.name}_${apiSection.name.toLocaleLowerCase()}.${curVal.name}.data;\n`;
+            if (curVal.inputStore && Object.keys(curVal.input).length > 0) {
+                acc = acc +
+                    `export const select${this.capitalizeFirstLetter(curVal.name)}Input = (state: RootState) => state.${expressSection.name}_${apiSection.name.toLocaleLowerCase()}.${curVal.name}Input;\n`;
+            }
             return acc;
         }, '')}
         `;
@@ -513,7 +542,7 @@ export default genRootSaga;
                         imports.add(`import { ${baseTypeName} } from '../data/${module}';`);
                     }
                     else {
-                        imports.add(`import { ${baseTypeName} } from 'src-gen/data/${module}';`);
+                        imports.add(`import { ${baseTypeName} } from '../../../data/${module}';`);
                     }
                 }
             });
@@ -526,7 +555,7 @@ export default genRootSaga;
                         imports.add(`import { ${baseTypeName} } from '../data/${module}';`);
                     }
                     else {
-                        imports.add(`import { ${baseTypeName} } from 'src-gen/data/${module}';`);
+                        imports.add(`import { ${baseTypeName} } from '../../../data/${module}';`);
                     }
                 }
             });
@@ -636,7 +665,6 @@ ${outputKeyList
         }
     }
     generateFromJSONField(field) {
-        console.log(field, "field");
         const typeParts = field.type.split("->");
         const baseType = typeParts.length === 2 ? typeParts[1] : field.type;
         if (baseType.endsWith("[]")) {

package/dist/helper/DataHelper.js

@@ -32,7 +32,6 @@ class DataHelper {
             const filePath = path_1.default.join(dataFolderPath, `${module}.data`);
             const specCode = fileHelper_1.FileHelper.readFile(filePath);
             const json = new BlendDataGrammarHelper_1.default().parseBlendData(specCode);
-            console.log(json, "json");
             if (!json.valid) {
                 throw new Error("Error while parsing the syntax");
             }

package/dist/helper/FrontEndHelper.js

@@ -104,9 +104,8 @@ ${this.generateLayoutCode(loChild)}
                 if (child.children) {
                     path = child.route && child.route != "" && child.route != "/" ? path + "/" + child.route : path;
                     acc[child.name] = generateRouterConstantObj(child.children);
-                    console.log(child.name, index, children.length, "Path With layout After");
                     if (index == children.length - 1) {
-                        path = path.split("/").slice(0, -1).join('_').toString();
+                        path = path.split("/").slice(0, -1).join('/').toString();
                         // const pathNumToBeRemoved = child.route.split("/").length;
                         // path = path.split("/").slice(0,-pathNumToBeRemoved).join('/').toString();
                     }
@@ -114,12 +113,10 @@ ${this.generateLayoutCode(loChild)}
                 else {
                     path = child.route && child.route != "" && child.route != "/" ? path + "/" + child.route : path;
                     acc[child.name] = path;
-                    console.log(path, "Path Without layout");
                     const pathNumToBeRemoved = child.route.split("/").length;
-                    console.log(pathNumToBeRemoved, index, children.length, "pathNumToBeRemoved..............");
-                    path = path.split("/").slice(0, -pathNumToBeRemoved).join('_').toString();
+                    path = path.split("/").slice(0, -pathNumToBeRemoved).join('/').toString();
                     if (index == children.length - 1) {
-                        path = path.split("/").slice(0, -1).join('_').toString();
+                        path = path.split("/").slice(0, -1).join('/').toString();
                         // const pathNumToBeRemoved = child.route.split("/").length;
                         // path = path.split("/").slice(0,-pathNumToBeRemoved).join('/').toString();
                     }
@@ -172,10 +169,8 @@ export default ${lo.name}Layout;
         import React from 'react';\n
         import BlendGeneratedLayout from '../../src/layout/BlendGeneratedLayout';
         `;
-        console.log([mainLayout], JSON.stringify([mainLayout]), "Main layout///////////////");
         const routerJsonCode = `const router = createBrowserRouter([${this.generateLayoutRouterJSONCode([mainLayout])}])\nexport default router;`;
         const routerConstant = this.generateRouterConstant([mainLayout]);
-        console.log(this.generateFlattenedArray(mainLayout.children), "this.generateFlattenedArray(mainLayout.children)");
         const importCode = `${this.generateFlattenedArray(mainLayout.children).reduce((acc, item) => {
             const importCode = `   ${item.children ? `
                     import ${item.name}Layout from '../../src/layout/${item.name}Layout';\n

package/dist/helper/fileHelper.js

@@ -97,7 +97,6 @@ class FileHelper {
                 yield fs_extra_1.default.ensureDir(path_1.default.dirname(destPath));
                 // Copy the file
                 yield fs_extra_1.default.copyFile(srcPath, destPath);
-                console.log(`File copied from ${srcPath} to ${destPath}`);
             }
             catch (error) {
                 console.error(`Error copying file from ${srcPath} to ${destPath}: ${error.message}`);
@@ -115,7 +114,6 @@ class FileHelper {
             try {
                 // Copy the folder recursively
                 yield fs_extra_1.default.copy(srcFolder, destFolder, { overwrite: true });
-                console.log(`Folder copied from ${srcFolder} to ${destFolder}`);
             }
             catch (error) {
                 console.error(`Error copying folder from ${srcFolder} to ${destFolder}: ${error.message}`);

package/dist/helper/grammarHelper/BlendApiGrammarHelper.js

@@ -28,7 +28,7 @@ class BlendApiGrammarHelper {
                 const apiNameList = new Set();
                 const apiSection = {
                     name: item.CAPITAL_IDENTIFIER().text, apiList: item.apiDefinition().map(api => {
-                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                         const apiName = api.IDENTIFIER().text;
                         if (apiNameList.has(apiName)) {
                             duplicateApis[apiName] = true;
@@ -47,24 +47,23 @@ class BlendApiGrammarHelper {
                                 name: (_g = (_f = (_e = api.outputDefinition()) === null || _e === void 0 ? void 0 : _e.directOutputDefenition()) === null || _f === void 0 ? void 0 : _f.type().text) === null || _g === void 0 ? void 0 : _g.replace("?", ""),
                             } : {},
                             authenticated: ((_h = api === null || api === void 0 ? void 0 : api.authenticated()) === null || _h === void 0 ? void 0 : _h.text) == "authenticated",
-                            url: api === null || api === void 0 ? void 0 : api.URL_IDENTIFIER().text.replace(/"/g, '')
+                            url: api === null || api === void 0 ? void 0 : api.URL_IDENTIFIER().text.replace(/"/g, ''),
+                            inputStore: !!((_j = api.inputDefinition()) === null || _j === void 0 ? void 0 : _j.store())
                         };
-                        (_k = (_j = api.inputDefinition()) === null || _j === void 0 ? void 0 : _j.field()) === null || _k === void 0 ? void 0 : _k.forEach(field => {
+                        (_l = (_k = api.inputDefinition()) === null || _k === void 0 ? void 0 : _k.field()) === null || _l === void 0 ? void 0 : _l.forEach(field => {
                             var _a, _b, _c;
                             const fieldName = ((_a = field.IDENTIFIER()) === null || _a === void 0 ? void 0 : _a.text) || ((_b = field.CAPITAL_IDENTIFIER()) === null || _b === void 0 ? void 0 : _b.text);
                             apiSpec.input[fieldName] = { type: (_c = field.type().text) === null || _c === void 0 ? void 0 : _c.replace("?", ""), required: !(field === null || field === void 0 ? void 0 : field.type().text.includes("?")) };
                         });
-                        // console.log(JSON.stringify(api.outputDefinition()?.field()||[]),"api.outputDefinition()")
-                        const customData = (_m = (_l = api.outputDefinition()) === null || _l === void 0 ? void 0 : _l.directOutputDefenition()) === null || _m === void 0 ? void 0 : _m.type().text;
+                        const customData = (_o = (_m = api.outputDefinition()) === null || _m === void 0 ? void 0 : _m.directOutputDefenition()) === null || _o === void 0 ? void 0 : _o.type().text;
                         if (customData && !dataModuleList.includes(customData === null || customData === void 0 ? void 0 : customData.split("->")[0])) {
                             console.error(`No Data Module '${customData.split("->")[0]}' Found in section '${item.CAPITAL_IDENTIFIER().text}' at line ${api.start.line}`);
                             haveNoDataFoundError = true;
                         }
-                        (_p = (_o = api.outputDefinition()) === null || _o === void 0 ? void 0 : _o.field()) === null || _p === void 0 ? void 0 : _p.forEach(field => {
+                        (_q = (_p = api.outputDefinition()) === null || _p === void 0 ? void 0 : _p.field()) === null || _q === void 0 ? void 0 : _q.forEach(field => {
                             var _a, _b, _c;
                             if (field.type().text.includes("->")) {
                                 const customDataSplit = field.type().text.split("->");
-                                console.log(dataModuleList, "dataModuleList....");
                                 if (!dataModuleList.includes(customDataSplit[0])) {
                                     console.error(`No Data Module '${customDataSplit[0]}' Found in section '${item.CAPITAL_IDENTIFIER().text}' at line ${api.start.line}`);
                                     haveNoDataFoundError = true;

package/dist/helper/grammarHelper/BlendBasicGrammarHelper.js

@@ -78,7 +78,6 @@ class BlendBasicGrammarHelper extends AbstractParseTreeVisitor_1.AbstractParseTr
         let screenList = [];
         let componentList = [];
         let roleList = [];
-        console.log("program", program.screenDefenition());
         program.screenDefenition().forEach(screen => {
             screen.CAPITAL_IDENTIFIER().forEach(screenName => {
                 screenList.push({ name: screenName.text, path: screen.PATH_IDENTIFIER().text.replace(/"/g, '') });
@@ -102,7 +101,7 @@ class BlendBasicGrammarHelper extends AbstractParseTreeVisitor_1.AbstractParseTr
                     var _a;
                     if (screenList.findIndex(item => item.name == page.CAPITAL_IDENTIFIER()[1].text) == -1) {
                         haveNoDataFoundError = true;
-                        console.log(`${(_a = page.CAPITAL_IDENTIFIER()[1]) === null || _a === void 0 ? void 0 : _a.text} Page Not found inside the layout ${layout.CAPITAL_IDENTIFIER().text} at line ${page.start.line}`);
+                        console.error(`❌ Screen '${(_a = page.CAPITAL_IDENTIFIER()[1]) === null || _a === void 0 ? void 0 : _a.text}' not found inside layout '${layout.CAPITAL_IDENTIFIER().text}' at line ${page.start.line}`);
                     }
                     return {
                         name: page.CAPITAL_IDENTIFIER()[0].text,
@@ -124,7 +123,6 @@ class BlendBasicGrammarHelper extends AbstractParseTreeVisitor_1.AbstractParseTr
             layout,
             roleList
         };
-        console.log("json", json);
         return {
             valid: parser.numberOfSyntaxErrors == 0 && !haveNoDataFoundError,
             json

package/dist/helper/grammarHelper/BlendDataGrammarHelper.js

@@ -19,7 +19,7 @@ class BlendDataGrammarHelper {
                 const dataName = dataDefinition.CAPITAL_IDENTIFIER().text;
                 if (dataSet.has(dataName)) {
                     hasError = true;
-                    console.log(`Duplicate Data ${dataName} found`);
+                    console.error(`❌ Duplicate Data '${dataName}' found`);
                 }
                 dataSet.add(dataDefinition.CAPITAL_IDENTIFIER().text);
                 const fieldSet = new Set();
@@ -29,7 +29,7 @@ class BlendDataGrammarHelper {
                         const fieldName = field.IDENTIFIER().text;
                         if (fieldSet.has(fieldName)) {
                             hasError = true;
-                            console.log(`Field Data ${fieldName} found in ${dataName}`);
+                            console.error(`❌ Duplicate field '${fieldName}' in '${dataName}'`);
                         }
                         fieldSet.add(fieldName);
                         return {

package/dist/helper/grammarHelper/GrammarErrorHelper.js

@@ -9,7 +9,6 @@ class GrammarErrorHelper {
                 syntaxErrors.push(`Line ${line}:${charPositionInLine} - ${msg}`);
             }
         });
-        console.log(syntaxErrors, "syntaxErrors");
         return syntaxErrors;
     }
 }

package/dist/index.js

@@ -47,41 +47,52 @@ program.command('init')
 program.command('prepare')
     .description('Prepare the environment (e.g., validating setup, etc.)')
     .action(() => {
-    const folderPath = path_1.default.join(process.cwd());
-    const folderName = path_1.default.basename(folderPath);
-    const basicFilePath = path_1.default.join(folderPath, `${folderName}.rbasic`);
-    const basicFileContent = fileHelper_1.FileHelper.readFile(basicFilePath);
-    const dataHelper = new DataHelper_1.default();
-    const apiHelper = new ApiHelper_1.default();
-    dataHelper.parseSpec();
-    apiHelper.parseSpec();
+    try {
+        const dataHelper = new DataHelper_1.default();
+        const apiHelper = new ApiHelper_1.default();
+        dataHelper.parseSpec();
+        apiHelper.parseSpec();
+        console.log(`✅ Prepare complete — apiConfig.json and dataConfig.json updated.`);
+    }
+    catch (e) {
+        console.error(`❌ Prepare failed: ${e.message}`);
+        process.exit(1);
+    }
 });
 // Command 3: blend-generate (add your logic here)
 program.command('serve')
     .description('Generate files or configurations based on existing ones')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
-    const folderPath = path_1.default.join(process.cwd());
-    const folderName = path_1.default.basename(folderPath);
-    const basicFilePath = path_1.default.join(folderPath, `${folderName}.rbasic`);
-    const basicFileContent = fileHelper_1.FileHelper.readFile(basicFilePath);
-    const frontEndHelper = new FrontEndHelper_1.default();
-    const apiHelper = new ApiHelper_1.default();
-    frontEndHelper.buildFrontEnd();
-    const dataHelper = new DataHelper_1.default();
-    dataHelper.parseJSONAndGenerateFiles();
-    apiHelper.doFrontEndApiGenerations();
-    // SectionHelper.createProject(basicFileContent);
-    // Add your custom logic here
+    try {
+        const frontEndHelper = new FrontEndHelper_1.default();
+        const apiHelper = new ApiHelper_1.default();
+        const dataHelper = new DataHelper_1.default();
+        frontEndHelper.buildFrontEnd();
+        dataHelper.parseJSONAndGenerateFiles();
+        apiHelper.doFrontEndApiGenerations();
+        console.log(`✅ Serve complete — frontend, data models, and Redux files generated.`);
+    }
+    catch (e) {
+        console.error(`❌ Serve failed: ${e.message}`);
+        process.exit(1);
+    }
 }));
 program.command('chop')
     .description('Generate files or configurations based on existing ones')
     .action(() => {
-    const folderPath = path_1.default.join(process.cwd());
-    const folderName = path_1.default.basename(folderPath);
-    const basicFilePath = path_1.default.join(folderPath, `${folderName}.rbasic`);
-    const basicFileContent = fileHelper_1.FileHelper.readFile(basicFilePath);
-    const basicHelper = new BasicHelper_1.default();
-    basicHelper.parseSpec(basicFileContent);
-    basicHelper.createRequiredFile(basicFileContent);
+    try {
+        const folderPath = path_1.default.join(process.cwd());
+        const folderName = path_1.default.basename(folderPath);
+        const basicFilePath = path_1.default.join(folderPath, `${folderName}.rbasic`);
+        const basicFileContent = fileHelper_1.FileHelper.readFile(basicFilePath);
+        const basicHelper = new BasicHelper_1.default();
+        basicHelper.parseSpec(basicFileContent);
+        basicHelper.createRequiredFile(basicFileContent);
+        console.log(`✅ Chop complete — spec files created from ${folderName}.rbasic.`);
+    }
+    catch (e) {
+        console.error(`❌ Chop failed: ${e.message}`);
+        process.exit(1);
+    }
 });
 program.parse(process.argv);