mirror of
https://github.com/usebruno/bruno.git
synced 2026-06-25 13:45:52 +00:00
* feat: enhance Bru grammar to support response blocks and examples - Added new grammar rules for response headers, status, and body types (JSON, XML, text). - Introduced parsing logic for example blocks, allowing multiple examples with various body types. - Implemented tests for example parsing, including edge cases and complex examples with authentication. - Created fixture files for simple and complex examples to validate parsing functionality. feat: extend jsonToBru functionality to support response handling and examples - Updated jsonToBru to include parsing for response headers, status, and body types (JSON, XML, text). - Enhanced example handling to support multiple examples with various body types. - Added comprehensive tests for example parsing, including edge cases and complex scenarios with authentication. - Created fixture files for testing the new features and validating parsing functionality. move: files to fixtures folder refactor: simplify response body handling in Bru grammar and JSON conversion - Removed specific body type handling (JSON, XML, text) from grammar and semantics. - Updated response body parsing in jsonToBru to handle a unified response body format. - Adjusted tests and fixtures to reflect changes in response body structure, ensuring compatibility with the new format. feat: add response bookmarking functionality to ResponsePane - Introduced ResponseBookmark component to allow users to save responses as examples. - Added NameExampleModal for naming saved examples. - Updated ResponsePane to include the new bookmarking feature. - Implemented Redux actions to manage response examples in the collections state. - Enhanced CollectionItem to display saved examples and allow for expansion. fix: remove unnecessary padding from ExampleItem component feat: implement delete and rename functionality for examples in ExampleItem component - Added DeleteExampleModal for confirming deletion of examples. - Integrated modal for renaming examples with state management. - Enhanced ExampleItem to handle example deletion and renaming through modals. - Updated Redux actions to support example updates and deletions in the collections state. fix: example writing to disc properly fix: example parsing errors fix: request with example parsing error fix: handle examples in collections and requests feat: implement response example functionality in the application - Added ResponseExample component to handle displaying and editing response examples. - Integrated ResponseExampleRequestPane and ResponseExampleResponsePane for structured request and response handling. - Enhanced RequestTabPanel and RequestTab components to support response-example tabs. - Introduced new styled components for better UI/UX in response examples. - Updated theme files to include styles for response examples. - Implemented URL bar for editing request URLs in response examples. - Added functionality for managing headers and parameters in response examples. - Improved overall structure and organization of response example components. add styles for example url bar feat: add Checkbox component and Table-v2 for enhanced UI - Introduced a new Checkbox component for better user interaction in forms. - Added Table-v2 component to improve table rendering and resizing functionality. - Updated existing components to utilize the new Checkbox and Table-v2 for managing headers and parameters in response examples. - Enhanced styling for better visual consistency across components. - Updated theme files to include styles for the new components. feat: implement custom scrollbar styles for response example components fix: features add actions , view more feat: enhance response example functionality - Added GenerateCodeItem component for generating code snippets from response examples. - Integrated modal for code generation within ResponseExample component. - Updated ResponseExampleTopBar to handle example name and description editing. - Improved state management for response examples, including new actions for updating names and descriptions. - Enhanced ResponseExampleRequestPane to support editing and saving request details. - Refactored URL handling in ResponseExampleUrlBar to utilize example-specific data. - Improved overall user experience with better UI elements and state management. feat: enhance response example management and UI components feat: enhance editing capabilities in response example components feat: update multipart form parameter handling in response examples feat: refactor response example parameter handling and enhance UI interactions feat: introduce RadioButton component and update Checkbox usage in response examples fix: styles fix radio button styling fixed radio button styles feat: add create example from sidebar feat: enhance ResponseExample components with layout adjustments and new HeightBoundContainer feat: add Checkbox and RadioButton components with comprehensive tests for rendering, user interactions, and accessibility feat: playwright test csaes rm: comments fix: linting fix: tests refactor: update response example tests and enhance functionality fix: tests fix: e2e-tests refactor: implement hasRequestChanges utility for better change detection rm: console rm: consoles fix: lint fix: tests fix: response header disabled by default issue Feat/with bru example parser (#5892) * fix: response header disabled by default issue feat: new parsing logic fix: change test cases to accomodate new brulang add: path params features rm:consoles six: make tab permanent on double click fix width feat: add status editing feat: review fixes review fixes fix: review fixes fix: post review mv: test files fix: review * fix: lint * fix: review comments * fix: icons folder strcuture fix: tests fix: lint fix: unit tests feat: body mode selector fix: close all collections rm: example feat added tests. lang change feat: add custom status text fix: status update feat: add body mode, update tests add default name prefilled for example fix: active tab styles, prefilled name, text fixes fix : pkg lock fix: review fix: review comments fix: hide cursor when readonly fix: height fix: null body fix: response body parsing fix: test cases feat: add method support for examples fix: reponse parsing fix: update response body type when content type is updated rm : commented code feat: update parser logic fix: organize files feat: enhance examples handling in collection export and import feat: postman imports fro examples feat: enhance OpenAPI import functionality to support examples feat: support postman export fix: postman export import fix: open api tests, remove requestbody related logic rm: examples fix: move common attributes files ui fixes fix: clone issue fix: create example from request menu review fixes more review fixes mv: files, fix mode req error organize files fix:tests fix: save dot issue fix: bugs fix: postman export fix: import path params * chore:improve modal handling in environment and response example tests fix: test issues resolved * chore: update response example tests to use new fixture files and improve cleanup logic --------- Co-authored-by: Abhishek S Lal <abhishek@usebruno.com> Co-authored-by: Bijin Bruno <bijin@usebruno.com>
157 lines
4.5 KiB
JavaScript
157 lines
4.5 KiB
JavaScript
const _ = require('lodash');
|
|
const {
|
|
parseRequest: _parseRequest,
|
|
parseCollection: _parseCollection
|
|
} = require('@usebruno/filestore');
|
|
|
|
const collectionBruToJson = (bru) => {
|
|
try {
|
|
const json = _parseCollection(bru);
|
|
|
|
const transformedJson = {
|
|
request: {
|
|
headers: _.get(json, 'headers', []),
|
|
auth: _.get(json, 'auth', {}),
|
|
script: _.get(json, 'script', {}),
|
|
vars: _.get(json, 'vars', {}),
|
|
tests: _.get(json, 'tests', '')
|
|
}
|
|
};
|
|
|
|
// add meta if it exists
|
|
// this is only for folder bru file
|
|
// in the future, all of this will be replaced by standard bru lang
|
|
const sequence = _.get(json, 'meta.seq');
|
|
if (json?.meta) {
|
|
transformedJson.meta = {
|
|
name: json.meta.name,
|
|
};
|
|
|
|
if (sequence) {
|
|
transformedJson.meta.seq = Number(sequence);
|
|
}
|
|
}
|
|
|
|
return transformedJson;
|
|
} catch (error) {
|
|
return Promise.reject(error);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* The transformer function for converting a BRU file to JSON.
|
|
*
|
|
* We map the json response from the bru lang and transform it into the DSL
|
|
* format that is used by the bruno app
|
|
*
|
|
* @param {string} bru The BRU file content.
|
|
* @returns {object} The JSON representation of the BRU file.
|
|
*/
|
|
const bruToJson = (bru) => {
|
|
try {
|
|
const json = _parseRequest(bru);
|
|
|
|
let requestType = _.get(json, 'meta.type');
|
|
|
|
switch (requestType) {
|
|
case 'http':
|
|
requestType = 'http-request';
|
|
break;
|
|
case 'graphql':
|
|
requestType = 'graphql-request';
|
|
break;
|
|
case 'grpc':
|
|
requestType = 'grpc-request';
|
|
break;
|
|
case 'ws':
|
|
requestType = 'ws-request';
|
|
break;
|
|
default:
|
|
requestType = 'http-request';
|
|
}
|
|
|
|
const sequence = _.get(json, 'meta.seq');
|
|
const transformedJson = {
|
|
type: requestType,
|
|
name: _.get(json, 'meta.name'),
|
|
seq: !_.isNaN(sequence) ? Number(sequence) : 1,
|
|
settings: _.get(json, 'settings', {}),
|
|
tags: _.get(json, 'meta.tags', []),
|
|
examples: _.get(json, 'examples', []),
|
|
request: {
|
|
url: _.get(json, requestType === 'grpc-request' ? 'grpc.url' : 'http.url'),
|
|
headers: requestType === 'grpc-request' ? _.get(json, 'metadata', []) : _.get(json, 'headers', []),
|
|
// Preserving special characters in custom methods. Using _.upperCase strips special characters.
|
|
method: String(_.get(json, 'http.method') ?? '').toUpperCase(),
|
|
auth: _.get(json, 'auth', {}),
|
|
params: _.get(json, 'params', []),
|
|
vars: _.get(json, 'vars', []),
|
|
assertions: _.get(json, 'assertions', []),
|
|
script: _.get(json, 'script', {}),
|
|
tests: _.get(json, 'tests', '')
|
|
}
|
|
};
|
|
|
|
if (requestType === 'grpc-request') {
|
|
const selectedMethod = _.get(json, 'grpc.method');
|
|
if(selectedMethod) transformedJson.request.method = selectedMethod;
|
|
const selectedMethodType = _.get(json, 'grpc.methodType');
|
|
if(selectedMethodType) transformedJson.request.methodType = selectedMethodType;
|
|
const protoPath = _.get(json, 'grpc.protoPath');
|
|
if(protoPath) transformedJson.request.protoPath = protoPath;
|
|
transformedJson.request.auth.mode = _.get(json, 'grpc.auth', 'none');
|
|
transformedJson.request.body = _.get(json, 'body', {
|
|
mode: 'grpc',
|
|
grpc: [{
|
|
name: 'message 1',
|
|
content: '{}'
|
|
}]
|
|
});
|
|
} else if (requestType === 'ws-request') {
|
|
transformedJson.request.auth.mode = _.get(json, 'ws.auth', 'none');
|
|
const bodyFromBru = _.get(json, 'body') || {};
|
|
transformedJson.request.body = {
|
|
mode: 'ws',
|
|
ws: [bodyFromBru]
|
|
};
|
|
} else {
|
|
transformedJson.request.method = _.upperCase(_.get(json, 'http.method'));
|
|
transformedJson.request.auth.mode = _.get(json, 'http.auth', 'none');
|
|
transformedJson.request.body = _.get(json, 'body', {});
|
|
transformedJson.request.body.mode = _.get(json, 'http.body', 'none');
|
|
}
|
|
|
|
return transformedJson;
|
|
} catch (err) {
|
|
return Promise.reject(err);
|
|
}
|
|
};
|
|
|
|
const getEnvVars = (environment = {}) => {
|
|
const variables = environment.variables;
|
|
if (!variables || !variables.length) {
|
|
return {};
|
|
}
|
|
|
|
const envVars = {};
|
|
_.each(variables, (variable) => {
|
|
if (variable.enabled) {
|
|
envVars[variable.name] = variable.value;
|
|
}
|
|
});
|
|
|
|
return envVars;
|
|
};
|
|
|
|
const options = {};
|
|
const getOptions = () => {
|
|
return options;
|
|
};
|
|
|
|
module.exports = {
|
|
bruToJson,
|
|
getEnvVars,
|
|
getOptions,
|
|
collectionBruToJson
|
|
};
|