@ethlete/eslint-plugin 0.1.0-next.3 → 0.1.0-next.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.1.0-next.6
+
+### Patch Changes
+
+- [`b73a127`](https://github.com/ethlete-io/ethdk/commit/b73a127002a06e3aa0c4e7e977b1ad1f3e04e7e6) Thanks [@TomTomB](https://github.com/TomTomB)! - Bump yet again, final one for sure, pinky promise
+
+## 0.1.0-beta.5
+
+### Patch Changes
+
+- [`ddb5d09`](https://github.com/ethlete-io/ethdk/commit/ddb5d09e4bc56e18cc8c228aa78a200441e7a766) Thanks [@TomTomB](https://github.com/TomTomB)! - Bump to beta
+
+## 0.1.0-next.4
+
+### Patch Changes
+
+- [`a690217`](https://github.com/ethlete-io/ethdk/commit/a6902172efd9bd1956a16237e79acbfbd816d946) Thanks [@TomTomB](https://github.com/TomTomB)! - Version bump only
+
 ## 0.1.0-next.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/eslint-plugin",
-  "version": "0.1.0-next.3",
+  "version": "0.1.0-next.6",
   "license": "MIT",
   "type": "commonjs",
   "main": "./src/index.js",

package/src/rules/class-member-order.js

@@ -232,14 +232,11 @@ const sortMembers = (members) => {
   const remainingMembers = [...members];
   /** @type {TMemberEntry[]} */
   const sortedMembers = [];
+  const remainingNames = new Set(remainingMembers.map((m) => m.name));
 
   while (remainingMembers.length > 0) {
     const readyMembers = remainingMembers
-      .filter((member) =>
-        [...member.dependencies].every(
-          (dependencyName) => !remainingMembers.some((remainingMember) => remainingMember.name === dependencyName),
-        ),
-      )
+      .filter((member) => [...member.dependencies].every((dependencyName) => !remainingNames.has(dependencyName)))
       .sort((left, right) => {
         if (left.groupIndex !== right.groupIndex) {
           return left.groupIndex - right.groupIndex;
@@ -258,6 +255,7 @@ const sortMembers = (members) => {
 
     const nextMemberIndex = remainingMembers.indexOf(nextMember);
     remainingMembers.splice(nextMemberIndex, 1);
+    remainingNames.delete(nextMember.name);
   }
 
   return sortedMembers;
@@ -377,6 +375,21 @@ const classMemberOrder = {
           return;
         }
 
+        // Methods live on the prototype and are available regardless of declaration order,
+        // so this.method() calls in initializers don't create real ordering dependencies.
+        const methodNames = new Set(
+          members.filter((m) => m.group === 'method' || m.group === 'private-method').map((m) => m.name),
+        );
+        if (methodNames.size > 0) {
+          for (const member of members) {
+            for (const dep of member.dependencies) {
+              if (methodNames.has(dep)) {
+                member.dependencies.delete(dep);
+              }
+            }
+          }
+        }
+
         const fix = buildClassOrderFix(sourceCode, node, members);
         let hasAttachedFix = false;
 

package/src/rules/template-member-accessibility.js

@@ -88,6 +88,20 @@ const templateMemberAccessibility = {
   },
   create(context) {
     const sourceCode = context.sourceCode;
+    /** @type {WeakMap<any, Set<string>>} */
+    const contractMembersCache = new WeakMap();
+
+    /**
+     * @param {any} classNode
+     */
+    const getContractMembers = (classNode) => {
+      if (contractMembersCache.has(classNode)) {
+        return contractMembersCache.get(classNode);
+      }
+      const result = getImplementedContractMemberNames({ classNode, context });
+      contractMembersCache.set(classNode, result);
+      return result;
+    };
 
     /**
      * @param {any} node
@@ -103,7 +117,7 @@ const templateMemberAccessibility = {
       const memberName = getMemberName(node);
       if (!memberName) return;
 
-      const implementedContractMembers = getImplementedContractMemberNames({ classNode, context });
+      const implementedContractMembers = getContractMembers(classNode);
       const implementsPublicContract = implementedContractMembers.has(memberName);
 
       if (implementsPublicContract) {
@@ -160,7 +174,7 @@ const templateMemberAccessibility = {
       const memberName = getMemberName(node);
       if (!memberName) return;
 
-      const implementedContractMembers = getImplementedContractMemberNames({ classNode, context });
+      const implementedContractMembers = getContractMembers(classNode);
       if (implementedContractMembers.has(memberName)) return;
 
       if (isReferencedFromTemplateOrHost(classNode, memberName, context)) return;