Skip to content

Commit

Permalink
Use prettier (#483)
Browse files Browse the repository at this point in the history
  • Loading branch information
pluma committed Dec 11, 2017
1 parent 7c73c95 commit ecb30ae
Show file tree
Hide file tree
Showing 47 changed files with 4,117 additions and 3,920 deletions.
11 changes: 11 additions & 0 deletions .eslintrc
@@ -0,0 +1,11 @@
{
"env": {
"node": true,
"es6": true
},
"extends": ["eslint:recommended", "prettier"],
"parser": "babel-eslint",
"rules": {
"no-console": "warn"
}
}
2 changes: 1 addition & 1 deletion arangojs.min.js

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions package.json
Expand Up @@ -46,14 +46,15 @@
"typings": "arangojs.d.ts",
"scripts": {
"test": "mocha --growl",
"lint": "standard --verbose src/**/*.js test/**/*.js | snazzy",
"lint": "eslint src/**/*.js test/**/*.js",
"ci": "mocha",
"preci": "npm install",
"jenkins": "npm run ci -- --timeout 0 --reporter xunit-file",
"dist": "babel --compact false -d lib src && webpack",
"prepublish": "npm run lint && npm run dist && node -e 'require(\"./\");'"
},
"dependencies": {
"babel-eslint": "^8.0.3",
"es6-error": "^4.0.1",
"http-errors": "^1.6.1",
"linkedlist": "^1.0.1",
Expand All @@ -71,10 +72,12 @@
"babel-preset-env": "^1.5.2",
"chai": "^4.0.2",
"core-js": "^2.4.1",
"eslint": "^4.13.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-prettier": "^2.3.1",
"mocha": "3.4.2",
"snazzy": "7.0.0",
"standard": "10.0.2",
"prettier": "^1.9.1",
"webpack": "^3.0.0",
"xunit-file": "1.0.0"
}
}
}
36 changes: 18 additions & 18 deletions src/aql-query.js
@@ -1,26 +1,26 @@
export default function aql (strings, ...args) {
const bindVars = {}
const bindVals = []
let query = strings[0]
export default function aql(strings, ...args) {
const bindVars = {};
const bindVals = [];
let query = strings[0];
for (let i = 0; i < args.length; i++) {
const rawValue = args[i]
let value = rawValue
if (rawValue && typeof rawValue.toAQL === 'function') {
query += `${rawValue.toAQL()}${strings[i + 1]}`
continue
const rawValue = args[i];
let value = rawValue;
if (rawValue && typeof rawValue.toAQL === "function") {
query += `${rawValue.toAQL()}${strings[i + 1]}`;
continue;
}
const index = bindVals.indexOf(rawValue)
const isKnown = index !== -1
let name = `value${isKnown ? index : bindVals.length}`
const index = bindVals.indexOf(rawValue);
const isKnown = index !== -1;
let name = `value${isKnown ? index : bindVals.length}`;
if (rawValue && rawValue.isArangoCollection) {
name = `@${name}`
value = rawValue.name
name = `@${name}`;
value = rawValue.name;
}
if (!isKnown) {
bindVals.push(rawValue)
bindVars[name] = value
bindVals.push(rawValue);
bindVars[name] = value;
}
query += `@${name}${strings[i + 1]}`
query += `@${name}${strings[i + 1]}`;
}
return {query, bindVars}
return { query, bindVars };
}

0 comments on commit ecb30ae

Please sign in to comment.