Merge pull request #6 from junekimdev/rc-250204

Rc 250204

Author: junekimdev

codegen-util.js

@@ -1,7 +1,7 @@
 /********************
  * User Input Inquirer
  ********************/
-const readline = require('readline');
+const readline = require('node:readline');
 /**
  * @param {string} query
  * @returns {Promise<string>}

codegen.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const { getArgs, askQuestion } = require('./codegen-util');
 
 const INDEX_TXT = `export { default } from './apiHandler';

eslint.config.mjs

@@ -1,10 +1,57 @@
-import eslint from '@eslint/js';
-import globals from 'globals';
-import tseslint from 'typescript-eslint';
+import js from '@eslint/js';
+import stylisticPlugin from '@stylistic/eslint-plugin';
+import ts from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
 
 export default [
-  eslint.configs.recommended,
-  ...tseslint.configs.recommended,
+  {
+    name: 'formatLint',
+    plugins: {
+      '@stylistic': stylisticPlugin,
+    },
+    rules: {
+      '@stylistic/semi': 'warn',
+      '@stylistic/no-extra-semi': 'error',
+      '@stylistic/no-mixed-spaces-and-tabs': 'warn',
+    },
+  },
+  {
+    name: 'jsLint',
+    files: ['**/*.js', '**/*.mjs'],
+    rules: {
+      ...js.configs.recommended.rules,
+      eqeqeq: 'warn',
+    },
+  },
+  {
+    name: 'tsLint',
+    files: ['**/*.ts'],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        ecmaFeatures: { modules: true },
+        ecmaVersion: 'latest',
+        project: './tsconfig.json',
+      },
+    },
+    plugins: {
+      '@typescript-eslint': ts,
+    },
+    rules: {
+      ...ts.configs['eslint-recommended'].rules,
+      ...ts.configs.recommended.rules,
+      '@typescript-eslint/no-require-imports': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
   {
     files: [
       'src/**/*.js',
@@ -15,11 +62,6 @@ export default [
       'test/**/*.ts',
     ],
   },
-  {
-    languageOptions: {
-      globals: { ...globals.node },
-    },
-  },
   {
     ignores: [
       // dependencies
@@ -32,6 +74,8 @@ export default [
 
       // dev-tools
       '*.js',
+      '*.mjs',
+      '*.ts',
 
       // testing
       'coverage/',
@@ -64,24 +108,4 @@ export default [
       'placeholder_*',
     ],
   },
-  {
-    rules: {
-      eqeqeq: 'warn',
-      semi: 'warn',
-      'no-mixed-spaces-and-tabs': 'warn',
-      'no-extra-semi': 'error',
-      'no-unreachable': 'warn',
-      'no-unused-vars': 'off',
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_',
-          caughtErrorsIgnorePattern: '^_',
-        },
-      ],
-    },
-  },
 ];

package.json

@@ -10,6 +10,7 @@
     "start": "node dist/server.js",
     "dev": "nodemon src/server.ts",
     "lint": "eslint",
+    "lint-inspect": "eslint --inspect-config",
     "test": "jest",
     "test-cover": "jest --coverage",
     "test-watch": "jest --verbose --coverage --watch",
@@ -20,38 +21,39 @@
   "dependencies": {
     "busboy": "^1.6.0",
     "cors": "^2.8.5",
-    "dotenv": "^16.3.1",
-    "express": "^4.21.1",
+    "dotenv": "^16.4.7",
+    "express": "^4.21.2",
     "express-promise-router": "^4.1.1",
     "helmet": "^8.0.0",
     "jsonwebtoken": "^9.0.0",
     "pg": "^8.13.1",
-    "pino": "^9.5.0",
-    "pino-http": "^10.1.0",
+    "pino": "^9.6.0",
+    "pino-http": "^10.4.0",
     "pino-pretty": "^13.0.0",
     "web-push": "^3.6.3"
   },
   "devDependencies": {
-    "@eslint/js": "^9.15.0",
+    "@eslint/js": "^9.19.0",
+    "@stylistic/eslint-plugin": "^3.0.1",
     "@types/busboy": "^1.5.0",
     "@types/cors": "^2.8.13",
     "@types/express": "^5.0.0",
     "@types/express-pino-logger": "^4.0.3",
     "@types/jest": "^29.5.14",
-    "@types/jsonwebtoken": "^9.0.7",
-    "@types/node": "^22.9.1",
-    "@types/pg": "^8.11.10",
+    "@types/jsonwebtoken": "^9.0.8",
+    "@types/node": "^22.13.1",
+    "@types/pg": "^8.11.11",
     "@types/supertest": "^6.0.2",
     "@types/web-push": "^3.6.4",
-    "eslint": "^9.15.0",
+    "eslint": "^9.19.0",
     "jest": "^29.5.0",
-    "nodemon": "^3.1.7",
-    "prettier": "^3.3.2",
+    "nodemon": "^3.1.9",
+    "prettier": "^3.4.2",
     "rimraf": "^6.0.1",
     "supertest": "^7.0.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.15.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.23.0"
   }
 }

src/utils/email.ts

@@ -1,5 +1,4 @@
 const emailRegExp =
-  // eslint-disable-next-line no-control-regex
   /(?!.*\.{2})^([a-z\d!#$%&'*+\-/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i;
 
 export const isEmailValid = (email: string | undefined) => {

src/utils/jwt.ts

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import jsonwebtoken, { SignOptions, VerifyOptions } from 'jsonwebtoken';
+import { StringValue } from 'ms';
 import path from 'path';
 
 const { JWT_PRI_FILENAME = '', JWT_PUB_FILENAME = '', JWT_ISS = '' } = process.env;
@@ -14,7 +15,7 @@ const tolerance = 10; // 10s tolerance for difference between servers
 export type JwtPayload = jsonwebtoken.JwtPayload;
 export type VerifyErrors = jsonwebtoken.VerifyErrors;
 
-export const createSignOpt = (sub: string, aud: string, exp: string = '1d'): SignOptions => {
+export const createSignOpt = (sub: string, aud: string, exp: StringValue = '1d'): SignOptions => {
   return {
     algorithm: alg,
     expiresIn: exp,
@@ -34,7 +35,7 @@ export const createVerifyOpt = (aud: string | RegExp): VerifyOptions => {
   };
 };
 
-export const sign = (payload: object, sub: string, aud: string, exp: string = '1d') =>
+export const sign = (payload: object, sub: string, aud: string, exp: StringValue = '1d') =>
   jsonwebtoken.sign(payload, priFile, createSignOpt(sub, aud, exp));
 
 export const verify = (token: string, aud: string | RegExp) =>

tsconfig.json

@@ -12,5 +12,5 @@
     "skipLibCheck": true
   },
   "exclude": ["node_modules", "/src/types/*"],
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts", "test/**/*.ts"]
 }