Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
plantain-00 committed Sep 5, 2021
1 parent 35f7c18 commit cf2efd2
Show file tree
Hide file tree
Showing 7 changed files with 259 additions and 258 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
"url": "https://github.com/plantain-00/types-as-schema/issues"
},
"typeCoverage": {
"atLeast": 99.83
"atLeast": 99.75
},
"homepage": "https://github.com/plantain-00/types-as-schema#readme",
"devDependencies": {
"@types/fs-extra": "9.0.12",
"@types/lodash": "4.14.172",
"@types/minimist": "1.2.2",
"@types/node": "16.7.4",
"@types/node": "16.7.10",
"@types/webpack": "5.28.0",
"@typescript-eslint/eslint-plugin": "4.29.3",
"@typescript-eslint/parser": "4.29.3",
"autoprefixer": "10.3.3",
"@typescript-eslint/eslint-plugin": "4.30.0",
"@typescript-eslint/parser": "4.30.0",
"autoprefixer": "10.3.4",
"clean-css-cli": "5.3.3",
"clean-release": "2.15.2",
"clean-scripts": "1.20.1",
Expand All @@ -53,11 +53,11 @@
"stylelint-config-standard": "22.0.0",
"ts-loader": "9.2.5",
"ts-node": "10.2.1",
"tsconfig-plantain": "0.0.1",
"type-coverage": "2.18.0",
"vue": "3.2.6",
"tsconfig-plantain": "0.0.2",
"type-coverage": "2.18.2",
"vue": "3.2.8",
"watch-then-execute": "1.2.0",
"webpack": "5.51.1",
"webpack": "5.52.0",
"webpack-cli": "4.8.0"
},
"dependencies": {
Expand Down
7 changes: 4 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,9 @@ function getReferenceTypeImports(referenceTypes: ReferenceType[], graphqlRootTyp
if (!map[file]) {
map[file] = []
}
if (map[file].every((n) => n !== referenceType.name)) {
map[file].push(referenceType.name)
const references = map[file]
if (references?.every((n) => n !== referenceType.name)) {
references.push(referenceType.name)
}
}
const dirname = path.dirname(graphqlRootTypePath)
Expand All @@ -329,7 +330,7 @@ function getReferenceTypeImports(referenceTypes: ReferenceType[], graphqlRootTyp
relativePath = '.' + path.sep + relativePath
}
relativePath = relativePath.substring(0, relativePath.length - path.extname(relativePath).length)
imports.push(`import { ${map[file].join(', ')} } from '${relativePath}'`)
imports.push(`import { ${map[file]?.join(', ')} } from '${relativePath}'`)
}
return imports.join('\n')
}
2 changes: 1 addition & 1 deletion src/json-schema-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export function getReferencedDefinitions(
if (definition.properties) {
for (const propertyName in definition.properties) {
if (definition.properties.hasOwnProperty(propertyName)) {
const propertyDefinition = definition.properties[propertyName]
const propertyDefinition = definition.properties[propertyName]!
Object.assign(result, getReferencedDefinitions(propertyDefinition, definitions, dependents))
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class Parser {
const members = declaration.members
if (members.length > 0) {
const firstMember = members[0]
if (firstMember.initializer) {
if (firstMember?.initializer) {
this.handleEnumDeclarationInitializer(declaration, members, firstMember.initializer, sourceFile)
} else {
const enumType: EnumDeclaration = {
Expand Down Expand Up @@ -668,7 +668,7 @@ export class Parser {

private getTypeOfArrayTypeReference(reference: ts.TypeReferenceNode, sourceFile: ts.SourceFile): ArrayType {
if (reference.typeArguments && reference.typeArguments.length === 1) {
const typeArgument = reference.typeArguments[0]
const typeArgument = reference.typeArguments[0]!
return {
kind: 'array',
type: this.getType(typeArgument, sourceFile),
Expand Down Expand Up @@ -710,7 +710,7 @@ export class Parser {
if ((reference.typeName.text === 'Promise'
|| reference.typeName.text === 'ReturnType'
|| reference.typeName.text === 'DeepReturnType')) {
const typeArgument = reference.typeArguments[0]
const typeArgument = reference.typeArguments[0]!
return this.getType(typeArgument, sourceFile)
} else if (reference.typeName.text === 'Pick') {
const type = this.getTypeOfPick(reference.typeName, reference.typeArguments, sourceFile)
Expand Down Expand Up @@ -749,13 +749,13 @@ export class Parser {
typeArguments: ts.NodeArray<ts.TypeNode>,
sourceFile: ts.SourceFile
): ObjectType | undefined {
const argument = typeArguments[0]
const argument = typeArguments[0]!
if (ts.isTypeReferenceNode(argument) && ts.isIdentifier(argument.typeName)) {
const declarationName = argument.typeName.escapedText.toString()
this.preHandleType(declarationName)
const declaration = this.declarations.find(m => m.kind === 'object' && m.name === declarationName)
if (declaration && declaration.kind === 'object') {
const field = typeArguments[1]
const field = typeArguments[1]!
const memberNames: string[] = []
if (ts.isLiteralTypeNode(field)) {
if (ts.isStringLiteral(field.literal)) {
Expand Down Expand Up @@ -798,10 +798,10 @@ export class Parser {
}

private getTypeOfTypeLiteral(literal: ts.TypeLiteralNode, sourceFile: ts.SourceFile): Type {
if (literal.members.length === 1 && ts.isIndexSignatureDeclaration(literal.members[0])) {
if (literal.members.length === 1 && ts.isIndexSignatureDeclaration(literal.members[0]!)) {
const member = literal.members[0]
if (ts.isIndexSignatureDeclaration(member) && member.parameters.length === 1) {
const parameterType = member.parameters[0].type
const parameterType = member.parameters[0]?.type
if (parameterType && member.type) {
return {
kind: 'map',
Expand Down
2 changes: 1 addition & 1 deletion src/swagger-doc-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function generateSwaggerDoc(context: Context, swaggerBase?: Record<string
}
referenceNames.push(...getReferencesInType(typeDeclaration.type).map((r) => r.name))
const useFormData = typeDeclaration.parameters.some((p) => p.type.kind === 'file')
paths[typeDeclaration.path][typeDeclaration.method] = {
paths[typeDeclaration.path]![typeDeclaration.method] = {
consumes: useFormData ? ['multipart/form-data'] : undefined,
operationId: typeDeclaration.name,
parameters: typeDeclaration.parameters.map((parameter) => {
Expand Down
4 changes: 2 additions & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export function toUpperCase(name: string) {
return name[0].toUpperCase() + name.substring(1)
return name[0]?.toUpperCase() + name.substring(1)
}

export function toLowerCase(name: string) {
return name[0].toLowerCase() + name.substring(1)
return name[0]?.toLowerCase() + name.substring(1)
}

export function warn(position: PositionValue, stage: string) {
Expand Down
Loading

0 comments on commit cf2efd2

Please sign in to comment.