Simplify Node creation

eslint.config.js

@@ -16,6 +16,7 @@ export default tseslint.config(
       "simple-import-sort": eslintPluginSimpleImportSort,
     },
     rules: {
+      "object-shorthand": "error",
       "@typescript-eslint/no-namespace": "off",
       "@typescript-eslint/no-non-null-assertion": "off",
       "@typescript-eslint/no-explicit-any": "off",

src/factories/alias.ts

@@ -1,15 +1,15 @@
 import { type Alias, type Content, type Position } from "../types.js";
-import { createCommentAttachable } from "./comment-attachable.js";
-import { createNode } from "./node.js";
 
 export function createAlias(
   position: Position,
   content: Content,
   value: string,
 ): Alias {
   return {
-    ...createNode("alias", position),
-    ...createCommentAttachable(),
+    type: "alias",
+    position,
+    leadingComments: [],
+    trailingComment: null,
     ...content,
     value,
   };

src/factories/anchor.ts

@@ -1,9 +1,9 @@
 import { type Anchor, type Position } from "../types.js";
-import { createNode } from "./node.js";
 
 export function createAnchor(position: Position, value: string): Anchor {
   return {
-    ...createNode("anchor", position),
+    type: "anchor",
+    position,
     value,
   };
 }

src/factories/block-value.ts

@@ -4,8 +4,6 @@ import {
   type Content,
   type Position,
 } from "../types.ts";
-import { createLeadingCommentAttachable } from "./leading-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createBlockValue(
   position: Position,
@@ -16,8 +14,9 @@ export function createBlockValue(
   indicatorComment: null | Comment,
 ): BlockValue {
   return {
-    ...createNode("blockValue", position),
-    ...createLeadingCommentAttachable(),
+    type: "blockValue",
+    position,
+    leadingComments: [],
     ...content,
     chomping,
     indent,

src/factories/directive.ts

@@ -1,15 +1,15 @@
 import { type Directive, type Position } from "../types.ts";
-import { createCommentAttachable } from "./comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createDirective(
   position: Position,
   name: string,
   parameters: string[],
 ): Directive {
   return {
-    ...createNode("directive", position),
-    ...createCommentAttachable(),
+    type: "directive",
+    position,
+    leadingComments: [],
+    trailingComment: null,
     name,
     parameters,
   };

src/factories/document-body.ts

@@ -4,17 +4,16 @@ import {
   type DocumentBody,
   type Position,
 } from "../types.ts";
-import { createEndCommentAttachable } from "./end-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createDocumentBody(
   position: Position,
   content: null | ContentNode,
   endComments: Comment[],
 ): DocumentBody {
   return {
-    ...createNode("documentBody", position),
-    ...createEndCommentAttachable(endComments),
+    type: "documentBody",
+    position,
+    endComments,
     children: !content ? [] : [content],
   };
 }

src/factories/document-head.ts

@@ -4,9 +4,6 @@ import {
   type DocumentHead,
   type Position,
 } from "../types.ts";
-import { createEndCommentAttachable } from "./end-comment-attachable.ts";
-import { createNode } from "./node.ts";
-import { createTrailingCommentAttachable } from "./trailing-comment-attachable.ts";
 
 export function createDocumentHead(
   position: Position,
@@ -15,9 +12,10 @@ export function createDocumentHead(
   trailingComment: null | Comment,
 ): DocumentHead {
   return {
-    ...createNode("documentHead", position),
-    ...createEndCommentAttachable(endComments),
-    ...createTrailingCommentAttachable(trailingComment),
+    type: "documentHead",
+    position,
+    endComments,
+    trailingComment,
     children,
   };
 }

src/factories/document.ts

@@ -5,8 +5,6 @@ import {
   type DocumentHead,
   type Position,
 } from "../types.ts";
-import { createNode } from "./node.ts";
-import { createTrailingCommentAttachable } from "./trailing-comment-attachable.ts";
 
 export function createDocument(
   position: Position,
@@ -17,8 +15,9 @@ export function createDocument(
   trailingComment: null | Comment,
 ): Document {
   return {
-    ...createNode("document", position),
-    ...createTrailingCommentAttachable(trailingComment),
+    type: "document",
+    position,
+    trailingComment,
     directivesEndMarker,
     documentEndMarker,
     children: [head, body],

src/factories/flow-collection.ts

@@ -4,17 +4,17 @@ import {
   type FlowSequenceItem,
   type Position,
 } from "../types.ts";
-import { createCommentAttachable } from "./comment-attachable.ts";
-import { createEndCommentAttachable } from "./end-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createFlowCollection<
   T extends FlowMappingItem | FlowSequenceItem,
 >(position: Position, content: Content, children: T[]) {
   return {
-    ...createNode("flowCollection", position),
-    ...createCommentAttachable(),
-    ...createEndCommentAttachable(),
+    type: "flowCollection",
+    position,
+
+    leadingComments: [],
+    trailingComment: null,
+    endComments: [],
     ...content,
     children,
   };

src/factories/flow-mapping-item.ts

@@ -4,17 +4,16 @@ import {
   type MappingValue,
   type Position,
 } from "../types.ts";
-import { createLeadingCommentAttachable } from "./leading-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createFlowMappingItem(
   position: Position,
   key: MappingKey,
   value: MappingValue,
 ): FlowMappingItem {
   return {
-    ...createNode("flowMappingItem", position),
-    ...createLeadingCommentAttachable(),
+    type: "flowMappingItem",
+    position,
+    leadingComments: [],
     children: [key, value],
   };
 }

src/factories/flow-sequence-item.ts

@@ -3,14 +3,14 @@ import {
   type FlowSequenceItem,
   type Position,
 } from "../types.ts";
-import { createNode } from "./node.ts";
 
 export function createFlowSequenceItem(
   position: Position,
   content: ContentNode,
 ): FlowSequenceItem {
   return {
-    ...createNode("flowSequenceItem", position),
+    type: "flowSequenceItem",
+    position,
     children: [content],
   };
 }

src/factories/mapping-item.ts

@@ -4,17 +4,16 @@ import {
   type MappingValue,
   type Position,
 } from "../types.ts";
-import { createLeadingCommentAttachable } from "./leading-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createMappingItem(
   position: Position,
   key: MappingKey,
   value: MappingValue,
 ): MappingItem {
   return {
-    ...createNode("mappingItem", position),
-    ...createLeadingCommentAttachable(),
+    type: "mappingItem",
+    position,
+    leadingComments: [],
     children: [key, value],
   };
 }

src/factories/mapping-key.ts

@@ -1,16 +1,14 @@
 import { type ContentNode, type MappingKey, type Position } from "../types.ts";
-import { createEndCommentAttachable } from "./end-comment-attachable.ts";
-import { createNode } from "./node.ts";
-import { createTrailingCommentAttachable } from "./trailing-comment-attachable.ts";
 
 export function createMappingKey(
   position: Position,
   content: null | ContentNode,
 ): MappingKey {
   return {
-    ...createNode("mappingKey", position),
-    ...createTrailingCommentAttachable(),
-    ...createEndCommentAttachable(),
+    type: "mappingKey",
+    position,
+    trailingComment: null,
+    endComments: [],
     children: !content ? [] : [content],
   };
 }

src/factories/mapping-value.ts

@@ -3,18 +3,18 @@ import {
   type MappingValue,
   type Position,
 } from "../types.ts";
-import { createCommentAttachable } from "./comment-attachable.ts";
-import { createEndCommentAttachable } from "./end-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createMappingValue(
   position: Position,
   content: null | ContentNode,
 ): MappingValue {
   return {
-    ...createNode("mappingValue", position),
-    ...createCommentAttachable(),
-    ...createEndCommentAttachable(),
+    type: "mappingValue",
+    position,
+
+    leadingComments: [],
+    trailingComment: null,
+    endComments: [],
     children: !content ? [] : [content],
   };
 }

src/factories/mapping.ts

@@ -4,17 +4,16 @@ import {
   type MappingItem,
   type Position,
 } from "../types.ts";
-import { createLeadingCommentAttachable } from "./leading-comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createMapping(
   position: Position,
   content: Content,
   children: MappingItem[],
 ): Mapping {
   return {
-    ...createNode("mapping", position),
-    ...createLeadingCommentAttachable(),
+    type: "mapping",
+    position,
+    leadingComments: [],
     ...content,
     children,
   };

src/factories/plain.ts

@@ -1,15 +1,15 @@
 import { type Content, type Plain, type Position } from "../types.ts";
-import { createCommentAttachable } from "./comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createPlain(
   position: Position,
   content: Content,
   value: string,
 ): Plain {
   return {
-    ...createNode("plain", position),
-    ...createCommentAttachable(),
+    type: "plain",
+    position,
+    leadingComments: [],
+    trailingComment: null,
     ...content,
     value,
   };

src/factories/quote-value.ts

@@ -1,16 +1,16 @@
 import { type Content, type Position, type QuoteValue } from "../types.ts";
-import { createCommentAttachable } from "./comment-attachable.ts";
-import { createNode } from "./node.ts";
 
 export function createQuoteValue(
   position: Position,
   content: Content,
   value: string,
 ): QuoteValue {
   return {
-    ...createNode("quoteValue", position),
+    type: "quoteValue",
+    position,
     ...content,
-    ...createCommentAttachable(),
+    leadingComments: [],
+    trailingComment: null,
     value,
   };
 }