From dffdfc44c2adbbea34820f2ed0efbfd1981671ad Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Tue, 22 Aug 2023 16:45:40 -0400
Subject: [PATCH 1/3] remove typed-sql submodule

---
 .gitmodules    | 3 ---
 deps/typed-sql | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 deps/typed-sql

diff --git a/.gitmodules b/.gitmodules
index 1ee6599..a8762fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "deps/wa-sqlite"]
 	path = deps/wa-sqlite
 	url = https://github.com/vlcn-io/wa-sqlite.git
-[submodule "deps/typed-sql"]
-	path = deps/typed-sql
-	url = https://github.com/vlcn-io/typed-sql.git
diff --git a/deps/typed-sql b/deps/typed-sql
deleted file mode 160000
index 5657b86..0000000
--- a/deps/typed-sql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5657b86a1cd90d62892c6be2c43ba81544e7e261

From 65a57b99593f03ee6b1a3414d2ef4e27b4b30257 Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Tue, 22 Aug 2023 16:49:11 -0400
Subject: [PATCH 2/3] typed-sql as companion repo

---
 .github/workflows/js-tests.yaml |  6 ++++++
 Makefile                        |  2 +-
 pnpm-lock.yaml                  | 10 +++++-----
 pnpm-workspace.yaml             |  8 ++++----
 tsbuild-all/tsconfig.json       |  6 +++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/js-tests.yaml b/.github/workflows/js-tests.yaml
index 87c21b4..b50bed3 100644
--- a/.github/workflows/js-tests.yaml
+++ b/.github/workflows/js-tests.yaml
@@ -25,6 +25,12 @@ jobs:
           submodules: recursive
           path: ./cr-sqlite
           repository: vlcn-io/cr-sqlite
+      - name: Checkout typed-sql
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          path: ./typed-sql
+          repository: vlcn-io/typed-sql
 
       - name: Load .env file
         uses: xom9ikk/dotenv@v2
diff --git a/Makefile b/Makefile
index 36c3895..07bee5c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ $(git-deps):
 	git submodule update --init --recursive
 
 $(typed-sql-pkg):
-	cd ./deps/typed-sql/packages/type-gen; ./build.sh
+	cd ../typed-sql/packages/type-gen; ./build.sh
 
 $(node-deps): $(git-deps) $(typed-sql-pkg)
 	pnpm install
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1ef3955..3ed5c80 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,7 +14,7 @@ importers:
 
   ../cr-sqlite/core: {}
 
-  deps/typed-sql/packages/cli:
+  ../typed-sql/packages/cli:
     dependencies:
       '@vlcn.io/type-gen-ts-adapter':
         specifier: workspace:*
@@ -33,7 +33,7 @@ importers:
         specifier: ^20.4.0
         version: 20.4.0
 
-  deps/typed-sql/packages/type-gen-ts-adapter:
+  ../typed-sql/packages/type-gen-ts-adapter:
     dependencies:
       typed-sql-type-gen:
         specifier: workspace:*
@@ -46,9 +46,9 @@ importers:
         specifier: ^0.33.0
         version: 0.33.0
 
-  deps/typed-sql/packages/type-gen/pkg: {}
+  ../typed-sql/packages/type-gen/pkg: {}
 
-  deps/typed-sql/packages/typed-sql:
+  ../typed-sql/packages/typed-sql:
     devDependencies:
       typescript:
         specifier: ^5.1.6
@@ -338,7 +338,7 @@ importers:
         version: link:../rx-tbl
       '@vlcn.io/typed-sql':
         specifier: workspace:*
-        version: link:../../deps/typed-sql/packages/typed-sql
+        version: link:../../../typed-sql/packages/typed-sql
       '@vlcn.io/ws-client':
         specifier: workspace:*
         version: link:../ws-client
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 58bfdb0..b402d36 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,10 +1,10 @@
 packages:
   - "../cr-sqlite/core"
   - "deps/wa-sqlite"
-  - "deps/typed-sql/packages/cli"
-  - "deps/typed-sql/packages/typed-sql"
-  - "deps/typed-sql/packages/type-gen/pkg"
-  - "deps/typed-sql/packages/type-gen-ts-adapter"
+  - "../typed-sql/packages/cli"
+  - "../typed-sql/packages/typed-sql"
+  - "../typed-sql/packages/type-gen/pkg"
+  - "../typed-sql/packages/type-gen-ts-adapter"
   - "packages/browser-tests"
   - "packages/crsqlite-wasm"
   - "packages/node-allinone"
diff --git a/tsbuild-all/tsconfig.json b/tsbuild-all/tsconfig.json
index c886bbc..819c255 100644
--- a/tsbuild-all/tsconfig.json
+++ b/tsbuild-all/tsconfig.json
@@ -22,8 +22,8 @@
     { "path": "../packages/ws-client" },
     { "path": "../packages/ws-browserdb" },
     { "path": "../packages/id" },
-    { "path": "../deps/typed-sql/packages/typed-sql" },
-    { "path": "../deps/typed-sql/packages/cli" },
-    { "path": "../deps/typed-sql/packages/type-gen-ts-adapter" }
+    { "path": "../../typed-sql/packages/typed-sql" },
+    { "path": "../../typed-sql/packages/cli" },
+    { "path": "../../typed-sql/packages/type-gen-ts-adapter" }
   ]
 }

From 980b5bd7a4f27b696c2c11b44c0f4e2562fa5f8d Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Tue, 22 Aug 2023 17:05:32 -0400
Subject: [PATCH 3/3] fix tsconfig path ref to typed-sql

---
 packages/react/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
index 436bf58..6cfd2ab 100644
--- a/packages/react/tsconfig.json
+++ b/packages/react/tsconfig.json
@@ -11,6 +11,6 @@
     { "path": "../xplat-api" },
     { "path": "../rx-tbl" },
     { "path": "../ws-client" },
-    { "path": "../../deps/typed-sql/packages/typed-sql" }
+    { "path": "../../../typed-sql/packages/typed-sql" }
   ]
 }