import { Col } from 'sequelize/types/lib/utils'
import { literal, OrderItem } from 'sequelize'
+type Primitive = string | Function | number | boolean | Symbol | undefined | null
+type DeepOmitHelper<T, K extends keyof T> = {
+ [P in K]: // extra level of indirection needed to trigger homomorhic behavior
+ T[P] extends infer TP // distribute over unions
+ ? TP extends Primitive
+ ? TP // leave primitives and functions alone
+ : TP extends any[]
+ ? DeepOmitArray<TP, K> // Array special handling
+ : DeepOmit<TP, K>
+ : never
+}
+type DeepOmit<T, K> = T extends Primitive ? T : DeepOmitHelper<T, Exclude<keyof T, K>>
+
+type DeepOmitArray<T extends any[], K> = {
+ [P in keyof T]: DeepOmit<T[P], K>
+}
+
type SortType = { sortModel: string, sortValue: string }
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
}
const createSafeIn = (model: typeof Model, stringArr: (string | number)[]) => {
- return stringArr.map(t => model.sequelize.escape('' + t))
- .join(', ')
+ return stringArr.map(t => {
+ return t === null
+ ? null
+ : model.sequelize.escape('' + t)
+ }).join(', ')
}
function buildLocalAccountIdsIn () {
)
}
+function buildDirectionAndField (value: string) {
+ let field: string
+ let direction: 'ASC' | 'DESC'
+
+ if (value.substring(0, 1) === '-') {
+ direction = 'DESC'
+ field = value.substring(1)
+ } else {
+ direction = 'ASC'
+ field = value
+ }
+
+ return { direction, field }
+}
+
// ---------------------------------------------------------------------------
export {
+ DeepOmit,
buildBlockedAccountSQL,
buildLocalActorIdsIn,
SortType,
isOutdated,
parseAggregateResult,
getFollowsSort,
+ buildDirectionAndField,
createSafeIn
}
function searchTrigramNormalizeCol (col: string) {
return Sequelize.fn('lower', Sequelize.fn('immutable_unaccent', Sequelize.col(col)))
}
-
-function buildDirectionAndField (value: string) {
- let field: string
- let direction: 'ASC' | 'DESC'
-
- if (value.substring(0, 1) === '-') {
- direction = 'DESC'
- field = value.substring(1)
- } else {
- direction = 'ASC'
- field = value
- }
-
- return { direction, field }
-}