Skip to content

Commit

Permalink
v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Le Cam committed Jun 29, 2017
1 parent d6af833 commit bf6ad07
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 114 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.6.1 (2017-06-29)

Fix version

## v0.6.0 (2017-05-26)

Update GraphQL to v0.10.0
Expand Down
6 changes: 5 additions & 1 deletion lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ var _commander = require('commander');

var _commander2 = _interopRequireDefault(_commander);

var _package = require('../package.json');

var _package2 = _interopRequireDefault(_package);

var _index = require('./index');

var _index2 = _interopRequireDefault(_index);
Expand Down Expand Up @@ -57,7 +61,7 @@ var run = function () {
};
}();

_commander2.default.version('0.5.0').usage('<url> [options]').option('-g, --graphql', 'write schema.graphql file').option('-c, --cookie <cookie>', 'pass additional Cookie header').option('-j, --json', 'write schema.json file').option('-o, --output <directory>', 'write to specified directory').option('-s, --sort', 'sort field keys').parse(process.argv);
_commander2.default.version(_package2.default.version).usage('<url> [options]').option('-g, --graphql', 'write schema.graphql file').option('-c, --cookie <cookie>', 'pass additional Cookie header').option('-j, --json', 'write schema.json file').option('-o, --output <directory>', 'write to specified directory').option('-s, --sort', 'sort field keys').parse(process.argv);

run(_commander2.default.args[0], {
graphql: !!_commander2.default.graphql,
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var sortType = function sortType(type) {
return type;
}

throw new Error("Unknown kind");
throw new Error('Unknown kind');
};

var sortObject = function sortObject(type) {
Expand Down Expand Up @@ -118,7 +118,7 @@ exports.default = function () {
}
pathPrefix = options.outputPath || './';
headers = {
'Accept': 'application/json',
Accept: 'application/json',
'Content-Type': 'application/json'
};

Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-fetch-schema",
"version": "0.6.0",
"version": "0.6.1",
"description": "Fetch a GraphQL schema from a server and write it to file",
"repository": {
"type": "git",
Expand All @@ -15,13 +15,13 @@
"compile": "babel src --out-dir lib",
"build": "npm run clean && npm run compile",
"start": "npm run build",
"prepublish": "npm start"
"prepublishOnly": "npm start"
},
"author": "Paul Le Cam <[email protected]>",
"license": "MIT",
"dependencies": {
"babel-runtime": "^6.22.0",
"commander": "^2.9.0",
"commander": "^2.10.0",
"graphql": "^0.10.0",
"node-fetch": "^1.7.0"
},
Expand All @@ -30,6 +30,7 @@
"babel-plugin-syntax-flow": "^6.18.0",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-preset-latest": "^6.22.0"
"babel-preset-latest": "^6.22.0",
"prettier": "^1.5.2"
}
}
3 changes: 2 additions & 1 deletion src/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import program from 'commander'

import pckg from '../package.json'
import fetchSchema from './index'

const run = async (url: string, options: Object) => {
Expand All @@ -16,7 +17,7 @@ const run = async (url: string, options: Object) => {
}

program
.version('0.5.0')
.version(pckg.version)
.usage('<url> [options]')
.option('-g, --graphql', 'write schema.graphql file')
.option('-c, --cookie <cookie>', 'pass additional Cookie header')
Expand Down
39 changes: 25 additions & 14 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ type Options = {
cookie?: string,
}

const writeFile = ({filePath, contents}: {filePath: string, contents: string}) => {
const writeFile = ({
filePath,
contents,
}: {
filePath: string,
contents: string,
}) => {
return new Promise((resolve, reject) => {
fs.writeFile(filePath, contents, (err) => {
fs.writeFile(filePath, contents, err => {
if (err) reject(err)
else resolve()
})
Expand All @@ -40,39 +46,44 @@ const sortType = (type: object) => {
return type
}

throw new Error("Unknown kind")
throw new Error('Unknown kind')
}

const sortObject = (type: object) => {
type.interfaces = type.interfaces
.sort((int1, int2) => int1.name.localeCompare(int2.name))
type.interfaces = type.interfaces.sort((int1, int2) =>
int1.name.localeCompare(int2.name),
)
type.fields = type.fields
.sort((field1, field2) => field1.name.localeCompare(field2.name))
.map(sortArgs)
return type
}

const sortInterface = (type: object) => {
type.fields = type.fields
.sort((field1, field2) => field1.name.localeCompare(field2.name))
type.fields = type.fields.sort((field1, field2) =>
field1.name.localeCompare(field2.name),
)
return type
}

const sortEnum = (type: object) => {
type.enumValues = type.enumValues
.sort((value1, value2) => value1.name.localeCompare(value2.name))
type.enumValues = type.enumValues.sort((value1, value2) =>
value1.name.localeCompare(value2.name),
)
return type
}

const sortInputObject = (type: object) => {
type.inputFields = type.inputFields
.sort((field1,field2) => field1.name.localeCompare(field2.name))
type.inputFields = type.inputFields.sort((field1, field2) =>
field1.name.localeCompare(field2.name),
)
return type
}

const sortArgs = (field: object) => {
field.args = field.args
.sort((arg1, arg2) => arg1.name.localeCompare(arg2.name))
field.args = field.args.sort((arg1, arg2) =>
arg1.name.localeCompare(arg2.name),
)
return field
}

Expand All @@ -85,7 +96,7 @@ export default async (url: string, options: Options = {}) => {
const pathPrefix = options.outputPath || './'

const headers = {
'Accept': 'application/json',
Accept: 'application/json',
'Content-Type': 'application/json',
}
if (options.cookie) {
Expand Down
Loading

0 comments on commit bf6ad07

Please sign in to comment.