Code improvements

Signed-off-by: Alan Cha <[email protected]>

Author: Alan-Cha

packages/openapi-to-graphql-cli/lib/openapi-to-graphql.js

@@ -8,15 +8,16 @@ import * as request from 'request'
 import * as fs from 'fs'
 import * as yaml from 'js-yaml'
 import { printSchema } from 'graphql'
+import { Command } from 'commander'
 
 import { createGraphQlSchema } from 'openapi-to-graphql'
 import { Oas2 } from 'openapi-to-graphql/lib/types/oas2'
 import { Oas3 } from 'openapi-to-graphql/lib/types/oas3'
 import { Options } from 'openapi-to-graphql/lib/types/options'
 
 const app = express()
-let program = require('commander')
 
+const program = new Command()
 program
   .version(require('../package.json').version)
   .usage('<OAS JSON file path(s) and/or remote url(s)> [options]')

packages/openapi-to-graphql-cli/lib/openapi-to-graphql.js.map

@@ -1,6 +1,6 @@
 import { GraphQLObjectType as GQObjectType } from 'graphql';
 import { Args, ResolveFunction } from './types/graphql';
-import { PreprocessingData } from './types/preprocessing_data.js';
+import { PreprocessingData } from './types/preprocessing_data';
 declare type Viewer = {
     type: GQObjectType;
     resolve: ResolveFunction;

packages/openapi-to-graphql-cli/src/openapi-to-graphql.ts

@@ -3,7 +3,7 @@
  */
 import { Oas2 } from './types/oas2';
 import { Operation } from './types/operation';
-import { Oas3, ServerObject, ParameterObject, SchemaObject, OperationObject, ReferenceObject, LinkObject, SecuritySchemeObject } from './types/oas3.js';
+import { Oas3, ServerObject, ParameterObject, SchemaObject, OperationObject, ReferenceObject, LinkObject, SecuritySchemeObject } from './types/oas3';
 import { PreprocessingData, ProcessedSecurityScheme } from './types/preprocessing_data';
 import { InternalOptions } from './types/options';
 export declare type SchemaNames = {

packages/openapi-to-graphql/lib/auth_builder.d.ts

@@ -21,7 +21,7 @@ import { Args, ResolveFunction } from './types/graphql'
 import {
   PreprocessingData,
   ProcessedSecurityScheme
-} from './types/preprocessing_data.js'
+} from './types/preprocessing_data'
 
 // Imports:
 import { getGraphQLType } from './schema_builder'

packages/openapi-to-graphql/lib/oas_3_tools.d.ts

@@ -26,7 +26,7 @@ import {
   MediaTypesObject,
   SecuritySchemeObject,
   SecurityRequirementObject
-} from './types/oas3.js'
+} from './types/oas3'
 import {
   PreprocessingData,
   ProcessedSecurityScheme

packages/openapi-to-graphql/src/auth_builder.ts

@@ -7,14 +7,15 @@
 
 /* globals beforeAll, test, expect */
 
-import * as openapiToGraphql from '../lib/index.js'
 import { graphql } from 'graphql'
 
+import * as openapiToGraphql from '../lib/index'
+import { startServer, stopServer } from './example_api_server'
+
 const oas = require('./fixtures/example_oas.json')
 const PORT = 3003
 // update PORT for this test case:
 oas.servers[0].variables.port.default = String(PORT)
-const { startServer, stopServer } = require('./example_api_server')
 
 let createdSchema
 

packages/openapi-to-graphql/src/oas_3_tools.ts

@@ -7,7 +7,7 @@
 
 /* globals beforeAll, test, expect */
 
-import * as openapiToGraphql from '../lib/index.js'
+import * as openapiToGraphql from '../lib/index'
 const { parse, validate } = require('graphql')
 
 const oas = require('./fixtures/cloudfunction_oas.json')

packages/openapi-to-graphql/test/authentication.test.ts

@@ -7,8 +7,8 @@
 
 /* globals test, expect */
 
-import * as openapiToGraphql from '../lib/index.js'
-import { Options } from '../lib/types/options.js'
+import * as openapiToGraphql from '../lib/index'
+import { Options } from '../lib/types/options'
 
 const oas = require('./fixtures/docusign_oas.json')