diff --git a/package.json b/package.json
index 491d8601641676b5438561751d119ac07226ebf6..ae7345349294a2fb11e12ed1320a9172f14d712e 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,20 @@
},
"devDependencies": {
"@types/bcrypt": "^5.0.2",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
"@types/bcryptjs": "^3.0.0",
"@types/express": "^4.17.21",
+=======
+ "@types/express": "^5.0.0",
+>>>>>>> f75e135 (Issue#1: ADD user schema)
+=======
+ "@types/express": "^5.0.0",
+>>>>>>> baa1360 ( consertado)
+=======
+ "@types/express": "^5.0.0",
+>>>>>>> a20601a32052cb95406df2e75d8114de3dc95e7b
"@types/jsonwebtoken": "^9.0.9",
"@types/node": "^22.13.9",
"@types/pg": "^8.11.11",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 103ae7b1d100ceae0c5ff65c24cab045b0e0adaa..761a4e2d132692050748c4aa3cdd7d25212d1a6c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ importers:
version: 12.0.1
drizzle-orm:
specifier: ^0.40.0
- version: 0.40.0(@types/pg@8.11.11)(gel@2.0.0)(pg@8.13.3)(postgres@3.4.5)
+ version: 0.40.0(@types/pg@8.11.11)(gel@2.0.1)(pg@8.14.0)(postgres@3.4.5)
express:
specifier: ^4.21.2
version: 4.21.2
@@ -31,7 +31,7 @@ importers:
version: 9.0.2
pg:
specifier: ^8.13.3
- version: 8.13.3
+ version: 8.14.0
postgres:
specifier: ^3.4.5
version: 3.4.5
@@ -46,14 +46,14 @@ importers:
specifier: ^3.0.0
version: 3.0.0
'@types/express':
- specifier: ^4.17.21
- version: 4.17.21
+ specifier: ^5.0.0
+ version: 5.0.0
'@types/jsonwebtoken':
specifier: ^9.0.9
version: 9.0.9
'@types/node':
specifier: ^22.13.9
- version: 22.13.9
+ version: 22.13.10
'@types/pg':
specifier: ^8.11.11
version: 8.11.11
@@ -62,7 +62,7 @@ importers:
version: 0.30.5
ts-node:
specifier: ^10.9.2
- version: 10.9.2(@types/node@22.13.9)(typescript@5.8.2)
+ version: 10.9.2(@types/node@22.13.10)(typescript@5.8.2)
tsx:
specifier: ^4.19.3
version: 4.19.3
@@ -93,8 +93,8 @@ packages:
cpu: [ppc64]
os: [aix]
- '@esbuild/aix-ppc64@0.25.0':
- resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+ '@esbuild/aix-ppc64@0.25.1':
+ resolution: {integrity: sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [aix]
@@ -111,8 +111,8 @@ packages:
cpu: [arm64]
os: [android]
- '@esbuild/android-arm64@0.25.0':
- resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
+ '@esbuild/android-arm64@0.25.1':
+ resolution: {integrity: sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==}
engines: {node: '>=18'}
cpu: [arm64]
os: [android]
@@ -129,8 +129,8 @@ packages:
cpu: [arm]
os: [android]
- '@esbuild/android-arm@0.25.0':
- resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+ '@esbuild/android-arm@0.25.1':
+ resolution: {integrity: sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==}
engines: {node: '>=18'}
cpu: [arm]
os: [android]
@@ -147,8 +147,8 @@ packages:
cpu: [x64]
os: [android]
- '@esbuild/android-x64@0.25.0':
- resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+ '@esbuild/android-x64@0.25.1':
+ resolution: {integrity: sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==}
engines: {node: '>=18'}
cpu: [x64]
os: [android]
@@ -165,8 +165,8 @@ packages:
cpu: [arm64]
os: [darwin]
- '@esbuild/darwin-arm64@0.25.0':
- resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+ '@esbuild/darwin-arm64@0.25.1':
+ resolution: {integrity: sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [darwin]
@@ -183,8 +183,8 @@ packages:
cpu: [x64]
os: [darwin]
- '@esbuild/darwin-x64@0.25.0':
- resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+ '@esbuild/darwin-x64@0.25.1':
+ resolution: {integrity: sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==}
engines: {node: '>=18'}
cpu: [x64]
os: [darwin]
@@ -201,8 +201,8 @@ packages:
cpu: [arm64]
os: [freebsd]
- '@esbuild/freebsd-arm64@0.25.0':
- resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+ '@esbuild/freebsd-arm64@0.25.1':
+ resolution: {integrity: sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==}
engines: {node: '>=18'}
cpu: [arm64]
os: [freebsd]
@@ -219,8 +219,8 @@ packages:
cpu: [x64]
os: [freebsd]
- '@esbuild/freebsd-x64@0.25.0':
- resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+ '@esbuild/freebsd-x64@0.25.1':
+ resolution: {integrity: sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==}
engines: {node: '>=18'}
cpu: [x64]
os: [freebsd]
@@ -237,8 +237,8 @@ packages:
cpu: [arm64]
os: [linux]
- '@esbuild/linux-arm64@0.25.0':
- resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+ '@esbuild/linux-arm64@0.25.1':
+ resolution: {integrity: sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [linux]
@@ -255,8 +255,8 @@ packages:
cpu: [arm]
os: [linux]
- '@esbuild/linux-arm@0.25.0':
- resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+ '@esbuild/linux-arm@0.25.1':
+ resolution: {integrity: sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==}
engines: {node: '>=18'}
cpu: [arm]
os: [linux]
@@ -273,8 +273,8 @@ packages:
cpu: [ia32]
os: [linux]
- '@esbuild/linux-ia32@0.25.0':
- resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
+ '@esbuild/linux-ia32@0.25.1':
+ resolution: {integrity: sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==}
engines: {node: '>=18'}
cpu: [ia32]
os: [linux]
@@ -291,8 +291,8 @@ packages:
cpu: [loong64]
os: [linux]
- '@esbuild/linux-loong64@0.25.0':
- resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+ '@esbuild/linux-loong64@0.25.1':
+ resolution: {integrity: sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==}
engines: {node: '>=18'}
cpu: [loong64]
os: [linux]
@@ -309,8 +309,8 @@ packages:
cpu: [mips64el]
os: [linux]
- '@esbuild/linux-mips64el@0.25.0':
- resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+ '@esbuild/linux-mips64el@0.25.1':
+ resolution: {integrity: sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==}
engines: {node: '>=18'}
cpu: [mips64el]
os: [linux]
@@ -327,8 +327,8 @@ packages:
cpu: [ppc64]
os: [linux]
- '@esbuild/linux-ppc64@0.25.0':
- resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+ '@esbuild/linux-ppc64@0.25.1':
+ resolution: {integrity: sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [linux]
@@ -345,8 +345,8 @@ packages:
cpu: [riscv64]
os: [linux]
- '@esbuild/linux-riscv64@0.25.0':
- resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+ '@esbuild/linux-riscv64@0.25.1':
+ resolution: {integrity: sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==}
engines: {node: '>=18'}
cpu: [riscv64]
os: [linux]
@@ -363,8 +363,8 @@ packages:
cpu: [s390x]
os: [linux]
- '@esbuild/linux-s390x@0.25.0':
- resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+ '@esbuild/linux-s390x@0.25.1':
+ resolution: {integrity: sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==}
engines: {node: '>=18'}
cpu: [s390x]
os: [linux]
@@ -381,14 +381,14 @@ packages:
cpu: [x64]
os: [linux]
- '@esbuild/linux-x64@0.25.0':
- resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+ '@esbuild/linux-x64@0.25.1':
+ resolution: {integrity: sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==}
engines: {node: '>=18'}
cpu: [x64]
os: [linux]
- '@esbuild/netbsd-arm64@0.25.0':
- resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+ '@esbuild/netbsd-arm64@0.25.1':
+ resolution: {integrity: sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==}
engines: {node: '>=18'}
cpu: [arm64]
os: [netbsd]
@@ -405,14 +405,14 @@ packages:
cpu: [x64]
os: [netbsd]
- '@esbuild/netbsd-x64@0.25.0':
- resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+ '@esbuild/netbsd-x64@0.25.1':
+ resolution: {integrity: sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==}
engines: {node: '>=18'}
cpu: [x64]
os: [netbsd]
- '@esbuild/openbsd-arm64@0.25.0':
- resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+ '@esbuild/openbsd-arm64@0.25.1':
+ resolution: {integrity: sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [openbsd]
@@ -429,8 +429,8 @@ packages:
cpu: [x64]
os: [openbsd]
- '@esbuild/openbsd-x64@0.25.0':
- resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+ '@esbuild/openbsd-x64@0.25.1':
+ resolution: {integrity: sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==}
engines: {node: '>=18'}
cpu: [x64]
os: [openbsd]
@@ -447,8 +447,8 @@ packages:
cpu: [x64]
os: [sunos]
- '@esbuild/sunos-x64@0.25.0':
- resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+ '@esbuild/sunos-x64@0.25.1':
+ resolution: {integrity: sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==}
engines: {node: '>=18'}
cpu: [x64]
os: [sunos]
@@ -465,8 +465,8 @@ packages:
cpu: [arm64]
os: [win32]
- '@esbuild/win32-arm64@0.25.0':
- resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+ '@esbuild/win32-arm64@0.25.1':
+ resolution: {integrity: sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [win32]
@@ -483,8 +483,8 @@ packages:
cpu: [ia32]
os: [win32]
- '@esbuild/win32-ia32@0.25.0':
- resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+ '@esbuild/win32-ia32@0.25.1':
+ resolution: {integrity: sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==}
engines: {node: '>=18'}
cpu: [ia32]
os: [win32]
@@ -501,8 +501,8 @@ packages:
cpu: [x64]
os: [win32]
- '@esbuild/win32-x64@0.25.0':
- resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+ '@esbuild/win32-x64@0.25.1':
+ resolution: {integrity: sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==}
engines: {node: '>=18'}
cpu: [x64]
os: [win32]
@@ -521,8 +521,8 @@ packages:
resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
hasBin: true
- '@petamoriken/float16@3.9.1':
- resolution: {integrity: sha512-j+ejhYwY6PeB+v1kn7lZFACUIG97u90WxMuGosILFsl9d4Ovi0sjk0GlPfoEcx+FzvXZDAfioD+NGnnPamXgMA==}
+ '@petamoriken/float16@3.9.2':
+ resolution: {integrity: sha512-VgffxawQde93xKxT3qap3OH+meZf7VaSB5Sqd4Rqc+FP5alWbpOyan/7tRbOAvynjpG3GpdtAuGU/NdhQpmrog==}
'@tsconfig/node10@1.0.11':
resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
@@ -549,11 +549,11 @@ packages:
'@types/connect@3.4.38':
resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
- '@types/express-serve-static-core@4.19.6':
- resolution: {integrity: sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==}
+ '@types/express-serve-static-core@5.0.6':
+ resolution: {integrity: sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==}
- '@types/express@4.17.21':
- resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+ '@types/express@5.0.0':
+ resolution: {integrity: sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==}
'@types/http-errors@2.0.4':
resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
@@ -567,8 +567,8 @@ packages:
'@types/ms@2.1.0':
resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
- '@types/node@22.13.9':
- resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==}
+ '@types/node@22.13.10':
+ resolution: {integrity: sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==}
'@types/pg@8.11.11':
resolution: {integrity: sha512-kGT1qKM8wJQ5qlawUrEkXgvMSXoV213KfMGXcwfDwUIfUHXqXYXOfS1nE1LINRJVVVx5wCm70XnFlMHaIcQAfw==}
@@ -596,8 +596,8 @@ packages:
resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
engines: {node: '>=0.4.0'}
- acorn@8.14.0:
- resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+ acorn@8.14.1:
+ resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
engines: {node: '>=0.4.0'}
hasBin: true
@@ -655,8 +655,8 @@ packages:
resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
engines: {node: '>= 0.4'}
- call-bound@1.0.3:
- resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
+ call-bound@1.0.4:
+ resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
engines: {node: '>= 0.4'}
chownr@2.0.0:
@@ -880,8 +880,8 @@ packages:
engines: {node: '>=12'}
hasBin: true
- esbuild@0.25.0:
- resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+ esbuild@0.25.1:
+ resolution: {integrity: sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==}
engines: {node: '>=18'}
hasBin: true
@@ -928,8 +928,8 @@ packages:
engines: {node: '>=10'}
deprecated: This package is no longer supported.
- gel@2.0.0:
- resolution: {integrity: sha512-Oq3Fjay71s00xzDc0BF/mpcLmnA+uRqMEJK8p5K4PaZjUEsxaeo+kR9OHBVAf289/qPd+0OcLOLUN0UhqiUCog==}
+ gel@2.0.1:
+ resolution: {integrity: sha512-gfem3IGvqKqXwEq7XseBogyaRwGsQGuE7Cw/yQsjLGdgiyqX92G1xENPCE0ltunPGcsJIa6XBOTx/PK169mOqw==}
engines: {node: '>= 18.0.0'}
hasBin: true
@@ -1154,13 +1154,13 @@ packages:
resolution: {integrity: sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==}
engines: {node: '>=4'}
- pg-pool@3.7.1:
- resolution: {integrity: sha512-xIOsFoh7Vdhojas6q3596mXFsR8nwBQBXX5JiV7p9buEVAGqYL4yFzclON5P9vFrpu1u7Zwl2oriyDa89n0wbw==}
+ pg-pool@3.8.0:
+ resolution: {integrity: sha512-VBw3jiVm6ZOdLBTIcXLNdSotb6Iy3uOCwDGFAksZCXmi10nyRvnP2v3jl4d+IsLYRyXf6o9hIm/ZtUzlByNUdw==}
peerDependencies:
pg: '>=8.0'
- pg-protocol@1.7.1:
- resolution: {integrity: sha512-gjTHWGYWsEgy9MsY0Gp6ZJxV24IjDqdpTW7Eh0x+WfJLFsm/TJx1MzL6T0D88mBvkpxotCQ6TwW6N+Kko7lhgQ==}
+ pg-protocol@1.8.0:
+ resolution: {integrity: sha512-jvuYlEkL03NRvOoyoRktBK7+qU5kOvlAwvmrH8sr3wbLrOdVWsRxQfz8mMy9sZFsqJ1hEWNfdWKI4SAmoL+j7g==}
pg-types@2.2.0:
resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
@@ -1170,8 +1170,8 @@ packages:
resolution: {integrity: sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==}
engines: {node: '>=10'}
- pg@8.13.3:
- resolution: {integrity: sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==}
+ pg@8.14.0:
+ resolution: {integrity: sha512-nXbVpyoaXVmdqlKEzToFf37qzyeeh7mbiXsnoWvstSqohj88yaa/I/Rq/HEVn2QPSZEuLIJa/jSpRDyzjEx4FQ==}
engines: {node: '>= 8.0.0'}
peerDependencies:
pg-native: '>=3.0.1'
@@ -1186,8 +1186,8 @@ packages:
resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
engines: {node: '>=4'}
- postgres-array@3.0.2:
- resolution: {integrity: sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==}
+ postgres-array@3.0.4:
+ resolution: {integrity: sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==}
engines: {node: '>=12'}
postgres-bytea@1.0.0:
@@ -1439,7 +1439,7 @@ snapshots:
'@esbuild/aix-ppc64@0.19.12':
optional: true
- '@esbuild/aix-ppc64@0.25.0':
+ '@esbuild/aix-ppc64@0.25.1':
optional: true
'@esbuild/android-arm64@0.18.20':
@@ -1448,7 +1448,7 @@ snapshots:
'@esbuild/android-arm64@0.19.12':
optional: true
- '@esbuild/android-arm64@0.25.0':
+ '@esbuild/android-arm64@0.25.1':
optional: true
'@esbuild/android-arm@0.18.20':
@@ -1457,7 +1457,7 @@ snapshots:
'@esbuild/android-arm@0.19.12':
optional: true
- '@esbuild/android-arm@0.25.0':
+ '@esbuild/android-arm@0.25.1':
optional: true
'@esbuild/android-x64@0.18.20':
@@ -1466,7 +1466,7 @@ snapshots:
'@esbuild/android-x64@0.19.12':
optional: true
- '@esbuild/android-x64@0.25.0':
+ '@esbuild/android-x64@0.25.1':
optional: true
'@esbuild/darwin-arm64@0.18.20':
@@ -1475,7 +1475,7 @@ snapshots:
'@esbuild/darwin-arm64@0.19.12':
optional: true
- '@esbuild/darwin-arm64@0.25.0':
+ '@esbuild/darwin-arm64@0.25.1':
optional: true
'@esbuild/darwin-x64@0.18.20':
@@ -1484,7 +1484,7 @@ snapshots:
'@esbuild/darwin-x64@0.19.12':
optional: true
- '@esbuild/darwin-x64@0.25.0':
+ '@esbuild/darwin-x64@0.25.1':
optional: true
'@esbuild/freebsd-arm64@0.18.20':
@@ -1493,7 +1493,7 @@ snapshots:
'@esbuild/freebsd-arm64@0.19.12':
optional: true
- '@esbuild/freebsd-arm64@0.25.0':
+ '@esbuild/freebsd-arm64@0.25.1':
optional: true
'@esbuild/freebsd-x64@0.18.20':
@@ -1502,7 +1502,7 @@ snapshots:
'@esbuild/freebsd-x64@0.19.12':
optional: true
- '@esbuild/freebsd-x64@0.25.0':
+ '@esbuild/freebsd-x64@0.25.1':
optional: true
'@esbuild/linux-arm64@0.18.20':
@@ -1511,7 +1511,7 @@ snapshots:
'@esbuild/linux-arm64@0.19.12':
optional: true
- '@esbuild/linux-arm64@0.25.0':
+ '@esbuild/linux-arm64@0.25.1':
optional: true
'@esbuild/linux-arm@0.18.20':
@@ -1520,7 +1520,7 @@ snapshots:
'@esbuild/linux-arm@0.19.12':
optional: true
- '@esbuild/linux-arm@0.25.0':
+ '@esbuild/linux-arm@0.25.1':
optional: true
'@esbuild/linux-ia32@0.18.20':
@@ -1529,7 +1529,7 @@ snapshots:
'@esbuild/linux-ia32@0.19.12':
optional: true
- '@esbuild/linux-ia32@0.25.0':
+ '@esbuild/linux-ia32@0.25.1':
optional: true
'@esbuild/linux-loong64@0.18.20':
@@ -1538,7 +1538,7 @@ snapshots:
'@esbuild/linux-loong64@0.19.12':
optional: true
- '@esbuild/linux-loong64@0.25.0':
+ '@esbuild/linux-loong64@0.25.1':
optional: true
'@esbuild/linux-mips64el@0.18.20':
@@ -1547,7 +1547,7 @@ snapshots:
'@esbuild/linux-mips64el@0.19.12':
optional: true
- '@esbuild/linux-mips64el@0.25.0':
+ '@esbuild/linux-mips64el@0.25.1':
optional: true
'@esbuild/linux-ppc64@0.18.20':
@@ -1556,7 +1556,7 @@ snapshots:
'@esbuild/linux-ppc64@0.19.12':
optional: true
- '@esbuild/linux-ppc64@0.25.0':
+ '@esbuild/linux-ppc64@0.25.1':
optional: true
'@esbuild/linux-riscv64@0.18.20':
@@ -1565,7 +1565,7 @@ snapshots:
'@esbuild/linux-riscv64@0.19.12':
optional: true
- '@esbuild/linux-riscv64@0.25.0':
+ '@esbuild/linux-riscv64@0.25.1':
optional: true
'@esbuild/linux-s390x@0.18.20':
@@ -1574,7 +1574,7 @@ snapshots:
'@esbuild/linux-s390x@0.19.12':
optional: true
- '@esbuild/linux-s390x@0.25.0':
+ '@esbuild/linux-s390x@0.25.1':
optional: true
'@esbuild/linux-x64@0.18.20':
@@ -1583,10 +1583,10 @@ snapshots:
'@esbuild/linux-x64@0.19.12':
optional: true
- '@esbuild/linux-x64@0.25.0':
+ '@esbuild/linux-x64@0.25.1':
optional: true
- '@esbuild/netbsd-arm64@0.25.0':
+ '@esbuild/netbsd-arm64@0.25.1':
optional: true
'@esbuild/netbsd-x64@0.18.20':
@@ -1595,10 +1595,10 @@ snapshots:
'@esbuild/netbsd-x64@0.19.12':
optional: true
- '@esbuild/netbsd-x64@0.25.0':
+ '@esbuild/netbsd-x64@0.25.1':
optional: true
- '@esbuild/openbsd-arm64@0.25.0':
+ '@esbuild/openbsd-arm64@0.25.1':
optional: true
'@esbuild/openbsd-x64@0.18.20':
@@ -1607,7 +1607,7 @@ snapshots:
'@esbuild/openbsd-x64@0.19.12':
optional: true
- '@esbuild/openbsd-x64@0.25.0':
+ '@esbuild/openbsd-x64@0.25.1':
optional: true
'@esbuild/sunos-x64@0.18.20':
@@ -1616,7 +1616,7 @@ snapshots:
'@esbuild/sunos-x64@0.19.12':
optional: true
- '@esbuild/sunos-x64@0.25.0':
+ '@esbuild/sunos-x64@0.25.1':
optional: true
'@esbuild/win32-arm64@0.18.20':
@@ -1625,7 +1625,7 @@ snapshots:
'@esbuild/win32-arm64@0.19.12':
optional: true
- '@esbuild/win32-arm64@0.25.0':
+ '@esbuild/win32-arm64@0.25.1':
optional: true
'@esbuild/win32-ia32@0.18.20':
@@ -1634,7 +1634,7 @@ snapshots:
'@esbuild/win32-ia32@0.19.12':
optional: true
- '@esbuild/win32-ia32@0.25.0':
+ '@esbuild/win32-ia32@0.25.1':
optional: true
'@esbuild/win32-x64@0.18.20':
@@ -1643,7 +1643,7 @@ snapshots:
'@esbuild/win32-x64@0.19.12':
optional: true
- '@esbuild/win32-x64@0.25.0':
+ '@esbuild/win32-x64@0.25.1':
optional: true
'@jridgewell/resolve-uri@3.1.2': {}
@@ -1670,7 +1670,7 @@ snapshots:
- encoding
- supports-color
- '@petamoriken/float16@3.9.1': {}
+ '@petamoriken/float16@3.9.2': {}
'@tsconfig/node10@1.0.11': {}
@@ -1682,32 +1682,38 @@ snapshots:
'@types/bcrypt@5.0.2':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
+<<<<<<< HEAD
+<<<<<<< HEAD
'@types/bcryptjs@3.0.0':
dependencies:
bcryptjs: 3.0.2
+=======
+>>>>>>> baa1360 ( consertado)
+=======
+>>>>>>> a20601a32052cb95406df2e75d8114de3dc95e7b
'@types/body-parser@1.19.5':
dependencies:
'@types/connect': 3.4.38
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/connect@3.4.38':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
- '@types/express-serve-static-core@4.19.6':
+ '@types/express-serve-static-core@5.0.6':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/qs': 6.9.18
'@types/range-parser': 1.2.7
'@types/send': 0.17.4
- '@types/express@4.17.21':
+ '@types/express@5.0.0':
dependencies:
'@types/body-parser': 1.19.5
- '@types/express-serve-static-core': 4.19.6
+ '@types/express-serve-static-core': 5.0.6
'@types/qs': 6.9.18
'@types/serve-static': 1.15.7
@@ -1716,20 +1722,20 @@ snapshots:
'@types/jsonwebtoken@9.0.9':
dependencies:
'@types/ms': 2.1.0
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/mime@1.3.5': {}
'@types/ms@2.1.0': {}
- '@types/node@22.13.9':
+ '@types/node@22.13.10':
dependencies:
undici-types: 6.20.0
'@types/pg@8.11.11':
dependencies:
- '@types/node': 22.13.9
- pg-protocol: 1.7.1
+ '@types/node': 22.13.10
+ pg-protocol: 1.8.0
pg-types: 4.0.2
'@types/qs@6.9.18': {}
@@ -1739,12 +1745,12 @@ snapshots:
'@types/send@0.17.4':
dependencies:
'@types/mime': 1.3.5
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/serve-static@1.15.7':
dependencies:
'@types/http-errors': 2.0.4
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/send': 0.17.4
abbrev@1.1.1: {}
@@ -1756,9 +1762,9 @@ snapshots:
acorn-walk@8.3.4:
dependencies:
- acorn: 8.14.0
+ acorn: 8.14.1
- acorn@8.14.0: {}
+ acorn@8.14.1: {}
agent-base@6.0.2:
dependencies:
@@ -1824,7 +1830,7 @@ snapshots:
es-errors: 1.3.0
function-bind: 1.1.2
- call-bound@1.0.3:
+ call-bound@1.0.4:
dependencies:
call-bind-apply-helpers: 1.0.2
get-intrinsic: 1.3.0
@@ -1879,15 +1885,15 @@ snapshots:
'@esbuild-kit/esm-loader': 2.6.5
esbuild: 0.19.12
esbuild-register: 3.6.0(esbuild@0.19.12)
- gel: 2.0.0
+ gel: 2.0.1
transitivePeerDependencies:
- supports-color
- drizzle-orm@0.40.0(@types/pg@8.11.11)(gel@2.0.0)(pg@8.13.3)(postgres@3.4.5):
+ drizzle-orm@0.40.0(@types/pg@8.11.11)(gel@2.0.1)(pg@8.14.0)(postgres@3.4.5):
optionalDependencies:
'@types/pg': 8.11.11
- gel: 2.0.0
- pg: 8.13.3
+ gel: 2.0.1
+ pg: 8.14.0
postgres: 3.4.5
dunder-proto@1.0.1:
@@ -1976,33 +1982,33 @@ snapshots:
'@esbuild/win32-ia32': 0.19.12
'@esbuild/win32-x64': 0.19.12
- esbuild@0.25.0:
+ esbuild@0.25.1:
optionalDependencies:
- '@esbuild/aix-ppc64': 0.25.0
- '@esbuild/android-arm': 0.25.0
- '@esbuild/android-arm64': 0.25.0
- '@esbuild/android-x64': 0.25.0
- '@esbuild/darwin-arm64': 0.25.0
- '@esbuild/darwin-x64': 0.25.0
- '@esbuild/freebsd-arm64': 0.25.0
- '@esbuild/freebsd-x64': 0.25.0
- '@esbuild/linux-arm': 0.25.0
- '@esbuild/linux-arm64': 0.25.0
- '@esbuild/linux-ia32': 0.25.0
- '@esbuild/linux-loong64': 0.25.0
- '@esbuild/linux-mips64el': 0.25.0
- '@esbuild/linux-ppc64': 0.25.0
- '@esbuild/linux-riscv64': 0.25.0
- '@esbuild/linux-s390x': 0.25.0
- '@esbuild/linux-x64': 0.25.0
- '@esbuild/netbsd-arm64': 0.25.0
- '@esbuild/netbsd-x64': 0.25.0
- '@esbuild/openbsd-arm64': 0.25.0
- '@esbuild/openbsd-x64': 0.25.0
- '@esbuild/sunos-x64': 0.25.0
- '@esbuild/win32-arm64': 0.25.0
- '@esbuild/win32-ia32': 0.25.0
- '@esbuild/win32-x64': 0.25.0
+ '@esbuild/aix-ppc64': 0.25.1
+ '@esbuild/android-arm': 0.25.1
+ '@esbuild/android-arm64': 0.25.1
+ '@esbuild/android-x64': 0.25.1
+ '@esbuild/darwin-arm64': 0.25.1
+ '@esbuild/darwin-x64': 0.25.1
+ '@esbuild/freebsd-arm64': 0.25.1
+ '@esbuild/freebsd-x64': 0.25.1
+ '@esbuild/linux-arm': 0.25.1
+ '@esbuild/linux-arm64': 0.25.1
+ '@esbuild/linux-ia32': 0.25.1
+ '@esbuild/linux-loong64': 0.25.1
+ '@esbuild/linux-mips64el': 0.25.1
+ '@esbuild/linux-ppc64': 0.25.1
+ '@esbuild/linux-riscv64': 0.25.1
+ '@esbuild/linux-s390x': 0.25.1
+ '@esbuild/linux-x64': 0.25.1
+ '@esbuild/netbsd-arm64': 0.25.1
+ '@esbuild/netbsd-x64': 0.25.1
+ '@esbuild/openbsd-arm64': 0.25.1
+ '@esbuild/openbsd-x64': 0.25.1
+ '@esbuild/sunos-x64': 0.25.1
+ '@esbuild/win32-arm64': 0.25.1
+ '@esbuild/win32-ia32': 0.25.1
+ '@esbuild/win32-x64': 0.25.1
escape-html@1.0.3: {}
@@ -2083,9 +2089,9 @@ snapshots:
strip-ansi: 6.0.1
wide-align: 1.1.5
- gel@2.0.0:
+ gel@2.0.1:
dependencies:
- '@petamoriken/float16': 3.9.1
+ '@petamoriken/float16': 3.9.2
debug: 4.4.0
env-paths: 3.0.0
semver: 7.7.1
@@ -2296,11 +2302,11 @@ snapshots:
pg-numeric@1.0.2: {}
- pg-pool@3.7.1(pg@8.13.3):
+ pg-pool@3.8.0(pg@8.14.0):
dependencies:
- pg: 8.13.3
+ pg: 8.14.0
- pg-protocol@1.7.1: {}
+ pg-protocol@1.8.0: {}
pg-types@2.2.0:
dependencies:
@@ -2314,17 +2320,17 @@ snapshots:
dependencies:
pg-int8: 1.0.1
pg-numeric: 1.0.2
- postgres-array: 3.0.2
+ postgres-array: 3.0.4
postgres-bytea: 3.0.0
postgres-date: 2.1.0
postgres-interval: 3.0.0
postgres-range: 1.1.4
- pg@8.13.3:
+ pg@8.14.0:
dependencies:
pg-connection-string: 2.7.0
- pg-pool: 3.7.1(pg@8.13.3)
- pg-protocol: 1.7.1
+ pg-pool: 3.8.0(pg@8.14.0)
+ pg-protocol: 1.8.0
pg-types: 2.2.0
pgpass: 1.0.5
optionalDependencies:
@@ -2336,7 +2342,7 @@ snapshots:
postgres-array@2.0.0: {}
- postgres-array@3.0.2: {}
+ postgres-array@3.0.4: {}
postgres-bytea@1.0.0: {}
@@ -2436,14 +2442,14 @@ snapshots:
side-channel-map@1.0.1:
dependencies:
- call-bound: 1.0.3
+ call-bound: 1.0.4
es-errors: 1.3.0
get-intrinsic: 1.3.0
object-inspect: 1.13.4
side-channel-weakmap@1.0.2:
dependencies:
- call-bound: 1.0.3
+ call-bound: 1.0.4
es-errors: 1.3.0
get-intrinsic: 1.3.0
object-inspect: 1.13.4
@@ -2497,15 +2503,15 @@ snapshots:
tr46@0.0.3: {}
- ts-node@10.9.2(@types/node@22.13.9)(typescript@5.8.2):
+ ts-node@10.9.2(@types/node@22.13.10)(typescript@5.8.2):
dependencies:
'@cspotcode/source-map-support': 0.8.1
'@tsconfig/node10': 1.0.11
'@tsconfig/node12': 1.0.11
'@tsconfig/node14': 1.0.3
'@tsconfig/node16': 1.0.4
- '@types/node': 22.13.9
- acorn: 8.14.0
+ '@types/node': 22.13.10
+ acorn: 8.14.1
acorn-walk: 8.3.4
arg: 4.1.3
create-require: 1.1.1
@@ -2517,7 +2523,7 @@ snapshots:
tsx@4.19.3:
dependencies:
- esbuild: 0.25.0
+ esbuild: 0.25.1
get-tsconfig: 4.10.0
optionalDependencies:
fsevents: 2.3.3
diff --git a/src/db/migrations/meta/_journal.json b/src/db/migrations/meta/_journal.json
index 75f8a0a7e95d60bee99150cd0185808f76cfa0e6..1a1350f39f0f4b785dc4c4aaa491884e8f0605f4 100644
--- a/src/db/migrations/meta/_journal.json
+++ b/src/db/migrations/meta/_journal.json
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
{
"version": "7",
"dialect": "postgresql",
@@ -17,4 +20,13 @@
"breakpoints": true
}
]
-}
\ No newline at end of file
+}
+=======
+{"version":"7","dialect":"postgresql","entries":[]}
+>>>>>>> f75e135 (Issue#1: ADD user schema)
+=======
+{"version":"7","dialect":"postgresql","entries":[]}
+>>>>>>> baa1360 ( consertado)
+=======
+{"version":"7","dialect":"postgresql","entries":[]}
+>>>>>>> a20601a32052cb95406df2e75d8114de3dc95e7b
diff --git a/src/db/schema.ts b/src/db/schema.ts
index b33df051693d0edcd0033607e8b06a97913237d3..0d5e011dfaae55749d76c8b01d21dc4a06cd20ee 100644
--- a/src/db/schema.ts
+++ b/src/db/schema.ts
@@ -28,4 +28,18 @@ export const purchasesTable = pgTable('pursaches', {
user_id: integer('user_id').notNull().references(() => usersTable.id, { onDelete: "cascade" }),
implant_id: integer('user_id').notNull().references(() => implantsTable.id, { onDelete: "cascade" }),
created_at: timestamp('created_at').notNull().defaultNow(),
-})
\ No newline at end of file
+})
+
+export const usersTable = pgTable("users", {
+ id: serial('id').primaryKey().unique().notNull(),
+ name: varchar('name', { length: 255 }).notNull(),
+ password: varchar('password', { length: 255 }).notNull(),
+ email: varchar('email', { length: 255 }).unique().notNull(),
+ birthday: timestamp('birthday', {mode: 'string'}).notNull(),
+ cpf: varchar('cpf', { length: 11 }).unique().notNull(),
+ money: numeric('money').notNull().default("0"),
+ cyberpsychosis: numeric('cyberpsychosis').notNull().default("0"),
+ cyberLimit: numeric('cyberLimit').notNull().default("100"),
+ created_at: timestamp('created_at', { mode: 'date'}).notNull().defaultNow(),
+ updated_at: timestamp('updated_at', { mode: 'date'}).notNull().defaultNow().$onUpdateFn(() => new Date()),
+});
diff --git a/teste2 b/teste2
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000