From be1d09808ccdcac2b27f0fd4373af5b9cfb3ea08 Mon Sep 17 00:00:00 2001 From: Gregor Date: Wed, 15 Nov 2017 08:36:34 -0800 Subject: [PATCH] fix: TypeScript/Flow definitions --- scripts/generateTypes.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/generateTypes.js b/scripts/generateTypes.js index 81f969c7..d5c3ac21 100644 --- a/scripts/generateTypes.js +++ b/scripts/generateTypes.js @@ -111,20 +111,18 @@ module.exports = function (languageName, templateFile, outputFile) { var template = fs.readFileSync(templatePath, 'utf8') // check routes path - var routesPath = pathJoin(__dirname, '..', 'lib', 'routes.json') - var routes = JSON.parse(fs.readFileSync(routesPath, 'utf8')) - if (!routes.defines) { + var routes = require('../lib/routes') + var definitions = require('../lib/definitions') + if (!definitions) { Util.log('No routes defined.', 'fatal') process.exit(1) } - var defines = routes.defines - var requestHeaders = defines['request-headers'] - delete routes.defines + var requestHeaders = definitions['request-headers'] Util.log('Generating ' + languageName + ' types...') - var params = entries(defines.params).reduce(combineParamData, []) + var params = entries(definitions.params).reduce(combineParamData, []) var namespaces = Object.keys(routes).reduce(function (namespaces, namespace) { var methods = entries(routes[namespace]).reduce(function (methods, entry) {