From 5d06745cebbeb2d24919a4c9fbd747cb477b2d3f Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Sun, 15 Oct 2023 18:33:12 -0600 Subject: [PATCH] refactor: use consistent import ordering - global modules - NPM modules (defaults first, then expansions) - local modules --- backend/UserConfig.ts | 4 +++- backend/app.ts | 10 ++++++---- backend/data.ts | 6 ++++-- backend/generators.ts | 2 +- backend/operations.ts | 3 ++- backend/routers/_frontend.ts | 5 +++-- backend/routers/api.ts | 10 ++++++---- backend/routers/index.ts | 14 ++++++++------ backend/s3.ts | 5 +++-- backend/sql/mysql.ts | 6 ++++-- 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/backend/UserConfig.ts b/backend/UserConfig.ts index 1dddbbc2..0a90031c 100644 --- a/backend/UserConfig.ts +++ b/backend/UserConfig.ts @@ -1,6 +1,8 @@ +import { UserConfiguration, UserConfigTypeChecker } from 'ass'; + import fs from 'fs-extra'; import { path } from '@tycrek/joint'; -import { UserConfiguration, UserConfigTypeChecker } from 'ass'; + import { log } from './log'; const FILEPATH = path.join('.ass-data/userconfig.json'); diff --git a/backend/app.ts b/backend/app.ts index 7d4d60fb..c443e2f7 100644 --- a/backend/app.ts +++ b/backend/app.ts @@ -1,14 +1,16 @@ -import express, { Request, Response, NextFunction, RequestHandler, json as BodyParserJson } from 'express'; +import { ServerConfiguration } from 'ass'; + +import fs from 'fs-extra'; +import tailwindcss from 'tailwindcss'; import session from 'express-session'; import MemoryStore from 'memorystore'; -import fs from 'fs-extra'; +import express, { Request, Response, NextFunction, RequestHandler, json as BodyParserJson } from 'express'; import { path, isProd } from '@tycrek/joint'; import { epcss } from '@tycrek/express-postcss'; -import tailwindcss from 'tailwindcss'; + import { log } from './log'; import { ensureFiles } from './data'; import { UserConfig } from './UserConfig'; -import { ServerConfiguration } from 'ass'; import { MySql } from './sql/mysql'; import { buildFrontendRouter } from './routers/_frontend'; diff --git a/backend/data.ts b/backend/data.ts index 2295fafc..85ae6450 100644 --- a/backend/data.ts +++ b/backend/data.ts @@ -1,8 +1,10 @@ +import { AssFile, AssUser, NID, FilesSchema, UsersSchema } from 'ass'; + import fs from 'fs-extra'; import { path } from '@tycrek/joint'; -import { nanoid } from './generators'; + import { log } from './log'; -import { AssFile, AssUser, NID, FilesSchema, UsersSchema } from 'ass'; +import { nanoid } from './generators'; import { UserConfig } from './UserConfig'; import { MySql } from './sql/mysql'; diff --git a/backend/generators.ts b/backend/generators.ts index 51e144f6..dba39995 100644 --- a/backend/generators.ts +++ b/backend/generators.ts @@ -1,6 +1,6 @@ import fs from 'fs-extra'; -import { randomBytes, getRandomValues } from 'crypto'; import cryptoRandomString from 'crypto-random-string'; +import { randomBytes, getRandomValues } from 'crypto'; import { path } from '@tycrek/joint'; type Length = { length: number, gfyLength?: number }; diff --git a/backend/operations.ts b/backend/operations.ts index 009e89ec..a33399df 100644 --- a/backend/operations.ts +++ b/backend/operations.ts @@ -3,8 +3,9 @@ import sharp from 'sharp'; import Vibrant from 'node-vibrant'; import ffmpeg from 'ffmpeg-static'; import { exec } from 'child_process'; -import { removeLocation } from '@xoi/gps-metadata-remover'; import { isProd } from '@tycrek/joint'; +import { removeLocation } from '@xoi/gps-metadata-remover'; + //@ts-ignore import shell from 'any-shell-escape'; diff --git a/backend/routers/_frontend.ts b/backend/routers/_frontend.ts index 9a830dbd..9a84c9c8 100644 --- a/backend/routers/_frontend.ts +++ b/backend/routers/_frontend.ts @@ -1,7 +1,8 @@ -import { path } from '@tycrek/joint'; import { Router } from 'express'; -import { UserConfig } from '../UserConfig'; +import { path } from '@tycrek/joint'; + import { App } from '../app'; +import { UserConfig } from '../UserConfig'; /** * Builds a basic router for loading a page with frontend JS diff --git a/backend/routers/api.ts b/backend/routers/api.ts index a39b6bac..20c63ce4 100644 --- a/backend/routers/api.ts +++ b/backend/routers/api.ts @@ -1,10 +1,12 @@ -import { Router, json as BodyParserJson, RequestHandler } from 'express'; +import { AssUser, AssUserNewReq } from 'ass'; + import * as bcrypt from 'bcrypt' -import { log } from '../log'; -import { UserConfig } from '../UserConfig'; +import { Router, json as BodyParserJson, RequestHandler } from 'express'; + import * as data from '../data'; -import { AssUser, AssUserNewReq } from 'ass'; +import { log } from '../log'; import { nanoid } from '../generators'; +import { UserConfig } from '../UserConfig'; import { MySql } from '../sql/mysql'; /** diff --git a/backend/routers/index.ts b/backend/routers/index.ts index e3bbf2b6..cf44fbda 100644 --- a/backend/routers/index.ts +++ b/backend/routers/index.ts @@ -1,15 +1,17 @@ +import { BusBoyFile, AssFile } from 'ass'; + import fs from 'fs-extra'; import bb from 'express-busboy'; -import { Router } from 'express'; import crypto from 'crypto'; -import { log } from '../log'; -import { UserConfig } from '../UserConfig'; -import { random } from '../generators'; -import { BusBoyFile, AssFile } from 'ass'; -import { getFileS3, uploadFileS3 } from '../s3'; +import { Router } from 'express'; import { Readable } from 'stream'; + import * as data from '../data'; +import { log } from '../log'; import { App } from '../app'; +import { random } from '../generators'; +import { UserConfig } from '../UserConfig'; +import { getFileS3, uploadFileS3 } from '../s3'; const router = Router({ caseSensitive: true }); diff --git a/backend/s3.ts b/backend/s3.ts index 2c6a8e23..16c39ef7 100644 --- a/backend/s3.ts +++ b/backend/s3.ts @@ -1,5 +1,3 @@ -import { UserConfig } from './UserConfig'; -import { log } from './log'; import { S3Client, S3ClientConfig, @@ -14,6 +12,9 @@ import { AbortMultipartUploadCommand, } from "@aws-sdk/client-s3"; +import { log } from './log'; +import { UserConfig } from './UserConfig'; + const NYR = 'S3 not ready'; /** diff --git a/backend/sql/mysql.ts b/backend/sql/mysql.ts index e26dc0ac..5d25a5a9 100644 --- a/backend/sql/mysql.ts +++ b/backend/sql/mysql.ts @@ -1,7 +1,9 @@ +import { AssFile, AssUser, NID, UploadToken } from 'ass'; + import mysql, { Pool } from 'mysql2/promise'; -import { UserConfig } from '../UserConfig'; + import { log } from '../log'; -import { AssFile, AssUser, NID, UploadToken } from 'ass'; +import { UserConfig } from '../UserConfig'; type TableNamesType = 'assfiles' | 'assusers' | 'asstokens';