diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index fd63f5b9d..418253e25 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -6,7 +6,7 @@ on: concurrency: cancel-in-progress: true - group: ${{ github.head_ref }} + group: pr-${{ github.event.pull_request.number }} jobs: test: @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20, 22, 24, 25] + node-version: [20, 22, 24, 26] steps: - uses: actions/checkout@v6 - uses: ./.github/actions/install diff --git a/.pnp.cjs b/.pnp.cjs index 9f6c36907..6b60acd84 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -832,7 +832,7 @@ const RAW_RUNTIME_STATE = ["lodash", "npm:4.18.1"],\ ["prettier", "npm:3.8.3"],\ ["rimraf", "npm:6.1.3"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["typescript-json-schema", "npm:0.67.4"],\ @@ -864,7 +864,7 @@ const RAW_RUNTIME_STATE = ["lodash", "npm:4.18.1"],\ ["prettier", "npm:3.8.3"],\ ["rimraf", "npm:6.1.3"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["typescript-json-schema", "npm:0.67.4"],\ @@ -890,7 +890,7 @@ const RAW_RUNTIME_STATE = ["io-ts", "virtual:c002b73213eac6876e4c7e8f1127022782443aa320c59f94c9da4dba1061f563e8f79297a86e377447e442af2f7b8a81ae3d0fb9d1954c7b72bb472f07eede19#npm:2.2.22"],\ ["rimraf", "npm:6.1.3"],\ ["title-case", "npm:4.3.2"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["vitest", "virtual:9af6ad551183488fdcf67ab4d2a6b7db121574c52b81e5e9dd82d71c2425158bec35fb2f6cfd71372398534f37f2c1a824c5b4b40797053c0402f99390a749ec#npm:4.1.8"]\ @@ -940,7 +940,7 @@ const RAW_RUNTIME_STATE = ["@types/node", "npm:24.12.4"],\ ["rimraf", "npm:6.1.3"],\ ["runtypes", "npm:7.0.4"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["vitest", "virtual:9af6ad551183488fdcf67ab4d2a6b7db121574c52b81e5e9dd82d71c2425158bec35fb2f6cfd71372398534f37f2c1a824c5b4b40797053c0402f99390a749ec#npm:4.1.8"]\ @@ -964,7 +964,7 @@ const RAW_RUNTIME_STATE = ["mkdirp", "npm:3.0.1"],\ ["rimraf", "npm:6.1.3"],\ ["runtypes", "npm:6.5.1"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["type-fest", "npm:5.7.0"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ @@ -993,7 +993,7 @@ const RAW_RUNTIME_STATE = ["mkdirp", "npm:3.0.1"],\ ["rimraf", "npm:6.1.3"],\ ["runtypes", "npm:6.5.1"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["type-fest", "npm:5.7.0"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ @@ -1013,7 +1013,7 @@ const RAW_RUNTIME_STATE = ["@types/json-schema", "npm:7.0.15"],\ ["@types/node", "npm:24.12.4"],\ ["rimraf", "npm:6.1.3"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["valibot", "virtual:9949236162c857fc51b2d966c0785246f08d1aa936472152350088a23a318cafbc25a0b7dda4767a4ca4828c76e5b04fd64538f943161eb110a8e062d4003a0f#npm:1.4.1"],\ @@ -1033,7 +1033,7 @@ const RAW_RUNTIME_STATE = ["@types/json-schema", "npm:7.0.15"],\ ["@types/node", "npm:24.12.4"],\ ["rimraf", "npm:6.1.3"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["ts-toolbelt", "npm:9.6.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ @@ -1056,7 +1056,7 @@ const RAW_RUNTIME_STATE = ["@types/node", "npm:24.12.4"],\ ["rimraf", "npm:6.1.3"],\ ["title-case", "npm:4.3.2"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["vitest", "virtual:9af6ad551183488fdcf67ab4d2a6b7db121574c52b81e5e9dd82d71c2425158bec35fb2f6cfd71372398534f37f2c1a824c5b4b40797053c0402f99390a749ec#npm:4.1.8"],\ @@ -1073,7 +1073,7 @@ const RAW_RUNTIME_STATE = ["@runtyping/zod-core", "virtual:d80ef0e0092f984209dfea304929b09c3b532763a3105568a151353f56d31e1d3f423712461a4bc5c42f6d5d0f71c15f39f248129565c51d1f526f03a46755e5#workspace:packages/zod-core"],\ ["@types/zod", null],\ ["title-case", "npm:4.3.2"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["zod", "npm:4.4.3"]\ @@ -1090,7 +1090,7 @@ const RAW_RUNTIME_STATE = ["@runtyping/generator", "virtual:c002b73213eac6876e4c7e8f1127022782443aa320c59f94c9da4dba1061f563e8f79297a86e377447e442af2f7b8a81ae3d0fb9d1954c7b72bb472f07eede19#workspace:packages/generator"],\ ["@runtyping/zod-core", "workspace:packages/zod-core"],\ ["title-case", "npm:4.3.2"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["zod", "npm:4.4.3"]\ @@ -1110,7 +1110,7 @@ const RAW_RUNTIME_STATE = ["@types/node", "npm:24.12.4"],\ ["rimraf", "npm:6.1.3"],\ ["title-case", "npm:4.3.2"],\ - ["ts-morph", "npm:27.0.2"],\ + ["ts-morph", "npm:28.0.0"],\ ["tslib", "npm:2.8.1"],\ ["typescript", "patch:typescript@npm%3A6.0.3#optional!builtin::version=6.0.3&hash=5786d5"],\ ["vitest", "virtual:9af6ad551183488fdcf67ab4d2a6b7db121574c52b81e5e9dd82d71c2425158bec35fb2f6cfd71372398534f37f2c1a824c5b4b40797053c0402f99390a749ec#npm:4.1.8"],\ @@ -1157,16 +1157,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@ts-morph/common", [\ - ["npm:0.28.1", {\ - "packageLocation": "./.yarn/cache/@ts-morph-common-npm-0.28.1-48cadd11c4-d5c6ed11cf.zip/node_modules/@ts-morph/common/",\ - "packageDependencies": [\ - ["@ts-morph/common", "npm:0.28.1"],\ - ["minimatch", "npm:10.1.1"],\ - ["path-browserify", "npm:1.0.1"],\ - ["tinyglobby", "npm:0.2.15"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:0.29.0", {\ "packageLocation": "./.yarn/cache/@ts-morph-common-npm-0.29.0-7860c29a60-d23cfb6c81.zip/node_modules/@ts-morph/common/",\ "packageDependencies": [\ @@ -5701,12 +5691,12 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["ts-morph", [\ - ["npm:27.0.2", {\ - "packageLocation": "./.yarn/cache/ts-morph-npm-27.0.2-9217ac03ef-b9bd8ed86d.zip/node_modules/ts-morph/",\ + ["npm:28.0.0", {\ + "packageLocation": "./.yarn/cache/ts-morph-npm-28.0.0-ea88d294f7-fb5541c2c5.zip/node_modules/ts-morph/",\ "packageDependencies": [\ - ["@ts-morph/common", "npm:0.28.1"],\ + ["@ts-morph/common", "npm:0.29.0"],\ ["code-block-writer", "npm:13.0.3"],\ - ["ts-morph", "npm:27.0.2"]\ + ["ts-morph", "npm:28.0.0"]\ ],\ "linkType": "HARD"\ }]\ diff --git a/.yarn/cache/@ts-morph-common-npm-0.28.1-48cadd11c4-d5c6ed11cf.zip b/.yarn/cache/@ts-morph-common-npm-0.28.1-48cadd11c4-d5c6ed11cf.zip deleted file mode 100644 index af1038176..000000000 Binary files a/.yarn/cache/@ts-morph-common-npm-0.28.1-48cadd11c4-d5c6ed11cf.zip and /dev/null differ diff --git a/.yarn/cache/ts-morph-npm-27.0.2-9217ac03ef-b9bd8ed86d.zip b/.yarn/cache/ts-morph-npm-27.0.2-9217ac03ef-b9bd8ed86d.zip deleted file mode 100644 index 1e5d587be..000000000 Binary files a/.yarn/cache/ts-morph-npm-27.0.2-9217ac03ef-b9bd8ed86d.zip and /dev/null differ diff --git a/.yarn/cache/ts-morph-npm-28.0.0-ea88d294f7-fb5541c2c5.zip b/.yarn/cache/ts-morph-npm-28.0.0-ea88d294f7-fb5541c2c5.zip new file mode 100644 index 000000000..828299703 Binary files /dev/null and b/.yarn/cache/ts-morph-npm-28.0.0-ea88d294f7-fb5541c2c5.zip differ diff --git a/packages/generator/package.json b/packages/generator/package.json index a003c22be..1eedb36f2 100644 --- a/packages/generator/package.json +++ b/packages/generator/package.json @@ -43,7 +43,7 @@ "js-yaml": "4.2.0", "json-schema-to-typescript": "15.0.4", "lodash": "4.18.1", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1", "yargs": "18.0.0", "zod": "4.4.3" diff --git a/packages/generator/src/object.ts b/packages/generator/src/object.ts index 7f67a1248..53bde49d5 100644 --- a/packages/generator/src/object.ts +++ b/packages/generator/src/object.ts @@ -19,7 +19,8 @@ export function isBuiltInType(type: Type) { .getSymbolOrThrow() .getDeclarations() .some((d) => { - if (d.getSourceFile().compilerNode.hasNoDefaultLib) { + const program = d.getProject().getProgram().compilerObject + if (program.isSourceFileDefaultLibrary(d.getSourceFile().compilerNode)) { const name = type.getSymbolOrThrow().getName() const parent = d.getParentOrThrow() const siblings = ( diff --git a/packages/io-ts/package.json b/packages/io-ts/package.json index 8ba0bf1f1..f9d67af2c 100644 --- a/packages/io-ts/package.json +++ b/packages/io-ts/package.json @@ -36,7 +36,7 @@ "@runtyping/generator": "workspace:*", "@ts-morph/common": "0.29.0", "title-case": "4.3.2", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/packages/runtypes/package.json b/packages/runtypes/package.json index ebc4c7782..c5c37a21f 100644 --- a/packages/runtypes/package.json +++ b/packages/runtypes/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@runtyping/generator": "workspace:*", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/packages/test-type-writers/package.json b/packages/test-type-writers/package.json index 0d7c23064..6a99f866d 100644 --- a/packages/test-type-writers/package.json +++ b/packages/test-type-writers/package.json @@ -44,7 +44,7 @@ "dependencies": { "assert-never": "1.4.0", "mkdirp": "3.0.1", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/packages/valibot/package.json b/packages/valibot/package.json index 318578635..4339024ef 100644 --- a/packages/valibot/package.json +++ b/packages/valibot/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@runtyping/generator": "workspace:*", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/packages/yup/package.json b/packages/yup/package.json index c1a157df7..3f89ac353 100644 --- a/packages/yup/package.json +++ b/packages/yup/package.json @@ -34,7 +34,7 @@ "dependencies": { "@runtyping/generator": "workspace:*", "@ts-morph/common": "0.29.0", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "ts-toolbelt": "9.6.0", "tslib": "2.8.1" } diff --git a/packages/zod-core/package.json b/packages/zod-core/package.json index ec7e6a564..bc0b3387c 100644 --- a/packages/zod-core/package.json +++ b/packages/zod-core/package.json @@ -25,7 +25,7 @@ "dependencies": { "@runtyping/generator": "workspace:*", "title-case": "4.3.2", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" }, "devDependencies": { diff --git a/packages/zod-mini/package.json b/packages/zod-mini/package.json index 1acb74d38..103a6a21a 100644 --- a/packages/zod-mini/package.json +++ b/packages/zod-mini/package.json @@ -34,7 +34,7 @@ "@runtyping/generator": "workspace:*", "@runtyping/zod-core": "workspace:*", "title-case": "4.3.2", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/packages/zod/package.json b/packages/zod/package.json index ae6618cbf..153ca0114 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -34,7 +34,7 @@ "@runtyping/generator": "workspace:*", "@runtyping/zod-core": "workspace:*", "title-case": "4.3.2", - "ts-morph": "27.0.2", + "ts-morph": "28.0.0", "tslib": "2.8.1" } } diff --git a/yarn.lock b/yarn.lock index 5a9fb8d73..e7584f5c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -610,7 +610,7 @@ __metadata: lodash: "npm:4.18.1" prettier: "npm:3.8.3" rimraf: "npm:6.1.3" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" typescript-json-schema: "npm:0.67.4" @@ -636,7 +636,7 @@ __metadata: io-ts: "npm:2.2.22" rimraf: "npm:6.1.3" title-case: "npm:4.3.2" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" vitest: "npm:4.1.8" @@ -686,7 +686,7 @@ __metadata: "@types/node": "npm:24.12.4" rimraf: "npm:6.1.3" runtypes: "npm:7.0.4" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" vitest: "npm:4.1.8" @@ -709,7 +709,7 @@ __metadata: assert-never: "npm:1.4.0" mkdirp: "npm:3.0.1" rimraf: "npm:6.1.3" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" type-fest: "npm:5.7.0" typescript: "npm:6.0.3" @@ -730,7 +730,7 @@ __metadata: "@types/json-schema": "npm:7.0.15" "@types/node": "npm:24.12.4" rimraf: "npm:6.1.3" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" valibot: "npm:1.4.1" @@ -752,7 +752,7 @@ __metadata: "@types/json-schema": "npm:7.0.15" "@types/node": "npm:24.12.4" rimraf: "npm:6.1.3" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" ts-toolbelt: "npm:9.6.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" @@ -772,7 +772,7 @@ __metadata: dependencies: "@runtyping/generator": "workspace:*" title-case: "npm:4.3.2" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" zod: "npm:4.4.3" @@ -792,7 +792,7 @@ __metadata: "@types/node": "npm:24.12.4" rimraf: "npm:6.1.3" title-case: "npm:4.3.2" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" vitest: "npm:4.1.8" @@ -815,7 +815,7 @@ __metadata: "@types/node": "npm:24.12.4" rimraf: "npm:6.1.3" title-case: "npm:4.3.2" - ts-morph: "npm:27.0.2" + ts-morph: "npm:28.0.0" tslib: "npm:2.8.1" typescript: "npm:6.0.3" vitest: "npm:4.1.8" @@ -857,7 +857,7 @@ __metadata: languageName: node linkType: hard -"@ts-morph/common@npm:0.29.0": +"@ts-morph/common@npm:0.29.0, @ts-morph/common@npm:~0.29.0": version: 0.29.0 resolution: "@ts-morph/common@npm:0.29.0" dependencies: @@ -868,17 +868,6 @@ __metadata: languageName: node linkType: hard -"@ts-morph/common@npm:~0.28.1": - version: 0.28.1 - resolution: "@ts-morph/common@npm:0.28.1" - dependencies: - minimatch: "npm:^10.0.1" - path-browserify: "npm:^1.0.1" - tinyglobby: "npm:^0.2.14" - checksum: 10/d5c6ed11cf046c186c7263c28c7e9b5fbefb61c65b99f66cfe6a3b249f70f3fbf116b5aace2980602a7ceabecdc399065d5a7f14aabe5475eb43fd573a3cc665 - languageName: node - linkType: hard - "@tsconfig/node10@npm:^1.0.7": version: 1.0.8 resolution: "@tsconfig/node10@npm:1.0.8" @@ -5003,13 +4992,13 @@ __metadata: languageName: node linkType: hard -"ts-morph@npm:27.0.2": - version: 27.0.2 - resolution: "ts-morph@npm:27.0.2" +"ts-morph@npm:28.0.0": + version: 28.0.0 + resolution: "ts-morph@npm:28.0.0" dependencies: - "@ts-morph/common": "npm:~0.28.1" + "@ts-morph/common": "npm:~0.29.0" code-block-writer: "npm:^13.0.3" - checksum: 10/b9bd8ed86d4b76ca23446d3f808787cfe95a3bcb2316769a2f3fa262ea9ab4043bb76bf8aef677f9be0d758576f074df2926e701a535f84fd21946fdbf465148 + checksum: 10/fb5541c2c5b25386ae85346203046cc136d4afa2821a9b7b5ea9ffdbcff6d8867eccf98a3d7d50dd86f64428f80cf4ae9e609bd8f02f99cef902ba2760ecd5d9 languageName: node linkType: hard