graphql-js-tree
Advanced tools
Comparing version 1.0.6 to 1.0.7
@@ -5,3 +5,2 @@ module.exports = { | ||
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin | ||
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier | ||
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. | ||
@@ -8,0 +7,0 @@ ], |
@@ -11,3 +11,4 @@ "use strict"; | ||
const mergeNode = (n1, n2) => { | ||
const mergedNode = Object.assign(Object.assign({}, n1), { args: [...n1.args, ...n2.args.map(addFromLibrary)], directives: [...n1.directives, ...n2.directives.map(addFromLibrary)], interfaces: [...n1.interfaces, ...n2.interfaces] }); | ||
const args = [...n1.args, ...n2.args.map(addFromLibrary)]; | ||
const mergedNode = Object.assign(Object.assign({}, n1), { id: (0, shared_2.generateNodeId)(n1.name, n1.data.type, args), args, directives: [...n1.directives, ...n2.directives.map(addFromLibrary)], interfaces: [...n1.interfaces, ...n2.interfaces] }); | ||
mergedNode.id = (0, shared_2.generateNodeId)(mergeNode.name, mergedNode.data.type, mergedNode.args); | ||
@@ -14,0 +15,0 @@ mergedNode.args = mergedNode.args.filter((a, i) => mergedNode.args.findIndex((aa) => aa.name === a.name) === i); |
{ | ||
"name": "graphql-js-tree", | ||
"version": "1.0.6", | ||
"version": "1.0.7", | ||
"private": false, | ||
@@ -24,20 +24,17 @@ "license": "MIT", | ||
"devDependencies": { | ||
"@commitlint/cli": "^8.3.5", | ||
"@commitlint/config-conventional": "^8.3.4", | ||
"@types/graphql": "^14.5.0", | ||
"@types/jest": "^25.1.4", | ||
"@types/node": "^13.9.0", | ||
"@typescript-eslint/eslint-plugin": "^4.15.0", | ||
"@typescript-eslint/parser": "^4.15.0", | ||
"cz-conventional-changelog": "^3.1.0", | ||
"eslint": "^7.19.0", | ||
"eslint-config-prettier": "^7.2.0", | ||
"eslint-plugin-prettier": "^3.3.1", | ||
"husky": "^4.2.3", | ||
"jest": "^29.5.0", | ||
"prettier": "^2.0.2", | ||
"ts-jest": "^29.1.0", | ||
"ts-node": "^9.0.0", | ||
"ts-patch": "^3.0.0", | ||
"typescript": "^5.1.3", | ||
"@types/jest": "^29.5.11", | ||
"@types/node": "^20.10.5", | ||
"@typescript-eslint/eslint-plugin": "^6.16.0", | ||
"@typescript-eslint/parser": "^6.16.0", | ||
"eslint": "^8.56.0", | ||
"eslint-config-prettier": "^9.1.0", | ||
"eslint-plugin-prettier": "^5.1.2", | ||
"husky": "^8.0.3", | ||
"jest": "^29.7.0", | ||
"prettier": "^3.1.1", | ||
"ts-jest": "^29.1.1", | ||
"ts-node": "^10.9.2", | ||
"ts-patch": "^3.1.1", | ||
"typescript": "^5.3.3", | ||
"typescript-transform-paths": "^3.4.6" | ||
@@ -47,13 +44,3 @@ }, | ||
"graphql": "15.4.0" | ||
}, | ||
"config": { | ||
"commitizen": { | ||
"path": "./node_modules/cz-conventional-changelog" | ||
} | ||
}, | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "npm run lint" | ||
} | ||
} | ||
} |
127567
16
78
2649