From ddbfb3a52cbc3ef453a909788bee026989ce24e7 Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Mon, 31 Aug 2020 17:27:18 +0200 Subject: [PATCH 1/4] Got all APIs working in Knex, except query. --- client/src/api.ts | 118 +- server/.gitignore | 2 +- server/app.ts | 37 +- server/config/config.json | 20 - .../endpoints/AlbumDetailsEndpointHandler.ts | 61 +- .../endpoints/ArtistDetailsEndpointHandler.ts | 38 +- .../endpoints/CreateAlbumEndpointHandler.ts | 98 +- .../endpoints/CreateArtistEndpointHandler.ts | 78 +- server/endpoints/CreateSongEndpointHandler.ts | 130 +- server/endpoints/CreateTagEndpointHandler.ts | 70 +- .../endpoints/ModifyAlbumEndpointHandler.ts | 164 +- .../endpoints/ModifyArtistEndpointHandler.ts | 105 +- server/endpoints/ModifySongEndpointHandler.ts | 217 ++- server/endpoints/ModifyTagEndpointHandler.ts | 85 +- server/endpoints/QueryEndpointHandler.ts | 324 ++-- .../endpoints/SongDetailsEndpointHandler.ts | 63 +- server/endpoints/TagDetailsEndpointHandler.ts | 43 +- server/endpoints/types.ts | 4 +- server/knex/knex.ts | 3 + server/knexfile.ts | 44 + server/migrations/20200828124218_init_db.ts | 118 ++ server/models/album.js | 14 - server/models/artist.js | 14 - server/models/index.js | 37 - server/models/ranking.js | 13 - server/models/song.js | 15 - server/models/tag.js | 14 - server/package.json | 3 +- server/server.ts | 15 +- server/test/integration/flows/AlbumFlow.js | 4 +- server/test/integration/flows/ArtistFlow.js | 27 +- server/test/integration/flows/QueryFlow.js | 4 +- server/test/integration/flows/SongFlow.js | 4 +- server/test/integration/flows/TagFlow.js | 4 +- server/test/integration/flows/helpers.js | 6 + server/yarn.lock | 1326 +++++++++++------ 36 files changed, 2069 insertions(+), 1253 deletions(-) delete mode 100644 server/config/config.json create mode 100644 server/knex/knex.ts create mode 100644 server/knexfile.ts create mode 100644 server/migrations/20200828124218_init_db.ts delete mode 100644 server/models/album.js delete mode 100644 server/models/artist.js delete mode 100644 server/models/index.js delete mode 100644 server/models/ranking.js delete mode 100644 server/models/song.js delete mode 100644 server/models/tag.js diff --git a/client/src/api.ts b/client/src/api.ts index 34887ee..8499339 100644 --- a/client/src/api.ts +++ b/client/src/api.ts @@ -15,38 +15,38 @@ export enum ItemType { } export interface ArtistDetails { - artistId: Number, - name: String, - storeLinks?: String[], + artistId: number, + name: string, + storeLinks?: string[], } export function isArtistDetails(q: any): q is ArtistDetails { return 'artistId' in q; } export interface TagDetails { - tagId: Number, - name: String, + tagId: number, + name: string, parent?: TagDetails, - storeLinks?: String[], + storeLinks?: string[], } export function isTagDetails(q: any): q is TagDetails { return 'tagId' in q; } export interface RankingDetails { - rankingId: Number, + rankingId: number, type: ItemType, // The item type being ranked - rankedId: Number, // The item being ranked + rankedId: number, // The item being ranked context: ArtistDetails | TagDetails, - value: Number, // The ranking (higher = better) + value: number, // The ranking (higher = better) } export function isRankingDetails(q: any): q is RankingDetails { return 'rankingId' in q; } export interface SongDetails { - songId: Number, - title: String, + songId: number, + title: string, artists?: ArtistDetails[], tags?: TagDetails[], - storeLinks?: String[], + storeLinks?: string[], rankings?: RankingDetails[], } export function isSongDetails(q: any): q is SongDetails { @@ -134,11 +134,11 @@ export function checkQueryRequest(req: any): boolean { export const SongDetailsEndpoint = '/song/:id'; export interface SongDetailsRequest { } export interface SongDetailsResponse { - title: String, - storeLinks: String[], - artistIds: Number[], - albumIds: Number[], - tagIds: Number[], + title: string, + storeLinks: string[], + artistIds: number[], + albumIds: number[], + tagIds: number[], } export function checkSongDetailsRequest(req: any): boolean { return true; @@ -148,9 +148,9 @@ export function checkSongDetailsRequest(req: any): boolean { export const ArtistDetailsEndpoint = '/artist/:id'; export interface ArtistDetailsRequest { } export interface ArtistDetailsResponse { - name: String, - tagIds: Number[], - storeLinks: String[], + name: string, + tagIds: number[], + storeLinks: string[], } export function checkArtistDetailsRequest(req: any): boolean { return true; @@ -159,14 +159,14 @@ export function checkArtistDetailsRequest(req: any): boolean { // Create a new song (POST). export const CreateSongEndpoint = '/song'; export interface CreateSongRequest { - title: String; - artistIds?: Number[]; - albumIds?: Number[]; - tagIds?: Number[]; - storeLinks?: String[]; + title: string; + artistIds?: number[]; + albumIds?: number[]; + tagIds?: number[]; + storeLinks?: string[]; } export interface CreateSongResponse { - id: Number; + id: number; } export function checkCreateSongRequest(req: any): boolean { return "body" in req && @@ -176,11 +176,11 @@ export function checkCreateSongRequest(req: any): boolean { // Modify an existing song (PUT). export const ModifySongEndpoint = '/song/:id'; export interface ModifySongRequest { - title?: String; - artistIds?: Number[]; - albumIds?: Number[]; - tagIds?: Number[]; - storeLinks?: String[]; + title?: string; + artistIds?: number[]; + albumIds?: number[]; + tagIds?: number[]; + storeLinks?: string[]; } export interface ModifySongResponse { } export function checkModifySongRequest(req: any): boolean { @@ -190,13 +190,13 @@ export function checkModifySongRequest(req: any): boolean { // Create a new album (POST). export const CreateAlbumEndpoint = '/album'; export interface CreateAlbumRequest { - name: String; - tagIds?: Number[]; - artistIds?: Number[]; - storeLinks?: String[]; + name: string; + tagIds?: number[]; + artistIds?: number[]; + storeLinks?: string[]; } export interface CreateAlbumResponse { - id: Number; + id: number; } export function checkCreateAlbumRequest(req: any): boolean { return "body" in req && @@ -206,10 +206,10 @@ export function checkCreateAlbumRequest(req: any): boolean { // Modify an existing album (PUT). export const ModifyAlbumEndpoint = '/album/:id'; export interface ModifyAlbumRequest { - name?: String; - tagIds?: Number[]; - artistIds?: Number[]; - storeLinks?: String[]; + name?: string; + tagIds?: number[]; + artistIds?: number[]; + storeLinks?: string[]; } export interface ModifyAlbumResponse { } export function checkModifyAlbumRequest(req: any): boolean { @@ -220,11 +220,11 @@ export function checkModifyAlbumRequest(req: any): boolean { export const AlbumDetailsEndpoint = '/album/:id'; export interface AlbumDetailsRequest { } export interface AlbumDetailsResponse { - name: String; - tagIds: Number[]; - artistIds: Number[]; - songIds: Number[]; - storeLinks: String[]; + name: string; + tagIds: number[]; + artistIds: number[]; + songIds: number[]; + storeLinks: string[]; } export function checkAlbumDetailsRequest(req: any): boolean { return true; @@ -233,12 +233,12 @@ export function checkAlbumDetailsRequest(req: any): boolean { // Create a new artist (POST). export const CreateArtistEndpoint = '/artist'; export interface CreateArtistRequest { - name: String; - tagIds?: Number[]; - storeLinks?: String[]; + name: string; + tagIds?: number[]; + storeLinks?: string[]; } export interface CreateArtistResponse { - id: Number; + id: number; } export function checkCreateArtistRequest(req: any): boolean { return "body" in req && @@ -248,9 +248,9 @@ export function checkCreateArtistRequest(req: any): boolean { // Modify an existing artist (PUT). export const ModifyArtistEndpoint = '/artist/:id'; export interface ModifyArtistRequest { - name?: String, - tagIds?: Number[]; - storeLinks?: String[], + name?: string, + tagIds?: number[]; + storeLinks?: string[], } export interface ModifyArtistResponse { } export function checkModifyArtistRequest(req: any): boolean { @@ -260,11 +260,11 @@ export function checkModifyArtistRequest(req: any): boolean { // Create a new tag (POST). export const CreateTagEndpoint = '/tag'; export interface CreateTagRequest { - name: String; - parentId?: Number; + name: string; + parentId?: number; } export interface CreateTagResponse { - id: Number; + id: number; } export function checkCreateTagRequest(req: any): boolean { return "body" in req && @@ -274,8 +274,8 @@ export function checkCreateTagRequest(req: any): boolean { // Modify an existing tag (PUT). export const ModifyTagEndpoint = '/tag/:id'; export interface ModifyTagRequest { - name?: String, - parentId?: Number; + name?: string, + parentId?: number; } export interface ModifyTagResponse { } export function checkModifyTagRequest(req: any): boolean { @@ -286,8 +286,8 @@ export function checkModifyTagRequest(req: any): boolean { export const TagDetailsEndpoint = '/tag/:id'; export interface TagDetailsRequest { } export interface TagDetailsResponse { - name: String, - parentId?: Number, + name: string, + parentId?: number, } export function checkTagDetailsRequest(req: any): boolean { return true; diff --git a/server/.gitignore b/server/.gitignore index 9e3efd4..fd63959 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -21,4 +21,4 @@ npm-debug.log* yarn-debug.log* yarn-error.log* -db_dev.sqlite3 +dev.sqlite3 diff --git a/server/app.ts b/server/app.ts index d1d6936..d412f51 100644 --- a/server/app.ts +++ b/server/app.ts @@ -1,5 +1,6 @@ const bodyParser = require('body-parser'); import * as api from '../client/src/api'; +import Knex from 'knex'; import { CreateSongEndpointHandler } from './endpoints/CreateSongEndpointHandler'; import { CreateArtistEndpointHandler } from './endpoints/CreateArtistEndpointHandler'; @@ -16,10 +17,10 @@ import { ModifyAlbumEndpointHandler } from './endpoints/ModifyAlbumEndpointHandl import { AlbumDetailsEndpointHandler } from './endpoints/AlbumDetailsEndpointHandler'; import * as endpointTypes from './endpoints/types'; -const invokeHandler = (handler:endpointTypes.EndpointHandler) => { +const invokeHandler = (handler:endpointTypes.EndpointHandler, knex: Knex) => { return async (req: any, res: any) => { console.log("Incoming", req.method, " @ ", req.url); - await handler(req, res) + await handler(req, res, knex) .catch(endpointTypes.catchUnhandledErrors) .catch((_e:endpointTypes.EndpointError) => { let e:endpointTypes.EndpointError = _e; @@ -30,24 +31,28 @@ const invokeHandler = (handler:endpointTypes.EndpointHandler) => { }; } -const SetupApp = (app: any) => { +const SetupApp = (app: any, knex: Knex) => { app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); + const invokeWithKnex = (handler: endpointTypes.EndpointHandler) => { + return invokeHandler(handler, knex); + } + // Set up REST API endpoints - app.post(api.CreateSongEndpoint, invokeHandler(CreateSongEndpointHandler)); - app.post(api.QueryEndpoint, invokeHandler(QueryEndpointHandler)); - app.post(api.CreateArtistEndpoint, invokeHandler(CreateArtistEndpointHandler)); - app.put(api.ModifyArtistEndpoint, invokeHandler(ModifyArtistEndpointHandler)); - app.put(api.ModifySongEndpoint, invokeHandler(ModifySongEndpointHandler)); - app.get(api.SongDetailsEndpoint, invokeHandler(SongDetailsEndpointHandler)); - app.get(api.ArtistDetailsEndpoint, invokeHandler(ArtistDetailsEndpointHandler)); - app.post(api.CreateTagEndpoint, invokeHandler(CreateTagEndpointHandler)); - app.put(api.ModifyTagEndpoint, invokeHandler(ModifyTagEndpointHandler)); - app.get(api.TagDetailsEndpoint, invokeHandler(TagDetailsEndpointHandler)); - app.post(api.CreateAlbumEndpoint, invokeHandler(CreateAlbumEndpointHandler)); - app.put(api.ModifyAlbumEndpoint, invokeHandler(ModifyAlbumEndpointHandler)); - app.get(api.AlbumDetailsEndpoint, invokeHandler(AlbumDetailsEndpointHandler)); + app.post(api.CreateSongEndpoint, invokeWithKnex(CreateSongEndpointHandler)); + app.post(api.QueryEndpoint, invokeWithKnex(QueryEndpointHandler)); + app.post(api.CreateArtistEndpoint, invokeWithKnex(CreateArtistEndpointHandler)); + app.put(api.ModifyArtistEndpoint, invokeWithKnex(ModifyArtistEndpointHandler)); + app.put(api.ModifySongEndpoint, invokeWithKnex(ModifySongEndpointHandler)); + app.get(api.SongDetailsEndpoint, invokeWithKnex(SongDetailsEndpointHandler)); + app.get(api.ArtistDetailsEndpoint, invokeWithKnex(ArtistDetailsEndpointHandler)); + app.post(api.CreateTagEndpoint, invokeWithKnex(CreateTagEndpointHandler)); + app.put(api.ModifyTagEndpoint, invokeWithKnex(ModifyTagEndpointHandler)); + app.get(api.TagDetailsEndpoint, invokeWithKnex(TagDetailsEndpointHandler)); + app.post(api.CreateAlbumEndpoint, invokeWithKnex(CreateAlbumEndpointHandler)); + app.put(api.ModifyAlbumEndpoint, invokeWithKnex(ModifyAlbumEndpointHandler)); + app.get(api.AlbumDetailsEndpoint, invokeWithKnex(AlbumDetailsEndpointHandler)); } export { SetupApp } \ No newline at end of file diff --git a/server/config/config.json b/server/config/config.json deleted file mode 100644 index 6b6e7d2..0000000 --- a/server/config/config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "development": { - "storage": "db_dev.sqlite3", - "dialect": "sqlite" - }, - "test": { - "username": "root", - "password": null, - "database": "database_test", - "host": "127.0.0.1", - "dialect": "mysql" - }, - "production": { - "username": "root", - "password": null, - "database": "database_production", - "host": "127.0.0.1", - "dialect": "mysql" - } -} diff --git a/server/endpoints/AlbumDetailsEndpointHandler.ts b/server/endpoints/AlbumDetailsEndpointHandler.ts index 85300ba..f18822d 100644 --- a/server/endpoints/AlbumDetailsEndpointHandler.ts +++ b/server/endpoints/AlbumDetailsEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const AlbumDetailsEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const AlbumDetailsEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkAlbumDetailsRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid AlbumDetails request: ' + JSON.stringify(req.body), @@ -12,27 +12,44 @@ export const AlbumDetailsEndpointHandler: EndpointHandler = async (req: any, res } try { - const albums = await models.Album.findAll({ - include: [models.Artist, models.Tag, models.Song], - where: { - id: req.params.id - } - }); - if (albums.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no album with id ' + req.params.id + '.', - httpStatus: 400 - }; - throw e; - } - let album = albums[0]; + // Start transfers for songs, tags and artists. + // Also request the album itself. + const tagIdsPromise = knex.select('tagId') + .from('albums_tags') + .where({ 'albumId': req.params.id }) + .then((tags: any) => { + return tags.map((tag: any) => tag['tagId']) + }); + const songIdsPromise = knex.select('songId') + .from('songs_albums') + .where({ 'albumId': req.params.id }) + .then((songs: any) => { + return songs.map((song: any) => song['songId']) + }); + const artistIdsPromise = knex.select('artistId') + .from('artists_albums') + .where({ 'albumId': req.params.id }) + .then((artists: any) => { + return artists.map((artist: any) => artist['artistId']) + }); + const albumPromise = knex.select('name', 'storeLinks') + .from('albums') + .where({ id: req.params.id }) + .then((albums: any) => albums[0]); + + // Wait for the requests to finish. + const [album, tags, songs, artists] = + await Promise.all([albumPromise, tagIdsPromise, songIdsPromise, artistIdsPromise]); + + // Respond to the request. const response: api.AlbumDetailsResponse = { - name: album.name, - artistIds: album.Artists.map((artist: any) => artist.id), - tagIds: album.Tags.map((tag: any) => tag.id), - songIds: album.Songs.map((song: any) => song.id), - storeLinks: album.storeLinks, - } + name: album['name'], + artistIds: artists, + tagIds: tags, + songIds: songs, + storeLinks: JSON.parse(album['storeLinks']), + }; + await res.send(response); } catch (e) { catchUnhandledErrors(e); diff --git a/server/endpoints/ArtistDetailsEndpointHandler.ts b/server/endpoints/ArtistDetailsEndpointHandler.ts index 3b20bad..753e12d 100644 --- a/server/endpoints/ArtistDetailsEndpointHandler.ts +++ b/server/endpoints/ArtistDetailsEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const ArtistDetailsEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const ArtistDetailsEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkArtistDetailsRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid ArtistDetails request: ' + JSON.stringify(req.body), @@ -12,27 +12,21 @@ export const ArtistDetailsEndpointHandler: EndpointHandler = async (req: any, re } try { - const artists: any[] = await models.Artist.findAll({ - where: { - id: req.params.id - }, - include: [models.Tag] - }); - if (artists.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no artist with id ' + req.params.id + '.', - httpStatus: 400 - }; - throw e; - } - let artist = artists[0]; - const storeLinks = Array.isArray(artist.storeLinks) ? artist.storeLinks : - (artist.storeLinks ? [artist.storeLinks] : []); + const tagIds = Array.from(new Set((await knex.select('tagId') + .from('artists_tags') + .where({ 'artistId': req.params.id }) + ).map((tag: any) => tag['tagId']))); + + const results = await knex.select(['id', 'name', 'storeLinks']) + .from('artists') + .where({ 'id': req.params.id }); + const response: api.ArtistDetailsResponse = { - name: artist.name, - tagIds: artist.Tags.map((tag: any) => tag.id), - storeLinks: storeLinks, - }; + name: results[0].name, + tagIds: tagIds, + storeLinks: JSON.parse(results[0].storeLinks), + } + await res.send(response); } catch (e) { catchUnhandledErrors(e) diff --git a/server/endpoints/CreateAlbumEndpointHandler.ts b/server/endpoints/CreateAlbumEndpointHandler.ts index 3fe833a..b35593e 100644 --- a/server/endpoints/CreateAlbumEndpointHandler.ts +++ b/server/endpoints/CreateAlbumEndpointHandler.ts @@ -1,9 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -const { Op } = require("sequelize"); +import Knex from 'knex'; -export const CreateAlbumEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const CreateAlbumEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkCreateAlbumRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid CreateAlbum request: ' + JSON.stringify(req.body), @@ -13,29 +12,30 @@ export const CreateAlbumEndpointHandler: EndpointHandler = async (req: any, res: } const reqObject: api.CreateAlbumRequest = req.body; - // Start retrieving the artist instances to link the album to. - var artistInstancesPromise = reqObject.artistIds && models.Artist.findAll({ - where: { - id: { - [Op.in]: reqObject.artistIds - } - } - }); + console.log("Create Album:", reqObject); - // Start retrieving the tag instances to link the album to. - var tagInstancesPromise = reqObject.tagIds && models.Tag.findAll({ - where: { - id: { - [Op.in]: reqObject.tagIds - } - } - }); + await knex.transaction(async (trx) => { + try { + // Start retrieving artists. + const artistIdsPromise = reqObject.artistIds ? + trx.select('id') + .from('artists') + .whereIn('id', reqObject.artistIds) + .then((as: any) => as.map((a: any) => a['id'])) : + (async () => { return [] })(); + + // Start retrieving tags. + const tagIdsPromise = reqObject.tagIds ? + trx.select('id') + .from('tags') + .whereIn('id', reqObject.tagIds) + .then((as: any) => as.map((a: any) => a['id'])) : + (async () => { return [] })(); - // Upon finish retrieving artists and tags, create the album and associate it. - await Promise.all([artistInstancesPromise, tagInstancesPromise]) - .then((values: any) => { - var [artists, tags] = values; + // Wait for the requests to finish. + var [artists, tags] = await Promise.all([artistIdsPromise, tagIdsPromise]);; + // Check that we found all artists and tags we need. if ((reqObject.artistIds && artists.length !== reqObject.artistIds.length) || (reqObject.tagIds && tags.length !== reqObject.tagIds.length)) { const e: EndpointError = { @@ -45,19 +45,47 @@ export const CreateAlbumEndpointHandler: EndpointHandler = async (req: any, res: throw e; } - var album = models.Album.build({ - name: reqObject.name, - storeLinks: reqObject.storeLinks || [], - }); - artists && album.addArtists(artists); - tags && album.addTags(tags); - return album.save(); - }) - .then((album: any) => { + // Create the album. + const albumId = (await trx('albums') + .insert({ + name: reqObject.name, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + )[0]; + + // Link the artists via the linking table. + if (artists && artists.length) { + await trx('artists_albums').insert( + artists.map((artistId: number) => { + return { + artistId: artistId, + albumId: albumId, + } + }) + ) + } + + // Link the tags via the linking table. + if (tags && tags.length) { + await trx('albums_tags').insert( + tags.map((tagId: number) => { + return { + albumId: albumId, + tagId: tagId, + } + }) + ) + } + + // Respond to the request. const responseObject: api.CreateSongResponse = { - id: album.id + id: albumId }; res.status(200).send(responseObject); - }) - .catch(catchUnhandledErrors); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/CreateArtistEndpointHandler.ts b/server/endpoints/CreateArtistEndpointHandler.ts index 22fb5ed..80a19b9 100644 --- a/server/endpoints/CreateArtistEndpointHandler.ts +++ b/server/endpoints/CreateArtistEndpointHandler.ts @@ -1,9 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -const { Op } = require("sequelize"); +import Knex from 'knex'; -export const CreateArtistEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const CreateArtistEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkCreateArtistRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid CreateArtist request: ' + JSON.stringify(req.body), @@ -15,38 +14,55 @@ export const CreateArtistEndpointHandler: EndpointHandler = async (req: any, res console.log("Create artist:", reqObject) - try { + await knex.transaction(async (trx) => { + try { + // Retrieve tag instances to link the artist to. + const tags: number[] = reqObject.tagIds ? + Array.from(new Set( + (await trx.select('id').from('tags') + .whereIn('id', reqObject.tagIds)) + .map((tag: any) => tag['id']) + )) + : []; - // Start retrieving the tag instances to link the artist to. - const tags = reqObject.tagIds && await models.Tag.findAll({ - where: { - id: { - [Op.in]: reqObject.tagIds - } + console.log("Found artist tags:", tags) + + if (reqObject.tagIds && tags && tags.length !== reqObject.tagIds.length) { + const e: EndpointError = { + internalMessage: 'Not all tags exist for CreateArtist request: ' + JSON.stringify(req.body), + httpStatus: 400 + }; + throw e; } - }); - console.log("Found artist tags:", tags) + // Create the artist. + const artistId = (await trx('artists') + .insert({ + name: reqObject.name, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + )[0]; + + // Link the tags via the linking table. + if (tags && tags.length) { + await trx('artists_tags').insert( + tags.map((tagId: number) => { + return { + artistId: artistId, + tagId: tagId, + } + }) + ) + } - if (reqObject.tagIds && tags.length !== reqObject.tagIds.length) { - const e: EndpointError = { - internalMessage: 'Not all tags exist for CreateArtist request: ' + JSON.stringify(req.body), - httpStatus: 400 + const responseObject: api.CreateSongResponse = { + id: artistId }; - throw e; - } + await res.status(200).send(responseObject); - var artist = models.Artist.build({ - name: reqObject.name, - storeLinks: reqObject.storeLinks || [], - }); - tags && artist.addTags(tags); - await artist.save(); - const responseObject: api.CreateSongResponse = { - id: artist.id - }; - await res.status(200).send(responseObject); - } catch (e) { - catchUnhandledErrors(e); - } + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }); } \ No newline at end of file diff --git a/server/endpoints/CreateSongEndpointHandler.ts b/server/endpoints/CreateSongEndpointHandler.ts index 8d55e71..0c42585 100644 --- a/server/endpoints/CreateSongEndpointHandler.ts +++ b/server/endpoints/CreateSongEndpointHandler.ts @@ -1,9 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -const { Op } = require("sequelize"); +import Knex from 'knex'; -export const CreateSongEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const CreateSongEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkCreateSongRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid CreateSong request: ' + JSON.stringify(req.body), @@ -13,41 +12,41 @@ export const CreateSongEndpointHandler: EndpointHandler = async (req: any, res: } const reqObject: api.CreateSongRequest = req.body; - // Start retrieving the artist instances to link the song to. - var artistInstancesPromise = reqObject.artistIds && models.Artist.findAll({ - where: { - id: { - [Op.in]: reqObject.artistIds - } - } - }); + console.log("Create Song:", reqObject); - // Start retrieving the album instances to link the song to. - var albumInstancesPromise = reqObject.albumIds && models.Album.findAll({ - where: { - id: { - [Op.in]: reqObject.albumIds - } - } - }); + await knex.transaction(async (trx) => { + try { + // Start retrieving artists. + const artistIdsPromise = reqObject.artistIds ? + trx.select('id') + .from('artists') + .whereIn('id', reqObject.artistIds) + .then((as: any) => as.map((a: any) => a['id'])) : + (async () => { return [] })(); - // Start retrieving the tag instances to link the song to. - var tagInstancesPromise = reqObject.tagIds && models.Tag.findAll({ - where: { - id: { - [Op.in]: reqObject.tagIds - } - } - }); + // Start retrieving tags. + const tagIdsPromise = reqObject.tagIds ? + trx.select('id') + .from('tags') + .whereIn('id', reqObject.tagIds) + .then((as: any) => as.map((a: any) => a['id'])) : + (async () => { return [] })(); - // Upon finish retrieving dependents, create the song and associate it. - await Promise.all([artistInstancesPromise, albumInstancesPromise, tagInstancesPromise]) - .then((values: any) => { - var [artists, albums, tags] = values; + // Start retrieving albums. + const albumIdsPromise = reqObject.albumIds ? + trx.select('id') + .from('albums') + .whereIn('id', reqObject.albumIds) + .then((as: any) => as.map((a: any) => a['id'])) : + (async () => { return [] })(); + // Wait for the requests to finish. + var [artists, tags, albums] = await Promise.all([artistIdsPromise, tagIdsPromise, albumIdsPromise]);; + + // Check that we found all objects we need. if ((reqObject.artistIds && artists.length !== reqObject.artistIds.length) || - (reqObject.albumIds && albums.length !== reqObject.albumIds.length) || - (reqObject.tagIds && tags.length !== reqObject.tagIds.length)) { + (reqObject.tagIds && tags.length !== reqObject.tagIds.length) || + (reqObject.albumIds && albums.length !== reqObject.albumIds.length)) { const e: EndpointError = { internalMessage: 'Not all albums and/or artists and/or tags exist for CreateSong request: ' + JSON.stringify(req.body), httpStatus: 400 @@ -55,20 +54,59 @@ export const CreateSongEndpointHandler: EndpointHandler = async (req: any, res: throw e; } - var song = models.Song.build({ - title: reqObject.title, - storeLinks: reqObject.storeLinks || [], - }); - artists && song.addArtists(artists); - albums && song.addAlbums(albums); - tags && song.addTags(tags); - return song.save(); - }) - .then((song: any) => { + // Create the song. + const songId = (await trx('songs') + .insert({ + title: reqObject.title, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + )[0]; + + // Link the artists via the linking table. + if (artists && artists.length) { + await Promise.all( + artists.map((artistId: number) => { + return trx('songs_artists').insert({ + artistId: artistId, + songId: songId, + }) + }) + ) + } + + // Link the tags via the linking table. + if (tags && tags.length) { + await Promise.all( + tags.map((tagId: number) => { + return trx('songs_tags').insert({ + songId: songId, + tagId: tagId, + }) + }) + ) + } + + // Link the albums via the linking table. + if (albums && albums.length) { + await Promise.all( + albums.map((albumId: number) => { + return trx('songs_albums').insert({ + songId: songId, + albumId: albumId, + }) + }) + ) + } + + // Respond to the request. const responseObject: api.CreateSongResponse = { - id: song.id + id: songId }; res.status(200).send(responseObject); - }) - .catch(catchUnhandledErrors); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/CreateTagEndpointHandler.ts b/server/endpoints/CreateTagEndpointHandler.ts index ab9b971..a1ff4d6 100644 --- a/server/endpoints/CreateTagEndpointHandler.ts +++ b/server/endpoints/CreateTagEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const CreateTagEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const CreateTagEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkCreateTagRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid CreateTag request: ' + JSON.stringify(req.body), @@ -12,37 +12,45 @@ export const CreateTagEndpointHandler: EndpointHandler = async (req: any, res: a } const reqObject: api.CreateTagRequest = req.body; - const getTag = async (id: Number) => { - const tag = await models.Tag.findAll({ - where: { - id: id + console.log("Create Tag: ", reqObject); + + await knex.transaction(async (trx) => { + try { + // If applicable, retrieve the parent tag. + const maybeParent: number | undefined = + reqObject.parentId ? + (await trx.select('id') + .from('tags') + .where({ 'id': reqObject.parentId }))[0]['id'] : + undefined; + + // Check if the parent was found, if applicable. + if (reqObject.parentId && maybeParent !== reqObject.parentId) { + const e: EndpointError = { + internalMessage: 'Could not find parent tag for CreateTag request: ' + JSON.stringify(req.body), + httpStatus: 400 + }; + throw e; } - }); - if (tag.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no tag with id ' + id + '.', - httpStatus: 400 + + // Create the new tag. + var tag: any = { + name: reqObject.name }; - throw e; - } - return tag[0]; - } + if (maybeParent) { + tag['parentId'] = maybeParent; + } + const tagId = (await trx('tags').insert(tag))[0]; - // If applicable, start retrieving the new parent tag. - const maybeNewParentPromise: Promise | Promise = - (reqObject.parentId) ? getTag(reqObject.parentId) : (async () => { return undefined })(); + // Respond to the request. + const responseObject: api.CreateTagResponse = { + id: tagId + }; + res.status(200).send(responseObject); - (async () => { - const maybeParent = await maybeNewParentPromise; - const tag = await models.Tag.create({ - name: reqObject.name - }); - reqObject.parentId && await tag.setParent(maybeParent); - await tag.save(); - const responseObject: api.CreateTagResponse = { - id: tag.id - }; - res.status(200).send(responseObject); - })() - .catch(catchUnhandledErrors); + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/ModifyAlbumEndpointHandler.ts b/server/endpoints/ModifyAlbumEndpointHandler.ts index ed92c6d..4d2ae29 100644 --- a/server/endpoints/ModifyAlbumEndpointHandler.ts +++ b/server/endpoints/ModifyAlbumEndpointHandler.ts @@ -1,9 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -const { Op } = require("sequelize"); +import Knex from 'knex'; -export const ModifyAlbumEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const ModifyAlbumEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkModifyAlbumRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid ModifyAlbum request: ' + JSON.stringify(req.body), @@ -13,50 +12,133 @@ export const ModifyAlbumEndpointHandler: EndpointHandler = async (req: any, res: } const reqObject: api.ModifyAlbumRequest = req.body; - // Start retrieving the artist instances to link the album to. - var artistInstancesPromise = reqObject.artistIds && models.Artist.findAll({ - where: { - id: { - [Op.in]: reqObject.artistIds - } - } - }); + console.log("Modify Album:", reqObject); - // Start retrieving the tag instances to link the album to. - var tagInstancesPromise = reqObject.tagIds && models.Tag.findAll({ - where: { - id: { - [Op.in]: reqObject.tagIds - } - } - }); + await knex.transaction(async (trx) => { + try { + // Start retrieving artists. + const artistIdsPromise = reqObject.artistIds ? + trx.select('artistId') + .from('artists_albums') + .whereIn('id', reqObject.artistIds) + .then((as: any) => as.map((a: any) => a['artistId'])) : + (async () => { return [] })(); - // Start retrieving the album to modify. - var albumInstancePromise = models.Album.findOne({ - where: { - id: req.params.id - } - }); + // Start retrieving tags. + const tagIdsPromise = reqObject.tagIds ? + trx.select('id') + .from('albums_tags') + .whereIn('id', reqObject.tagIds) + .then((ts: any) => ts.map((t: any) => t['tagId'])) : + (async () => { return [] })(); - // Upon finish retrieving artists and albums, modify the album. - await Promise.all([artistInstancesPromise, tagInstancesPromise, albumInstancePromise]) - .then(async (values: any) => { - var [artists, tags, album] = values; - if (!album) { + // Start retrieving the album itself. + const albumPromise = trx.select('id') + .from('albums') + .where({ id: req.params.id }) + .then((r: any) => (r && r[0]) ? r[0]['id'] : undefined) + + // Wait for the requests to finish. + var [album, artists, tags] = await Promise.all([albumPromise, artistIdsPromise, tagIdsPromise]);; + + // Check that we found all objects we need. + if ((reqObject.artistIds && artists.length !== reqObject.artistIds.length) || + (reqObject.tagIds && tags.length !== reqObject.tagIds.length) || + !album) { const e: EndpointError = { - internalMessage: 'There is no album with id ' + req.params.id + '.', + internalMessage: 'Not all albums and/or artists and/or tags exist for ModifyAlbum request: ' + JSON.stringify(req.body), httpStatus: 400 }; throw e; } - if (reqObject.artistIds) { album.setArtists(artists) }; - if (reqObject.tagIds) { album.setTags(tags) }; - if (reqObject.name) { album.name = reqObject.name }; - if (reqObject.storeLinks) { album.setStoreIds(reqObject.storeLinks) }; - await album.save(); - }) - .then(() => { - res.status(200).send({}); - }) - .catch(catchUnhandledErrors); + + // Modify the album. + const modifyAlbumPromise = trx('albums') + .where({ 'id': req.params.id }) + .update({ + name: reqObject.name, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + + // Remove unlinked artists. + // TODO: test this! + const removeUnlinkedArtists = trx('artists_albums') + .where({ 'albumId': req.params.id }) + .whereNotIn('artistId', reqObject.artistIds || []) + .delete(); + + // Remove unlinked tags. + // TODO: test this! + const removeUnlinkedTags = trx('albums_tags') + .where({ 'albumId': req.params.id }) + .whereNotIn('tagId', reqObject.tagIds || []) + .delete(); + + // Link new artists. + // TODO: test this! + const addArtists = trx('artists_albums') + .where({ 'albumId': req.params.id }) + .then((as: any) => as.map((a: any) => a['artistId'])) + .then((doneArtistIds: number[]) => { + // Get the set of artists that are not yet linked + const toLink = artists.filter((id: number) => { + return !doneArtistIds.includes(id); + }); + const insertObjects = toLink.map((artistId: number) => { + return { + artistId: artistId, + albumId: req.params.id, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('artists_albums').insert(obj) + ) + ); + }) + + // Link new tags. + // TODO: test this! + const addTags = trx('albums_tags') + .where({ 'albumId': req.params.id }) + .then((ts: any) => ts.map((t: any) => t['tagId'])) + .then((doneTagIds: number[]) => { + // Get the set of tags that are not yet linked + const toLink = tags.filter((id: number) => { + return !doneTagIds.includes(id); + }); + const insertObjects = toLink.map((tagId: number) => { + return { + tagId: tagId, + albumId: req.params.id, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('albums_tags').insert(obj) + ) + ); + }) + + // Wait for all operations to finish. + await Promise.all([ + modifyAlbumPromise, + removeUnlinkedArtists, + removeUnlinkedTags, + addArtists, + addTags + ]); + + // Respond to the request. + res.status(200).send(); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/ModifyArtistEndpointHandler.ts b/server/endpoints/ModifyArtistEndpointHandler.ts index 7eb5941..165415b 100644 --- a/server/endpoints/ModifyArtistEndpointHandler.ts +++ b/server/endpoints/ModifyArtistEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const ModifyArtistEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const ModifyArtistEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkModifyArtistRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid ModifyArtist request: ' + JSON.stringify(req.body), @@ -10,26 +10,95 @@ export const ModifyArtistEndpointHandler: EndpointHandler = async (req: any, res }; throw e; } - const reqObject:api.ModifyArtistRequest = req.body; + const reqObject: api.ModifyArtistRequest = req.body; + console.log("Modify Artist:", reqObject); - await models.Artist.findAll({ - where: { id: req.params.id } - }) - .then(async (artists: any[]) => { - if (artists.length != 1) { + await knex.transaction(async (trx) => { + try { + const artistId = parseInt(req.params.id); + + // Start retrieving tags. + const tagIdsPromise = reqObject.tagIds ? + trx.select('id') + .from('artists_tags') + .whereIn('id', reqObject.tagIds) + .then((ts: any) => ts.map((t: any) => t['tagId'])) : + (async () => { return [] })(); + + // Start retrieving the artist itself. + const artistPromise = trx.select('id') + .from('artists') + .where({ id: artistId }) + .then((r: any) => (r && r[0]) ? r[0]['id'] : undefined) + + // Wait for the requests to finish. + var [artist, tags] = await Promise.all([artistPromise, tagIdsPromise]);; + + // Check that we found all objects we need. + if ((reqObject.tagIds && tags.length !== reqObject.tagIds.length) || + !artist) { const e: EndpointError = { - internalMessage: 'There is no artist with id ' + req.params.id + '.', + internalMessage: 'Not all artists and/or tags exist for ModifyArtist request: ' + JSON.stringify(req.body), httpStatus: 400 }; throw e; } - let artist = artists[0]; - artist.name = reqObject.name; - if(reqObject.storeLinks) { artist.setStoreLinks(reqObject.storeLinks) }; - await artist.save(); - }) - .then(() => { - res.status(200).send({}); - }) - .catch(catchUnhandledErrors); + + // Modify the artist. + const modifyArtistPromise = trx('artists') + .where({ 'id': artistId }) + .update({ + name: reqObject.name, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + + // Remove unlinked tags. + // TODO: test this! + const removeUnlinkedTags = reqObject.tagIds ? + trx('artists_tags') + .where({ 'artistId': artistId }) + .whereNotIn('tagId', reqObject.tagIds || []) + .delete() : + (async () => undefined)(); + + // Link new tags. + // TODO: test this! + const addTags = trx('artists_tags') + .where({ 'artistId': artistId }) + .then((ts: any) => ts.map((t: any) => t['tagId'])) + .then((doneTagIds: number[]) => { + // Get the set of tags that are not yet linked + const toLink = tags.filter((id: number) => { + return !doneTagIds.includes(id); + }); + const insertObjects = toLink.map((tagId: number) => { + return { + tagId: tagId, + artistId: artistId, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('artists_tags').insert(obj) + ) + ); + }); + + // Wait for all operations to finish. + await Promise.all([ + modifyArtistPromise, + removeUnlinkedTags, + addTags + ]); + + // Respond to the request. + res.status(200).send(); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/ModifySongEndpointHandler.ts b/server/endpoints/ModifySongEndpointHandler.ts index 7b73752..980f62a 100644 --- a/server/endpoints/ModifySongEndpointHandler.ts +++ b/server/endpoints/ModifySongEndpointHandler.ts @@ -1,9 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -const { Op } = require("sequelize"); +import Knex from 'knex'; -export const ModifySongEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const ModifySongEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkModifySongRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid ModifySong request: ' + JSON.stringify(req.body), @@ -13,53 +12,177 @@ export const ModifySongEndpointHandler: EndpointHandler = async (req: any, res: } const reqObject: api.ModifySongRequest = req.body; - // Start retrieving the artist instances to link the song to. - var artistInstancesPromise = reqObject.artistIds && models.Artist.findAll({ - where: { - id: { - [Op.in]: reqObject.artistIds - } - } - }); + console.log("Modify Song:", reqObject); - // Start retrieving the album instances to link the song to. - var albumInstancesPromise = reqObject.albumIds && models.Album.findAll({ - where: { - id: { - [Op.in]: reqObject.albumIds - } - } - }); + await knex.transaction(async (trx) => { + try { + // Start retrieving artists. + const artistIdsPromise = reqObject.artistIds ? + trx.select('artistId') + .from('songs_artists') + .whereIn('id', reqObject.artistIds) + .then((as: any) => as.map((a: any) => a['artistId'])) : + (async () => { return [] })(); + + // Start retrieving tags. + const tagIdsPromise = reqObject.tagIds ? + trx.select('id') + .from('songs_tags') + .whereIn('id', reqObject.tagIds) + .then((ts: any) => ts.map((t: any) => t['tagId'])) : + (async () => { return [] })(); + + // Start retrieving albums. + const albumIdsPromise = reqObject.albumIds ? + trx.select('id') + .from('songs_albums') + .whereIn('id', reqObject.albumIds) + .then((as: any) => as.map((a: any) => a['albumId'])) : + (async () => { return [] })(); - // Start retrieving the tag instances to link the song to. - var tagInstancesPromise = reqObject.tagIds && models.Tag.findAll({ - where: { - id: { - [Op.in]: reqObject.tagIds + // Start retrieving the song itself. + const songPromise = trx.select('id') + .from('songs') + .where({ id: req.params.id }) + .then((r: any) => (r && r[0]) ? r[0]['id'] : undefined) + + // Wait for the requests to finish. + var [song, artists, tags, albums] = + await Promise.all([songPromise, artistIdsPromise, tagIdsPromise, albumIdsPromise]);; + + // Check that we found all objects we need. + if ((reqObject.artistIds && artists.length !== reqObject.artistIds.length) || + (reqObject.tagIds && tags.length !== reqObject.tagIds.length) || + (reqObject.albumIds && albums.length !== reqObject.albumIds.length) || + !song) { + const e: EndpointError = { + internalMessage: 'Not all albums and/or artists and/or tags exist for ModifySong request: ' + JSON.stringify(req.body), + httpStatus: 400 + }; + throw e; } - } - }); - // Start retrieving the song to modify. - var songInstancePromise = models.Song.findAll({ - where: { - id: req.params.id + // Modify the song. + const modifySongPromise = trx('songs') + .where({ 'id': req.params.id }) + .update({ + title: reqObject.title, + storeLinks: JSON.stringify(reqObject.storeLinks || []), + }) + + // Remove unlinked artists. + // TODO: test this! + const removeUnlinkedArtists = trx('artists_songs') + .where({ 'songId': req.params.id }) + .whereNotIn('artistId', reqObject.artistIds || []) + .delete(); + + // Remove unlinked tags. + // TODO: test this! + const removeUnlinkedTags = trx('songs_tags') + .where({ 'songId': req.params.id }) + .whereNotIn('tagId', reqObject.tagIds || []) + .delete(); + + // Remove unlinked albums. + // TODO: test this! + const removeUnlinkedAlbums = trx('songs_albums') + .where({ 'songId': req.params.id }) + .whereNotIn('albumId', reqObject.albumIds || []) + .delete(); + + // Link new artists. + // TODO: test this! + const addArtists = trx('artists_songs') + .where({ 'songId': req.params.id }) + .then((as: any) => as.map((a: any) => a['artistId'])) + .then((doneArtistIds: number[]) => { + // Get the set of artists that are not yet linked + const toLink = artists.filter((id: number) => { + return !doneArtistIds.includes(id); + }); + const insertObjects = toLink.map((artistId: number) => { + return { + artistId: artistId, + songId: req.params.id, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('artists_songs').insert(obj) + ) + ); + }) + + // Link new tags. + // TODO: test this! + const addTags = trx('songs_tags') + .where({ 'songId': req.params.id }) + .then((ts: any) => ts.map((t: any) => t['tagId'])) + .then((doneTagIds: number[]) => { + // Get the set of tags that are not yet linked + const toLink = tags.filter((id: number) => { + return !doneTagIds.includes(id); + }); + const insertObjects = toLink.map((tagId: number) => { + return { + tagId: tagId, + songId: req.params.id, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('songs_tags').insert(obj) + ) + ); + }) + + // Link new albums. + // TODO: test this! + const addAlbums = trx('songs_albums') + .where({ 'albumId': req.params.id }) + .then((as: any) => as.map((a: any) => a['albumId'])) + .then((doneAlbumIds: number[]) => { + // Get the set of albums that are not yet linked + const toLink = albums.filter((id: number) => { + return !doneAlbumIds.includes(id); + }); + const insertObjects = toLink.map((albumId: number) => { + return { + albumId: albumId, + songId: req.params.id, + } + }) + + // Link them + return Promise.all( + insertObjects.map((obj: any) => + trx('songs_albums').insert(obj) + ) + ); + }) + + // Wait for all operations to finish. + await Promise.all([ + modifySongPromise, + removeUnlinkedArtists, + removeUnlinkedTags, + removeUnlinkedAlbums, + addArtists, + addTags, + addAlbums, + ]); + + // Respond to the request. + res.status(200).send(); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); } - }); - - // Upon finish retrieving artists and albums, modify the song. - await Promise.all([artistInstancesPromise, albumInstancesPromise, tagInstancesPromise, songInstancePromise]) - .then(async (values: any) => { - var [artists, albums, tags, song] = values; - if (reqObject.artistIds) { song.setArtists(artists) }; - if (reqObject.albumIds) { song.setAlbums(albums) }; - if (reqObject.tagIds) { song.setTags(tags) }; - if (reqObject.title) { song.setTitle(reqObject.title) }; - if (reqObject.storeLinks) { song.setStoreIds(reqObject.storeLinks) }; - await song.save(); - }) - .then(() => { - res.status(200).send({}); - }) - .catch(catchUnhandledErrors); + }) } \ No newline at end of file diff --git a/server/endpoints/ModifyTagEndpointHandler.ts b/server/endpoints/ModifyTagEndpointHandler.ts index 076c354..adfb558 100644 --- a/server/endpoints/ModifyTagEndpointHandler.ts +++ b/server/endpoints/ModifyTagEndpointHandler.ts @@ -1,10 +1,9 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; -import tag from '../models/tag'; +import Knex from 'knex'; -export const ModifyTagEndpointHandler: EndpointHandler = async (req: any, res: any) => { - if (!api.checkModifySongRequest(req)) { +export const ModifyTagEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { + if (!api.checkModifyTagRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid ModifyTag request: ' + JSON.stringify(req.body), httpStatus: 400 @@ -13,39 +12,51 @@ export const ModifyTagEndpointHandler: EndpointHandler = async (req: any, res: a } const reqObject: api.ModifyTagRequest = req.body; - const getTag = async (id:Number) => { - const tag = await models.Tag.findAll({ - where: { - id: id + console.log("Modify Tag:", reqObject); + + await knex.transaction(async (trx) => { + try { + // Start retrieving the parent tag. + const parentTagPromise = reqObject.parentId ? + trx.select('id') + .from('tags') + .where({ 'id': reqObject.parentId }) + .then((ts: any) => ts.map((t: any) => t['tagId'])) : + (async () => { return [] })(); + + // Start retrieving the tag itself. + const tagPromise = trx.select('id') + .from('tags') + .where({ id: req.params.id }) + .then((r: any) => (r && r[0]) ? r[0]['id'] : undefined) + + // Wait for the requests to finish. + var [tag, parent] = await Promise.all([tagPromise, parentTagPromise]);; + + // Check that we found all objects we need. + if ((reqObject.parentId && !parent) || + !tag) { + const e: EndpointError = { + internalMessage: 'Tag or parent does not exist for ModifyTag request: ' + JSON.stringify(req.body), + httpStatus: 400 + }; + throw e; } - }); - if(tag.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no tag with id ' + id + '.', - httpStatus: 400 - }; - throw e; - } - return tag[0]; - } - // If applicable, start retrieving the new parent tag. - const maybeNewParentPromise:Promise|Promise = - (reqObject.parentId) ? getTag(reqObject.parentId) : (async () => { return undefined })(); - - // Start retrieving the tag to modify. - var tagInstancePromise: Promise = getTag(req.params.id); - - // Upon finish retrieving artists and albums, modify the song. - await Promise.all([maybeNewParentPromise, tagInstancePromise]) - .then(async (values: any) => { - var [maybeParent, tag] = values; - if(reqObject.name) { tag.setName(reqObject.name) }; - if(reqObject.parentId) { tag.setParent(maybeParent) }; - await tag.save(); - }) - .then(() => { - res.status(200).send({}); - }) - .catch(catchUnhandledErrors); + // Modify the tag. + await trx('tags') + .where({ 'id': req.params.id }) + .update({ + name: reqObject.name, + parentId: reqObject.parentId || null, + }) + + // Respond to the request. + res.status(200).send(); + + } catch (e) { + catchUnhandledErrors(e); + trx.rollback(); + } + }) } \ No newline at end of file diff --git a/server/endpoints/QueryEndpointHandler.ts b/server/endpoints/QueryEndpointHandler.ts index c819cf9..f0f06a1 100644 --- a/server/endpoints/QueryEndpointHandler.ts +++ b/server/endpoints/QueryEndpointHandler.ts @@ -1,5 +1,3 @@ -const models = require('../models'); -const { Op } = require("sequelize"); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; @@ -9,87 +7,87 @@ enum QueryType { Tag, } -const sequelizeOps: any = { - [api.QueryFilterOp.Eq]: Op.eq, - [api.QueryFilterOp.Ne]: Op.ne, - [api.QueryFilterOp.In]: Op.in, - [api.QueryFilterOp.NotIn]: Op.notIn, - [api.QueryFilterOp.Like]: Op.like, - [api.QueryElemOp.And]: Op.and, - [api.QueryElemOp.Or]: Op.or, -}; +// const sequelizeOps: any = { +// [api.QueryFilterOp.Eq]: Op.eq, +// [api.QueryFilterOp.Ne]: Op.ne, +// [api.QueryFilterOp.In]: Op.in, +// [api.QueryFilterOp.NotIn]: Op.notIn, +// [api.QueryFilterOp.Like]: Op.like, +// [api.QueryElemOp.And]: Op.and, +// [api.QueryElemOp.Or]: Op.or, +// }; -const sequelizeProps: any = { - [QueryType.Song]: { - [api.QueryElemProperty.songTitle]: "title", - [api.QueryElemProperty.songId]: "id", - [api.QueryElemProperty.artistName]: "$Artists.name$", - [api.QueryElemProperty.artistId]: "$Artists.id$", - [api.QueryElemProperty.albumName]: "$Albums.name$", - }, - [QueryType.Artist]: { - [api.QueryElemProperty.songTitle]: "$Songs.title$", - [api.QueryElemProperty.songId]: "$Songs.id$", - [api.QueryElemProperty.artistName]: "name", - [api.QueryElemProperty.artistId]: "id", - [api.QueryElemProperty.albumName]: "$Albums.name$", - }, - [QueryType.Tag]: { - [api.QueryElemProperty.songTitle]: "$Songs.title$", - [api.QueryElemProperty.songId]: "$Songs.id$", - [api.QueryElemProperty.artistName]: "$Artists.name$", - [api.QueryElemProperty.artistId]: "$Artists.id$", - [api.QueryElemProperty.albumName]: "$Albums.name$", - } -}; +// const sequelizeProps: any = { +// [QueryType.Song]: { +// [api.QueryElemProperty.songTitle]: "title", +// [api.QueryElemProperty.songId]: "id", +// [api.QueryElemProperty.artistName]: "$Artists.name$", +// [api.QueryElemProperty.artistId]: "$Artists.id$", +// [api.QueryElemProperty.albumName]: "$Albums.name$", +// }, +// [QueryType.Artist]: { +// [api.QueryElemProperty.songTitle]: "$Songs.title$", +// [api.QueryElemProperty.songId]: "$Songs.id$", +// [api.QueryElemProperty.artistName]: "name", +// [api.QueryElemProperty.artistId]: "id", +// [api.QueryElemProperty.albumName]: "$Albums.name$", +// }, +// [QueryType.Tag]: { +// [api.QueryElemProperty.songTitle]: "$Songs.title$", +// [api.QueryElemProperty.songId]: "$Songs.id$", +// [api.QueryElemProperty.artistName]: "$Artists.name$", +// [api.QueryElemProperty.artistId]: "$Artists.id$", +// [api.QueryElemProperty.albumName]: "$Albums.name$", +// } +// }; -const sequelizeOrderColumns: any = { - [QueryType.Song]: { - [api.OrderByType.Name]: 'title', - [api.OrderByType.ArtistRanking]: '$Rankings.rank$', - [api.OrderByType.TagRanking]: '$Rankings.rank$', - }, - [QueryType.Artist]: { - [api.OrderByType.Name]: 'name' - }, - [QueryType.Tag]: { - [api.OrderByType.Name]: 'name' - }, -} +// const sequelizeOrderColumns: any = { +// [QueryType.Song]: { +// [api.OrderByType.Name]: 'title', +// [api.OrderByType.ArtistRanking]: '$Rankings.rank$', +// [api.OrderByType.TagRanking]: '$Rankings.rank$', +// }, +// [QueryType.Artist]: { +// [api.OrderByType.Name]: 'name' +// }, +// [QueryType.Tag]: { +// [api.OrderByType.Name]: 'name' +// }, +// } -// Returns the "where" clauses for Sequelize, per object type. -const getSequelizeWhere = (queryElem: api.QueryElem, type: QueryType) => { - var where: any = { - [Op.and]: [] - }; +// // Returns the "where" clauses for Sequelize, per object type. +// const getSequelizeWhere = (queryElem: api.QueryElem, type: QueryType) => { +// var where: any = { +// [Op.and]: [] +// }; - if (queryElem.prop && queryElem.propOperator && queryElem.propOperand) { - // Visit a filter-like subquery leaf. - where[Op.and].push({ - [sequelizeProps[type][queryElem.prop]]: { - [sequelizeOps[queryElem.propOperator]]: queryElem.propOperand - } - }); - } - if (queryElem.childrenOperator && queryElem.children) { - // Recursively visit a nested subquery. +// if (queryElem.prop && queryElem.propOperator && queryElem.propOperand) { +// // Visit a filter-like subquery leaf. +// where[Op.and].push({ +// [sequelizeProps[type][queryElem.prop]]: { +// [sequelizeOps[queryElem.propOperator]]: queryElem.propOperand +// } +// }); +// } +// if (queryElem.childrenOperator && queryElem.children) { +// // Recursively visit a nested subquery. - const children = queryElem.children.map((child: api.QueryElem) => getSequelizeWhere(child, type)); - where[Op.and].push({ - [sequelizeOps[queryElem.childrenOperator]]: children - }); - } +// const children = queryElem.children.map((child: api.QueryElem) => getSequelizeWhere(child, type)); +// where[Op.and].push({ +// [sequelizeOps[queryElem.childrenOperator]]: children +// }); +// } - return where; -} +// return where; +// } -function getSequelizeOrder(order: api.Ordering, type: QueryType) { - const ascstring = order.ascending ? 'ASC' : 'DESC'; +// function getSequelizeOrder(order: api.Ordering, type: QueryType) { +// const ascstring = order.ascending ? 'ASC' : 'DESC'; - return [ - [ sequelizeOrderColumns[type][order.orderBy.type], ascstring ] - ]; -} +// return [ +// [ sequelizeOrderColumns[type][order.orderBy.type], ascstring ] +// ]; +// } export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any) => { if (!api.checkQueryRequest(req.body)) { @@ -101,93 +99,95 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any) } const reqObject: api.QueryRequest = req.body; - try { - const songLimit = reqObject.offsetsLimits.songLimit; - const songOffset = reqObject.offsetsLimits.songOffset; - const tagLimit = reqObject.offsetsLimits.tagLimit; - const tagOffset = reqObject.offsetsLimits.tagOffset; - const artistLimit = reqObject.offsetsLimits.artistLimit; - const artistOffset = reqObject.offsetsLimits.artistOffset; + // try { + // const songLimit = reqObject.offsetsLimits.songLimit; + // const songOffset = reqObject.offsetsLimits.songOffset; + // const tagLimit = reqObject.offsetsLimits.tagLimit; + // const tagOffset = reqObject.offsetsLimits.tagOffset; + // const artistLimit = reqObject.offsetsLimits.artistLimit; + // const artistOffset = reqObject.offsetsLimits.artistOffset; - const songs = (songLimit && songLimit > 0) && await models.Song.findAll({ - // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. - // Custom pagination is implemented before responding. - where: getSequelizeWhere(reqObject.query, QueryType.Song), - order: getSequelizeOrder(reqObject.ordering, QueryType.Song), - include: [ models.Artist, models.Album, models.Tag, models.Ranking ], - //limit: reqObject.limit, - //offset: reqObject.offset, - }) - const artists = (artistLimit && artistLimit > 0) && await models.Artist.findAll({ - // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. - // Custom pagination is implemented before responding. - where: getSequelizeWhere(reqObject.query, QueryType.Artist), - order: getSequelizeOrder(reqObject.ordering, QueryType.Artist), - include: [models.Song, models.Album, models.Tag], - //limit: reqObject.limit, - //offset: reqObject.offset, - }) - const tags = (tagLimit && tagLimit > 0) && await models.Tag.findAll({ - // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. - // Custom pagination is implemented before responding. - where: getSequelizeWhere(reqObject.query, QueryType.Tag), - order: getSequelizeOrder(reqObject.ordering, QueryType.Tag), - include: [models.Song, models.Album, models.Artist], - //limit: reqObject.limit, - //offset: reqObject.offset, - }) + // const songs = (songLimit && songLimit > 0) && await models.Song.findAll({ + // // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. + // // Custom pagination is implemented before responding. + // where: getSequelizeWhere(reqObject.query, QueryType.Song), + // order: getSequelizeOrder(reqObject.ordering, QueryType.Song), + // include: [ models.Artist, models.Album, models.Tag, models.Ranking ], + // //limit: reqObject.limit, + // //offset: reqObject.offset, + // }) + // const artists = (artistLimit && artistLimit > 0) && await models.Artist.findAll({ + // // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. + // // Custom pagination is implemented before responding. + // where: getSequelizeWhere(reqObject.query, QueryType.Artist), + // order: getSequelizeOrder(reqObject.ordering, QueryType.Artist), + // include: [models.Song, models.Album, models.Tag], + // //limit: reqObject.limit, + // //offset: reqObject.offset, + // }) + // const tags = (tagLimit && tagLimit > 0) && await models.Tag.findAll({ + // // NOTE: have to disable limit and offset because of bug: https://github.com/sequelize/sequelize/issues/11938. + // // Custom pagination is implemented before responding. + // where: getSequelizeWhere(reqObject.query, QueryType.Tag), + // order: getSequelizeOrder(reqObject.ordering, QueryType.Tag), + // include: [models.Song, models.Album, models.Artist], + // //limit: reqObject.limit, + // //offset: reqObject.offset, + // }) - const response: api.QueryResponse = { - songs: ((songLimit || -1) <= 0) ? [] : await Promise.all(songs.map(async (song: any) => { - const artists = song.getArtists(); - const tags = song.getTags(); - const rankings = song.getRankings(); - return { - songId: song.id, - title: song.title, - storeLinks: song.storeLinks, - artists: (await artists).map((artist: any) => { - return { - artistId: artist.id, - name: artist.name, - } - }), - tags: (await tags).map((tag: any) => { - return { - tagId: tag.id, - name: tag.name, - } - }), - rankings: await (await rankings).map(async (ranking: any) => { - const maybeTagContext: api.TagDetails | undefined = await ranking.getTagContext(); - const maybeArtistContext: api.ArtistDetails | undefined = await ranking.getArtistContext(); - const maybeContext = maybeTagContext || maybeArtistContext; - return { - rankingId: ranking.id, - type: api.ItemType.Song, - rankedId: song.id, - context: maybeContext, - value: ranking.value, - } - }) - }; - }).slice(songOffset || 0, (songOffset || 0) + (songLimit || 10))), - // TODO: custom pagination due to bug mentioned above - artists: ((artistLimit || -1) <= 0) ? [] : await Promise.all(artists.map(async (artist: any) => { - return { - artistId: artist.id, - name: artist.name, - }; - }).slice(artistOffset || 0, (artistOffset || 0) + (artistLimit || 10))), - tags: ((tagLimit || -1) <= 0) ? [] : await Promise.all(tags.map(async (tag: any) => { - return { - tagId: tag.id, - name: tag.name, - }; - }).slice(tagOffset || 0, (tagOffset || 0) + (tagLimit || 10))), - }; - res.send(response); - } catch (e) { - catchUnhandledErrors(e); - } + // const response: api.QueryResponse = { + // songs: ((songLimit || -1) <= 0) ? [] : await Promise.all(songs.map(async (song: any) => { + // const artists = song.getArtists(); + // const tags = song.getTags(); + // const rankings = song.getRankings(); + // return { + // songId: song.id, + // title: song.title, + // storeLinks: song.storeLinks, + // artists: (await artists).map((artist: any) => { + // return { + // artistId: artist.id, + // name: artist.name, + // } + // }), + // tags: (await tags).map((tag: any) => { + // return { + // tagId: tag.id, + // name: tag.name, + // } + // }), + // rankings: await (await rankings).map(async (ranking: any) => { + // const maybeTagContext: api.TagDetails | undefined = await ranking.getTagContext(); + // const maybeArtistContext: api.ArtistDetails | undefined = await ranking.getArtistContext(); + // const maybeContext = maybeTagContext || maybeArtistContext; + // return { + // rankingId: ranking.id, + // type: api.ItemType.Song, + // rankedId: song.id, + // context: maybeContext, + // value: ranking.value, + // } + // }) + // }; + // }).slice(songOffset || 0, (songOffset || 0) + (songLimit || 10))), + // // TODO: custom pagination due to bug mentioned above + // artists: ((artistLimit || -1) <= 0) ? [] : await Promise.all(artists.map(async (artist: any) => { + // return { + // artistId: artist.id, + // name: artist.name, + // }; + // }).slice(artistOffset || 0, (artistOffset || 0) + (artistLimit || 10))), + // tags: ((tagLimit || -1) <= 0) ? [] : await Promise.all(tags.map(async (tag: any) => { + // return { + // tagId: tag.id, + // name: tag.name, + // }; + // }).slice(tagOffset || 0, (tagOffset || 0) + (tagLimit || 10))), + // }; + // res.send(response); + // } catch (e) { + // catchUnhandledErrors(e); + // } + + throw "NOTIMPLEMENTED"; } \ No newline at end of file diff --git a/server/endpoints/SongDetailsEndpointHandler.ts b/server/endpoints/SongDetailsEndpointHandler.ts index 15a87d0..7fc3149 100644 --- a/server/endpoints/SongDetailsEndpointHandler.ts +++ b/server/endpoints/SongDetailsEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const SongDetailsEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const SongDetailsEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkSongDetailsRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid SongDetails request: ' + JSON.stringify(req.body), @@ -12,29 +12,50 @@ export const SongDetailsEndpointHandler: EndpointHandler = async (req: any, res: } try { - const songs = await models.Song.findAll({ - include: [models.Artist, models.Album, models.Tag], - where: { - id: req.params.id - } - }); - if (songs.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no song with id ' + req.params.id + '.', - httpStatus: 400 - }; - throw e; - } - let song = songs[0]; + const tagIdsPromise: Promise = knex.select('tagId') + .from('songs_tags') + .where({ 'songId': req.params.id }) + .then((ts: any) => { + return Array.from(new Set( + ts.map((tag: any) => tag['tagId']) + )); + }) + + const albumIdsPromise: Promise = knex.select('albumId') + .from('songs_albums') + .where({ 'songId': req.params.id }) + .then((as: any) => { + return Array.from(new Set( + as.map((album: any) => album['albumId']) + )); + }) + + const artistIdsPromise: Promise = knex.select('artistId') + .from('songs_artists') + .where({ 'songId': req.params.id }) + .then((as: any) => { + return Array.from(new Set( + as.map((artist: any) => artist['artistId']) + )); + }) + const songPromise = await knex.select(['id', 'title', 'storeLinks']) + .from('songs') + .where({ 'id': req.params.id }) + .then((ss: any) => ss[0]) + + const [tags, albums, artists, song] = + await Promise.all([tagIdsPromise, albumIdsPromise, artistIdsPromise, songPromise]); + const response: api.SongDetailsResponse = { title: song.title, - artistIds: song.Artists.map((artist: any) => artist.id), - albumIds: song.Albums.map((album: any) => album.id), - tagIds: song.Tags.map((tag: any) => tag.id), - storeLinks: song.storeLinks, + tagIds: tags, + artistIds: artists, + albumIds: albums, + storeLinks: JSON.parse(song.storeLinks), } + await res.send(response); } catch (e) { - catchUnhandledErrors(e); + catchUnhandledErrors(e) } } \ No newline at end of file diff --git a/server/endpoints/TagDetailsEndpointHandler.ts b/server/endpoints/TagDetailsEndpointHandler.ts index 581ab49..7497acb 100644 --- a/server/endpoints/TagDetailsEndpointHandler.ts +++ b/server/endpoints/TagDetailsEndpointHandler.ts @@ -1,8 +1,8 @@ -const models = require('../models'); import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -export const TagDetailsEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const TagDetailsEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkTagDetailsRequest(req)) { const e: EndpointError = { internalMessage: 'Invalid TagDetails request: ' + JSON.stringify(req.body), @@ -11,29 +11,18 @@ export const TagDetailsEndpointHandler: EndpointHandler = async (req: any, res: throw e; } - await models.Tag.findAll({ - where: { - id: req.params.id - }, - include: [{ - model: models.Tag, - as: 'parent' - }] - }) - .then((tags: any[]) => { - if (tags.length != 1) { - const e: EndpointError = { - internalMessage: 'There is no tag with id ' + req.params.id + '.', - httpStatus: 400 - }; - throw e; - } - let tag = tags[0]; - var response: api.TagDetailsResponse = { - name: tag.name, - }; - if(tag.parent) { response['parentId'] = tag.parent.id; } - res.send(response); - }) - .catch(catchUnhandledErrors); + try { + const results = await knex.select(['id', 'name', 'parentId']) + .from('tags') + .where({ 'id': req.params.id }); + + const response: api.TagDetailsResponse = { + name: results[0].name, + parentId: results[0].parentId, + } + + await res.send(response); + } catch (e) { + catchUnhandledErrors(e) + } } \ No newline at end of file diff --git a/server/endpoints/types.ts b/server/endpoints/types.ts index 277beb7..a2bd28e 100644 --- a/server/endpoints/types.ts +++ b/server/endpoints/types.ts @@ -1,4 +1,6 @@ -export type EndpointHandler = (req: any, res: any) => Promise; +import Knex from 'knex'; + +export type EndpointHandler = (req: any, res: any, knex: Knex) => Promise; export interface EndpointError { internalMessage: String; diff --git a/server/knex/knex.ts b/server/knex/knex.ts new file mode 100644 index 0000000..a1af280 --- /dev/null +++ b/server/knex/knex.ts @@ -0,0 +1,3 @@ +const environment = process.env.ENVIRONMENT || 'development' +const config = require('../knexfile.js')[environment]; +export default require('knex')(config); \ No newline at end of file diff --git a/server/knexfile.ts b/server/knexfile.ts new file mode 100644 index 0000000..ca655ca --- /dev/null +++ b/server/knexfile.ts @@ -0,0 +1,44 @@ +// Update with your config settings. + +export default { + + development: { + client: "sqlite3", + connection: { + filename: "./dev.sqlite3" + } + }, + + // staging: { + // client: "postgresql", + // connection: { + // database: "my_db", + // user: "username", + // password: "password" + // }, + // pool: { + // min: 2, + // max: 10 + // }, + // migrations: { + // tableName: "knex_migrations" + // } + // }, + + // production: { + // client: "postgresql", + // connection: { + // database: "my_db", + // user: "username", + // password: "password" + // }, + // pool: { + // min: 2, + // max: 10 + // }, + // migrations: { + // tableName: "knex_migrations" + // } + // } + +}; diff --git a/server/migrations/20200828124218_init_db.ts b/server/migrations/20200828124218_init_db.ts new file mode 100644 index 0000000..81a6392 --- /dev/null +++ b/server/migrations/20200828124218_init_db.ts @@ -0,0 +1,118 @@ +import * as Knex from "knex"; + + +export async function up(knex: Knex): Promise { + // Songs table. + await knex.schema.createTable( + 'songs', + (table: any) => { + table.increments('id'); + table.string('title'); + table.json('storeLinks') + } + ) + + // Artists table. + await knex.schema.createTable( + 'artists', + (table: any) => { + table.increments('id'); + table.string('name'); + table.json('storeLinks'); + } + ) + + // Albums table. + await knex.schema.createTable( + 'albums', + (table: any) => { + table.increments('id'); + table.string('name'); + table.json('storeLinks'); + } + ) + + // Tags table. + await knex.schema.createTable( + 'tags', + (table: any) => { + table.increments('id'); + table.string('name'); + table.integer('parentId'); + } + ) + + // Songs <-> Artists + await knex.schema.createTable( + 'songs_artists', + (table: any) => { + table.increments('id'); + table.integer('songId'); + table.integer('artistId'); + } + ) + + // Songs <-> Albums + await knex.schema.createTable( + 'songs_albums', + (table: any) => { + table.increments('id'); + table.integer('songId'); + table.integer('albumId'); + } + ) + + // Songs <-> Tags + await knex.schema.createTable( + 'songs_tags', + (table: any) => { + table.increments('id'); + table.integer('songId'); + table.integer('tagId'); + } + ) + + // Artists <-> Tags + await knex.schema.createTable( + 'artists_tags', + (table: any) => { + table.increments('id'); + table.integer('artistId'); + table.integer('tagId'); + } + ) + + // Albums <-> Tags + await knex.schema.createTable( + 'albums_tags', + (table: any) => { + table.increments('id'); + table.integer('tagId'); + table.integer('albumId'); + } + ) + + // Artists <-> Albums + await knex.schema.createTable( + 'artists_albums', + (table: any) => { + table.increments('id'); + table.integer('artistId'); + table.integer('albumId'); + } + ) +} + + +export async function down(knex: Knex): Promise { + await knex.schema.dropTable('songs'); + await knex.schema.dropTable('artists'); + await knex.schema.dropTable('albums'); + await knex.schema.dropTable('tags'); + await knex.schema.dropTable('songs_artists'); + await knex.schema.dropTable('songs_albums'); + await knex.schema.dropTable('songs_tags'); + await knex.schema.dropTable('artists_tags'); + await knex.schema.dropTable('albums_tags'); +} + diff --git a/server/models/album.js b/server/models/album.js deleted file mode 100644 index 83ce74b..0000000 --- a/server/models/album.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - var Album = sequelize.define('Album', { - name: DataTypes.STRING, - storeLinks: DataTypes.JSON, - }); - - Album.associate = function (models) { - models.Album.belongsToMany(models.Song, { through: "SongAlbums" }); - models.Album.belongsToMany(models.Artist, { through: "AlbumArtists" }); - models.Album.belongsToMany(models.Tag, { through: 'AlbumTags' }); - }; - - return Album; -}; \ No newline at end of file diff --git a/server/models/artist.js b/server/models/artist.js deleted file mode 100644 index d56bdb1..0000000 --- a/server/models/artist.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - var Artist = sequelize.define('Artist', { - name: DataTypes.STRING, - storeLinks: DataTypes.JSON, - }); - - Artist.associate = function (models) { - models.Artist.belongsToMany(models.Song, { through: "SongArtists" }); - models.Artist.belongsToMany(models.Album, { through: "AlbumArtists" }); - models.Artist.belongsToMany(models.Tag, { through: 'ArtistTags' }); - }; - - return Artist; -}; \ No newline at end of file diff --git a/server/models/index.js b/server/models/index.js deleted file mode 100644 index 33f09e7..0000000 --- a/server/models/index.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const Sequelize = require('sequelize'); -const basename = path.basename(__filename); -const env = process.env.NODE_ENV || 'development'; -const config = require(__dirname + '/../config/config.json')[env]; -const db = {}; - -let sequelize; -if (config.use_env_variable) { - sequelize = new Sequelize(process.env[config.use_env_variable], config); -} else { - sequelize = new Sequelize(config.database, config.username, config.password, config); -} - -fs - .readdirSync(__dirname) - .filter(file => { - return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js'); - }) - .forEach(file => { - const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes); - db[model.name] = model; - }); - -Object.keys(db).forEach(modelName => { - if (db[modelName].associate) { - db[modelName].associate(db); - } -}); - -db.sequelize = sequelize; -db.Sequelize = Sequelize; - -module.exports = db; diff --git a/server/models/ranking.js b/server/models/ranking.js deleted file mode 100644 index d15a74e..0000000 --- a/server/models/ranking.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - var Ranking = sequelize.define('Ranking', { - rank: DataTypes.DOUBLE - }); - - Ranking.associate = function (models) { - models.Ranking.hasOne(models.Tag, { as: 'tagContext' }); - models.Ranking.hasOne(models.Artist, { as: 'artistContext' }); - models.Ranking.belongsToMany(models.Song, { through: 'SongRankings' }); - }; - - return Ranking; -}; \ No newline at end of file diff --git a/server/models/song.js b/server/models/song.js deleted file mode 100644 index 0f0e965..0000000 --- a/server/models/song.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - var Song = sequelize.define('Song', { - title: DataTypes.STRING, - storeLinks: DataTypes.JSON, - }); - - Song.associate = function (models) { - models.Song.belongsToMany(models.Artist, { through: "SongArtists" }); - models.Song.belongsToMany(models.Album, { through: "SongAlbums" }); - models.Song.belongsToMany(models.Tag, { through: 'SongTags' }); - models.Song.belongsToMany(models.Ranking, { through: 'SongRankings'}); - }; - - return Song; -}; \ No newline at end of file diff --git a/server/models/tag.js b/server/models/tag.js deleted file mode 100644 index 0478872..0000000 --- a/server/models/tag.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = (sequelize, DataTypes) => { - var Tag = sequelize.define('Tag', { - name: DataTypes.STRING, - }); - - Tag.associate = function (models) { - models.Tag.hasOne(models.Tag, { as: 'parent' }); - models.Tag.belongsToMany(models.Artist, { through: 'ArtistTags' }); - models.Tag.belongsToMany(models.Album, { through: 'AlbumTags' }); - models.Tag.belongsToMany(models.Song, { through: 'SongTags' }); - }; - - return Tag; -}; \ No newline at end of file diff --git a/server/package.json b/server/package.json index f0638f9..0751c9e 100644 --- a/server/package.json +++ b/server/package.json @@ -12,8 +12,7 @@ "chai-http": "^4.3.0", "express": "^4.16.4", "jasmine": "^3.5.0", - "sequelize": "^6.3.0", - "sequelize-cli": "^6.2.0", + "knex": "^0.21.5", "sqlite3": "^5.0.0", "ts-node": "^8.10.2", "typescript": "~3.7.2" diff --git a/server/server.ts b/server/server.ts index 45d2447..4485977 100644 --- a/server/server.ts +++ b/server/server.ts @@ -1,17 +1,16 @@ const express = require('express'); -const bodyParser = require('body-parser'); -const models = require('./models'); + +const environment = process.env.ENVIRONMENT || 'development' +const knexConfig = require('knexfile.js')[environment]; +const knex = require('knex')(knexConfig); import { SetupApp } from './app'; const app = express(); -SetupApp(app); +SetupApp(app, knex); -models.sequelize.sync().then(() => { - // TODO: configurable port - const port = process.env.PORT || 5000; - app.listen(port, () => console.log(`Listening on port ${port}`)); -}) +const port = process.env.PORT || 5000; +app.listen(port, () => console.log(`Listening on port ${port}`)); export { } \ No newline at end of file diff --git a/server/test/integration/flows/AlbumFlow.js b/server/test/integration/flows/AlbumFlow.js index 91fcc61..0c8bdd3 100644 --- a/server/test/integration/flows/AlbumFlow.js +++ b/server/test/integration/flows/AlbumFlow.js @@ -1,7 +1,6 @@ const chai = require('chai'); const chaiHttp = require('chai-http'); const express = require('express'); -const models = require('../../../models'); import { SetupApp } from '../../../app'; import { expect } from 'chai'; import * as helpers from './helpers'; @@ -9,8 +8,7 @@ import * as helpers from './helpers'; async function init() { chai.use(chaiHttp); const app = express(); - SetupApp(app); - await models.sequelize.sync({ force: true }); + SetupApp(app, await helpers.initTestDB()); return app; } diff --git a/server/test/integration/flows/ArtistFlow.js b/server/test/integration/flows/ArtistFlow.js index dcfb39a..020cee9 100644 --- a/server/test/integration/flows/ArtistFlow.js +++ b/server/test/integration/flows/ArtistFlow.js @@ -1,7 +1,6 @@ const chai = require('chai'); const chaiHttp = require('chai-http'); const express = require('express'); -const models = require('../../../models'); import { SetupApp } from '../../../app'; import { expect } from 'chai'; import * as helpers from './helpers'; @@ -9,8 +8,7 @@ import * as helpers from './helpers'; async function init() { chai.use(chaiHttp); const app = express(); - SetupApp(app); - await models.sequelize.sync({ force: true }); + SetupApp(app, await helpers.initTestDB()); return app; } @@ -32,32 +30,23 @@ describe('POST /artist with no name', () => { describe('POST /artist with a correct request', () => { it('should succeed', done => { init().then((app) => { - chai - .request(app) - .post('/artist') - .send({ - name: "MyArtist" - }) - .then((res) => { - expect(res).to.have.status(200); - expect(res.body).to.deep.equal({ - id: 1 - }); - done(); - }); + var req = chai.request(app).keepOpen(); + helpers.createArtist(req, { name: "MyArtist" }, 200, { id: 1 }) + .then(() => helpers.checkArtist(req, 1, 200, { name: "MyArtist", storeLinks: [], tagIds: [] })) + .then(req.close) + .then(done); }); }); }); - describe('PUT /artist on nonexistent artist', () => { it('should fail', done => { init().then((app) => { chai .request(app) - .put('/artist/1') + .put('/artist/0') .send({ - id: 1, + id: 0, name: "NewArtistName" }) .then((res) => { diff --git a/server/test/integration/flows/QueryFlow.js b/server/test/integration/flows/QueryFlow.js index 741a884..3781034 100644 --- a/server/test/integration/flows/QueryFlow.js +++ b/server/test/integration/flows/QueryFlow.js @@ -1,7 +1,6 @@ const chai = require('chai'); const chaiHttp = require('chai-http'); const express = require('express'); -const models = require('../../../models'); import { SetupApp } from '../../../app'; import { expect } from 'chai'; import * as helpers from './helpers'; @@ -9,8 +8,7 @@ import * as helpers from './helpers'; async function init() { chai.use(chaiHttp); const app = express(); - SetupApp(app); - await models.sequelize.sync({ force: true }); + SetupApp(app, await helpers.initTestDB());; return app; } diff --git a/server/test/integration/flows/SongFlow.js b/server/test/integration/flows/SongFlow.js index 9071265..e296f55 100644 --- a/server/test/integration/flows/SongFlow.js +++ b/server/test/integration/flows/SongFlow.js @@ -1,7 +1,6 @@ const chai = require('chai'); const chaiHttp = require('chai-http'); const express = require('express'); -const models = require('../../../models'); import { SetupApp } from '../../../app'; import { expect } from 'chai'; import * as helpers from './helpers'; @@ -9,8 +8,7 @@ import * as helpers from './helpers'; async function init() { chai.use(chaiHttp); const app = express(); - SetupApp(app); - await models.sequelize.sync({ force: true }); + SetupApp(app, await helpers.initTestDB()); return app; } diff --git a/server/test/integration/flows/TagFlow.js b/server/test/integration/flows/TagFlow.js index 200254c..918587d 100644 --- a/server/test/integration/flows/TagFlow.js +++ b/server/test/integration/flows/TagFlow.js @@ -1,7 +1,6 @@ const chai = require('chai'); const chaiHttp = require('chai-http'); const express = require('express'); -const models = require('../../../models'); import { SetupApp } from '../../../app'; import { expect } from 'chai'; import * as helpers from './helpers'; @@ -9,8 +8,7 @@ import * as helpers from './helpers'; async function init() { chai.use(chaiHttp); const app = express(); - SetupApp(app); - await models.sequelize.sync({ force: true }); + SetupApp(app, await helpers.initTestDB()); return app; } diff --git a/server/test/integration/flows/helpers.js b/server/test/integration/flows/helpers.js index 7bd89d0..354a16a 100644 --- a/server/test/integration/flows/helpers.js +++ b/server/test/integration/flows/helpers.js @@ -1,5 +1,11 @@ import { expect } from "chai"; +export async function initTestDB() { + const knex = await require('knex')({ client: 'sqlite3', connection: ':memory:'}) + await knex.migrate.latest(); + return knex; +} + export async function createSong( req, props = { title: "Song" }, diff --git a/server/yarn.lock b/server/yarn.lock index 3a5962f..d6b716b 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -48,7 +48,7 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-regex@^2.0.0, ansi-regex@^2.1.1: +ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= @@ -58,23 +58,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-styles@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -any-promise@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -93,11 +76,41 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -115,11 +128,21 @@ assertion-error@^1.1.0: resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -135,6 +158,19 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -149,11 +185,6 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - body-parser@1.19.0, body-parser@^1.18.3: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -178,6 +209,22 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -188,10 +235,20 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" caseless@~0.12.0: version "0.12.0" @@ -233,43 +290,33 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -cli-color@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f" - integrity sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w== +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== dependencies: - ansi-regex "^2.1.1" - d "1" - es5-ext "^0.10.46" - es6-iterator "^2.0.3" - memoizee "^0.4.14" - timers-ext "^0.1.5" - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= dependencies: - color-name "1.1.3" + map-visit "^1.0.0" + object-visit "^1.0.0" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +colorette@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" @@ -278,12 +325,12 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.19.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -component-emitter@^1.2.0: +component-emitter@^1.2.0, component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -293,14 +340,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -config-chain@^1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -333,19 +372,16 @@ cookiejar@^2.1.0, cookiejar@^2.1.1: resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -d@1, d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -353,13 +389,20 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -debug@2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" +debug@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -367,17 +410,10 @@ debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= deep-eql@^3.0.1: version "3.0.1" @@ -391,6 +427,28 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -411,6 +469,11 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -421,11 +484,6 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -dottie@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" - integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg== - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -434,84 +492,50 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -editorconfig@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" - integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== - dependencies: - commander "^2.19.0" - lru-cache "^4.1.5" - semver "^5.6.0" - sigmund "^1.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - -es6-iterator@^2.0.3, es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.1.1, es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - -es6-weak-map@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" - integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== - dependencies: - d "1" - es5-ext "^0.10.46" - es6-iterator "^2.0.3" - es6-symbol "^3.1.1" - escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= +esm@^3.2.25: + version "3.2.25" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" + integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== + etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -event-emitter@^0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk= +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= dependencies: - d "1" - es5-ext "~0.10.14" + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" express@^4.16.4: version "4.17.1" @@ -549,18 +573,40 @@ express@^4.16.4: utils-merge "1.0.1" vary "~1.1.2" -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= dependencies: - type "^2.0.0" + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" extend@^3.0.0, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -581,6 +627,16 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -594,12 +650,43 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@^3.0.0: +findup-sync@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" + integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== + dependencies: + detect-file "^1.0.0" + is-glob "^4.0.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +fined@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== dependencies: - locate-path "^3.0.0" + expand-tilde "^2.0.2" + is-plain-object "^2.0.3" + object.defaults "^1.1.0" + object.pick "^1.2.0" + parse-filepath "^1.0.1" + +flagged-respawn@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= + dependencies: + for-in "^1.0.1" forever-agent@~0.6.1: version "0.6.1" @@ -634,20 +721,18 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -684,16 +769,21 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -get-caller-file@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getopts@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" + integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -713,7 +803,27 @@ glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6: +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +graceful-fs@^4.1.2: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -736,6 +846,44 @@ has-unicode@^2.0.0: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -781,11 +929,6 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -inflection@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -794,7 +937,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@~2.0.0, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@~2.0.0, inherits@~2.0.3, inherits@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -809,6 +952,11 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + ip-regex@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -819,6 +967,82 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -831,6 +1055,13 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-glob@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + is-ip@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-2.0.0.tgz#68eea07e8a0a0a94c2d080dd674c731ab2a461ab" @@ -838,17 +1069,45 @@ is-ip@^2.0.0: dependencies: ip-regex "^2.0.0" -is-promise@^2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" - integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -isarray@~1.0.0: +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +is-windows@^1.0.1, is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -858,6 +1117,18 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -876,17 +1147,6 @@ jasmine@^3.5.0: glob "^7.1.4" jasmine-core "~3.5.0" -js-beautify@^1.8.8: - version "1.11.0" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.11.0.tgz#afb873dc47d58986360093dcb69951e8bcd5ded2" - integrity sha512-a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A== - dependencies: - config-chain "^1.1.12" - editorconfig "^0.15.3" - glob "^7.1.3" - mkdirp "~1.0.3" - nopt "^4.0.3" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -907,13 +1167,6 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -924,58 +1177,99 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -lodash@^4.17.15, lodash@^4.17.5: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + is-buffer "^1.1.5" -lru-cache@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" + is-buffer "^1.1.5" -lru-queue@0.1: - version "0.1.0" - resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" - integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM= +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +knex@^0.21.5: + version "0.21.5" + resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.5.tgz#c4be1958488f348aed3510aa4b7115639ee1bd01" + integrity sha512-cQj7F2D/fu03eTr6ZzYCYKdB9w7fPYlvTiU/f2OeXay52Pq5PwD+NAkcf40WDnppt/4/4KukROwlMOaE7WArcA== + dependencies: + colorette "1.2.1" + commander "^5.1.0" + debug "4.1.1" + esm "^3.2.25" + getopts "2.2.5" + inherits "~2.0.4" + interpret "^2.2.0" + liftoff "3.1.0" + lodash "^4.17.20" + mkdirp "^1.0.4" + pg-connection-string "2.3.0" + tarn "^3.0.0" + tildify "2.0.0" + uuid "^7.0.3" + v8flags "^3.2.0" + +liftoff@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" + integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== dependencies: - es5-ext "~0.10.2" + extend "^3.0.0" + findup-sync "^3.0.0" + fined "^1.0.1" + flagged-respawn "^1.0.0" + is-plain-object "^2.0.4" + object.map "^1.0.0" + rechoir "^0.6.2" + resolve "^1.1.7" + +lodash@^4.17.20: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== + dependencies: + kind-of "^6.0.2" + +map-cache@^0.2.0, map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memoizee@^0.4.14: - version "0.4.14" - resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57" - integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg== - dependencies: - d "1" - es5-ext "^0.10.45" - es6-weak-map "^2.0.2" - event-emitter "^0.3.5" - is-promise "^2.1" - lru-queue "0.1" - next-tick "1" - timers-ext "^0.1.5" - merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -986,6 +1280,25 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +micromatch@^3.0.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + mime-db@1.44.0: version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -1030,6 +1343,14 @@ minizlib@^1.2.1: dependencies: minipass "^2.9.0" +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -1037,23 +1358,11 @@ minizlib@^1.2.1: dependencies: minimist "^1.2.5" -mkdirp@~1.0.3: +mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment-timezone@^0.5.31: - version "0.5.31" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz#9c40d8c5026f0c7ab46eda3d63e49c155148de05" - integrity sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.26.0: - version "2.27.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" - integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -1069,6 +1378,23 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + needle@^2.2.1: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -1083,16 +1409,6 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -next-tick@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" - integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== - -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - node-addon-api@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.0.tgz#f9afb8d777a91525244b01775ea0ddbe1125483b" @@ -1139,7 +1455,7 @@ node-pre-gyp@^0.11.0: dependencies: abbrev "1" -nopt@^4.0.1, nopt@^4.0.3: +nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== @@ -1193,6 +1509,47 @@ object-assign@^4.1.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.defaults@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" + integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= + dependencies: + array-each "^1.0.1" + array-slice "^1.0.0" + for-own "^1.0.0" + isobject "^3.0.0" + +object.map@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + +object.pick@^1.2.0, object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -1225,34 +1582,29 @@ osenv@0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== +parse-filepath@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" + integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= dependencies: - p-limit "^2.0.0" + is-absolute "^1.0.0" + map-cache "^0.2.0" + path-root "^0.1.1" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= path-is-absolute@^1.0.0: version "1.0.1" @@ -1264,6 +1616,18 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-root-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= + +path-root@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= + dependencies: + path-root-regex "^0.1.0" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -1279,16 +1643,21 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +pg-connection-string@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.3.0.tgz#c13fcb84c298d0bfa9ba12b40dd6c23d946f55d6" + integrity sha512-ukMTJXLI7/hZIwTW7hGMZJ0Lj0S2XQBCJ4Shv4y1zgQ/vqVea+FLhzywvPj0ujSuofu+yA4MYHGZPTsgjBgJ+w== + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= - proxy-addr@~2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" @@ -1297,11 +1666,6 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.1" -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - psl@^1.1.28: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -1365,6 +1729,31 @@ readable-stream@^2.0.6, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + dependencies: + resolve "^1.1.6" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + request@^2.87.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -1391,29 +1780,30 @@ request@^2.87.0: tunnel-agent "^0.6.0" uuid "^3.3.2" -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.5.0: +resolve@^1.1.6, resolve@^1.1.7: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== dependencies: path-parse "^1.0.6" -retry-as-promised@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543" - integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== - dependencies: - any-promise "^1.3.0" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== rimraf@2, rimraf@^2.6.1: version "2.7.1" @@ -1432,6 +1822,13 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -1442,16 +1839,11 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -semver@^5.3.0, semver@^5.6.0: +semver@^5.3.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -1476,43 +1868,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -sequelize-cli@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.2.0.tgz#fd02bfeae23b8226872f9947f3f8212cc49a4771" - integrity sha512-6WQ2x91hg30dUn66mXHnzvHATZ4pyI1GHSNbS/TNN/vRR4BLRSLijadeMgC8zqmKDsL0VqzVVopJWfJakuP++Q== - dependencies: - cli-color "^1.4.0" - fs-extra "^7.0.1" - js-beautify "^1.8.8" - lodash "^4.17.5" - resolve "^1.5.0" - umzug "^2.3.0" - yargs "^13.1.0" - -sequelize-pool@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-6.0.0.tgz#2b2f6570fb633ecb38a338c4fc266c0e42ce2af7" - integrity sha512-D/VfOX2Z+6JTWqM73lhcqMXp1X4CeqRNVMlndvbOMtyjFAZ2kYzH7rGFGFrLO1r+RZQdc/h+3zQL4nd3cclNLg== - -sequelize@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.3.0.tgz#4b1353174a4702ab0be1d991f9d872021e1a6bff" - integrity sha512-aVZUvT0w1ebewlApFuaUJE/fJ7aTfIpMnwNM/Zgr29QnY0fT1t0EjXxl48Fwmfq3BHJogLMhfMTJRXJQaiaFVQ== - dependencies: - debug "^4.1.1" - dottie "^2.0.0" - inflection "1.12.0" - lodash "^4.17.15" - moment "^2.26.0" - moment-timezone "^0.5.31" - retry-as-promised "^3.2.0" - semver "^7.3.2" - sequelize-pool "^6.0.0" - toposort-class "^1.0.1" - uuid "^8.1.0" - validator "^10.11.0" - wkx "^0.5.0" - serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -1523,26 +1878,72 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sigmund@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= - signal-exit@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + source-map-support@^0.5.17: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -1551,11 +1952,28 @@ source-map-support@^0.5.17: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + source-map@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + sqlite3@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.0.tgz#1bfef2151c6bc48a3ab1a6c126088bb8dd233566" @@ -1581,6 +1999,14 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -1603,15 +2029,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -1633,13 +2050,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -1683,24 +2093,46 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.3" -timers-ext@^0.1.5: - version "0.1.7" - resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6" - integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ== +tarn@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.0.tgz#a4082405216c0cce182b8b4cb2639c52c1e870d4" + integrity sha512-PKUnlDFODZueoA8owLehl8vLcgtA8u4dRuVbZc92tspDYZixjJL6TqYOmryf/PfP/EBX+2rgNcrj96NO+RPkdQ== + +tildify@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tildify/-/tildify-2.0.0.tgz#f205f3674d677ce698b7067a99e949ce03b4754a" + integrity sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw== + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= dependencies: - es5-ext "~0.10.46" - next-tick "1" + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -toposort-class@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" - integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= - tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -1745,38 +2177,39 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== - -type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3" - integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow== - typescript@~3.7.2: version "3.7.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== -umzug@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184" - integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw== - dependencies: - bluebird "^3.7.2" - -universalify@^0.1.0: +unc-path-regex@^0.1.2: version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" @@ -1784,6 +2217,16 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -1799,15 +2242,17 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.1.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e" - integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q== +uuid@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" + integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== -validator@^10.11.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" - integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== +v8flags@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" vary@~1.1.2: version "1.1.2" @@ -1823,12 +2268,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which@1: +which@1, which@^1.2.14: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -1842,66 +2282,16 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -wkx@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c" - integrity sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg== - dependencies: - "@types/node" "*" - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - yallist@^3.0.0, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs@^13.1.0: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" -- 2.36.1 From 4471c27b4c396652cb1416adb5c5649705043743 Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Tue, 1 Sep 2020 12:23:46 +0200 Subject: [PATCH 2/4] Query endpoint is up again, but no filtering yet. --- server/endpoints/QueryEndpointHandler.ts | 151 ++++++++++++++++++++++- server/knex/knex.ts | 4 +- server/knexfile.ts | 2 +- server/server.ts | 13 +- 4 files changed, 156 insertions(+), 14 deletions(-) diff --git a/server/endpoints/QueryEndpointHandler.ts b/server/endpoints/QueryEndpointHandler.ts index f0f06a1..5eb4a8f 100644 --- a/server/endpoints/QueryEndpointHandler.ts +++ b/server/endpoints/QueryEndpointHandler.ts @@ -1,10 +1,98 @@ import * as api from '../../client/src/api'; import { EndpointError, EndpointHandler, catchUnhandledErrors } from './types'; +import Knex from 'knex'; -enum QueryType { +enum ObjectType { Song = 0, Artist, Tag, + Album, +} + +// To keep track of which database objects are needed to filter on +// certain properties. +const propertyObjects: Record = { + [api.QueryElemProperty.albumName]: ObjectType.Album, + [api.QueryElemProperty.artistId]: ObjectType.Artist, + [api.QueryElemProperty.artistName]: ObjectType.Artist, + [api.QueryElemProperty.songId]: ObjectType.Song, + [api.QueryElemProperty.songTitle]: ObjectType.Song, +} + +// To keep track of the tables in which objects are stored. +const objectTables: Record = { + [ObjectType.Album]: 'albums', + [ObjectType.Artist]: 'artists', + [ObjectType.Song]: 'songs', + [ObjectType.Tag]: 'tags', +} + +// To keep track of linking tables between objects. +const linkingTables: any = [ + [[ObjectType.Song, ObjectType.Album], 'songs_albums'], + [[ObjectType.Song, ObjectType.Artist], 'songs_artists'], + [[ObjectType.Song, ObjectType.Tag], 'songs_tags'], + [[ObjectType.Artist, ObjectType.Album], 'artists_albums'], + [[ObjectType.Artist, ObjectType.Tag], 'artists_tags'], + [[ObjectType.Album, ObjectType.Tag], 'albums_tags'], +] +function getLinkingTable(a: ObjectType, b: ObjectType): string { + var res: string | undefined = undefined; + linkingTables.forEach((row: any) => { + if (row[0].includes(a) && row[0].includes(b)) { + res = row[1]; + } + }) + if (res) return res; + + throw "Could not find linking table for objects: " + JSON.stringify(a) + ", " + JSON.stringify(b); +} + +// To keep track of ID fields used in linking tables. +const linkingTableIdNames: Record = { + [ObjectType.Album]: 'albumId', + [ObjectType.Artist]: 'artistId', + [ObjectType.Song]: 'songId', + [ObjectType.Tag]: 'tagId', +} + +function getRequiredDatabaseObjects(queryElem: api.QueryElem): Set { + if (queryElem.prop) { + // Leaf node. + return new Set([propertyObjects[queryElem.prop]]); + } else if (queryElem.children) { + // Branch node. + var r = new Set(); + queryElem.children.forEach((child: api.QueryElem) => { + getRequiredDatabaseObjects(child).forEach(object => r.add(object)); + }); + return r; + } + return new Set([]); +} + +function addJoin(knexQuery: any, base: ObjectType, other: ObjectType) { + const linkTable = getLinkingTable(base, other); + const baseTable = objectTables[base]; + const otherTable = objectTables[other]; + return knexQuery + .join(linkTable, { [baseTable + '.id']: linkTable + '.' + linkingTableIdNames[base] }) + .join(otherTable, { [otherTable + '.id']: linkTable + '.' + linkingTableIdNames[other] }); +} + +function constructQuery(knex: Knex, queryFor: ObjectType, queryElem: api.QueryElem) { + // First, we create a base query for the type of object we need to yield. + var q = knex.select('*').distinct().from(objectTables[queryFor]); + + // Now, we need to add join statements for other objects we want to filter on. + const allObjects = getRequiredDatabaseObjects(queryElem); + allObjects.delete(queryFor); // We are already querying this object in the base query. + allObjects.forEach((object: ObjectType) => { + q = addJoin(q, queryFor, object); + }) + + // TODO: apply filters. + return q; } // const sequelizeOps: any = { @@ -89,7 +177,7 @@ enum QueryType { // ]; // } -export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any) => { +export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkQueryRequest(req.body)) { const e: EndpointError = { internalMessage: 'Invalid Query request: ' + JSON.stringify(req.body), @@ -99,6 +187,63 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any) } const reqObject: api.QueryRequest = req.body; + try { + const songLimit = reqObject.offsetsLimits.songLimit; + const songOffset = reqObject.offsetsLimits.songOffset; + const tagLimit = reqObject.offsetsLimits.tagLimit; + const tagOffset = reqObject.offsetsLimits.tagOffset; + const artistLimit = reqObject.offsetsLimits.artistLimit; + const artistOffset = reqObject.offsetsLimits.artistOffset; + + const artistsPromise: Promise = (artistLimit && artistLimit > 0) ? + constructQuery(knex, ObjectType.Artist, reqObject.query) + .offset(artistOffset || 0).limit(artistLimit) : + (async () => [])(); + + const songsPromise: Promise = (songLimit && songLimit > 0) ? + constructQuery(knex, ObjectType.Song, reqObject.query) + .offset(songOffset || 0).limit(songLimit) : + (async () => [])(); + + const tagsPromise: Promise = (tagLimit && tagLimit > 0) ? + constructQuery(knex, ObjectType.Tag, reqObject.query) + .offset(tagOffset || 0).limit(tagLimit) : + (async () => [])(); + + const [songs, artists, tags] = await Promise.all([songsPromise, artistsPromise, tagsPromise]); + + const response: api.QueryResponse = { + songs: songs.map((song: any) => { + return { + songId: song['id'], + title: song['title'], + storeLinks: JSON.parse(song['storeLinks']), + artists: [], //FIXME + tags: [], //FIXME + albums: [], //FIXME + } + }), + artists: artists.map((artist: any) => { + return { + artistId: artist['id'], + name: artist['name'], + storeLinks: JSON.parse(artist['storeLinks']), + } + }), + tags: tags.map((tag: any) => { + return { + tagId: tag['id'], + name: tag['name'], + parentId: tag['parentId'], + } + }), + } + + res.send(response); + } catch (e) { + catchUnhandledErrors(e); + } + // try { // const songLimit = reqObject.offsetsLimits.songLimit; // const songOffset = reqObject.offsetsLimits.songOffset; @@ -188,6 +333,4 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any) // } catch (e) { // catchUnhandledErrors(e); // } - - throw "NOTIMPLEMENTED"; } \ No newline at end of file diff --git a/server/knex/knex.ts b/server/knex/knex.ts index a1af280..e7655d8 100644 --- a/server/knex/knex.ts +++ b/server/knex/knex.ts @@ -1,3 +1,3 @@ const environment = process.env.ENVIRONMENT || 'development' -const config = require('../knexfile.js')[environment]; -export default require('knex')(config); \ No newline at end of file +import config from '../knexfile'; +export default require('knex')(config[environment]); \ No newline at end of file diff --git a/server/knexfile.ts b/server/knexfile.ts index ca655ca..7ed1d05 100644 --- a/server/knexfile.ts +++ b/server/knexfile.ts @@ -1,6 +1,6 @@ // Update with your config settings. -export default { +export default > { development: { client: "sqlite3", diff --git a/server/server.ts b/server/server.ts index 4485977..452b0fc 100644 --- a/server/server.ts +++ b/server/server.ts @@ -1,16 +1,15 @@ const express = require('express'); -const environment = process.env.ENVIRONMENT || 'development' -const knexConfig = require('knexfile.js')[environment]; -const knex = require('knex')(knexConfig); - +import knex from './knex/knex'; import { SetupApp } from './app'; const app = express(); -SetupApp(app, knex); +knex.migrate.latest().then(() => { + SetupApp(app, knex); -const port = process.env.PORT || 5000; -app.listen(port, () => console.log(`Listening on port ${port}`)); + const port = process.env.PORT || 5000; + app.listen(port, () => console.log(`Listening on port ${port}`)); +}) export { } \ No newline at end of file -- 2.36.1 From 1d5df9b43b46bdac8c2e00f271df1e2c44539bdd Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Tue, 1 Sep 2020 14:35:43 +0200 Subject: [PATCH 3/4] Got some basic filtering working. Not finished with queries yet. --- server/endpoints/QueryEndpointHandler.ts | 195 +++++++++++++++-------- 1 file changed, 131 insertions(+), 64 deletions(-) diff --git a/server/endpoints/QueryEndpointHandler.ts b/server/endpoints/QueryEndpointHandler.ts index 5eb4a8f..a3281d5 100644 --- a/server/endpoints/QueryEndpointHandler.ts +++ b/server/endpoints/QueryEndpointHandler.ts @@ -80,68 +80,92 @@ function addJoin(knexQuery: any, base: ObjectType, other: ObjectType) { .join(otherTable, { [otherTable + '.id']: linkTable + '.' + linkingTableIdNames[other] }); } +function addLeafWhere(knexQuery: any, queryElem: api.QueryElem) { + const simpleLeafOps = { + [api.QueryFilterOp.Eq]: "=", + [api.QueryFilterOp.Ne]: "!=", + [api.QueryFilterOp.Like]: "like", + } + + const propertyKeys = { + [api.QueryElemProperty.songTitle]: 'songs.title', + [api.QueryElemProperty.songId]: 'songs.id', + [api.QueryElemProperty.artistName]: 'artists.name', + [api.QueryElemProperty.artistId]: 'artists.id', + [api.QueryElemProperty.albumName]: 'albums.name', + } + + if (!queryElem.propOperator) throw "Cannot create where clause without an operator."; + const operator = queryElem.propOperator || api.QueryFilterOp.Eq; + const a = queryElem.prop && propertyKeys[queryElem.prop]; + const b = queryElem.propOperand || ""; + + if (Object.keys(simpleLeafOps).includes(operator)) { + return knexQuery.where(a, operator, b); + } + + throw "Query filter not implemented"; +} + +function addWhere(knexQuery: any, queryElem: api.QueryElem) { + if (queryElem.prop) { + // Leaf node. + return addLeafWhere(knexQuery, queryElem); + } else if (queryElem.children) { + // Branch node. + } + + throw "Query filter not implemented."; +} + +const objectColumns = { + [ObjectType.Song]: ['songs.id as songs.id', 'songs.title as songs.title', 'songs.storeLinks as songs.storeLinks'], + [ObjectType.Artist]: ['artists.id as artists.id', 'artists.name as artists.name', 'artists.storeLinks as artists.storeLinks'], + [ObjectType.Album]: ['albums.id as albums.id', 'albums.name as albums.name', 'albums.storeLinks as albums.storeLinks'], + [ObjectType.Tag]: ['tags.id as tags.id', 'tags.name as tags.name', 'tags.parentId as tags.parentId'] +}; + function constructQuery(knex: Knex, queryFor: ObjectType, queryElem: api.QueryElem) { + const joinObjects = getRequiredDatabaseObjects(queryElem); + joinObjects.delete(queryFor); // We are already querying this object in the base query. + + // Figure out what data we want to select from the results. + var columns: string[] = []; + joinObjects.forEach((obj: ObjectType) => columns.push(...objectColumns[obj])); + columns.push(...objectColumns[queryFor]); + // First, we create a base query for the type of object we need to yield. - var q = knex.select('*').distinct().from(objectTables[queryFor]); + var q = knex.select(columns) + .distinct(objectTables[queryFor] + '.' + 'id') + .from(objectTables[queryFor]); // Now, we need to add join statements for other objects we want to filter on. - const allObjects = getRequiredDatabaseObjects(queryElem); - allObjects.delete(queryFor); // We are already querying this object in the base query. - allObjects.forEach((object: ObjectType) => { + joinObjects.forEach((object: ObjectType) => { q = addJoin(q, queryFor, object); }) - // TODO: apply filters. + // Apply filtering. + q = addWhere(q, queryElem); + + // TODO: add ordering, limiting + return q; } -// const sequelizeOps: any = { -// [api.QueryFilterOp.Eq]: Op.eq, -// [api.QueryFilterOp.Ne]: Op.ne, -// [api.QueryFilterOp.In]: Op.in, -// [api.QueryFilterOp.NotIn]: Op.notIn, -// [api.QueryFilterOp.Like]: Op.like, -// [api.QueryElemOp.And]: Op.and, -// [api.QueryElemOp.Or]: Op.or, -// }; - -// const sequelizeProps: any = { -// [QueryType.Song]: { -// [api.QueryElemProperty.songTitle]: "title", -// [api.QueryElemProperty.songId]: "id", -// [api.QueryElemProperty.artistName]: "$Artists.name$", -// [api.QueryElemProperty.artistId]: "$Artists.id$", -// [api.QueryElemProperty.albumName]: "$Albums.name$", -// }, -// [QueryType.Artist]: { -// [api.QueryElemProperty.songTitle]: "$Songs.title$", -// [api.QueryElemProperty.songId]: "$Songs.id$", -// [api.QueryElemProperty.artistName]: "name", -// [api.QueryElemProperty.artistId]: "id", -// [api.QueryElemProperty.albumName]: "$Albums.name$", -// }, -// [QueryType.Tag]: { -// [api.QueryElemProperty.songTitle]: "$Songs.title$", -// [api.QueryElemProperty.songId]: "$Songs.id$", -// [api.QueryElemProperty.artistName]: "$Artists.name$", -// [api.QueryElemProperty.artistId]: "$Artists.id$", -// [api.QueryElemProperty.albumName]: "$Albums.name$", -// } -// }; - -// const sequelizeOrderColumns: any = { -// [QueryType.Song]: { -// [api.OrderByType.Name]: 'title', -// [api.OrderByType.ArtistRanking]: '$Rankings.rank$', -// [api.OrderByType.TagRanking]: '$Rankings.rank$', -// }, -// [QueryType.Artist]: { -// [api.OrderByType.Name]: 'name' -// }, -// [QueryType.Tag]: { -// [api.OrderByType.Name]: 'name' -// }, -// } +async function getLinkedObjects(knex: Knex, base: ObjectType, linked: ObjectType, baseIds: number[]) { + var result: Record = {}; + const otherTable = objectTables[linked]; + const linkingTable = getLinkingTable(base, linked); + const columns = objectColumns[linked]; + + await Promise.all(baseIds.map((baseId: number) => { + return knex.select(columns).distinct(otherTable + '.id').from(otherTable) + .join(linkingTable, { [linkingTable + '.' + linkingTableIdNames[linked]]: otherTable + '.id' }) + .where({ [linkingTable + '.' + linkingTableIdNames[base]]: baseId }) + .then((others: any) => { result[baseId] = others; }) + })) + return result; +} // // Returns the "where" clauses for Sequelize, per object type. // const getSequelizeWhere = (queryElem: api.QueryElem, type: QueryType) => { @@ -210,31 +234,74 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any, .offset(tagOffset || 0).limit(tagLimit) : (async () => [])(); - const [songs, artists, tags] = await Promise.all([songsPromise, artistsPromise, tagsPromise]); + // For some objects, we want to return linked information as well. + // For that we need to do further queries. + const songIdsPromise = (async () => { + const songs = await songsPromise; + console.log("Found songs:", songs); + const ids = songs.map((song: any) => song['songs.id']); + return ids; + })(); + const songsArtistsPromise: Promise> = (songLimit && songLimit > 0) ? + (async () => { + return await getLinkedObjects(knex, ObjectType.Song, ObjectType.Artist, await songIdsPromise); + })() : + (async () => { return {}; })(); + const songsTagsPromise: Promise> = (songLimit && songLimit > 0) ? + (async () => { + return await getLinkedObjects(knex, ObjectType.Song, ObjectType.Tag, await songIdsPromise); + })() : + (async () => { return {}; })(); + + const [ + songs, + artists, + tags, + songsArtists, + songsTags + ] = + await Promise.all([ + songsPromise, + artistsPromise, + tagsPromise, + songsArtistsPromise, + songsTagsPromise, + ]); const response: api.QueryResponse = { songs: songs.map((song: any) => { return { - songId: song['id'], - title: song['title'], - storeLinks: JSON.parse(song['storeLinks']), - artists: [], //FIXME - tags: [], //FIXME + songId: song['songs.id'], + title: song['songs.title'], + storeLinks: JSON.parse(song['songs.storeLinks']), + artists: songsArtists[song['songs.id']].map((artist: any) => { + return { + artistId: artist['artists.id'], + name: artist['artists.name'], + storeLinks: JSON.parse(artist['artists.storeLinks']), + }; + }), + tags: songsTags[song['songs.id']].map((tag: any) => { + return { + tagId: tag['tags.id'], + name: tag['tags.name'], + }; + }), albums: [], //FIXME } }), artists: artists.map((artist: any) => { return { - artistId: artist['id'], - name: artist['name'], - storeLinks: JSON.parse(artist['storeLinks']), + artistId: artist['artists.id'], + name: artist['artists.name'], + storeLinks: JSON.parse(artist['artists.storeLinks']), } }), tags: tags.map((tag: any) => { return { - tagId: tag['id'], - name: tag['name'], - parentId: tag['parentId'], + tagId: tag['tags.id'], + name: tag['tags.name'], + parentId: tag['tags.parentId'], } }), } -- 2.36.1 From 4d20c72889c2ae0d614acce7d94875e8dbaa5126 Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Tue, 1 Sep 2020 16:06:12 +0200 Subject: [PATCH 4/4] All tests working again. --- client/src/api.ts | 3 - server/endpoints/QueryEndpointHandler.ts | 134 +++++++++++++-------- server/test/integration/flows/QueryFlow.js | 15 ++- 3 files changed, 94 insertions(+), 58 deletions(-) diff --git a/client/src/api.ts b/client/src/api.ts index 8499339..748c80c 100644 --- a/client/src/api.ts +++ b/client/src/api.ts @@ -75,8 +75,6 @@ export enum QueryElemProperty { } export enum OrderByType { Name = 0, - ArtistRanking, - TagRanking } export interface QueryElem { prop?: QueryElemProperty, @@ -88,7 +86,6 @@ export interface QueryElem { export interface Ordering { orderBy: { type: OrderByType, - itemId?: number, } ascending: boolean, } diff --git a/server/endpoints/QueryEndpointHandler.ts b/server/endpoints/QueryEndpointHandler.ts index a3281d5..4d26a00 100644 --- a/server/endpoints/QueryEndpointHandler.ts +++ b/server/endpoints/QueryEndpointHandler.ts @@ -80,8 +80,13 @@ function addJoin(knexQuery: any, base: ObjectType, other: ObjectType) { .join(otherTable, { [otherTable + '.id']: linkTable + '.' + linkingTableIdNames[other] }); } -function addLeafWhere(knexQuery: any, queryElem: api.QueryElem) { - const simpleLeafOps = { +enum WhereType { + And = 0, + Or, +}; + +function addLeafWhere(knexQuery: any, queryElem: api.QueryElem, type: WhereType) { + const simpleLeafOps: Record = { [api.QueryFilterOp.Eq]: "=", [api.QueryFilterOp.Ne]: "!=", [api.QueryFilterOp.Like]: "like", @@ -101,21 +106,61 @@ function addLeafWhere(knexQuery: any, queryElem: api.QueryElem) { const b = queryElem.propOperand || ""; if (Object.keys(simpleLeafOps).includes(operator)) { - return knexQuery.where(a, operator, b); + if (type == WhereType.And) { + return knexQuery.andWhere(a, simpleLeafOps[operator], b); + } else if (type == WhereType.Or) { + return knexQuery.orWhere(a, simpleLeafOps[operator], b); + } + } else if (operator == api.QueryFilterOp.In) { + if (type == WhereType.And) { + return knexQuery.whereIn(a, b); + } else if (type == WhereType.Or) { + return knexQuery.orWhereIn(a, b); + } + } else if (operator == api.QueryFilterOp.NotIn) { + if (type == WhereType.And) { + return knexQuery.whereNotIn(a, b); + } else if (type == WhereType.Or) { + return knexQuery.orWhereNotIn(a, b); + } } throw "Query filter not implemented"; } -function addWhere(knexQuery: any, queryElem: api.QueryElem) { +function addBranchWhere(knexQuery: any, queryElem: api.QueryElem, type: WhereType) { + if (queryElem.children && queryElem.childrenOperator === api.QueryElemOp.And) { + var q = knexQuery; + queryElem.children.forEach((child: api.QueryElem) => { + q = addWhere(q, child, type); + }) + return q; + } else if (queryElem.children && queryElem.childrenOperator === api.QueryElemOp.Or) { + var q = knexQuery; + const c = queryElem.children; + const f = function (this: any) { + for (var i = 0; i < c.length; i++) { + addWhere(this, c[i], WhereType.Or); + } + } + if (type == WhereType.And) { + return q.where(f); + } else if (type == WhereType.Or) { + return q.orWhere(f); + } + } +} + +function addWhere(knexQuery: any, queryElem: api.QueryElem, type: WhereType) { if (queryElem.prop) { // Leaf node. - return addLeafWhere(knexQuery, queryElem); + return addLeafWhere(knexQuery, queryElem, type); } else if (queryElem.children) { // Branch node. + return addBranchWhere(knexQuery, queryElem, type); } - throw "Query filter not implemented."; + return knexQuery; } const objectColumns = { @@ -125,7 +170,8 @@ const objectColumns = { [ObjectType.Tag]: ['tags.id as tags.id', 'tags.name as tags.name', 'tags.parentId as tags.parentId'] }; -function constructQuery(knex: Knex, queryFor: ObjectType, queryElem: api.QueryElem) { +function constructQuery(knex: Knex, queryFor: ObjectType, queryElem: api.QueryElem, ordering: api.Ordering, + offset: number, limit: number) { const joinObjects = getRequiredDatabaseObjects(queryElem); joinObjects.delete(queryFor); // We are already querying this object in the base query. @@ -145,9 +191,17 @@ function constructQuery(knex: Knex, queryFor: ObjectType, queryElem: api.QueryEl }) // Apply filtering. - q = addWhere(q, queryElem); + q = addWhere(q, queryElem, WhereType.And); + + // Apply ordering + const orderKeys = { + [api.OrderByType.Name]: objectTables[queryFor] + '.' + ((queryFor === ObjectType.Song) ? 'title' : 'name') + }; + q = q.orderBy(orderKeys[ordering.orderBy.type], + (ordering.ascending ? 'asc' : 'desc')); - // TODO: add ordering, limiting + // Apply limiting. + q = q.limit(limit).offset(offset); return q; } @@ -167,40 +221,6 @@ async function getLinkedObjects(knex: Knex, base: ObjectType, linked: ObjectType return result; } -// // Returns the "where" clauses for Sequelize, per object type. -// const getSequelizeWhere = (queryElem: api.QueryElem, type: QueryType) => { -// var where: any = { -// [Op.and]: [] -// }; - -// if (queryElem.prop && queryElem.propOperator && queryElem.propOperand) { -// // Visit a filter-like subquery leaf. -// where[Op.and].push({ -// [sequelizeProps[type][queryElem.prop]]: { -// [sequelizeOps[queryElem.propOperator]]: queryElem.propOperand -// } -// }); -// } -// if (queryElem.childrenOperator && queryElem.children) { -// // Recursively visit a nested subquery. - -// const children = queryElem.children.map((child: api.QueryElem) => getSequelizeWhere(child, type)); -// where[Op.and].push({ -// [sequelizeOps[queryElem.childrenOperator]]: children -// }); -// } - -// return where; -// } - -// function getSequelizeOrder(order: api.Ordering, type: QueryType) { -// const ascstring = order.ascending ? 'ASC' : 'DESC'; - -// return [ -// [ sequelizeOrderColumns[type][order.orderBy.type], ascstring ] -// ]; -// } - export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any, knex: Knex) => { if (!api.checkQueryRequest(req.body)) { const e: EndpointError = { @@ -210,6 +230,7 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any, throw e; } const reqObject: api.QueryRequest = req.body; + console.log("Query: ", reqObject); try { const songLimit = reqObject.offsetsLimits.songLimit; @@ -220,18 +241,33 @@ export const QueryEndpointHandler: EndpointHandler = async (req: any, res: any, const artistOffset = reqObject.offsetsLimits.artistOffset; const artistsPromise: Promise = (artistLimit && artistLimit > 0) ? - constructQuery(knex, ObjectType.Artist, reqObject.query) - .offset(artistOffset || 0).limit(artistLimit) : + constructQuery(knex, + ObjectType.Artist, + reqObject.query, + reqObject.ordering, + artistOffset || 0, + artistLimit + ) : (async () => [])(); const songsPromise: Promise = (songLimit && songLimit > 0) ? - constructQuery(knex, ObjectType.Song, reqObject.query) - .offset(songOffset || 0).limit(songLimit) : + constructQuery(knex, + ObjectType.Song, + reqObject.query, + reqObject.ordering, + songOffset || 0, + songLimit + ) : (async () => [])(); const tagsPromise: Promise = (tagLimit && tagLimit > 0) ? - constructQuery(knex, ObjectType.Tag, reqObject.query) - .offset(tagOffset || 0).limit(tagLimit) : + constructQuery(knex, + ObjectType.Tag, + reqObject.query, + reqObject.ordering, + tagOffset || 0, + tagLimit + ) : (async () => [])(); // For some objects, we want to return linked information as well. diff --git a/server/test/integration/flows/QueryFlow.js b/server/test/integration/flows/QueryFlow.js index 3781034..a36e42b 100644 --- a/server/test/integration/flows/QueryFlow.js +++ b/server/test/integration/flows/QueryFlow.js @@ -54,11 +54,12 @@ describe('POST /query with several songs and filters', () => { artists: [ { artistId: 1, - name: 'Artist1' + name: 'Artist1', + storeLinks: [], } ], tags: [], - rankings: [] + albums: [] }; const song2 = { songId: 2, @@ -67,11 +68,12 @@ describe('POST /query with several songs and filters', () => { artists: [ { artistId: 1, - name: 'Artist1' + name: 'Artist1', + storeLinks: [], } ], tags: [], - rankings: [] + albums: [] }; const song3 = { songId: 3, @@ -80,11 +82,12 @@ describe('POST /query with several songs and filters', () => { artists: [ { artistId: 2, - name: 'Artist2' + name: 'Artist2', + storeLinks: [], } ], tags: [], - rankings: [] + albums: [] }; async function checkAllSongs(req) { -- 2.36.1