Update to Prettier 2 and use ES Private Fields (#4498)

13 files changed, 23 insertions, 26 deletions

diff --git a/std/encoding/yaml/type/binary.ts b/std/encoding/yaml/type/binary.ts
index 8cfe54f79..f4823b3f7 100644
--- a/std/encoding/yaml/type/binary.ts
+++ b/std/encoding/yaml/type/binary.ts
@@ -135,5 +135,5 @@ export const binary = new Type("tag:yaml.org,2002:binary", {
   kind: "scalar",
   predicate: isBinary,
   represent: representYamlBinary,
-  resolve: resolveYamlBinary
+  resolve: resolveYamlBinary,
 });
diff --git a/std/encoding/yaml/type/bool.ts b/std/encoding/yaml/type/bool.ts
index e39823872..a5a85cf9e 100644
--- a/std/encoding/yaml/type/bool.ts
+++ b/std/encoding/yaml/type/bool.ts
@@ -33,7 +33,7 @@ export const bool = new Type("tag:yaml.org,2002:bool", {
     },
     camelcase(object: boolean): string {
       return object ? "True" : "False";
-    }
+    },
   },
-  resolve: resolveYamlBoolean
+  resolve: resolveYamlBoolean,
 });
diff --git a/std/encoding/yaml/type/float.ts b/std/encoding/yaml/type/float.ts
index acb12f5b0..5ae0689b2 100644
--- a/std/encoding/yaml/type/float.ts
+++ b/std/encoding/yaml/type/float.ts
@@ -121,5 +121,5 @@ export const float = new Type("tag:yaml.org,2002:float", {
   kind: "scalar",
   predicate: isFloat,
   represent: representYamlFloat,
-  resolve: resolveYamlFloat
+  resolve: resolveYamlFloat,
 });
diff --git a/std/encoding/yaml/type/int.ts b/std/encoding/yaml/type/int.ts
index 93ec8260e..6a86aafe9 100644
--- a/std/encoding/yaml/type/int.ts
+++ b/std/encoding/yaml/type/int.ts
@@ -8,18 +8,18 @@ import { isNegativeZero, Any } from "../utils.ts";
 
 function isHexCode(c: number): boolean {
   return (
-    (0x30 /* 0 */ <= c && c <= 0x39) /* 9 */ ||
-    (0x41 /* A */ <= c && c <= 0x46) /* F */ ||
-    (0x61 /* a */ <= c && c <= 0x66) /* f */
+    (0x30 <= /* 0 */ c && c <= 0x39) /* 9 */ ||
+    (0x41 <= /* A */ c && c <= 0x46) /* F */ ||
+    (0x61 <= /* a */ c && c <= 0x66) /* f */
   );
 }
 
 function isOctCode(c: number): boolean {
-  return 0x30 /* 0 */ <= c && c <= 0x37 /* 7 */;
+  return 0x30 <= /* 0 */ c && c <= 0x37 /* 7 */;
 }
 
 function isDecCode(c: number): boolean {
-  return 0x30 /* 0 */ <= c && c <= 0x39 /* 9 */;
+  return 0x30 <= /* 0 */ c && c <= 0x39 /* 9 */;
 }
 
 function resolveYamlInteger(data: string): boolean {
@@ -175,17 +175,14 @@ export const int = new Type("tag:yaml.org,2002:int", {
     hexadecimal(obj: number): string {
       return obj >= 0
         ? `0x${obj.toString(16).toUpperCase()}`
-        : `-0x${obj
-            .toString(16)
-            .toUpperCase()
-            .slice(1)}`;
-    }
+        : `-0x${obj.toString(16).toUpperCase().slice(1)}`;
+    },
   },
   resolve: resolveYamlInteger,
   styleAliases: {
     binary: [2, "bin"],
     decimal: [10, "dec"],
     hexadecimal: [16, "hex"],
-    octal: [8, "oct"]
-  }
+    octal: [8, "oct"],
+  },
 });
diff --git a/std/encoding/yaml/type/map.ts b/std/encoding/yaml/type/map.ts
index 60e678657..dcd99abca 100644
--- a/std/encoding/yaml/type/map.ts
+++ b/std/encoding/yaml/type/map.ts
@@ -10,5 +10,5 @@ export const map = new Type("tag:yaml.org,2002:map", {
   construct(data): Any {
     return data !== null ? data : {};
   },
-  kind: "mapping"
+  kind: "mapping",
 });
diff --git a/std/encoding/yaml/type/merge.ts b/std/encoding/yaml/type/merge.ts
index 77b34025b..68314bf2e 100644
--- a/std/encoding/yaml/type/merge.ts
+++ b/std/encoding/yaml/type/merge.ts
@@ -11,5 +11,5 @@ function resolveYamlMerge(data: string): boolean {
 
 export const merge = new Type("tag:yaml.org,2002:merge", {
   kind: "scalar",
-  resolve: resolveYamlMerge
+  resolve: resolveYamlMerge,
 });
diff --git a/std/encoding/yaml/type/nil.ts b/std/encoding/yaml/type/nil.ts
index 00627514c..8a48d02fb 100644
--- a/std/encoding/yaml/type/nil.ts
+++ b/std/encoding/yaml/type/nil.ts
@@ -39,7 +39,7 @@ export const nil = new Type("tag:yaml.org,2002:null", {
     },
     camelcase(): string {
       return "Null";
-    }
+    },
   },
-  resolve: resolveYamlNull
+  resolve: resolveYamlNull,
 });
diff --git a/std/encoding/yaml/type/omap.ts b/std/encoding/yaml/type/omap.ts
index 541e31df6..d6d751505 100644
--- a/std/encoding/yaml/type/omap.ts
+++ b/std/encoding/yaml/type/omap.ts
@@ -42,5 +42,5 @@ function constructYamlOmap(data: Any): Any {
 export const omap = new Type("tag:yaml.org,2002:omap", {
   construct: constructYamlOmap,
   kind: "sequence",
-  resolve: resolveYamlOmap
+  resolve: resolveYamlOmap,
 });
diff --git a/std/encoding/yaml/type/pairs.ts b/std/encoding/yaml/type/pairs.ts
index c964524b5..e999748ae 100644
--- a/std/encoding/yaml/type/pairs.ts
+++ b/std/encoding/yaml/type/pairs.ts
@@ -45,5 +45,5 @@ function constructYamlPairs(data: string): Any[] {
 export const pairs = new Type("tag:yaml.org,2002:pairs", {
   construct: constructYamlPairs,
   kind: "sequence",
-  resolve: resolveYamlPairs
+  resolve: resolveYamlPairs,
 });
diff --git a/std/encoding/yaml/type/seq.ts b/std/encoding/yaml/type/seq.ts
index bd7ceb945..b19565dbc 100644
--- a/std/encoding/yaml/type/seq.ts
+++ b/std/encoding/yaml/type/seq.ts
@@ -10,5 +10,5 @@ export const seq = new Type("tag:yaml.org,2002:seq", {
   construct(data): Any {
     return data !== null ? data : [];
   },
-  kind: "sequence"
+  kind: "sequence",
 });
diff --git a/std/encoding/yaml/type/set.ts b/std/encoding/yaml/type/set.ts
index 3b7fca0e9..0bfe1c8db 100644
--- a/std/encoding/yaml/type/set.ts
+++ b/std/encoding/yaml/type/set.ts
@@ -27,5 +27,5 @@ function constructYamlSet(data: string): Any {
 export const set = new Type("tag:yaml.org,2002:set", {
   construct: constructYamlSet,
   kind: "mapping",
-  resolve: resolveYamlSet
+  resolve: resolveYamlSet,
 });
diff --git a/std/encoding/yaml/type/str.ts b/std/encoding/yaml/type/str.ts
index c7227743e..cd6e9430f 100644
--- a/std/encoding/yaml/type/str.ts
+++ b/std/encoding/yaml/type/str.ts
@@ -8,5 +8,5 @@ export const str = new Type("tag:yaml.org,2002:str", {
   construct(data): string {
     return data !== null ? data : "";
   },
-  kind: "scalar"
+  kind: "scalar",
 });
diff --git a/std/encoding/yaml/type/timestamp.ts b/std/encoding/yaml/type/timestamp.ts
index 14d24077a..eb03b3825 100644
--- a/std/encoding/yaml/type/timestamp.ts
+++ b/std/encoding/yaml/type/timestamp.ts
@@ -92,5 +92,5 @@ export const timestamp = new Type("tag:yaml.org,2002:timestamp", {
   instanceOf: Date,
   kind: "scalar",
   represent: representYamlTimestamp,
-  resolve: resolveYamlTimestamp
+  resolve: resolveYamlTimestamp,
 });