diff --git a/package-lock.json b/package-lock.json index 58872cb..a87bf8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "root", "devDependencies": { - "@croquiscom/eslint-config": "^3.2.0", + "@croquiscom/eslint-config": "^3.2.1", "eslint": "^9.24.0", "husky": "^9.1.7", "lint-staged": "^15.5.1", @@ -16,9 +16,9 @@ } }, "node_modules/@croquiscom/eslint-config": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@croquiscom/eslint-config/-/eslint-config-3.2.0.tgz", - "integrity": "sha512-D5Fpbj4lWk2V937Nsx7fN2STiW4LX/VAPbghbnhggWaukealuCGm7oOCq5UAVA79pAgV5u3RetqE/Xr+kRlUNw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@croquiscom/eslint-config/-/eslint-config-3.2.1.tgz", + "integrity": "sha512-OUJCrzeJkbQbdy8w8YZ+lFGhyuPyhCa8bfmEuKS0uR3D/Qwt6WBT1EMh5G/xUT7BYXDyNGFdp0izhia0Lq9JDA==", "dev": true, "license": "MIT", "dependencies": { @@ -4601,9 +4601,9 @@ }, "dependencies": { "@croquiscom/eslint-config": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@croquiscom/eslint-config/-/eslint-config-3.2.0.tgz", - "integrity": "sha512-D5Fpbj4lWk2V937Nsx7fN2STiW4LX/VAPbghbnhggWaukealuCGm7oOCq5UAVA79pAgV5u3RetqE/Xr+kRlUNw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@croquiscom/eslint-config/-/eslint-config-3.2.1.tgz", + "integrity": "sha512-OUJCrzeJkbQbdy8w8YZ+lFGhyuPyhCa8bfmEuKS0uR3D/Qwt6WBT1EMh5G/xUT7BYXDyNGFdp0izhia0Lq9JDA==", "dev": true, "requires": { "eslint-import-resolver-typescript": "^4.3.2", diff --git a/package.json b/package.json index 16cca47..c5a3d01 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "prepare": "husky" }, "devDependencies": { - "@croquiscom/eslint-config": "^3.2.0", + "@croquiscom/eslint-config": "^3.2.1", "eslint": "^9.24.0", "husky": "^9.1.7", "lint-staged": "^15.5.1", diff --git a/packages/express/.changeset/huge-nights-take.md b/packages/express/.changeset/huge-nights-take.md new file mode 100644 index 0000000..8766d18 --- /dev/null +++ b/packages/express/.changeset/huge-nights-take.md @@ -0,0 +1,5 @@ +--- +'@croquiscom/crary-express': patch +--- + +remove unnecessary @types/cookie diff --git a/packages/express/eslint.config.mjs b/packages/express/eslint.config.mjs index 4d7cb6c..c04d6b3 100644 --- a/packages/express/eslint.config.mjs +++ b/packages/express/eslint.config.mjs @@ -36,7 +36,6 @@ export default tseslint.config( '@typescript-eslint/consistent-indexed-object-style': 'off', '@typescript-eslint/prefer-nullish-coalescing': 'off', '@typescript-eslint/prefer-optional-chain': 'off', - '@typescript-eslint/no-base-to-string': 'off', '@typescript-eslint/prefer-string-starts-ends-with': 'off', }, }, diff --git a/packages/express/examples/routes/api/hello.ts b/packages/express/examples/routes/api/hello.ts index 02569ca..deab2f2 100644 --- a/packages/express/examples/routes/api/hello.ts +++ b/packages/express/examples/routes/api/hello.ts @@ -1,8 +1,9 @@ import { Router } from '../../..'; export default (router: Router) => { - // $ curl http://localhost:3000/api/hello + // $ curl http://localhost:3000/api/hello?name=crary router.get('/hello', (req, res) => { - res.sendResult({ msg: 'hello' }); + const name = req.query.name?.toString() || 'world'; + res.sendResult({ msg: `hello ${name}` }); }); }; diff --git a/packages/express/lib/logger.js b/packages/express/lib/logger.js index 668b0bf..37041b9 100644 --- a/packages/express/lib/logger.js +++ b/packages/express/lib/logger.js @@ -30,7 +30,7 @@ log4js_1.default.addLayout('json', () => { } return JSON.stringify({ '@timestamp': logEvent.startTime.toISOString(), - 'loglevel': logEvent.level.toString(), + 'loglevel': logEvent.level.levelStr.toString(), 'service_name': logEvent.categoryName, ...data, }); diff --git a/packages/express/package-lock.json b/packages/express/package-lock.json index aaf2da7..0fc4b2c 100644 --- a/packages/express/package-lock.json +++ b/packages/express/package-lock.json @@ -9,7 +9,6 @@ "version": "2.0.1", "license": "MIT", "dependencies": { - "@types/cookie": "^1.0.0", "body-parser": "^2.2.0", "compression": "^1.8.0", "connect-redis": "^8.0.2", @@ -514,16 +513,6 @@ "@types/node": "*" } }, - "node_modules/@types/cookie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-1.0.0.tgz", - "integrity": "sha512-mGFXbkDQJ6kAXByHS7QAggRXgols0mAdP4MuXgloGY1tXokvzaFFM4SMqWvf7AH0oafI7zlFJwoGWzmhDqTZ9w==", - "deprecated": "This is a stub types definition. cookie provides its own type definitions, so you do not need this installed.", - "license": "MIT", - "dependencies": { - "cookie": "*" - } - }, "node_modules/@types/cookie-parser": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.8.tgz", @@ -3555,14 +3544,6 @@ "@types/node": "*" } }, - "@types/cookie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-1.0.0.tgz", - "integrity": "sha512-mGFXbkDQJ6kAXByHS7QAggRXgols0mAdP4MuXgloGY1tXokvzaFFM4SMqWvf7AH0oafI7zlFJwoGWzmhDqTZ9w==", - "requires": { - "cookie": "*" - } - }, "@types/cookie-parser": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.8.tgz", diff --git a/packages/express/package.json b/packages/express/package.json index 2887972..9b148c9 100644 --- a/packages/express/package.json +++ b/packages/express/package.json @@ -27,7 +27,6 @@ }, "homepage": "https://github.com/croquiscom/crary-node", "dependencies": { - "@types/cookie": "^1.0.0", "body-parser": "^2.2.0", "compression": "^1.8.0", "connect-redis": "^8.0.2", diff --git a/packages/express/src/logger.ts b/packages/express/src/logger.ts index 6d7a2cc..81ba383 100644 --- a/packages/express/src/logger.ts +++ b/packages/express/src/logger.ts @@ -28,7 +28,7 @@ log4js.addLayout('json', () => { } return JSON.stringify({ '@timestamp': logEvent.startTime.toISOString(), - 'loglevel': logEvent.level.toString(), + 'loglevel': logEvent.level.levelStr.toString(), 'service_name': logEvent.categoryName, ...data, });