Skip to content

Develop #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 6, 2017
Merged

Develop #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73be954
Merge tag '0.7.0' into develop
danielcherubini Oct 6, 2017
8d79f51
fixes stupid cheating shit
danielcherubini Oct 6, 2017
e337156
fixes tests
danielcherubini Oct 6, 2017
3042ff0
Merge pull request #95 from express-vue/feature/fix-string-shit
danielcherubini Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 32 additions & 14 deletions src/utils/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,34 @@ class PropClass {
}
}

function isLastElement(script: Object | any, currentElement: string): string {
const elementArray = Object.keys(script);
const lastElement = elementArray[elementArray.length - 1];

if (currentElement === lastElement) {
return '';
} else {
return ',';
}
}

function routesToString(routes: Object[]): string {
let routeString = '';
routes.forEach(script => routeString += scriptToString(script) + ',');
return `[${routeString}]`.replace(new RegExp(/,}/, 'g'), '}').replace(new RegExp(/,]/, 'g'), ']');
const lastRoute = routes[routes.length-1];
routes.forEach(route => {
if (route !== lastRoute) {
routeString += scriptToString(route) + ',';
} else {
routeString += scriptToString(route);
}
});
return `[${routeString}]`;
}

function routeComponentsToString(script: Object): string {
let componentString = '';
for (let member in script) {
componentString += member + ': __' + script[member] + ',';
componentString += member + ': __' + script[member] + isLastElement(script, member);
}
return `{${componentString}}`;
}
Expand Down Expand Up @@ -60,44 +78,44 @@ function scriptToString(script: Object | any): string {
const dataObj = xss(JSON.stringify(script[member]()));
scriptString += `${member}: function(){return ${dataObj}},`;
} else {
scriptString += member + ': ' + String(script[member]) + ',';
scriptString += member + ': ' + String(script[member]) + isLastElement(script, member);
}
break;
case 'object':
if (member === 'data') {
scriptString += member + ': ' + xss(JSON.stringify(script[member])) + ',';
scriptString += member + ': ' + xss(JSON.stringify(script[member])) + isLastElement(script, member);
} else if (member === 'routes' || member === 'children') {
scriptString += member + ': ' + routesToString(script[member]) + ',';
scriptString += member + ': ' + routesToString(script[member]) + isLastElement(script, member);
} else if (member === 'components' && script['path'] !== undefined) { // Checks if 'components' is in a route object
scriptString += member + ': ' + routeComponentsToString(script[member]) + ',';
scriptString += member + ': ' + routeComponentsToString(script[member]) + isLastElement(script, member);
} else if (member === 'mixins') {
scriptString += member + ': [' + mixinsToString(script[member]) + '],';
} else if (script[member].constructor === Array) {
scriptString += member + ': ' + xss(JSON.stringify(script[member])) + ',';
scriptString += member + ': ' + xss(JSON.stringify(script[member])) + isLastElement(script, member);
} else if (member === 'props') {
if (script[member][Object.keys(script[member])[0]].type === null) {
var propsArray = Object.keys(script[member]);
scriptString += member + ': ' + xss(JSON.stringify(propsArray)) + ',';
scriptString += member + ': ' + xss(JSON.stringify(propsArray)) + isLastElement(script, member);
} else {
// scriptString += member + ': ' + scriptToString(script[member]) + ',';
// scriptString += member + ': ' + scriptToString(script[member]) + isLastElement(script, member);
const propsString = propsToString(script[member]);
scriptString += `${member}: ${propsString},`;
}

} else {
scriptString += member + ': ' + scriptToString(script[member]) + ',';
scriptString += member + ': ' + scriptToString(script[member]) + isLastElement(script, member);
}
break;
default:
if (member === 'component' && script['path'] !== undefined) { // Checks if 'component' is in a route object
scriptString += member + ': __' + script[member] + ',';
scriptString += member + ': __' + script[member] + isLastElement(script, member);
} else {
scriptString += member + ': ' + JSON.stringify(script[member]) + ',';
scriptString += member + ': ' + JSON.stringify(script[member]) + isLastElement(script, member);
}
break;
}
}
let finalScriptString = `{${scriptString}}`.replace(new RegExp(/,}/, 'g'), '}').replace(new RegExp(/,]/, 'g'), ']');
let finalScriptString = `{${scriptString}}`;
return finalScriptString;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/utils/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const components = {

const componentsString = routeComponentsToString(components);
test('Route components', (t) => {
t.is(componentsString.includes(`{myview0: __mycomponent0,myview1: __mycomponent1,myview3: __mycomponent2,}`), true);
t.is(componentsString.includes(`{myview0: __mycomponent0,myview1: __mycomponent1,myview3: __mycomponent2}`), true);
});

// Test scriptToString() using properties named 'component' and 'components'
Expand Down