@typescript-eslint/typescript-estree 8.24.2-alpha.3 → 8.24.2-alpha.4

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 (3) hide show
  1. package/dist/convert.d.ts.map +1 -1
  2. package/dist/convert.js +50 -9
  3. package/package.json +3 -3
package/dist/convert.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EACV,aAAa,EACb,2BAA2B,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,EAAE,MAAM,aAAa,CAAC;AAmCtE,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC9C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,wBAAwB,GAAG,EAAE,CAAC,sBAAsB,GAC1D,OAAO,CAMT;AAED,MAAM,WAAW,OAAO;IACtB,qBAAqB,EAAE,2BAA2B,CAAC;IACnD,qBAAqB,EAAE,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,qBAAa,SAAS;;IACpB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IAEvD;;;;;OAKG;gBACS,GAAG,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,gBAAgB;IAsZ1D,OAAO,CAAC,qBAAqB;IAsB7B,OAAO,CAAC,oCAAoC;IAe5C;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAiC9B,OAAO,CAAC,sBAAsB;IA4C9B;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAIpB;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAItB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAsB7B;;;;;OAKG;IACH,OAAO,CAAC,gDAAgD;IAexD;;;;OAIG;IACH,OAAO,CAAC,kDAAkD;IAmB1D;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAgBzB;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IA8BjB,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,+BAA+B;IAiDvC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,sBAAsB;IAoC9B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IA69EnB,OAAO,CAAC,UAAU;IAelB,cAAc,IAAI,QAAQ,CAAC,OAAO;IAIlC;;;;OAIG;IACH,OAAO,CAAC,UAAU;IA0FlB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAiFlB,UAAU,IAAI,OAAO;IAOrB;;OAEG;IACH,OAAO,CAAC,uBAAuB;CAYhC"}
1
+ {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EACV,aAAa,EACb,2BAA2B,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,EAAE,MAAM,aAAa,CAAC;AAmCtE,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC9C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,wBAAwB,GAAG,EAAE,CAAC,sBAAsB,GAC1D,OAAO,CAMT;AAED,MAAM,WAAW,OAAO;IACtB,qBAAqB,EAAE,2BAA2B,CAAC;IACnD,qBAAqB,EAAE,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,qBAAa,SAAS;;IACpB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IAEvD;;;;;OAKG;gBACS,GAAG,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,gBAAgB;IAsZ1D,OAAO,CAAC,qBAAqB;IAsB7B,OAAO,CAAC,oCAAoC;IAe5C;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAiC9B,OAAO,CAAC,sBAAsB;IA4C9B;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAIpB;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAItB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAsB7B;;;;;OAKG;IACH,OAAO,CAAC,gDAAgD;IAexD;;;;OAIG;IACH,OAAO,CAAC,kDAAkD;IAmB1D;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAgBzB;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IA8BjB,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,+BAA+B;IAgDvC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,sBAAsB;IAoC9B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAwhFnB,OAAO,CAAC,UAAU;IAclB,cAAc,IAAI,QAAQ,CAAC,OAAO;IAIlC;;;;OAIG;IACH,OAAO,CAAC,UAAU;IA0FlB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAgFlB,UAAU,IAAI,OAAO;IAOrB;;OAEG;IACH,OAAO,CAAC,uBAAuB;CAYhC"}
package/dist/convert.js CHANGED
@@ -517,7 +517,6 @@ class Converter {
517
517
  // this is intentional we can ignore conversion if `:` is in first character
518
518
  if (colonIndex > 0) {
519
519
  const range = (0, node_utils_1.getRange)(node, this.ast);
520
- // @ts-expect-error -- TypeScript@<5.1 doesn't have ts.JsxNamespacedName
521
520
  const result = this.createNode(node, {
522
521
  type: ts_estree_1.AST_NODE_TYPES.JSXNamespacedName,
523
522
  range,
@@ -2232,11 +2231,56 @@ class Converter {
2232
2231
  const token = (0, node_utils_1.findNextToken)(node.getFirstToken(), node, this.ast);
2233
2232
  range[0] = token.getStart(this.ast);
2234
2233
  }
2234
+ let options = null;
2235
+ if (node.attributes) {
2236
+ const value = this.createNode(node.attributes, {
2237
+ type: ts_estree_1.AST_NODE_TYPES.ObjectExpression,
2238
+ properties: node.attributes.elements.map(importAttribute => this.createNode(importAttribute, {
2239
+ type: ts_estree_1.AST_NODE_TYPES.Property,
2240
+ computed: false,
2241
+ key: this.convertChild(importAttribute.name),
2242
+ kind: 'init',
2243
+ method: false,
2244
+ optional: false,
2245
+ shorthand: false,
2246
+ value: this.convertChild(importAttribute.value),
2247
+ })),
2248
+ });
2249
+ const commaToken = (0, node_utils_1.findNextToken)(node.argument, node, this.ast);
2250
+ const openBraceToken = (0, node_utils_1.findNextToken)(commaToken, node, this.ast);
2251
+ const closeBraceToken = (0, node_utils_1.findNextToken)(node.attributes, node, this.ast);
2252
+ const withToken = (0, node_utils_1.findNextToken)(openBraceToken, node, this.ast);
2253
+ const withTokenRange = (0, node_utils_1.getRange)(withToken, this.ast);
2254
+ options = this.createNode(node, {
2255
+ type: ts_estree_1.AST_NODE_TYPES.ObjectExpression,
2256
+ range: [openBraceToken.getStart(this.ast), closeBraceToken.end],
2257
+ properties: [
2258
+ this.createNode(node, {
2259
+ type: ts_estree_1.AST_NODE_TYPES.Property,
2260
+ range: [withTokenRange[0], node.attributes.end],
2261
+ computed: false,
2262
+ key: this.createNode(node, {
2263
+ type: ts_estree_1.AST_NODE_TYPES.Identifier,
2264
+ range: withTokenRange,
2265
+ decorators: [],
2266
+ name: 'with',
2267
+ optional: false,
2268
+ typeAnnotation: undefined,
2269
+ }),
2270
+ kind: 'init',
2271
+ method: false,
2272
+ optional: false,
2273
+ shorthand: false,
2274
+ value,
2275
+ }),
2276
+ ],
2277
+ });
2278
+ }
2235
2279
  const result = this.createNode(node, {
2236
2280
  type: ts_estree_1.AST_NODE_TYPES.TSImportType,
2237
2281
  range,
2238
2282
  argument: this.convertChild(node.argument),
2239
- attributes: this.convertImportAttributes(node.attributes),
2283
+ options,
2240
2284
  qualifier: this.convertChild(node.qualifier),
2241
2285
  typeArguments: node.typeArguments
2242
2286
  ? this.convertTypeArgumentsToTypeParameterInstantiation(node.typeArguments, node)
@@ -2299,7 +2343,7 @@ class Converter {
2299
2343
  kind: 'global',
2300
2344
  };
2301
2345
  }
2302
- if (!(node.flags & ts.NodeFlags.Namespace)) {
2346
+ if (ts.isStringLiteral(node.name)) {
2303
2347
  const body = this.convertChild(node.body);
2304
2348
  return {
2305
2349
  kind: 'module',
@@ -2352,7 +2396,7 @@ class Converter {
2352
2396
  declare: false,
2353
2397
  global: false,
2354
2398
  id: name,
2355
- kind: 'namespace',
2399
+ kind: node.flags & ts.NodeFlags.Namespace ? 'namespace' : 'module',
2356
2400
  };
2357
2401
  })(),
2358
2402
  });
@@ -2517,9 +2561,7 @@ class Converter {
2517
2561
  return this.deeplyCopy(node);
2518
2562
  }
2519
2563
  }
2520
- createNode(
2521
- // The 'parent' property will be added later if specified
2522
- node, data) {
2564
+ createNode(node, data) {
2523
2565
  const result = data;
2524
2566
  result.range ??= (0, node_utils_1.getRange)(node, this.ast);
2525
2567
  result.loc ??= (0, node_utils_1.getLocFor)(result.range, this.ast);
@@ -2618,8 +2660,7 @@ class Converter {
2618
2660
  * @returns the ESTreeNode with fixed exports
2619
2661
  */
2620
2662
  fixExports(node, result) {
2621
- const isNamespaceNode = ts.isModuleDeclaration(node) &&
2622
- Boolean(node.flags & ts.NodeFlags.Namespace);
2663
+ const isNamespaceNode = ts.isModuleDeclaration(node) && !ts.isStringLiteral(node.name);
2623
2664
  const modifiers = isNamespaceNode
2624
2665
  ? (0, node_utils_1.getNamespaceModifiers)(node)
2625
2666
  : (0, getModifiers_1.getModifiers)(node);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typescript-eslint/typescript-estree",
3
- "version": "8.24.2-alpha.3",
3
+ "version": "8.24.2-alpha.4",
4
4
  "description": "A parser that converts TypeScript source code into an ESTree compatible form",
5
5
  "files": [
6
6
  "dist",
@@ -55,8 +55,8 @@
55
55
  "check-types": "npx nx typecheck"
56
56
  },
57
57
  "dependencies": {
58
- "@typescript-eslint/types": "8.24.2-alpha.3",
59
- "@typescript-eslint/visitor-keys": "8.24.2-alpha.3",
58
+ "@typescript-eslint/types": "8.24.2-alpha.4",
59
+ "@typescript-eslint/visitor-keys": "8.24.2-alpha.4",
60
60
  "debug": "^4.3.4",
61
61
  "fast-glob": "^3.3.2",
62
62
  "is-glob": "^4.0.3",