add and apply @trivago/prettier-plugin-sort-imports

.github/dependabot.yml

@@ -5,14 +5,14 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: 'npm' # See documentation for possible values
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: 'weekly'
 
-  - package-ecosystem: "github-actions"
+  - package-ecosystem: 'github-actions'
     # Workflow files stored in the
     # default location of `.github/workflows`
-    directory: "/"
+    directory: '/'
     schedule:
-      interval: "weekly"
+      interval: 'weekly'

.prettierrc

@@ -1,5 +1,8 @@
 {
   "semi": false,
   "singleQuote": true,
-  "trailingComma": "all"
+  "plugins": ["@trivago/prettier-plugin-sort-imports"],
+  "importOrder": ["<THIRD_PARTY_MODULES>", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true
 }

cloud/analytics.ts

@@ -1,4 +1,5 @@
 import { DateTime, Settings } from 'luxon'
+
 import documentClient from './documentClient'
 
 Settings.defaultZone = 'Europe/Amsterdam'

cloud/browser.ts

@@ -1,10 +1,10 @@
+import { Logger } from '@aws-lambda-powertools/logger'
 import chromium from '@sparticuz/chromium'
 import puppeteer, {
-  defaultArgs,
   Browser,
   PuppeteerLaunchOptions,
+  defaultArgs,
 } from 'puppeteer-core'
-import { Logger } from '@aws-lambda-powertools/logger'
 
 // see https://github.com/Sparticuz/chromium#running-locally--headlessheadful-mode
 // for how to install a locally running chromium

cloud/clients/duckduckgo.ts

@@ -1,5 +1,6 @@
-import got from 'got'
 import camelcaseKeys from 'camelcase-keys'
+import got from 'got'
+
 import { camelcaseKeysHook, logErrorHook } from './gotHooks'
 
 const USER_AGENT: string = 'expatcinema.com'

cloud/clients/google-customsearch.ts

@@ -1,5 +1,6 @@
-import got from 'got'
 import camelcaseKeys from 'camelcase-keys'
+import got from 'got'
+
 import { camelcaseKeysHook, logErrorHook } from './gotHooks'
 
 type Options = {

cloud/clients/gotHooks.ts

@@ -1,5 +1,6 @@
 import camelcaseKeys from 'camelcase-keys'
 import { RequestError } from 'got'
+
 import { logger } from '../powertools'
 
 export const camelcaseKeysHook = (response: any) => {

cloud/clients/omdb.ts

@@ -1,5 +1,6 @@
-import got from 'got'
 import camelcaseKeys from 'camelcase-keys'
+import got from 'got'
+
 import { camelcaseKeysHook, logErrorHook } from './gotHooks'
 
 const getClient = (apiKey: string) => {

cloud/clients/tmdb.ts

@@ -1,4 +1,5 @@
 import got from 'got'
+
 import { camelcaseKeysHook, logErrorHook } from './gotHooks'
 
 const getClient = (apiKey: string) => {

cloud/fillAnalytics.ts

@@ -1,8 +1,7 @@
 // Used for the initial filling of the analytics DynamoDB table based on the contents of the scrapers S3 bucket
-
 import AWS from 'aws-sdk'
-import { inspect } from 'util'
 import pMap from 'p-map'
+import { inspect } from 'util'
 
 import documentClient from './documentClient'
 

cloud/handler.ts

@@ -1,10 +1,10 @@
-import { Context, APIGatewayEvent } from 'aws-lambda'
+import { APIGatewayEvent, Context } from 'aws-lambda'
 
-import scrapers from './scrapers'
-import playground from './playground'
-import notifySlack from './notifySlack'
 import analytics from './analytics'
 import fillAnalytics from './fillAnalytics'
+import notifySlack from './notifySlack'
+import playground from './playground'
+import scrapers from './scrapers'
 
 const scrapersWrappedWithHTTP = async (
   event: APIGatewayEvent,

cloud/metadata/index.ts

@@ -1,6 +1,6 @@
-import searchMetadata from './searchMetadata'
 import documentClient from '../documentClient'
 import { logger } from '../powertools'
+import searchMetadata from './searchMetadata'
 
 type Metadata = {
   query: string

cloud/metadata/searchMetadata.ts

@@ -1,11 +1,11 @@
-import leven from 'leven'
 import diacritics from 'diacritics'
-import { logger } from '../powertools'
+import leven from 'leven'
 
-import getTmdbClient from '../clients/tmdb'
-import getOmdbClient from '../clients/omdb'
 import getDuckDuckGoClient from '../clients/duckduckgo'
 import getGoogleCustomSearchClient from '../clients/google-customsearch'
+import getOmdbClient from '../clients/omdb'
+import getTmdbClient from '../clients/tmdb'
+import { logger } from '../powertools'
 
 const getFirstTmdbSearchResult = async (title: string) => {
   const apiKey = process.env.TMDB_API_KEY

cloud/package.json

@@ -52,18 +52,18 @@
     "x-ray": "^2.3.4"
   },
   "devDependencies": {
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@tsconfig/node16": "^1.0.3",
     "@types/aws-lambda": "^8.10.101",
     "@types/diacritics": "^1.3.1",
     "@types/jsdom": "^16.2.14",
     "@types/luxon": "^2.3.2",
     "@types/ramda": "^0.29.3",
     "@types/x-ray": "^2.3.3",
-    "apollo": "^2.34.0",
     "aws-sdk": "^2.1181.0",
     "esbuild": "^0.14.49",
     "lumigo-cli": "^0.48.4",
-    "prettier": "^3.0.2",
+    "prettier": "^3.2.5",
     "puppeteer": "^21.3.2",
     "serverless": "^3.21.0",
     "serverless-esbuild": "^1.31.0",

cloud/playground.ts

@@ -1,30 +1,26 @@
-import { Context, APIGatewayProxyCallback, APIGatewayEvent } from 'aws-lambda'
-
-import { DateTime, Info, Settings } from 'luxon'
-import { inspect } from 'util'
-import ketelhuis from './scrapers/ketelhuis'
-import got from 'got'
-import { publicIp, publicIpv4, publicIpv6 } from 'public-ip'
+import { injectLambdaContext } from '@aws-lambda-powertools/logger'
+import middy from '@middy/core'
 // import chromium from 'chrome-aws-lambda'
 // const chromium = require('chrome-aws-lambda')
 import chromium from '@sparticuz/chromium'
-import pMap from 'p-map'
+import { APIGatewayEvent, APIGatewayProxyCallback, Context } from 'aws-lambda'
 import diacritics from 'diacritics'
-
+import got from 'got'
+import { DateTime, Info, Settings } from 'luxon'
+import pMap from 'p-map'
+import { logger as parentLogger } from 'powertools'
+import { publicIp, publicIpv4, publicIpv6 } from 'public-ip'
 import puppeteer from 'puppeteer-core'
 import { Screening } from 'types'
+import { inspect } from 'util'
 
-import getTmdbClient from './clients/tmdb'
-import getOmdbClient from './clients/omdb'
+import { getBrowser } from './browser'
 import getDuckDuckGoClient from './clients/duckduckgo'
 import getGoogleCustomSearchClient from './clients/google-customsearch'
-
-import { getBrowser } from './browser'
-import { logger as parentLogger } from 'powertools'
-
+import getOmdbClient from './clients/omdb'
+import getTmdbClient from './clients/tmdb'
 import getMetadata from './metadata'
-import middy from '@middy/core'
-import { injectLambdaContext } from '@aws-lambda-powertools/logger'
+import ketelhuis from './scrapers/ketelhuis'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/bioscopenleiden.ts

@@ -1,10 +1,10 @@
 // like Kino
-import { DateTime } from 'luxon'
 import got from 'got'
 import { decode } from 'html-entities'
+import { DateTime } from 'luxon'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/cinecenter.ts

@@ -1,8 +1,8 @@
-import Xray from 'x-ray'
 import { DateTime } from 'luxon'
+import Xray from 'x-ray'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/cinecitta.ts

@@ -1,8 +1,8 @@
-import { DateTime } from 'luxon'
 import got from 'got'
+import { DateTime } from 'luxon'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/cinerama.ts

@@ -1,8 +1,8 @@
+import got from 'got'
 import { DateTime } from 'luxon'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
-import got from 'got'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/defilmhallen.ts

@@ -1,6 +1,6 @@
-import { Screening } from 'types'
-import { DateTime } from 'luxon'
 import got from 'got'
+import { DateTime } from 'luxon'
+import { Screening } from 'types'
 
 import { logger as parentLogger } from '../powertools'
 

cloud/scrapers/deuitkijk.ts

@@ -1,8 +1,8 @@
-import Xray from 'x-ray'
 import { DateTime } from 'luxon'
+import Xray from 'x-ray'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/eyefilm.ts

@@ -1,9 +1,9 @@
-import { DateTime } from 'luxon'
-import { ApolloClient, gql, HttpLink, InMemoryCache } from '@apollo/client'
+import { ApolloClient, HttpLink, InMemoryCache, gql } from '@apollo/client'
 import fetch from 'cross-fetch'
+import { DateTime } from 'luxon'
 
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/filmhuisdenhaag.ts

@@ -1,11 +1,10 @@
-import { DateTime } from 'luxon'
 import got from 'got'
+import { DateTime } from 'luxon'
 
+import { logger as parentLogger } from '../powertools'
 import { Screening } from '../types'
 import splitTime from './utils/splitTime'
 
-import { logger as parentLogger } from '../powertools'
-
 const logger = parentLogger.createChild({
   persistentLogAttributes: {
     scraper: 'filmhuisdenhaag',

cloud/scrapers/filmhuislumen.ts

@@ -1,10 +1,10 @@
-import Xray from 'x-ray'
 import { DateTime } from 'luxon'
+import Xray from 'x-ray'
 
-import { shortMonthToNumberDutch } from './utils/monthToNumber'
-import guessYear from './utils/guessYear'
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
+import guessYear from './utils/guessYear'
+import { shortMonthToNumberDutch } from './utils/monthToNumber'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/filmkoepel.ts

@@ -1,11 +1,11 @@
-import Xray from 'x-ray'
-import { Screening } from 'types'
+import got from 'got'
 import { DateTime } from 'luxon'
+import { Screening } from 'types'
+import Xray from 'x-ray'
 
-import guessYear from './utils/guessYear'
 import { logger as parentLogger } from '../powertools'
+import guessYear from './utils/guessYear'
 import { monthToNumber } from './utils/monthToNumber'
-import got from 'got'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/forumgroningen.ts

@@ -1,9 +1,9 @@
-import Xray from 'x-ray'
 import { DateTime } from 'luxon'
+import Xray from 'x-ray'
 
-import guessYear from './utils/guessYear'
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
+import guessYear from './utils/guessYear'
 import { fullMonthToNumberEnglish } from './utils/monthToNumber'
 import splitTime from './utils/splitTime'
 

cloud/scrapers/hartlooper.ts

@@ -1,14 +1,13 @@
 // TODO: totally copy pasted from springhaver. That has to be better
-
-import Xray from 'x-ray'
-import { DateTime } from 'luxon'
 import got from 'got'
+import { DateTime } from 'luxon'
+import Xray from 'x-ray'
 
-import splitTime from './utils/splitTime'
-import { fullMonthToNumberDutch } from './utils/monthToNumber'
-import guessYear from './utils/guessYear'
-import { Screening } from '../types'
 import { logger as parentLogger } from '../powertools'
+import { Screening } from '../types'
+import guessYear from './utils/guessYear'
+import { fullMonthToNumberDutch } from './utils/monthToNumber'
+import splitTime from './utils/splitTime'
 
 const logger = parentLogger.createChild({
   persistentLogAttributes: {

cloud/scrapers/index.ts

@@ -1,18 +1,19 @@
-import { Context, APIGatewayEvent } from 'aws-lambda'
-
-import { DateTime, Settings } from 'luxon'
-import * as R from 'ramda'
+import { injectLambdaContext } from '@aws-lambda-powertools/logger'
+import middy from '@middy/core'
+import { APIGatewayEvent, Context } from 'aws-lambda'
 import AWS from 'aws-sdk'
-import { writeFile, mkdir } from 'fs/promises'
-import { dirname } from 'path'
 import diacritics from 'diacritics'
+import { mkdir, writeFile } from 'fs/promises'
+import { DateTime, Settings } from 'luxon'
 import pMap from 'p-map'
-import { injectLambdaContext } from '@aws-lambda-powertools/logger'
-import middy from '@middy/core'
+import { dirname } from 'path'
+import * as R from 'ramda'
+import { Screening } from 'types'
 
+import { closeBrowser } from '../browser'
 import documentClient from '../documentClient'
 import getMetadata from '../metadata'
-
+import { logger as parentLogger } from '../powertools'
 // TODO: esbuild doesn't support dynamic import, hence all the imports below
 // SCRAPERS.map(async (name) => {
 //   const fn = await import(`./${name}`)
@@ -80,10 +81,6 @@ const SCRAPERS = {
   themovies,
 }
 
-import { logger as parentLogger } from '../powertools'
-import { Screening } from 'types'
-import { closeBrowser } from '../browser'
-
 const logger = parentLogger.createChild({
   persistentLogAttributes: {
     scraper: 'combined',