From 6c8eb4c4df0d6d3738f6ca04d5b75c96ed8c81c7 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Thu, 28 Jul 2022 13:52:27 -0400
Subject: [PATCH] refactor: object-view.value.vue to composition api

---
 .../src/components/object-view.value.vue      | 66 +++++++------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/components/object-view.value.vue b/packages/client/src/components/object-view.value.vue
index 0c7230d78..519a47d39 100644
--- a/packages/client/src/components/object-view.value.vue
+++ b/packages/client/src/components/object-view.value.vue
@@ -6,13 +6,13 @@
 	<div v-else-if="typeof value === 'number'" class="number">{{ number(value) }}</div>
 	<div v-else-if="isArray(value) && isEmpty(value)" class="array empty">[]</div>
 	<div v-else-if="isArray(value)" class="array">
-		<div v-for="i in value.length" class="element">
+		<div v-for="i in value.length" :key="i" class="element">
 			{{ i }}: <XValue :value="value[i - 1]" collapsed/>
 		</div>
 	</div>
 	<div v-else-if="isObject(value) && isEmpty(value)" class="object empty">{}</div>
 	<div v-else-if="isObject(value)" class="object">
-		<div v-for="k in Object.keys(value)" class="kv">
+		<div v-for="k in Object.keys(value)" :key="k" class="kv">
 			<button class="toggle _button" :class="{ visible: collapsable(value[k]) }" @click="collapsed[k] = !collapsed[k]">{{ collapsed[k] ? '+' : '-' }}</button>
 			<div class="k">{{ k }}:</div>
 			<div v-if="collapsed[k]" class="v">
@@ -28,54 +28,38 @@
 </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, reactive, ref } from 'vue';
+<script lang="ts" setup>
+import { reactive, defineProps } from 'vue';
 import number from '@/filters/number';
 
-export default defineComponent({
-	name: 'XValue',
+const props = defineProps<{
+	value: any;
+}>();
 
-	props: {
-		value: {
-			required: true,
-		},
-	},
+const collapsed = reactive({});
 
-	setup(props) {
-		const collapsed = reactive({});
+if (isObject(props.value)) {
+	for (const key in props.value) {
+		collapsed[key] = collapsable(props.value[key]);
+	}
+}
 
-		if (isObject(props.value)) {
-			for (const key in props.value) {
-				collapsed[key] = collapsable(props.value[key]);
-			}
-		}
+function isObject(v): boolean {
+	return typeof v === 'object' && !Array.isArray(v) && v !== null;
+}
 
-		function isObject(v): boolean {
-			return typeof v === 'object' && !Array.isArray(v) && v !== null;
-		}
+function isArray(v): boolean {
+	return Array.isArray(v);
+}
 
-		function isArray(v): boolean {
-			return Array.isArray(v);
-		}
+function isEmpty(v): boolean {
+	return (isArray(v) && v.length === 0) || (isObject(v) && Object.keys(v).length === 0);
+}
 
-		function isEmpty(v): boolean {
-			return (isArray(v) && v.length === 0) || (isObject(v) && Object.keys(v).length === 0);
-		}
+function collapsable(v): boolean {
+	return (isObject(v) || isArray(v)) && !isEmpty(v);
+}
 
-		function collapsable(v): boolean {
-			return (isObject(v) || isArray(v)) && !isEmpty(v);
-		}
-
-		return {
-			number,
-			collapsed,
-			isObject,
-			isArray,
-			isEmpty,
-			collapsable,
-		};
-	},
-});
 </script>
 
 <style lang="scss" scoped>