Skip to content

Commit

Permalink
Replace lodash chain with native Object.keys and filter
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinigami92 committed Mar 4, 2021
1 parent d7997ad commit 360cb7c
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions src/operations/tables.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import _ from 'lodash'
import { MigrationOptions, Literal } from '../types'
import { applyType, applyTypeAdapters, makeComment, escapeValue, formatLines } from '../utils'
import { FunctionParamType } from './functionsTypes'
Expand Down Expand Up @@ -75,10 +74,10 @@ const parseColumns = (
[x: string]: ColumnDefinition & FunctionParamType
}>((previous, column) => ({ ...previous, [column]: applyType(columns[column], extendingTypeShorthands) }), {})

const primaryColumns = _.chain(columnsWithOptions)
.map((options: ColumnDefinition, columnName) => (options.primaryKey ? columnName : null))
.filter((columnName): columnName is string => Boolean(columnName))
.value()
const primaryColumns = Object.keys(columnsWithOptions).filter((columnName) => {
const options = columnsWithOptions[columnName]
return options.primaryKey
})
const multiplePrimaryColumns = primaryColumns.length > 1

if (multiplePrimaryColumns) {
Expand All @@ -96,14 +95,13 @@ const parseColumns = (
)
}

const comments = _.chain(columnsWithOptions)
.map(
(options: ColumnDefinition, columnName) =>
typeof options.comment !== 'undefined' &&
makeComment('COLUMN', `${mOptions.literal(tableName)}.${mOptions.literal(columnName)}`, options.comment),
const comments = Object.keys(columnsWithOptions).filter((columnName) => {
const options = columnsWithOptions[columnName]
return (
typeof options.comment !== 'undefined' &&
makeComment('COLUMN', `${mOptions.literal(tableName)}.${mOptions.literal(columnName)}`, options.comment)
)
.filter((comment): comment is string => Boolean(comment))
.value()
})

return {
columns: Object.keys(columnsWithOptions).map((columnName) => {
Expand Down

0 comments on commit 360cb7c

Please sign in to comment.