Merge pull request #56 from discretize/typescript-5

marcustyphoon · web-flow · commit 70df4de6cb6e · 2024-10-30T02:23:00.000-07:00
diff --git a/gw2-ui/api_typecheck.mjs b/gw2-ui/api_typecheck.mjs
@@ -1,13 +1,16 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as process from 'node:process';
+import * as module from 'node:module';
 import { writeSource } from '../node_api_helpers.mjs';
 
+const require = module.createRequire(import.meta.url);
+
 // rollup and plugins
 import { rollup } from 'rollup';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import ttypescript from 'ttypescript';
+const tsPatchCompiler = require('ts-patch/compiler');
 import typescript from '@rollup/plugin-typescript';
 
 const MAX_FAILURES = 20;
@@ -27,7 +30,7 @@ async function run() {
       resolve(),
       commonjs(),
       typescript({
-        typescript: ttypescript,
+        typescript: tsPatchCompiler,
         tsconfig: './src/gw2api/typeguards/tsconfig.json',
       }),
     ],
diff --git a/gw2-ui/package.json b/gw2-ui/package.json
@@ -47,8 +47,8 @@
     "clsx": "^2.1.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "ttypescript": "^1.5.15",
-    "typescript-is": "^0.19.0"
+    "ts-patch": "^3.2.1",
+    "typia": "^6.11.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",
diff --git a/gw2-ui/src/gw2api/typeguards/guards.ts b/gw2-ui/src/gw2api/typeguards/guards.ts
@@ -1,13 +1,14 @@
-import { createAssertType } from 'typescript-is';
+import { createAssertEquals } from 'typia';
 
 import type GW2ApiItem from '../types/items/item';
 import type GW2ApiSkill from '../types/skills/skill';
 import type GW2ApiSpecialization from '../types/specialization/specialization';
 import type GW2ApiTrait from '../types/traits/trait';
 
-export const isGW2ApiItem = createAssertType<GW2ApiItem>();
-export const isGW2ApiSkill = createAssertType<GW2ApiSkill>();
-export const isGW2ApiSpecialization = createAssertType<GW2ApiSpecialization>();
-export const isGW2ApiTrait = createAssertType<GW2ApiTrait>();
+export const isGW2ApiItem = createAssertEquals<GW2ApiItem>();
+export const isGW2ApiSkill = createAssertEquals<GW2ApiSkill>();
+export const isGW2ApiSpecialization =
+  createAssertEquals<GW2ApiSpecialization>();
+export const isGW2ApiTrait = createAssertEquals<GW2ApiTrait>();
 
 export * from '../overrides/index';
diff --git a/gw2-ui/src/gw2api/typeguards/tsconfig.json b/gw2-ui/src/gw2api/typeguards/tsconfig.json
@@ -15,11 +15,7 @@
     "module": "esnext",
     "plugins": [
       {
-        "transform": "typescript-is/lib/transform-inline/transformer",
-        "shortCircuit": false,
-        "disallowSuperfluousObjectProperties": true,
-        "transformNonNullExpressions": true,
-        "emitDetailedErrors": "true"
+        "transform": "typia/lib/transform"
       }
     ]
   }
diff --git a/gw2-ui/src/gw2api/types/common/fact.ts b/gw2-ui/src/gw2api/types/common/fact.ts
@@ -118,7 +118,7 @@ export interface GW2ApiFactUnblockable extends GW2ApiFactBase {
   value: boolean;
 }
 
-type GW2ApiFact =
+export type GW2ApiFact =
   | GW2ApiFactAttributeAdjust
   | GW2ApiFactBuff
   | GW2ApiFactBuffConversion
diff --git a/gw2-ui/src/gw2api/types/common/traited_fact.ts b/gw2-ui/src/gw2api/types/common/traited_fact.ts
@@ -1,116 +1,10 @@
-import {
-  type GW2ApiFactAttributeAdjust,
-  type GW2ApiFactBuff,
-  type GW2ApiFactBuffConversion,
-  type GW2ApiFactComboField,
-  type GW2ApiFactComboFinisher,
-  type GW2ApiFactDamage,
-  type GW2ApiFactDistance,
-  type GW2ApiFactDuration,
-  type GW2ApiFactHeal,
-  type GW2ApiFactHealingAdjust,
-  type GW2ApiFactNoData,
-  type GW2ApiFactNumber,
-  type GW2ApiFactPercent,
-  type GW2ApiFactPrefixedBuff,
-  type GW2ApiFactRadius,
-  type GW2ApiFactRange,
-  type GW2ApiFactRecharge,
-  type GW2ApiFactStunBreak,
-  type GW2ApiFactTime,
-  type GW2ApiFactUnblockable,
-} from './fact';
+import { type GW2ApiFact } from './fact';
 
 type GW2ApiTraitedFactAdditional = {
   requires_trait: number;
   overrides?: number;
 };
 
-// This is a bit more complicated than
-// GW2ApiTraitedFact & GW2ApiTraitedFactAdditional
-// because otherwise typescript-is gets confused.
-
-interface GW2ApiTraitedFactAttributeAdjust
-  extends GW2ApiFactAttributeAdjust,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactBuff
-  extends GW2ApiFactBuff,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactBuffConversion
-  extends GW2ApiFactBuffConversion,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactComboField
-  extends GW2ApiFactComboField,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactComboFinisher
-  extends GW2ApiFactComboFinisher,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactDamage
-  extends GW2ApiFactDamage,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactDistance
-  extends GW2ApiFactDistance,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactDuration
-  extends GW2ApiFactDuration,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactHeal
-  extends GW2ApiFactHeal,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactHealingAdjust
-  extends GW2ApiFactHealingAdjust,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactNoData
-  extends GW2ApiFactNoData,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactNumber
-  extends GW2ApiFactNumber,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactPercent
-  extends GW2ApiFactPercent,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactPrefixedBuff
-  extends GW2ApiFactPrefixedBuff,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactRadius
-  extends GW2ApiFactRadius,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactRange
-  extends GW2ApiFactRange,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactRecharge
-  extends GW2ApiFactRecharge,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactStunBreak
-  extends GW2ApiFactStunBreak,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactTime
-  extends GW2ApiFactTime,
-    GW2ApiTraitedFactAdditional {}
-interface GW2ApiTraitedFactUnblockable
-  extends GW2ApiFactUnblockable,
-    GW2ApiTraitedFactAdditional {}
-
-type GW2ApiTraitedFact =
-  | GW2ApiTraitedFactAttributeAdjust
-  | GW2ApiTraitedFactBuff
-  | GW2ApiTraitedFactBuffConversion
-  | GW2ApiTraitedFactComboField
-  | GW2ApiTraitedFactComboFinisher
-  | GW2ApiTraitedFactDamage
-  | GW2ApiTraitedFactDistance
-  | GW2ApiTraitedFactDuration
-  | GW2ApiTraitedFactHeal
-  | GW2ApiTraitedFactHealingAdjust
-  | GW2ApiTraitedFactNoData
-  | GW2ApiTraitedFactNumber
-  | GW2ApiTraitedFactPercent
-  | GW2ApiTraitedFactPrefixedBuff
-  | GW2ApiTraitedFactRadius
-  | GW2ApiTraitedFactRange
-  | GW2ApiTraitedFactRecharge
-  | GW2ApiTraitedFactStunBreak
-  | GW2ApiTraitedFactTime
-  | GW2ApiTraitedFactUnblockable;
+type GW2ApiTraitedFact = GW2ApiFact & GW2ApiTraitedFactAdditional;
 
 export default GW2ApiTraitedFact;
diff --git a/gw2-ui/src/gw2api/types/items/item.ts b/gw2-ui/src/gw2api/types/items/item.ts
@@ -37,10 +37,8 @@ type Keys =
 // Tell typescript that all the other properties are either missing or undefined.
 // That'll make destructuring safe.
 // Note: We need this hack for <Item> and <ItemDetails>
-// But typescript-is doesn't handle intersection types, and we need to disable it for typechecking
 type WrapInUndefined<T> = T &
   Partial<Record<Exclude<Keys, keyof T>, undefined>>;
-//type WrapInUndefined<T> = T;
 
 type GW2ApiUpgradeMethod = 'Attunement' | 'Infusion';
 
diff --git a/package.json b/package.json
@@ -49,12 +49,9 @@
     "rollup-plugin-postcss": "^4.0.2",
     "storybook": "^8.3.6",
     "storybook-css-modules-preset": "^1.1.1",
-    "typescript": "~4.7.4",
+    "typescript": "^5.6.3",
     "typescript-plugin-css-modules": "^5.1.0"
   },
-  "resolutions": {
-    "typescript": "~4.7.4"
-  },
   "engines": {
     "npm": "please-use-pnpm",
     "yarn": "please-use-pnpm"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,7 @@`
`15`	`15`	`"module": "esnext",`
`16`	`16`	`"plugins": [`
`17`	`17`	`{`
`18`		`- "transform": "typescript-is/lib/transform-inline/transformer",`
`19`		`- "shortCircuit": false,`
`20`		`- "disallowSuperfluousObjectProperties": true,`
`21`		`- "transformNonNullExpressions": true,`
`22`		`- "emitDetailedErrors": "true"`
	`18`	`+ "transform": "typia/lib/transform"`
`23`	`19`	`}`
`24`	`20`	`]`
`25`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export interface GW2ApiFactUnblockable extends GW2ApiFactBase {`
`118`	`118`	`value: boolean;`
`119`	`119`	`}`
`120`	`120`
`121`		`-type GW2ApiFact =`
	`121`	`+export type GW2ApiFact =`
`122`	`122`	`\| GW2ApiFactAttributeAdjust`
`123`	`123`	`\| GW2ApiFactBuff`
`124`	`124`	`\| GW2ApiFactBuffConversion`