impl

l-trotta · l-trotta · commit 357010e64bee · 2025-12-12T17:30:58.000+01:00
diff --git a/specification/logstash/_types/Pipeline.ts b/specification/logstash/_types/Pipeline.ts
@@ -68,6 +68,7 @@ export class Pipeline {
    * The configuration for the pipeline.
    * @ext_doc_id logstash-configuration-file-structure
    */
+  // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type
   pipeline: string
   /**
    * Optional metadata about the pipeline, which can have any contents.
diff --git a/specification/ml/put_trained_model/types.ts b/specification/ml/put_trained_model/types.ts
@@ -106,5 +106,6 @@ export class AggregateOutput {
 }
 
 export class Weights {
+  // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type
   weights: double
 }
diff --git a/specification/nodes/_types/Stats.ts b/specification/nodes/_types/Stats.ts
@@ -1073,6 +1073,7 @@ export class Scripting {
 }
 
 export class Context {
+  // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type
   context?: string
   compilations?: long
   cache_evictions?: long
diff --git a/specification/security/put_privileges/types.ts b/specification/security/put_privileges/types.ts
@@ -20,6 +20,7 @@
 import { Metadata, Name } from '@_types/common'
 
 export class Actions {
+  // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type
   actions: string[]
   application?: string
   name?: Name
diff --git a/validator/README.md b/validator/README.md
@@ -10,7 +10,7 @@ It is configured [in the specification directory](../specification/eslint.config
 | `single-key-dictionary-key-is-string` | `SingleKeyDictionary` keys must be strings.                                                                                                                                                |
 | `dictionary-key-is-string`            | `Dictionary` keys must be strings.                                                                                                                                                         |
 | `no-native-types`                     | TypeScript native utility types (`Record`, `Partial`, etc.) and collection types (`Map`, `Set`, etc.) are not allowed. Use spec-defined aliases like `Dictionary` instead.                 |
-| `no-same-name-as-enclosing-type`      | TODO                                                                                                                                                                                       |
+| `no-same-name-as-enclosing-type`      | Classes having fields with the same name as the class is breaking for some client libraries.                                                                                               |
 | `invalid-node-types`                  | The spec uses a subset of TypeScript, so some types, clauses and expressions are not allowed.                                                                                              |
 | `no-generic-number`                   | Generic `number` type is not allowed outside of `_types/Numeric.ts`. Use concrete numeric types like `integer`, `long`, `float`, `double`, etc.                                            |
 | `request-must-have-urls`              | All Request interfaces extending `RequestBase` must have a `urls` property defining their endpoint paths and HTTP methods.                                                                 |
diff --git a/validator/rules/no-same-name-as-enclosing-type.js b/validator/rules/no-same-name-as-enclosing-type.js
@@ -17,47 +17,51 @@
  * under the License.
  */
 import { ESLintUtils } from '@typescript-eslint/utils';
+import ts from "typescript";
 
 const createRule = ESLintUtils.RuleCreator(name => `https://example.com/rule/${name}`)
 
-const TYPE_SUGGESTIONS = {
-  'Record': 'Use Dictionary instead',
-  'Partial': 'Use spec-defined aliases instead',
-  'Required': 'Use spec-defined aliases instead',
-  'Pick': 'Use spec-defined aliases instead',
-  'Omit': 'Use spec-defined aliases instead',
-  'Map': 'Use Dictionary instead',
-  'Set': 'Use an array type instead (e.g., string[])',
-  'WeakMap': 'Use Dictionary instead',
-  'WeakSet': 'Use an array type instead',
-};
-
 export default createRule({
   name: 'no-same-name-as-enclosing-type',
   create(context) {
     return {
-      TSTypeReference(node) {
-        console.log("BBBBBBBBBBB")
-        const typeName = node.typeName.name;
-        if (TYPE_SUGGESTIONS[typeName]) {
-          context.report({ 
-            node, 
-            messageId: 'noNativeType',
-            data: {
-              type: typeName,
-              suggestion: TYPE_SUGGESTIONS[typeName]
+      ClassDeclaration(node) {
+        if (!node.id || !node.id.name) {
+          return; // anonymous class - nothing to check
+        }
+        const services = ESLintUtils.getParserServices(context)
+        const tsClass = services.esTreeNodeToTSNodeMap.get(node);
+        if (!tsClass || !tsClass.members) {
+          return; // no fields
+        }
+        const className = node.id.name;
+        for (const member of tsClass.members) {
+            // Property declarations on the class (instance or static fields)
+            if (ts.isPropertyDeclaration(member) || ts.isPropertySignature?.(member)) {
+                const name = member.name;
+                if (name && name.kind === ts.SyntaxKind.Identifier) {
+                    if (String(name.escapedText).toUpperCase() === className.toUpperCase()) {
+                        context.report({
+                            node,
+                            messageId: 'shouldNotUseClassNameForFieldNames',
+                            data: {
+                                class: className,
+                                suggestion: 'Fields in a class should not have the same name as the class itself.'
+                            }
+                        })
+                    }
+                }
             }
-          })
         }
       },
     }
   },
   meta: {
     docs: {
-      description: 'TypeScript native utility and collection types not allowed, use spec-defined aliases',
+      description: 'Classes having fields with the same name as the class is breaking for some client libraries.',
     },
     messages: {
-      noNativeType: 'Native TypeScript type "{{type}}" is not allowed. {{suggestion}}.'
+      shouldNotUseClassNameForFieldNames: 'Class "{{class}}" has invalid fields. {{suggestion}}.'
     },
     type: 'suggestion',
   },
diff --git a/validator/test/no-same-name-as-enclosing-type.js b/validator/test/no-same-name-as-enclosing-type.js
@@ -32,51 +32,27 @@ const ruleTester = new RuleTester({
 
 ruleTester.run('no-same-name-as-enclosing-type', rule, {
   valid: [
-    `type MyDict = Dictionary<string, object>`,
-    `type MyMapping = Dictionary<string, any>`,
-    `type MyType = { field: string }`,
-    `class MyClass { prop: integer }`,
+    `class MyClass { 
+      field: integer
+      anotherfield: string 
+    }`,
   ],
   invalid: [
     {
-      code: `type MyRecord = Record<string, object>`,
-      errors: [{ messageId: 'noNativeType' }]
+      code: `class MyClass { MyClass: integer }`,
+      errors: [{ messageId: 'shouldNotUseClassNameForFieldNames' }]
     },
     {
-      code: `type MyPart = Partial<SomeType>`,
-      errors: [{ messageId: 'noNativeType' }]
+      code: `class MyClass { myclass: integer }`,
+      errors: [{ messageId: 'shouldNotUseClassNameForFieldNames' }]
     },
     {
-      code:  `type MyReq = Required<SomeType>`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MyPick = Pick<SomeType, "field">`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MyOmit = Omit<SomeType, "field">`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MyMap = Map<string, object>`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MySet = Set<string>`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MyWeakMap = WeakMap<object, string>`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `type MyWeakSet = WeakSet<object>`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
-    {
-      code: `class MyClass { items: Map<string, number> }`,
-      errors: [{ messageId: 'noNativeType' }]
-    },
+      code: `class MyClass { 
+        field: integer
+        anotherfield: string
+        myclass: boolean 
+        }`,
+      errors: [{ messageId: 'shouldNotUseClassNameForFieldNames' }]
+    }
   ],
 })

Original file line number	Diff line number	Diff line change
`@@ -106,5 +106,6 @@ export class AggregateOutput {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`export class Weights {`
	`109`	`+ // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type`
`109`	`110`	`weights: double`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1073,6 +1073,7 @@ export class Scripting {`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`	`1075`	`export class Context {`
	`1076`	`+ // eslint-disable-next-line es-spec-validator/no-same-name-as-enclosing-type`
`1076`	`1077`	`context?: string`
`1077`	`1078`	`compilations?: long`
`1078`	`1079`	`cache_evictions?: long`