diff --git a/lib/rules/no-unused-properties.js b/lib/rules/no-unused-properties.js
index d09aca5c2..7eb7eb75d 100644
--- a/lib/rules/no-unused-properties.js
+++ b/lib/rules/no-unused-properties.js
@@ -496,12 +496,16 @@ module.exports = {
           let groupName = null
           if (/^mapMutations|mapActions$/u.test(node.callee.name)) {
             groupName = 'methods'
-          } else if (/^mapState|mapGetters$/u.test(node.callee.name)) {
+          } else if (
+            /^mapState|mapGetters|mapWritableState$/u.test(node.callee.name)
+          ) {
             groupName = 'computed'
           }
 
           if (!groupName || node.arguments.length === 0) return
-          const arg = node.arguments[0]
+          // On Pinia the store is always the first argument
+          const arg =
+            node.arguments.length === 2 ? node.arguments[1] : node.arguments[0]
           if (arg.type === 'ObjectExpression') {
             // e.g.
             // `mapMutations({ add: 'increment' })`
diff --git a/tests/lib/rules/no-unused-properties.js b/tests/lib/rules/no-unused-properties.js
index 65b185298..64e858d31 100644
--- a/tests/lib/rules/no-unused-properties.js
+++ b/tests/lib/rules/no-unused-properties.js
@@ -53,6 +53,7 @@ const unreferencedOptions = {
 
 tester.run('no-unused-properties', rule, {
   valid: [
+    // vuex getters
     {
       filename: 'test.vue',
       code: `
@@ -74,6 +75,68 @@ tester.run('no-unused-properties', rule, {
       `,
       options: allOptions
     },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapGetters(['count']),
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapGetters(['count1', 'count2'])
+          }
+        </script>
+        <template>
+          {{ count1 }} {{ count2 }}
+        </template>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapGetters({
+              count: 'count'
+            })
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapGetters({
+                count: 'count'
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `
+    },
+
+    // vuex mutations
     {
       filename: 'test.vue',
       code: `
@@ -136,6 +199,8 @@ tester.run('no-unused-properties', rule, {
         </template>
       `
     },
+
+    // vuex actions
     {
       filename: 'test.vue',
       code: `
@@ -196,6 +261,8 @@ tester.run('no-unused-properties', rule, {
         </template>
       `
     },
+
+    // vuex state
     {
       filename: 'test.vue',
       code: `
@@ -251,7 +318,7 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             computed: {
-              ...mapGetters(['count']),
+              ...mapState(['count'])
             }
           }
         </script>
@@ -260,27 +327,37 @@ tester.run('no-unused-properties', rule, {
         </template>
       `
     },
+
+    // pinia getters
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            computed: mapGetters(['count1', 'count2'])
+            computed: {
+              ...mapGetters(useStore, ["bar"]),
+            },
+            methods: {
+              baz() {
+                return this.bar
+              }
+            }
           }
         </script>
         <template>
-          {{ count1 }} {{ count2 }}
+          {{ baz() }}
         </template>
-      `
+      `,
+      options: allOptions
     },
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            computed: mapGetters({
-              count: 'count'
-            })
+            computed: {
+              ...mapGetters(useStore, ['count']),
+            }
           }
         </script>
         <template>
@@ -293,15 +370,11 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            computed: {
-              ...mapGetters({
-                count: 'count'
-              })
-            }
+            computed: mapGetters(useStore, ['count1', 'count2'])
           }
         </script>
         <template>
-          {{ count }}
+          {{ count1 }} {{ count2 }}
         </template>
       `
     },
@@ -310,9 +383,9 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            computed: {
-              ...mapState(['count'])
-            }
+            computed: mapGetters(useStore, {
+              count: 'count'
+            })
           }
         </script>
         <template>
@@ -320,52 +393,55 @@ tester.run('no-unused-properties', rule, {
         </template>
       `
     },
-    // a property used in a script expression
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            props: ['count'],
-            created() {
-              alert(this.count + 1)
+            computed: {
+              ...mapGetters(useStore, {
+                count: 'count'
+              })
             }
-          };
+          }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
+
+    // pinia actions
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            props: ['count'],
-            created() {
-              alert(this.$props.count + 1)
+            methods: {
+              ...mapActions(useStore, {
+                add: 'increment'
+              })
             }
-          };
+          }
         </script>
+        <template>
+          {{ add() }}
+        </template>
       `
     },
-    // default options
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            data () {
-              return {
-                foo: 1
-              }
-            },
-            computed: {
-              bar() {}
-            },
-            methods: {
-              baz () {}
-            }
-          };
+            methods: mapActions(useStore, {
+              add: 'increment'
+            })
+          }
         </script>
+        <template>
+          {{ add() }}
+        </template>
       `
     },
     {
@@ -373,143 +449,352 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            setup () {
-              return {
-                foo
-              }
-            },
-          };
+            methods: mapActions(useStore, ['add'])
+          }
         </script>
+        <template>
+          {{ add() }}
+        </template>
       `
     },
-
-    // a property being watched
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            props: {
-              count: {
-                type: Number,
-                default: 0
-              }
-            },
-            watch: {
-              count() {
-                alert('Increased!');
-              },
-            },
-          };
+            methods: {
+              ...mapActions(useStore, ['add'])
+            }
+          }
         </script>
+        <template>
+          {{ add() }}
+        </template>
       `
     },
 
-    // a property used as a template identifier
+    // pinia state
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div>{{ count }}</div>
-        </template>
         <script>
           export default {
-            props: ['count']
+            computed: mapState(useStore, {
+              count: state => state.todosCount
+            })
           }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
-    // a property used as a template $props member expression
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div>{{ $props.count }}</div>
-        </template>
         <script>
           export default {
-            props: ['count']
+            computed: {
+              ...mapState(useStore, {
+                count: state => state.todosCount
+              })
+            }
           }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
-
-    // properties used in a template expression
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div>{{ count1 + count2 }}</div>
-        </template>
         <script>
           export default {
-            props: ['count1', 'count2']
-          };
+            computed: mapState(useStore, {
+              count (state) {
+                return state.todosCount
+              }
+            })
+          }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
-    // properties used in a template expression as $props member expression
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div>{{ $props.count1 + $props.count2 }}</div>
-        </template>
         <script>
           export default {
-            props: ['count1', 'count2']
-          };
+            computed: {
+              ...mapState(useStore, ['count'])
+            }
+          }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
 
-    // a property used in v-if
+    // pinia writable state
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div v-if="count > 0"></div>
-        </template>
         <script>
           export default {
-            props: {
-              count: {
-                type: Number
-              }
-            }
-          };
+            computed: mapWritableState(useStore, {
+              count: state => state.todosCount
+            })
+          }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
-    // a property used in v-if as $props member expression
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div v-if="$props.count > 0"></div>
-        </template>
         <script>
           export default {
-            props: {
-              count: {
-                type: Number
-              }
+            computed: {
+              ...mapWritableState(useStore, {
+                count: state => state.todosCount
+              })
             }
-          };
+          }
         </script>
+        <template>
+          {{ count }}
+        </template>
       `
     },
-
-    // a property used in v-for
     {
       filename: 'test.vue',
       code: `
-        <template>
-          <div v-for="color in colors">{{ color }}</div>
-        </template>
         <script>
           export default {
-            props: {
+            computed: mapWritableState(useStore, {
+              count (state) {
+                return state.todosCount
+              }
+            })
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapWritableState(useStore, ['count'])
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `
+    },
+
+    // a property used in a script expression
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            props: ['count'],
+            created() {
+              alert(this.count + 1)
+            }
+          };
+        </script>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            props: ['count'],
+            created() {
+              alert(this.$props.count + 1)
+            }
+          };
+        </script>
+      `
+    },
+    // default options
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            data () {
+              return {
+                foo: 1
+              }
+            },
+            computed: {
+              bar() {}
+            },
+            methods: {
+              baz () {}
+            }
+          };
+        </script>
+      `
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            setup () {
+              return {
+                foo
+              }
+            },
+          };
+        </script>
+      `
+    },
+
+    // a property being watched
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            props: {
+              count: {
+                type: Number,
+                default: 0
+              }
+            },
+            watch: {
+              count() {
+                alert('Increased!');
+              },
+            },
+          };
+        </script>
+      `
+    },
+
+    // a property used as a template identifier
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div>{{ count }}</div>
+        </template>
+        <script>
+          export default {
+            props: ['count']
+          }
+        </script>
+      `
+    },
+    // a property used as a template $props member expression
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div>{{ $props.count }}</div>
+        </template>
+        <script>
+          export default {
+            props: ['count']
+          }
+        </script>
+      `
+    },
+
+    // properties used in a template expression
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div>{{ count1 + count2 }}</div>
+        </template>
+        <script>
+          export default {
+            props: ['count1', 'count2']
+          };
+        </script>
+      `
+    },
+    // properties used in a template expression as $props member expression
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div>{{ $props.count1 + $props.count2 }}</div>
+        </template>
+        <script>
+          export default {
+            props: ['count1', 'count2']
+          };
+        </script>
+      `
+    },
+
+    // a property used in v-if
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div v-if="count > 0"></div>
+        </template>
+        <script>
+          export default {
+            props: {
+              count: {
+                type: Number
+              }
+            }
+          };
+        </script>
+      `
+    },
+    // a property used in v-if as $props member expression
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div v-if="$props.count > 0"></div>
+        </template>
+        <script>
+          export default {
+            props: {
+              count: {
+                type: Number
+              }
+            }
+          };
+        </script>
+      `
+    },
+
+    // a property used in v-for
+    {
+      filename: 'test.vue',
+      code: `
+        <template>
+          <div v-for="color in colors">{{ color }}</div>
+        </template>
+        <script>
+          export default {
+            props: {
               colors: {
                 type: Array,
                 default: () => []
@@ -2156,38 +2441,375 @@ tester.run('no-unused-properties', rule, {
       </script>`
     },
     {
-      // defineModel
+      // defineModel
+      filename: 'test.vue',
+      code: `
+      <script setup>
+      defineProps(['a'])
+      const foo = defineModel('a')
+      </script>
+      <template>
+        {{ foo }}
+      </template>
+      `
+    }
+  ],
+  invalid: [
+    // vuex unused mutations
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: mapMutations({
+              add2: 'increment',
+              add: 'iqwnei'
+            })
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: {
+              ...mapMutations({
+                add2: 'increment',
+                add: 'inrement'
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 6
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: mapMutations(['add', 'add2'])
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 4
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: {
+              methods: {
+                ...mapMutations(['add', 'add2'])
+              }
+            }
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 6
+        }
+      ]
+    },
+
+    // vuex unused actions
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: {
+              ...mapActions({
+                add2: 'increment',
+                add: 'qweqwqewqwe'
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 6
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: mapActions({
+              add2: 'increment',
+              add: 'inasdasda'
+            })
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: mapActions(['add', 'add2'])
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 4
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            methods: {
+              ...mapActions(['add', 'add2'])
+            }
+          }
+        </script>
+        <template>
+          {{ add() }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'add2' of method found, but never used.",
+          line: 5
+        }
+      ]
+    },
+
+    // vuex unused state
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapState({
+              count2: state => state.todosCount,
+              count: state => state.todosCount
+            })
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count2' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapState({
+                count2: state => state.todosCount,
+                count: state => state.todosCount
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count2' of computed property found, but never used.",
+          line: 6
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapState({
+              count2 (state) {
+                return state.todosCount
+              },
+
+              count (state) {
+                return state.todosCount
+              }
+            })
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count2' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapState(['count', 'count2', 'count3'])
+            }
+          }
+        </script>
+        <template>
+          {{ count2 }} {{ count3 }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapState({
+              count: 'todosCount',
+              count2: 'someCount'
+            })
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count2' of computed property found, but never used.",
+          line: 6
+        }
+      ]
+    },
+
+    // vuex unused getters
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapGetters(['count', 'count2']),
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count2' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
       filename: 'test.vue',
       code: `
-      <script setup>
-      defineProps(['a'])
-      const foo = defineModel('a')
-      </script>
-      <template>
-        {{ foo }}
-      </template>
-      `
-    }
-  ],
-  invalid: [
+        <script>
+          export default {
+            computed: mapGetters(['count1', 'count2', 'count'])
+          }
+        </script>
+        <template>
+          {{ count1 }} {{ count2 }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count' of computed property found, but never used.",
+          line: 4
+        }
+      ]
+    },
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            methods: mapMutations({
-              add2: 'increment',
-              add: 'iqwnei'
+            computed: mapGetters({
+              count2: 'count',
+              count: 'count'
             })
           }
         </script>
         <template>
-          {{ add() }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'add2' of method found, but never used.",
+          message: "'count2' of computed property found, but never used.",
           line: 5
         }
       ]
@@ -2197,22 +2819,22 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            methods: {
-              ...mapMutations({
-                add2: 'increment',
-                add: 'inrement'
+            computed: {
+              ...mapGetters({
+                count: 'count',
+                count3: 'count2'
               })
             }
           }
         </script>
         <template>
-          {{ add() }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'add2' of method found, but never used.",
-          line: 6
+          message: "'count3' of computed property found, but never used.",
+          line: 7
         }
       ]
     },
@@ -2221,17 +2843,21 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            methods: mapMutations(['add', 'add2'])
+            computed: {
+              ...mapGetters({
+                a: { b :'c' }, // This is an invalid definition, but it does not use "a".
+              })
+            }
           }
         </script>
         <template>
-          {{ add() }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'add2' of method found, but never used.",
-          line: 4
+          message: "'a' of computed property found, but never used.",
+          line: 6
         }
       ]
     },
@@ -2240,31 +2866,34 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            methods: {
-              methods: {
-                ...mapMutations(['add', 'add2'])
-              }
+            computed: {
+              ...mapGetters([
+                "a",
+                a['foo'] // cannot be inferred.
+              ])
             }
           }
         </script>
         <template>
-          {{ add() }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'add2' of method found, but never used.",
+          message: "'a' of computed property found, but never used.",
           line: 6
         }
       ]
     },
+
+    // pinia unused actions
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
             methods: {
-              ...mapActions({
+              ...mapActions(useStore, {
                 add2: 'increment',
                 add: 'qweqwqewqwe'
               })
@@ -2287,7 +2916,7 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            methods: mapActions({
+            methods: mapActions(useStore, {
               add2: 'increment',
               add: 'inasdasda'
             })
@@ -2309,7 +2938,7 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            methods: mapActions(['add', 'add2'])
+            methods: mapActions(useStore, ['add', 'add2'])
           }
         </script>
         <template>
@@ -2329,7 +2958,7 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             methods: {
-              ...mapActions(['add', 'add2'])
+              ...mapActions(useStore, ['add', 'add2'])
             }
           }
         </script>
@@ -2344,12 +2973,14 @@ tester.run('no-unused-properties', rule, {
         }
       ]
     },
+
+    // pinia unused state
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            computed: mapState({
+            computed: mapState(useStore, {
               count2: state => state.todosCount,
               count: state => state.todosCount
             })
@@ -2372,7 +3003,7 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             computed: {
-              ...mapState({
+              ...mapState(useStore, {
                 count2: state => state.todosCount,
                 count: state => state.todosCount
               })
@@ -2395,7 +3026,7 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            computed: mapState({
+            computed: mapState(useStore, {
               count2 (state) {
                 return state.todosCount
               },
@@ -2423,17 +3054,17 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             computed: {
-              ...mapGetters(['count', 'count2']),
+              ...mapState(useStore, ['count', 'count2', 'count3'])
             }
           }
         </script>
         <template>
-          {{ count }}
+          {{ count2 }} {{ count3 }}
         </template>
       `,
       errors: [
         {
-          message: "'count2' of computed property found, but never used.",
+          message: "'count' of computed property found, but never used.",
           line: 5
         }
       ]
@@ -2443,28 +3074,33 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            computed: mapGetters(['count1', 'count2', 'count'])
+            computed: mapState(useStore, {
+              count: 'todosCount',
+              count2: 'someCount'
+            })
           }
         </script>
         <template>
-          {{ count1 }} {{ count2 }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'count' of computed property found, but never used.",
-          line: 4
+          message: "'count2' of computed property found, but never used.",
+          line: 6
         }
       ]
     },
+
+    // pinia unused writable state
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            computed: mapGetters({
-              count2: 'count',
-              count: 'count'
+            computed: mapWritableState(useStore, {
+              count2: state => state.todosCount,
+              count: state => state.todosCount
             })
           }
         </script>
@@ -2485,9 +3121,9 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             computed: {
-              ...mapGetters({
-                count: 'count',
-                count3: 'count2'
+              ...mapWritableState(useStore, {
+                count2: state => state.todosCount,
+                count: state => state.todosCount
               })
             }
           }
@@ -2498,8 +3134,8 @@ tester.run('no-unused-properties', rule, {
       `,
       errors: [
         {
-          message: "'count3' of computed property found, but never used.",
-          line: 7
+          message: "'count2' of computed property found, but never used.",
+          line: 6
         }
       ]
     },
@@ -2508,11 +3144,15 @@ tester.run('no-unused-properties', rule, {
       code: `
         <script>
           export default {
-            computed: {
-              ...mapGetters({
-                a: { b :'c' }, // This is an invalid definition, but it does not use "a".
-              })
-            }
+            computed: mapWritableState(useStore, {
+              count2 (state) {
+                return state.todosCount
+              },
+
+              count (state) {
+                return state.todosCount
+              }
+            })
           }
         </script>
         <template>
@@ -2521,8 +3161,8 @@ tester.run('no-unused-properties', rule, {
       `,
       errors: [
         {
-          message: "'a' of computed property found, but never used.",
-          line: 6
+          message: "'count2' of computed property found, but never used.",
+          line: 5
         }
       ]
     },
@@ -2532,57 +3172,93 @@ tester.run('no-unused-properties', rule, {
         <script>
           export default {
             computed: {
-              ...mapGetters([
-                "a",
-                a['foo'] // cannot be inferred.
-              ])
+              ...mapWritableState(useStore, ['count', 'count2', 'count3'])
             }
           }
         </script>
+        <template>
+          {{ count2 }} {{ count3 }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapWritableState(useStore, {
+              count: 'todosCount',
+              count2: 'someCount'
+            })
+          }
+        </script>
         <template>
           {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'a' of computed property found, but never used.",
+          message: "'count2' of computed property found, but never used.",
           line: 6
         }
       ]
     },
 
-    // vuex unused state
+    // pinia unused getters
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
             computed: {
-              ...mapState(['count', 'count2', 'count3'])
+              ...mapGetters(useStore, ['count', 'count2']),
             }
           }
         </script>
         <template>
-          {{ count2 }} {{ count3 }}
+          {{ count }}
         </template>
       `,
       errors: [
         {
-          message: "'count' of computed property found, but never used.",
+          message: "'count2' of computed property found, but never used.",
           line: 5
         }
       ]
     },
-
-    // vuex unused state
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
-            computed: mapState({
-              count: 'todosCount',
-              count2: 'someCount'
+            computed: mapGetters(useStore, ['count1', 'count2', 'count'])
+          }
+        </script>
+        <template>
+          {{ count1 }} {{ count2 }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count' of computed property found, but never used.",
+          line: 4
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: mapGetters(useStore, {
+              count2: 'count',
+              count: 'count'
             })
           }
         </script>
@@ -2593,19 +3269,67 @@ tester.run('no-unused-properties', rule, {
       errors: [
         {
           message: "'count2' of computed property found, but never used.",
+          line: 5
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapGetters(useStore, {
+                count: 'count',
+                count3: 'count2'
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'count3' of computed property found, but never used.",
+          line: 7
+        }
+      ]
+    },
+    {
+      filename: 'test.vue',
+      code: `
+        <script>
+          export default {
+            computed: {
+              ...mapGetters(useStore, {
+                a: { b :'c' }, // This is an invalid definition, but it does not use "a".
+              })
+            }
+          }
+        </script>
+        <template>
+          {{ count }}
+        </template>
+      `,
+      errors: [
+        {
+          message: "'a' of computed property found, but never used.",
           line: 6
         }
       ]
     },
-
-    // vuex unused state
     {
       filename: 'test.vue',
       code: `
         <script>
           export default {
             computed: {
-              ...mapState(['count', 'additional'])
+              ...mapGetters(useStore, [
+                "a",
+                a['foo'] // cannot be inferred.
+              ])
             }
           }
         </script>
@@ -2615,8 +3339,8 @@ tester.run('no-unused-properties', rule, {
       `,
       errors: [
         {
-          message: "'additional' of computed property found, but never used.",
-          line: 5
+          message: "'a' of computed property found, but never used.",
+          line: 6
         }
       ]
     },