From 53199b15c64b967cfcc003448d31a1ea8bf11e07 Mon Sep 17 00:00:00 2001
From: lainNao <none>
Date: Thu, 23 May 2024 02:26:20 +0900
Subject: [PATCH] fix: add type module to bundler package

---
 Cargo.toml                    |   2 +-
 Makefile                      |   9 +++++++--
 e2e-test/bundler/bun.lockb    | Bin 21687 -> 21687 bytes
 e2e-test/bundler/package.json |   2 +-
 e2e-test/node/bun.lockb       | Bin 2425 -> 2425 bytes
 e2e-test/node/package.json    |   2 +-
 e2e-test/web/bun.lockb        | Bin 19142 -> 19142 bytes
 e2e-test/web/package.json     |   2 +-
 resources/generatedTypes.ts   |   2 +-
 9 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2bb5136..74df2c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chord-progression-parser"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["lainNao"]
 edition = "2021"
 license = "MIT"
diff --git a/Makefile b/Makefile
index bb373ae..80a4c91 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,7 @@ build-wasm-bundler:
 		--out-dir ./pkg/pkg-bundler \
 		--target bundler
 	make generate-ts-declare-file-for-pkg-bundler
+	make add-package-json-type-module-for-pkg-bundler
 
 # modify package-name
 # append "-bundler" to package json "name" field
@@ -134,8 +135,8 @@ generate-ts-declare-file-for-pkg-bundler:
 # Rewrite definition of return value of run function in pkg-bundler/chord_progression_parser.d.ts to "Ast"
 	sed -i.bak 's/any/ParsedResult/g' pkg/pkg-bundler/chord_progression_parser.d.ts && rm pkg/pkg-bundler/chord_progression_parser.d.ts.bak
 # compile additinal files
-	npx tsc resources/error_code_message_map.ts --declaration --allowJs --module ES6 --outDir pkg/pkg-bundler
-	npx tsc resources/generatedTypes.ts --declaration --allowJs --module ES6 --outDir pkg/pkg-bundler
+	npx tsc resources/error_code_message_map.ts --declaration --allowJs --module NodeNext --moduleResolution nodenext --outDir pkg/pkg-bundler
+	npx tsc resources/generatedTypes.ts --declaration --allowJs --module NodeNext --moduleResolution nodenext --outDir pkg/pkg-bundler
 # add to package.json "files"
 	sed -i.bak 's/"files": \[/"files": \[\
 		"error_code_message_map.js", "error_code_message_map.d.ts", /g' pkg/pkg-bundler/package.json && rm pkg/pkg-bundler/package.json.bak
@@ -144,6 +145,10 @@ generate-ts-declare-file-for-pkg-bundler:
 # prepend contents of additionalType.ts.txt to pkg/pkg-bundler/chord_progression_parser.d.ts
 	cat resources/additionalType.ts.txt pkg/pkg-bundler/chord_progression_parser.d.ts > pkg/pkg-bundler/chord_progression_parser.d.ts.tmp && mv pkg/pkg-bundler/chord_progression_parser.d.ts.tmp pkg/pkg-bundler/chord_progression_parser.d.ts
 
+# add package.json type module
+add-package-json-type-module-for-pkg-bundler:
+	sed -i.bak 's/"name": "\(.*\)"/"name": "\1",\n  "type": "module"/' pkg/pkg-bundler/package.json && rm pkg/pkg-bundler/package.json.bak
+
 # generate types
 generate-ts-types:
 	typeshare ./src \
diff --git a/e2e-test/bundler/bun.lockb b/e2e-test/bundler/bun.lockb
index 205c94c2bca36a72192e2ddeae129558d3c0a633..52ca9df5883e643fcf42b5570cd8d8932abd5508 100755
GIT binary patch
delta 139
zcmV;60CfMisR6gC0gx^r`t;@F-O9vx@(J<eml?6$u2Eli6PjJ`(Rj&o{-uWZu}=CA
zlf(olvv3fd6+pehI8u~ggUx6m6$QZ^7D$20w_Rr^w18Gt4I=N5rl+!8|DdG;a{Zn@
t7e<D~AviLuBguQ#{XF21urb&HhrzQ=CW<TpHIp$%ACr4i3bO%IwgJ!`Ln;6O

delta 141
zcmV;80CNAgsR6gC0gx^rB92Bq$FBT^&CbzR3$RHa``c|AaK;2O0l44VH26kiu}=CA
z0Rofp11Ga^5S<l3`)}aTS8UWoWj~^9YD5qXc-eK64EnmMYGGL<LZRYJ6C!=$4oC{M
vytE19UE~DKXM}RqtaarxG0|<6`e>rfvrQ(7ECDi;F-IShds7Ot0aLaCB<erp

diff --git a/e2e-test/bundler/package.json b/e2e-test/bundler/package.json
index 7085f9a..0808366 100644
--- a/e2e-test/bundler/package.json
+++ b/e2e-test/bundler/package.json
@@ -17,7 +17,7 @@
     "@playwright/test": "^1.39.0",
     "bun-types": "latest",
     "playwright": "^1.39.0",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.5",
     "vite": "^4.4.5",
     "vite-plugin-top-level-await": "^1.3.1",
     "vite-plugin-wasm": "^3.2.2"
diff --git a/e2e-test/node/bun.lockb b/e2e-test/node/bun.lockb
index 1b4e7272b57f8b7741933059cbe5dd9f40a7afdf..e1a2124042b603ae2e36050c0626c6d8690f768e 100755
GIT binary patch
delta 132
zcmV-~0DJ%W68RF4FCRzFgU&@C0mdqc81)A%33Ig~rFzZ&EB9ypdQ}QCYq3rm0RaV(
z(I>Nz0hIwjy}~$BlwgC+Xdx8^!5tPzfy%dCXD76PR#pun?~taavRwb5r2=yOo<0{w
mhQ%Q`GOQ!Xd)ECt;E=E}*a3&Zvt<JT1pzgap$H$7h6wYROE{GP

delta 132
zcmV-~0DJ%W68RF4FCR`m`b-}NkX7kQObT4Mz+GxYIjKjGPLr3Cm7J9ckFib~0RaM$
z(I>Nz0hIwj`)}aTS8UWoWj~^9YD5qXc-eK64EnmMYGGL<LZRYJ6C!=$4oC{MytE19
mUE~DKXM}RqtaarxG0|<6`e>rfvt<JT1pzXXp$H$7h6wY-4LQL8

diff --git a/e2e-test/node/package.json b/e2e-test/node/package.json
index 1f0551b..89161fe 100644
--- a/e2e-test/node/package.json
+++ b/e2e-test/node/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "devDependencies": {
     "bun-types": "latest",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
diff --git a/e2e-test/web/bun.lockb b/e2e-test/web/bun.lockb
index 2d81ba300dcaec4ee6d0d4e82b1f3ae4a0a36477..f368b4a4e4ab0c22eebd62ead7a698cf8a2102b4 100755
GIT binary patch
delta 139
zcmV;60CfMxl>x?;0gx^rKJQmIVw<)~EH~Ll?8%V)xl-_Z5Of3l%IFTcS;~U6u}=B}
zlf(rmvv36U4?w-bI8u~ggUx6m6$QZ^7D$20w_Rr^w18Gt4I=N5rl+!8|DdG;a{Zn@
t7e<D~AviLuBguQ#{XF21urb&HhrzR@6oV)MHIu<aACt^I3bRr@bPX6)K#%|c

delta 137
zcmV;40CxYzl>x?;0gx^rB*MR>EvZNVu@sQ~K}ygMYYK-?lzghjksvRWw@i*Ou}=B}
zlf(@uvv36U4?z2G;LulW)I?=JqHJnJ5Dj?Qb(0MGx~XbmStLTC;!G1Fec}#C3bnkn
r3FBSl1kGoJa@DML<uftSZI$|HqRq3V6oV*}z(gRE%smRTQayAHthPSL

diff --git a/e2e-test/web/package.json b/e2e-test/web/package.json
index 4cccf08..8f62dd2 100644
--- a/e2e-test/web/package.json
+++ b/e2e-test/web/package.json
@@ -15,7 +15,7 @@
     "@playwright/test": "^1.39.0",
     "http-server": "^14.1.1",
     "playwright": "^1.39.0",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@lainnao/chord-progression-parser-web": "../../pkg/pkg-web"
diff --git a/resources/generatedTypes.ts b/resources/generatedTypes.ts
index b85b6a3..14dfe52 100644
--- a/resources/generatedTypes.ts
+++ b/resources/generatedTypes.ts
@@ -1,5 +1,5 @@
 /*
- Generated by typeshare 1.7.0
+ Generated by typeshare 1.9.2
 */
 
 export type SectionMeta =