From 2ee680205dbde78af46f4e4347cdf4fa80adfe3b Mon Sep 17 00:00:00 2001
From: Weyoss <weyoss@protonmail.com>
Date: Sun, 24 Mar 2024 14:54:45 +0100
Subject: [PATCH] fix: include missing enums when exporting esm/cjs modules

---
 .npmignore          |  5 ++++-
 package-lock.json   |  8 ++++----
 package.json        | 15 ++++++++++-----
 scripts/build.sh    |  3 ---
 tsconfig.json       |  2 ++
 tsconfig.types.json | 10 ----------
 6 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 tsconfig.types.json

diff --git a/.npmignore b/.npmignore
index 79e971b1..efee8081 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,6 @@
 dist/tests
 dist/examples
+dist/**/tests
 examples
 src/**
 tests/**
@@ -24,4 +25,6 @@ build
 docker-compose.yml
 scripts/**
 docs/**
-.codecov.yml
\ No newline at end of file
+.codecov.yml
+tsconfig*
+jest*
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 4d326846..b59cb140 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "cron-parser": "4.7.1",
         "lodash": "4.17.21",
-        "redis-smq-common": "3.0.0-rc.14",
+        "redis-smq-common": "3.0.0-rc.15",
         "uuid": "9.0.0"
       },
       "devDependencies": {
@@ -5506,9 +5506,9 @@
       }
     },
     "node_modules/redis-smq-common": {
-      "version": "3.0.0-rc.14",
-      "resolved": "https://registry.npmjs.org/redis-smq-common/-/redis-smq-common-3.0.0-rc.14.tgz",
-      "integrity": "sha512-PEoruqTKfRk6AU/6uDp4JXcy9eQ1S9K/So/CuBbEmvSJQYsxjfvLYEiQs8ZrZvYXS7OBamcXMaHIFIQ9aUtoAg==",
+      "version": "3.0.0-rc.15",
+      "resolved": "https://registry.npmjs.org/redis-smq-common/-/redis-smq-common-3.0.0-rc.15.tgz",
+      "integrity": "sha512-Q0cZqo06L1w+J+Bk9xmwxSD2vXavGKnxAiO9NjTCLDsiN8mk3ADoqyq16tnpAwtAqGZWg37OlGCJ0rG34BxFlg==",
       "dependencies": {
         "@redis/client": "1.1.0",
         "@types/bunyan": "1.8.7",
diff --git a/package.json b/package.json
index 6ce4196f..43edd2cb 100644
--- a/package.json
+++ b/package.json
@@ -33,12 +33,17 @@
   "type": "module",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
+  "types": "./dist/esm/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "types": "./dist/types/index.d.ts"
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     },
     "./package.json": "./package.json"
   },
@@ -52,7 +57,7 @@
   "dependencies": {
     "cron-parser": "4.7.1",
     "lodash": "4.17.21",
-    "redis-smq-common": "3.0.0-rc.14",
+    "redis-smq-common": "3.0.0-rc.15",
     "uuid": "9.0.0"
   },
   "devDependencies": {
diff --git a/scripts/build.sh b/scripts/build.sh
index 4343997c..277dcf0d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -27,6 +27,3 @@ cat >dist/cjs/package.json <<!EOF
 }
 !EOF
 cp -r src/common/redis-client/scripts/lua dist/cjs/src/common/redis-client/scripts/
-
-# types
-tsc -p ./tsconfig.types.json
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 62bc429b..2ebffc53 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,8 @@
     "allowSyntheticDefaultImports": true,
     "isolatedModules": true,
     "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "declarationMap": true,
 
     // esm settings
     "outDir": "dist/esm",
diff --git a/tsconfig.types.json b/tsconfig.types.json
deleted file mode 100644
index fdb46056..00000000
--- a/tsconfig.types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "declaration": true,
-    "declarationMap": true,
-    "declarationDir": "./dist/types",
-    "emitDeclarationOnly": true
-  },
-  "exclude": ["./node_modules", "dist", "tests", "**/*.js", "**/*.cjs"]
-}