From 992f2a4614778fbe172543b5fc2d9d9783adce06 Mon Sep 17 00:00:00 2001
From: Oskar Dudycz <oskar.dudycz@gmail.com>
Date: Thu, 8 Aug 2024 18:22:50 +0200
Subject: [PATCH] Moved shim exports to top level instead of nested folder, to
 make types import possible without dist

---
 src/package-lock.json                                |  6 +++---
 src/package.json                                     |  2 +-
 src/packages/pongo/package.json                      | 12 ++++++------
 src/packages/pongo/src/{shim => mongo}/findCursor.ts |  0
 src/packages/pongo/src/{shim => mongo}/index.ts      |  0
 .../pongo/src/{shim => mongo}/mongoClient.ts         |  0
 .../pongo/src/{shim => mongo}/mongoCollection.ts     |  0
 src/packages/pongo/src/{shim => mongo}/mongoDb.ts    |  0
 src/packages/pongo/src/shim.ts                       |  1 +
 src/packages/pongo/tsup.config.ts                    |  2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)
 rename src/packages/pongo/src/{shim => mongo}/findCursor.ts (100%)
 rename src/packages/pongo/src/{shim => mongo}/index.ts (100%)
 rename src/packages/pongo/src/{shim => mongo}/mongoClient.ts (100%)
 rename src/packages/pongo/src/{shim => mongo}/mongoCollection.ts (100%)
 rename src/packages/pongo/src/{shim => mongo}/mongoDb.ts (100%)
 create mode 100644 src/packages/pongo/src/shim.ts

diff --git a/src/package-lock.json b/src/package-lock.json
index 9bea72a..b7eabc7 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@event-driven-io/pongo-core",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@event-driven-io/pongo-core",
-      "version": "0.12.3",
+      "version": "0.12.4",
       "workspaces": [
         "packages/dumbo",
         "packages/pongo"
@@ -5694,7 +5694,7 @@
     },
     "packages/pongo": {
       "name": "@event-driven-io/pongo",
-      "version": "0.12.3",
+      "version": "0.12.4",
       "dependencies": {
         "@types/pg-connection-string": "^2.0.0",
         "pg-connection-string": "^2.6.4"
diff --git a/src/package.json b/src/package.json
index 3f911cb..57e6b6d 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/pongo-core",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "Pongo - Mongo with strong consistency on top of Postgres",
   "type": "module",
   "engines": {
diff --git a/src/packages/pongo/package.json b/src/packages/pongo/package.json
index 87c9959..541bfcc 100644
--- a/src/packages/pongo/package.json
+++ b/src/packages/pongo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/pongo",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "Pongo - Mongo with strong consistency on top of Postgres",
   "type": "module",
   "scripts": {
@@ -41,12 +41,12 @@
     },
     "./shim": {
       "import": {
-        "types": "./dist/shim/index.d.ts",
-        "default": "./dist/shim/index.js"
+        "types": "./dist/shim.d.ts",
+        "default": "./dist/shim.js"
       },
       "require": {
-        "types": "./dist/shim/index.d.cts",
-        "default": "./dist/shim/index.cjs"
+        "types": "./dist/shim.d.cts",
+        "default": "./dist/shim.cjs"
       }
     }
   },
@@ -56,7 +56,7 @@
         "./dist/index.d.ts"
       ],
       "shim": [
-        "./dist/shim/index.d.ts"
+        "./dist/shim.d.ts"
       ]
     }
   },
diff --git a/src/packages/pongo/src/shim/findCursor.ts b/src/packages/pongo/src/mongo/findCursor.ts
similarity index 100%
rename from src/packages/pongo/src/shim/findCursor.ts
rename to src/packages/pongo/src/mongo/findCursor.ts
diff --git a/src/packages/pongo/src/shim/index.ts b/src/packages/pongo/src/mongo/index.ts
similarity index 100%
rename from src/packages/pongo/src/shim/index.ts
rename to src/packages/pongo/src/mongo/index.ts
diff --git a/src/packages/pongo/src/shim/mongoClient.ts b/src/packages/pongo/src/mongo/mongoClient.ts
similarity index 100%
rename from src/packages/pongo/src/shim/mongoClient.ts
rename to src/packages/pongo/src/mongo/mongoClient.ts
diff --git a/src/packages/pongo/src/shim/mongoCollection.ts b/src/packages/pongo/src/mongo/mongoCollection.ts
similarity index 100%
rename from src/packages/pongo/src/shim/mongoCollection.ts
rename to src/packages/pongo/src/mongo/mongoCollection.ts
diff --git a/src/packages/pongo/src/shim/mongoDb.ts b/src/packages/pongo/src/mongo/mongoDb.ts
similarity index 100%
rename from src/packages/pongo/src/shim/mongoDb.ts
rename to src/packages/pongo/src/mongo/mongoDb.ts
diff --git a/src/packages/pongo/src/shim.ts b/src/packages/pongo/src/shim.ts
new file mode 100644
index 0000000..b9fe678
--- /dev/null
+++ b/src/packages/pongo/src/shim.ts
@@ -0,0 +1 @@
+export * from './mongo';
diff --git a/src/packages/pongo/tsup.config.ts b/src/packages/pongo/tsup.config.ts
index 81817c0..14a226f 100644
--- a/src/packages/pongo/tsup.config.ts
+++ b/src/packages/pongo/tsup.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
   watch: env === 'development',
   target: 'esnext',
   outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
-  entry: ['src/index.ts', 'src/shim/index.ts'],
+  entry: ['src/index.ts', 'src/shim.ts'],
   //entry: ['src/**/*.ts', '!src/**/*.spec.ts', '!src/**/*.internal.ts'], //include all files under src but not specs
   sourcemap: true,
   tsconfig: 'tsconfig.build.json', // workaround for https://github.com/egoist/tsup/issues/571#issuecomment-1760052931