style: Apply updated Prettier rules

eemeli · Feb 24, 2024 · e4f963a · e4f963a
1 parent cdc032e
commit e4f963a
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 50 deletions.
diff --git a/docs/06_custom_tags.md b/docs/06_custom_tags.md
@@ -118,16 +118,16 @@ class YAMLError extends YAMLMap {
       name === 'EvalError'
         ? EvalError
         : name === 'RangeError'
-        ? RangeError
-        : name === 'ReferenceError'
-        ? ReferenceError
-        : name === 'SyntaxError'
-        ? SyntaxError
-        : name === 'TypeError'
-        ? TypeError
-        : name === 'URIError'
-        ? URIError
-        : Error
+          ? RangeError
+          : name === 'ReferenceError'
+            ? ReferenceError
+            : name === 'SyntaxError'
+              ? SyntaxError
+              : name === 'TypeError'
+                ? TypeError
+                : name === 'URIError'
+                  ? URIError
+                  : Error
     if (Cls.name !== name) {
       Object.defineProperty(er, 'name', {
         value: name,

diff --git a/src/compose/compose-collection.ts b/src/compose/compose-collection.ts
@@ -28,8 +28,8 @@ function resolveCollection(
     token.type === 'block-map'
       ? resolveBlockMap(CN, ctx, token, onError, tag)
       : token.type === 'block-seq'
-      ? resolveBlockSeq(CN, ctx, token, onError, tag)
-      : resolveFlowCollection(CN, ctx, token, onError, tag)
+        ? resolveBlockSeq(CN, ctx, token, onError, tag)
+        : resolveFlowCollection(CN, ctx, token, onError, tag)
 
   const Coll = coll.constructor as typeof YAMLMap | typeof YAMLSeq
 
@@ -60,10 +60,10 @@ export function composeCollection(
     token.type === 'block-map'
       ? 'map'
       : token.type === 'block-seq'
-      ? 'seq'
-      : token.start.source === '{'
-      ? 'map'
-      : 'seq'
+        ? 'seq'
+        : token.start.source === '{'
+          ? 'map'
+          : 'seq'
 
   // shortcut: check if it's a generic YAMLMap or YAMLSeq
   // before jumping into the custom tag logic.

diff --git a/src/compose/compose-scalar.ts b/src/compose/compose-scalar.ts
@@ -28,8 +28,8 @@ export function composeScalar(
     tagToken && tagName
       ? findScalarTagByName(ctx.schema, value, tagName, tagToken, onError)
       : token.type === 'scalar'
-      ? findScalarTagByTest(ctx, value, token, onError)
-      : ctx.schema[SCALAR]
+        ? findScalarTagByTest(ctx, value, token, onError)
+        : ctx.schema[SCALAR]
 
   let scalar: Scalar
   try {

diff --git a/src/compose/resolve-flow-collection.ts b/src/compose/resolve-flow-collection.ts
@@ -169,8 +169,15 @@ export function resolveFlowCollection(
       const valueNode = value
         ? composeNode(ctx, value, valueProps, onError)
         : valueProps.found
-        ? composeEmptyNode(ctx, valueProps.end, sep, null, valueProps, onError)
-        : null
+          ? composeEmptyNode(
+              ctx,
+              valueProps.end,
+              sep,
+              null,
+              valueProps,
+              onError
+            )
+          : null
       if (valueNode) {
         if (isBlock(value)) onError(valueNode.range, 'BLOCK_IN_FLOW', blockMsg)
       } else if (valueProps.comment) {

diff --git a/src/doc/createNode.ts b/src/doc/createNode.ts
@@ -89,8 +89,8 @@ export function createNode(
       value instanceof Map
         ? schema[MAP]
         : Symbol.iterator in Object(value)
-        ? schema[SEQ]
-        : schema[MAP]
+          ? schema[SEQ]
+          : schema[MAP]
   }
   if (onTagObj) {
     onTagObj(tagObj)
@@ -100,8 +100,8 @@ export function createNode(
   const node = tagObj?.createNode
     ? tagObj.createNode(ctx.schema, value, ctx)
     : typeof tagObj?.nodeClass?.from === 'function'
-    ? tagObj.nodeClass.from(ctx.schema, value, ctx)
-    : new Scalar(value)
+      ? tagObj.nodeClass.from(ctx.schema, value, ctx)
+      : new Scalar(value)
   if (tagName) node.tag = tagName
   else if (!tagObj.default) node.tag = tagObj.tag
 

diff --git a/src/nodes/Node.ts b/src/nodes/Node.ts
@@ -26,14 +26,14 @@ export type NodeType<T> = T extends
   | undefined
   ? Scalar<T>
   : T extends Date
-  ? Scalar<string | Date>
-  : T extends Array<any>
-  ? YAMLSeq<NodeType<T[number]>>
-  : T extends { [key: string]: any }
-  ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>>
-  : T extends { [key: number]: any } // Merge with previous once supported in all TS versions
-  ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>>
-  : Node
+    ? Scalar<string | Date>
+    : T extends Array<any>
+      ? YAMLSeq<NodeType<T[number]>>
+      : T extends { [key: string]: any }
+        ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>>
+        : T extends { [key: number]: any } // Merge with previous once supported in all TS versions
+          ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>>
+          : Node
 
 export type ParsedNode =
   | Alias.Parsed

diff --git a/src/schema/Schema.ts b/src/schema/Schema.ts
@@ -36,8 +36,8 @@ export class Schema {
     this.compat = Array.isArray(compat)
       ? getTags(compat, 'compat')
       : compat
-      ? getTags(null, compat)
-      : null
+        ? getTags(null, compat)
+        : null
     this.merge = !!merge
     this.name = (typeof schema === 'string' && schema) || 'core'
     this.knownTags = resolveKnownTags ? coreKnownTags : {}
@@ -53,8 +53,8 @@ export class Schema {
       typeof sortMapEntries === 'function'
         ? sortMapEntries
         : sortMapEntries === true
-        ? sortMapEntriesByKey
-        : null
+          ? sortMapEntriesByKey
+          : null
   }
 
   clone(): Schema {

diff --git a/src/schema/core/float.ts b/src/schema/core/float.ts
@@ -11,8 +11,8 @@ export const floatNaN: ScalarTag = {
     str.slice(-3).toLowerCase() === 'nan'
       ? NaN
       : str[0] === '-'
-      ? Number.NEGATIVE_INFINITY
-      : Number.POSITIVE_INFINITY,
+        ? Number.NEGATIVE_INFINITY
+        : Number.POSITIVE_INFINITY,
   stringify: stringifyNumber
 }
 

diff --git a/src/schema/yaml-1.1/float.ts b/src/schema/yaml-1.1/float.ts
@@ -11,8 +11,8 @@ export const floatNaN: ScalarTag = {
     str.slice(-3).toLowerCase() === 'nan'
       ? NaN
       : str[0] === '-'
-      ? Number.NEGATIVE_INFINITY
-      : Number.POSITIVE_INFINITY,
+        ? Number.NEGATIVE_INFINITY
+        : Number.POSITIVE_INFINITY,
   stringify: stringifyNumber
 }
 

diff --git a/src/stringify/stringify.ts b/src/stringify/stringify.ts
@@ -165,8 +165,8 @@ export function stringify(
     typeof tagObj.stringify === 'function'
       ? tagObj.stringify(node as Scalar, ctx, onComment, onChompKeep)
       : isScalar(node)
-      ? stringifyString(node, ctx, onComment, onChompKeep)
-      : node.toString(ctx, onComment, onChompKeep)
+        ? stringifyString(node, ctx, onComment, onChompKeep)
+        : node.toString(ctx, onComment, onChompKeep)
   if (!props) return str
   return isScalar(node) || str[0] === '{' || str[0] === '['
     ? `${props} ${str}`

diff --git a/src/stringify/stringifyComment.ts b/src/stringify/stringifyComment.ts
@@ -17,5 +17,5 @@ export const lineComment = (str: string, indent: string, comment: string) =>
   str.endsWith('\n')
     ? indentComment(comment, indent)
     : comment.includes('\n')
-    ? '\n' + indentComment(comment, indent)
-    : (str.endsWith(' ') ? '' : ' ') + comment
+      ? '\n' + indentComment(comment, indent)
+      : (str.endsWith(' ') ? '' : ' ') + comment
diff --git a/src/stringify/stringifyString.ts b/src/stringify/stringifyString.ts
@@ -197,10 +197,10 @@ function blockString(
     blockQuote === 'literal'
       ? true
       : blockQuote === 'folded' || type === Scalar.BLOCK_FOLDED
-      ? false
-      : type === Scalar.BLOCK_LITERAL
-      ? true
-      : !lineLengthOverLimit(value, lineWidth, indent.length)
+        ? false
+        : type === Scalar.BLOCK_LITERAL
+          ? true
+          : !lineLengthOverLimit(value, lineWidth, indent.length)
   if (!value) return literal ? '|\n' : '>\n'
 
   // determine chomping from whitespace at value end

diff --git a/tests/doc/stringify.ts b/tests/doc/stringify.ts
@@ -874,7 +874,7 @@ describe('lineWidth', () => {
   )
 
   test('limit to 80 with overlong flow collection', () => {
-    expect(doc.toString({lineWidth: 80})).toBe(`[
+    expect(doc.toString({ lineWidth: 80 })).toBe(`[
   'Sed',
   'ut',
   'perspiciatis',
@@ -894,7 +894,9 @@ describe('lineWidth', () => {
   })
 
   test('limit > flow collection length', () => {
-    expect(doc.toString({lineWidth: 162})).toBe("[ 'Sed', 'ut', 'perspiciatis', 'unde', 'omnis', 'iste', 'natus', 'error', 'sit', 'voluptatem', 'accusantium', 'doloremque', 'laudantium,', 'totam' ]\n")
+    expect(doc.toString({ lineWidth: 162 })).toBe(
+      "[ 'Sed', 'ut', 'perspiciatis', 'unde', 'omnis', 'iste', 'natus', 'error', 'sit', 'voluptatem', 'accusantium', 'doloremque', 'laudantium,', 'totam' ]\n"
+    )
   })
 })