refactor: update to use kv-utils

kitsonk · kitsonk · commit bfc38a2b230a · 2024-11-19T13:22:19.000+11:00
diff --git a/components/BlobViewer.tsx b/components/BlobViewer.tsx
@@ -1,5 +1,5 @@
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { matches } from "@oak/commons/media_types";
 import { format } from "@std/fmt/bytes";
 import { keyJsonToPath } from "$utils/kv.ts";
diff --git a/components/DialogAddEntry.tsx b/components/DialogAddEntry.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { type Signal, useSignal } from "@preact/signals";
 import { useRef } from "preact/hooks";
diff --git a/components/DialogDeleteEntries.tsx b/components/DialogDeleteEntries.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { useRef } from "preact/hooks";
 import {
diff --git a/components/DialogDeleteEntry.tsx b/components/DialogDeleteEntry.tsx
@@ -1,6 +1,6 @@
 import { asset } from "$fresh/runtime.ts";
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvEntryJSON, type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvEntryJSON, type KvKeyJSON } from "@deno/kv-utils/json";
 import { type Signal } from "@preact/signals";
 import { keyJsonToPath } from "$utils/kv.ts";
 import { assert } from "@std/assert/assert";
diff --git a/components/DialogEditValue.tsx b/components/DialogEditValue.tsx
@@ -1,5 +1,5 @@
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvEntryJSON, type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvEntryJSON, type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { type Signal, useComputed, useSignal } from "@preact/signals";
 import { useRef } from "preact/hooks";
diff --git a/components/DialogExport.tsx b/components/DialogExport.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type Signal, useComputed } from "@preact/signals";
 import { keyJsonToPath } from "$utils/kv.ts";
 
diff --git a/components/DialogImport.tsx b/components/DialogImport.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { type Signal, useComputed, useSignal } from "@preact/signals";
 import { keyJsonToPath } from "$utils/kv.ts";
diff --git a/components/Jobs.tsx b/components/Jobs.tsx
@@ -1,7 +1,7 @@
 import { KvKey } from "./KvKey.tsx";
 import { format } from "@std/fmt/duration";
 
-import { keyToJSON } from "@kitsonk/kv-toolbox/json";
+import { keyToJSON } from "@deno/kv-utils/json";
 import { getJobs, type Job, type JobState } from "$utils/kv_bulk.ts";
 
 function JobState({ state }: { state: JobState }) {
diff --git a/components/KvEntry.tsx b/components/KvEntry.tsx
@@ -1,5 +1,5 @@
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvEntryJSON, type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvEntryJSON, type KvKeyJSON } from "@deno/kv-utils/json";
 import { type Signal, useComputed, useSignal } from "@preact/signals";
 import { isEditable } from "$utils/kv.ts";
 import { addNotification } from "$utils/state.ts";
diff --git a/components/KvKey.tsx b/components/KvKey.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { type Signal } from "@preact/signals";
 
diff --git a/components/KvKeyList.tsx b/components/KvKeyList.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type Signal } from "@preact/signals";
 
 import { KvKeyPart } from "./KvKeyPart.tsx";
diff --git a/components/KvKeyPart.tsx b/components/KvKeyPart.tsx
@@ -1,4 +1,4 @@
-import { type KvKeyJSON, type KvKeyPartJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON, type KvKeyPartJSON } from "@deno/kv-utils/json";
 import { type Signal } from "@preact/signals";
 
 export function KvKeyPart(
diff --git a/components/KvValue.tsx b/components/KvValue.tsx
@@ -1,10 +1,6 @@
 import { type ComponentChildren } from "preact";
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import {
-  type KvKeyJSON,
-  type KvValueJSON,
-  toValue,
-} from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON, type KvValueJSON, toValue } from "@deno/kv-utils/json";
 import { highlightJson } from "$utils/highlight.ts";
 
 import { BlobViewer } from "./BlobViewer.tsx";
diff --git a/components/KvValueEditor.tsx b/components/KvValueEditor.tsx
@@ -1,5 +1,5 @@
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvValueJSON, toValue } from "@kitsonk/kv-toolbox/json";
+import { type KvValueJSON, toValue } from "@deno/kv-utils/json";
 import { useComputed, useSignal } from "@preact/signals";
 import { isBlobMeta, replacer } from "$utils/kv.ts";
 
diff --git a/components/WatchedStore.tsx b/components/WatchedStore.tsx
@@ -1,7 +1,4 @@
-import {
-  type KvEntryMaybeJSON,
-  type KvKeyJSON,
-} from "@kitsonk/kv-toolbox/json";
+import { type KvEntryMaybeJSON, type KvKeyJSON } from "@deno/kv-utils/json";
 import { type Signal } from "@preact/signals";
 import { keyJsonToPath } from "$utils/kv.ts";
 
diff --git a/deno.json b/deno.json
@@ -22,7 +22,8 @@
     "$islands/": "./islands/",
     "$utils/": "./utils/",
     "@deno/gfm": "jsr:/@deno/gfm@0.9",
-    "@kitsonk/kv-toolbox": "jsr:/@kitsonk/kv-toolbox@0.20.1",
+    "@deno/kv-utils": "jsr:@deno/kv-utils@^0.1.1",
+    "@kitsonk/kv-toolbox": "jsr:/@kitsonk/kv-toolbox@0.23.0",
     "@oak/commons/": "jsr:/@oak/commons@~1/",
     "@preact/signals": "npm:/@preact/signals@1.3.0",
     "@preact/signals-core": "npm:/@preact/signals-core@1.8.0",
diff --git a/islands/KeyTree.tsx b/islands/KeyTree.tsx
@@ -1,7 +1,7 @@
 import { type Signal, useSignal, useSignalEffect } from "@preact/signals";
 import { Loader } from "$components/Loader.tsx";
 import { TreeView } from "$components/TreeView.tsx";
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { keyJsonToPath } from "$utils/kv.ts";
 import { kvTreeToNodes, state, TreeState } from "$utils/tree_state.ts";
 
diff --git a/islands/KvExplorer.tsx b/islands/KvExplorer.tsx
@@ -12,7 +12,7 @@ import { useSignal, useSignalEffect } from "@preact/signals";
 import { DashDb } from "$utils/dash.ts";
 import { keyJsonToPath } from "$utils/kv.ts";
 import { type BlobMeta } from "@kitsonk/kv-toolbox/blob";
-import { type KvEntryJSON, type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvEntryJSON, type KvKeyJSON } from "@deno/kv-utils/json";
 
 interface ListElement {
   key: KvKeyJSON;
diff --git a/islands/Watches.tsx b/islands/Watches.tsx
@@ -5,7 +5,7 @@ import {
   type KvEntryMaybeJSON,
   type KvKeyJSON,
   toKey,
-} from "@kitsonk/kv-toolbox/json";
+} from "@deno/kv-utils/json";
 import { equals } from "@kitsonk/kv-toolbox/keys";
 import { batch, type Signal, signal } from "@preact/signals";
 import { addNotification } from "$utils/state.ts";
diff --git a/routes/api/kv/[id]/[...path].ts b/routes/api/kv/[id]/[...path].ts
@@ -7,7 +7,7 @@ import {
   type KvValueJSON,
   toKey,
   toValue,
-} from "@kitsonk/kv-toolbox/json";
+} from "@deno/kv-utils/json";
 import { matches } from "@oak/commons/media_types";
 import { assert } from "@std/assert/assert";
 import {
diff --git a/routes/api/watch/index.ts b/routes/api/watch/index.ts
@@ -1,5 +1,5 @@
 import { Handlers } from "$fresh/server.ts";
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { state } from "$utils/state.ts";
 import { addWatch, deleteWatch, serialize } from "$utils/watches.ts";
 
diff --git a/routes/api/watch/server.ts b/routes/api/watch/server.ts
@@ -1,5 +1,5 @@
 import { Handlers } from "$fresh/server.ts";
-import { entryMaybeToJSON } from "@kitsonk/kv-toolbox/json";
+import { entryMaybeToJSON } from "@deno/kv-utils/json";
 import { effect } from "@preact/signals";
 import { setAccessToken } from "$utils/dash.ts";
 import { getKvName, getKvPath } from "$utils/kv_state.ts";
diff --git a/utils/formData.test.ts b/utils/formData.test.ts
@@ -5,7 +5,7 @@ import { formDataToKvValueJSON } from "./formData.ts";
 Deno.test({
   name: "formDataToKvValueJSON - object",
   async fn() {
-    const type = "json_object";
+    const type = "object";
     const value = JSON.stringify({ a: 1, b: 2 });
     assertEquals(await formDataToKvValueJSON(type, value, null), {
       type,
@@ -20,7 +20,7 @@ Deno.test({
 Deno.test({
   name: "formDataToKvValueJSON - array",
   async fn() {
-    const type = "json_array";
+    const type = "Array";
     const value = JSON.stringify([1, 2]);
     assertEquals(await formDataToKvValueJSON(type, value, null), {
       type,
@@ -35,7 +35,7 @@ Deno.test({
 Deno.test({
   name: "formDataToKvValueJSON - set",
   async fn() {
-    const type = "json_set";
+    const type = "Set";
     const value = JSON.stringify([1, 2]);
     assertEquals(await formDataToKvValueJSON(type, value, null), {
       type,
@@ -50,7 +50,7 @@ Deno.test({
 Deno.test({
   name: "formDataToKvValueJSON - map",
   async fn() {
-    const type = "json_map";
+    const type = "Map";
     const value = JSON.stringify([["a", 1], ["b", 2]]);
     assertEquals(await formDataToKvValueJSON(type, value, null), {
       type,
diff --git a/utils/formData.ts b/utils/formData.ts
@@ -3,7 +3,7 @@ import {
   type KvKeyPartJSON,
   type KvValueJSON,
   valueToJSON,
-} from "@kitsonk/kv-toolbox/json";
+} from "@deno/kv-utils/json";
 import { assert } from "@std/assert/assert";
 
 export function formDataToKvKeyPartJSON(
@@ -60,22 +60,22 @@ export async function formDataToKvValueJSON(
         return formDataToKvKeyPartJSON(type, value);
       case "null":
         return { type, value: null };
-      case "json_map": {
+      case "Map": {
         const parsedValue = JSON.parse(value);
         assert(Array.isArray(parsedValue), "Expected an array.");
         return valueToJSON(new Map(parsedValue));
       }
-      case "json_set": {
+      case "Set": {
         const parsedValue = JSON.parse(value);
         assert(Array.isArray(parsedValue), "Expected an array.");
         return valueToJSON(new Set(parsedValue));
       }
-      case "json_array": {
+      case "Array": {
         const parsedValue = JSON.parse(value);
         assert(Array.isArray(parsedValue), "Expected an array.");
         return { type, value: parsedValue.map(valueToJSON) };
       }
-      case "json_object": {
+      case "object": {
         const parsedValue = JSON.parse(value);
         assert(
           typeof parsedValue === "object" && parsedValue !== null,
diff --git a/utils/kv.test.ts b/utils/kv.test.ts
@@ -1,4 +1,4 @@
-import { keyToJSON } from "@kitsonk/kv-toolbox/json";
+import { keyToJSON } from "@deno/kv-utils/json";
 import { assertEquals } from "@std/assert/equals";
 
 import { isEditable, keyJsonToPath, pathToKey } from "./kv.ts";
@@ -123,10 +123,10 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_object",
+        type: "object",
         value: {
           "a": {
-            type: "json_object",
+            type: "object",
             value: { "b": { type: "string", value: "string" } },
           },
         },
@@ -141,7 +141,7 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_object",
+        type: "object",
         value: { "a": { type: "bigint", value: "100" } },
       }),
       false,
@@ -154,11 +154,11 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_array",
+        type: "Array",
         value: [
           { type: "string", value: "string" },
           {
-            type: "json_object",
+            type: "object",
             value: { "b": { type: "string", value: "string" } },
           },
         ],
@@ -173,11 +173,11 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_array",
+        type: "Array",
         value: [
           { type: "bigint", value: "100" },
           {
-            type: "json_object",
+            type: "object",
             value: { "b": { type: "string", value: "string" } },
           },
         ],
@@ -192,11 +192,11 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_map",
+        type: "Map",
         value: [
           [
             {
-              type: "json_object",
+              type: "object",
               value: { a: { type: "string", value: "string" } },
             },
             { type: "string", value: "string" },
@@ -213,13 +213,13 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_map",
+        type: "Map",
         value: [
           [{
-            type: "json_object",
+            type: "object",
             value: { a: { type: "string", value: "string" } },
           }, {
-            type: "json_object",
+            type: "object",
             value: { b: { type: "RegExp", value: "/1234/i" } },
           }],
         ],
@@ -234,7 +234,7 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_set",
+        type: "Set",
         value: [{ type: "string", value: "string" }],
       }),
       true,
@@ -247,7 +247,7 @@ Deno.test({
   fn() {
     assertEquals(
       isEditable({
-        type: "json_set",
+        type: "Set",
         value: [{ type: "string", value: "string" }, {
           type: "Date",
           value: "2021-01-01",
diff --git a/utils/kv.ts b/utils/kv.ts
@@ -6,7 +6,7 @@ import {
   type KvKeyPartJSON,
   type KvValueJSON,
   valueToJSON,
-} from "@kitsonk/kv-toolbox/json";
+} from "@deno/kv-utils/json";
 import { decodeBase64Url } from "@std/encoding/base64url";
 import { join } from "@std/path/join";
 import inspect from "object-inspect";
@@ -43,14 +43,14 @@ export function isBlobJSON(value: unknown): value is BlobJSON {
 
 function containsComplex(value: KvValueJSON): boolean {
   switch (value.type) {
-    case "json_array":
-    case "json_set":
+    case "Array":
+    case "Set":
       return value.value.some(containsComplex);
-    case "json_map":
+    case "Map":
       return value.value.some(([key, value]) =>
         containsComplex(key) || containsComplex(value)
       );
-    case "json_object":
+    case "object":
       return Object.entries(value.value).some(([_, value]) =>
         containsComplex(value)
       );
@@ -73,10 +73,10 @@ export function isEditable(value: KvValueJSON | BlobMeta | undefined): boolean {
     return true;
   }
   switch (value.type) {
-    case "json_array":
-    case "json_map":
-    case "json_object":
-    case "json_set":
+    case "Array":
+    case "Map":
+    case "object":
+    case "Set":
       return !containsComplex(value);
   }
   return ![
diff --git a/utils/state.ts b/utils/state.ts
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { type ComponentChildren } from "preact";
 import { effect, signal } from "@preact/signals";
 
diff --git a/utils/tree_state.ts b/utils/tree_state.ts
@@ -1,4 +1,4 @@
-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";
+import { type KvKeyJSON } from "@deno/kv-utils/json";
 import { createContext } from "preact";
 import { computed, type Signal, signal } from "@preact/signals";
 
diff --git a/utils/watches.ts b/utils/watches.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { type KvKeyJSON } from "@kitsonk/kv-toolbox/json";`
	`1`	`+import { type KvKeyJSON } from "@deno/kv-utils/json";`
`2`	`2`	`import { type ComponentChildren } from "preact";`
`3`	`3`	`import { type Signal, useSignal } from "@preact/signals";`
`4`	`4`	`import { useRef } from "preact/hooks";`