@definitelytyped/eslint-plugin 0.1.14 → 0.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/rules/expect.d.ts +1 -1
  3. package/dist/rules/expect.js +53 -7
  4. package/dist/rules/expect.js.map +1 -1
  5. package/dist/rules/index.d.ts +1 -1
  6. package/dist/suggestions.js +1 -2
  7. package/dist/suggestions.js.map +1 -1
  8. package/dist/util.js +7 -7
  9. package/dist/util.js.map +1 -1
  10. package/package.json +11 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @definitelytyped/eslint-plugin
2
2
 
3
+ ## 0.1.16
4
+
5
+ ### Patch Changes
6
+
7
+ - 8100279: Support ts-expect-error for specific version ranges
8
+
9
+ ## 0.1.15
10
+
11
+ ### Patch Changes
12
+
13
+ - 6dd1778: Re-fix ExpectType
14
+ - 2a6318d: Bump typescript-eslint to v7
15
+ - 2a6318d: Bump TypeScript to 5.5
16
+ - Updated dependencies [2a6318d]
17
+ - @definitelytyped/utils@0.1.7
18
+
3
19
  ## 0.1.14
4
20
 
5
21
  ### Patch Changes
package/dist/rules/expect.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- declare const rule: import("../util").RuleModule<[{}], "failure" | "noTsconfig" | "twoAssertions" | "diagnostic" | "noTsconfigMatch" | "noMatch" | "needInstall">;
1
+ declare const rule: import("../util").RuleModule<[{}], "noTsconfig" | "twoAssertions" | "failure" | "diagnostic" | "noTsconfigMatch" | "noMatch" | "needInstall">;
2
2
  export = rule;
package/dist/rules/expect.js CHANGED
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
27
  };
@@ -6,6 +29,7 @@ const util_1 = require("../util");
6
29
  const utils_1 = require("@typescript-eslint/utils");
7
30
  const path_1 = __importDefault(require("path"));
8
31
  const fs_1 = __importDefault(require("fs"));
32
+ const semver = __importStar(require("semver"));
9
33
  const rule = (0, util_1.createRule)({
10
34
  name: "expect",
11
35
  meta: {
@@ -173,12 +197,35 @@ const zeroSourceLocation = {
173
197
  start: { line: 0, column: 0 },
174
198
  end: { line: 0, column: 0 },
175
199
  };
200
+ const expectTypeToken = "$ExpectType";
201
+ // Based on TypeScript's scanner.ts
202
+ const expectErrorSingleLine = /^\/\/\/?\s*@ts-expect-error\s+(.*)/;
203
+ const expectErrorMultiLine = /^(?:\/|\*)*\s*@ts-expect-error\s+(.*)/;
176
204
  function walk(getLocFromIndex, report, fileName, sourceFile, program, ts, versionName, nextHigherVersion, dirPath, reportDiagnostics) {
177
205
  const checker = program.getTypeChecker();
178
206
  if (reportDiagnostics) {
179
207
  // Don't care about emit errors.
180
208
  const diagnostics = ts.getPreEmitDiagnostics(program, sourceFile);
181
209
  for (const diagnostic of diagnostics) {
210
+ if (diagnostic.code === 2578) {
211
+ // This is a ts-expect-error; parse "// @ts-expect-error <range>" and ignore when the current version is outside that range.
212
+ const text = sourceFile.text.slice(diagnostic.start, diagnostic.start + diagnostic.length);
213
+ const match = text.match(expectErrorSingleLine) || text.match(expectErrorMultiLine);
214
+ if (match) {
215
+ let range;
216
+ try {
217
+ range = new semver.Range(match[1].trim());
218
+ }
219
+ catch {
220
+ // Ignore any parsing errors.
221
+ }
222
+ if (range) {
223
+ if (!semver.satisfies(versionName, range, { loose: true })) {
224
+ continue;
225
+ }
226
+ }
227
+ }
228
+ }
182
229
  addDiagnosticFailure(diagnostic);
183
230
  }
184
231
  const cannotFindDepsDiags = diagnostics
@@ -205,7 +252,7 @@ function walk(getLocFromIndex, report, fileName, sourceFile, program, ts, versio
205
252
  }
206
253
  }
207
254
  }
208
- if (sourceFile.isDeclarationFile || !sourceFile.text.includes("$ExpectType")) {
255
+ if (sourceFile.isDeclarationFile || !sourceFile.text.includes(expectTypeToken)) {
209
256
  // Normal file.
210
257
  return;
211
258
  }
@@ -300,7 +347,7 @@ function parseAssertions(sourceFile) {
300
347
  const typeAssertions = new Map();
301
348
  const duplicates = [];
302
349
  const { text } = sourceFile;
303
- const commentRegexp = /\/\/(.*)/g;
350
+ const commentRegexp = /^(.*?)\/\/(.*)$/gm;
304
351
  const lineStarts = sourceFile.getLineStarts();
305
352
  let curLine = 0;
306
353
  while (true) {
@@ -308,13 +355,12 @@ function parseAssertions(sourceFile) {
308
355
  if (commentMatch === null) {
309
356
  break;
310
357
  }
311
- // Match on the contents of that comment so we do nothing in a commented-out assertion,
312
- // i.e. `// foo; // $ExpectType number`
313
- if (!commentMatch[1].startsWith(" $ExpectType ")) {
358
+ const comment = commentMatch[2].trim();
359
+ if (!comment.startsWith(expectTypeToken)) {
314
360
  continue;
315
361
  }
316
- const line = getLine(commentMatch.index);
317
- const expectedType = commentMatch[1].slice(" $ExpectType ".length);
362
+ const line = getLine(commentMatch.index + commentMatch[1].length);
363
+ const expectedType = comment.slice(expectTypeToken.length).trim();
318
364
  // Don't bother with the assertion if there are 2 assertions on 1 line. Just fail for the duplicate.
319
365
  if (typeAssertions.delete(line)) {
320
366
  duplicates.push(line);
package/dist/rules/expect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expect.js","sourceRoot":"","sources":["../../src/rules/expect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expect.js","sourceRoot":"","sources":["../../src/rules/expect.ts"],"names":[],"mappings":"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"}
package/dist/rules/index.d.ts CHANGED
@@ -17,6 +17,6 @@ export declare const rules: {
17
17
  "no-single-declare-module": import("../util").RuleModule<[], "oneModuleDeclaration">;
18
18
  "no-old-dt-header": import("../util").RuleModule<[], "noOldDTHeader">;
19
19
  "no-import-of-dev-dependencies": import("../util").RuleModule<[], "noImportOfDevDependencies" | "noReferenceOfDevDependencies">;
20
- expect: import("../util").RuleModule<[{}], "failure" | "noTsconfig" | "twoAssertions" | "diagnostic" | "noTsconfigMatch" | "noMatch" | "needInstall">;
20
+ expect: import("../util").RuleModule<[{}], "noTsconfig" | "twoAssertions" | "failure" | "diagnostic" | "noTsconfigMatch" | "noMatch" | "needInstall">;
21
21
  "no-type-only-packages": import("../util").RuleModule<[], "onlyTypes">;
22
22
  };
package/dist/suggestions.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addSuggestion = void 0;
3
+ exports.addSuggestion = addSuggestion;
4
4
  const fs = require("fs");
5
5
  const path = require("path");
6
6
  const utils_1 = require("@definitelytyped/utils");
@@ -36,7 +36,6 @@ function addSuggestion(fileName, ruleName, message, start, width) {
36
36
  console.log(`Could not write suggestions for package ${packageName}. ${e.message || ""}`);
37
37
  }
38
38
  }
39
- exports.addSuggestion = addSuggestion;
40
39
  const dtPath = path.join("DefinitelyTyped", "types");
41
40
  function dtPackageName(filePath) {
42
41
  const dtIndex = filePath.indexOf(dtPath);
package/dist/suggestions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"suggestions.js","sourceRoot":"","sources":["../src/suggestions.ts"],"names":[],"mappings":";;;AAAA,yBAA0B;AAC1B,6BAA8B;AAC9B,kDAAwD;AAUxD,4EAA4E;AAC5E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEnC;;GAEG;AACH,SAAgB,aAAa,CAAC,QAAgB,EAAE,QAAgB,EAAE,OAAe,EAAE,KAAc,EAAE,KAAc;IAC/G,MAAM,UAAU,GAAe;QAC7B,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,KAAK;QACL,KAAK;KACN,CAAC;IAEF,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,IAAI,GAAG,GAAG,CAAC;QACX,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IACD,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,sBAAc,CAAC,EAAE,CAAC;YACnC,EAAE,CAAC,SAAS,CAAC,sBAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,sBAAc,EAAE,WAAW,GAAG,MAAM,CAAC,EAC/C,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACjF,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAC3B,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,2CAA2C,WAAW,KAAM,CAAW,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IACvG,CAAC;AACH,CAAC;AA9BD,sCA8BC;AAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;AAErD,SAAS,aAAa,CAAC,QAAgB;IACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IAClE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,gDAAgD;IAChD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAsB;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC"}
1
+ {"version":3,"file":"suggestions.js","sourceRoot":"","sources":["../src/suggestions.ts"],"names":[],"mappings":";;AAkBA,sCA8BC;AAhDD,yBAA0B;AAC1B,6BAA8B;AAC9B,kDAAwD;AAUxD,4EAA4E;AAC5E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEnC;;GAEG;AACH,SAAgB,aAAa,CAAC,QAAgB,EAAE,QAAgB,EAAE,OAAe,EAAE,KAAc,EAAE,KAAc;IAC/G,MAAM,UAAU,GAAe;QAC7B,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,KAAK;QACL,KAAK;KACN,CAAC;IAEF,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,IAAI,GAAG,GAAG,CAAC;QACX,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IACD,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,sBAAc,CAAC,EAAE,CAAC;YACnC,EAAE,CAAC,SAAS,CAAC,sBAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,sBAAc,EAAE,WAAW,GAAG,MAAM,CAAC,EAC/C,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACjF,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAC3B,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,2CAA2C,WAAW,KAAM,CAAW,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IACvG,CAAC;AACH,CAAC;AAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;AAErD,SAAS,aAAa,CAAC,QAAgB;IACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IAClE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,gDAAgD;IAChD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAsB;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC"}
package/dist/util.js CHANGED
@@ -3,7 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.isMainFile = exports.getImportSource = exports.findTypesPackage = exports.findUp = exports.commentsMatching = exports.getTypesPackageForDeclarationFile = exports.createRule = void 0;
6
+ exports.createRule = void 0;
7
+ exports.getTypesPackageForDeclarationFile = getTypesPackageForDeclarationFile;
8
+ exports.commentsMatching = commentsMatching;
9
+ exports.findUp = findUp;
10
+ exports.findTypesPackage = findTypesPackage;
11
+ exports.getImportSource = getImportSource;
12
+ exports.isMainFile = isMainFile;
7
13
  const utils_1 = require("@definitelytyped/utils");
8
14
  const utils_2 = require("@typescript-eslint/utils");
9
15
  const path_1 = __importDefault(require("path"));
@@ -15,7 +21,6 @@ function getTypesPackageForDeclarationFile(file) {
15
21
  }
16
22
  return findTypesPackage(file)?.realName;
17
23
  }
18
- exports.getTypesPackageForDeclarationFile = getTypesPackageForDeclarationFile;
19
24
  function commentsMatching(sourceFile, regex, f) {
20
25
  for (const comment of sourceFile.ast.comments) {
21
26
  const m = comment.value.match(regex);
@@ -23,7 +28,6 @@ function commentsMatching(sourceFile, regex, f) {
23
28
  f(m[1], comment);
24
29
  }
25
30
  }
26
- exports.commentsMatching = commentsMatching;
27
31
  function findUp(p, fn) {
28
32
  p = path_1.default.resolve(p);
29
33
  const root = path_1.default.parse(p).root;
@@ -39,7 +43,6 @@ function findUp(p, fn) {
39
43
  }
40
44
  return undefined;
41
45
  }
42
- exports.findUp = findUp;
43
46
  // TODO(jakebailey): pull this helper out to util package?
44
47
  function isTypesPackage(packageJson) {
45
48
  return (typeof packageJson.name === "string" &&
@@ -65,7 +68,6 @@ function findTypesPackage(file) {
65
68
  };
66
69
  });
67
70
  }
68
- exports.findTypesPackage = findTypesPackage;
69
71
  function getImportSource(node) {
70
72
  if (node.type === "ImportDeclaration") {
71
73
  return node.source;
@@ -77,7 +79,6 @@ function getImportSource(node) {
77
79
  }
78
80
  return undefined;
79
81
  }
80
- exports.getImportSource = getImportSource;
81
82
  function isMainFile(fileName, allowNested) {
82
83
  // Linter may be run with cwd of the package. We want `index.d.ts` but not `submodule/index.d.ts` to match.
83
84
  if (fileName === "index.d.ts") {
@@ -95,5 +96,4 @@ function isMainFile(fileName, allowNested) {
95
96
  // Allow "types/foo/index.d.ts", not "types/foo/utils/index.d.ts"
96
97
  return path_1.default.basename(path_1.default.dirname(parent)) === "types";
97
98
  }
98
- exports.isMainFile = isMainFile;
99
99
  //# sourceMappingURL=util.js.map
package/dist/util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@definitelytyped/eslint-plugin",
3
- "version": "0.1.14",
3
+ "version": "0.1.16",
4
4
  "description": "ESLint rules for DefinitelyTyped",
5
5
  "main": "./dist/index.js",
6
6
  "publishConfig": {
@@ -18,13 +18,14 @@
18
18
  "directory": "packages/eslint-plugin"
19
19
  },
20
20
  "dependencies": {
21
- "@typescript-eslint/types": "^6.19.0",
22
- "@typescript-eslint/utils": "^6.19.0",
23
- "@definitelytyped/utils": "0.1.6"
21
+ "@typescript-eslint/types": "^7.14.1",
22
+ "@typescript-eslint/utils": "^7.14.1",
23
+ "semver": "^7.5.4",
24
+ "@definitelytyped/utils": "0.1.7"
24
25
  },
25
26
  "peerDependencies": {
26
- "@typescript-eslint/eslint-plugin": "^6.11.0",
27
- "@typescript-eslint/parser": "^6.11.0",
27
+ "@typescript-eslint/eslint-plugin": "^7.14.1",
28
+ "@typescript-eslint/parser": "^7.14.1",
28
29
  "eslint": "^8.40.0",
29
30
  "eslint-plugin-jsdoc": "^44.0.0",
30
31
  "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev || >=5.0.0-dev"
@@ -32,10 +33,13 @@
32
33
  "devDependencies": {
33
34
  "@definitelytyped/eslint-plugin": "link:",
34
35
  "@types/eslint": "^8.56.2",
36
+ "@types/semver": "^7.5.6",
35
37
  "glob": "^10.3.10",
36
38
  "jest-file-snapshot": "^0.5.0",
37
39
  "strip-ansi": "^6.0.1",
38
- "typescript": "^5.4.2"
40
+ "typescript": "^5.5.2",
41
+ "typescript-5.4": "npm:typescript@~5.4.0-0",
42
+ "typescript-5.5": "npm:typescript@~5.5.0-0"
39
43
  },
40
44
  "engines": {
41
45
  "node": ">=18.18.0"