Simplify Node creation (#311)

Author: fisker

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/comment-attachable.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/comment.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/directive.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-body.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],