Rearranging the placement of the definition of the AstNode type

Author: Janther

src/index.ts

@@ -16,7 +16,8 @@ import type {
   RequiredOptions,
   SupportLanguage
 } from 'prettier';
-import type { AstNode, Comment } from './types';
+import type { AstNode } from './slang-nodes';
+import type { Comment } from './types';
 
 const parserName = 'slang';
 const astFormat = 'slang-ast';

src/slang-comments/handler.ts

@@ -1,7 +1,8 @@
 import handlers from './handlers/index.js';
 
 import type { ParserOptions } from 'prettier';
-import type { AstNode, Comment } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { Comment } from '../types';
 
 function ownLine(
   comment: Comment,

src/slang-comments/handlers/add-hub-node-first-comment.ts

@@ -1,6 +1,7 @@
 import { util } from 'prettier';
 
-import type { Comment, HubNode } from '../../types';
+import type { HubNode } from '../../slang-nodes';
+import type { Comment } from '../../types';
 
 const { addDanglingComment, addLeadingComment } = util;
 

src/slang-comments/handlers/add-hub-node-last-comment.ts

@@ -1,6 +1,7 @@
 import { util } from 'prettier';
 
-import type { Comment, HubNode } from '../../types';
+import type { HubNode } from '../../slang-nodes';
+import type { Comment } from '../../types';
 
 const { addDanglingComment, addTrailingComment } = util;
 

src/slang-comments/handlers/types.d.ts

@@ -1,4 +1,5 @@
-import type { Comment, StrictAstNode } from '../../types';
+import type { StrictAstNode } from '../../slang-nodes';
+import type { Comment } from '../../types';
 
 interface HandlerParams {
   text: string;

src/slang-comments/printer.ts

@@ -2,7 +2,8 @@ import { doc } from 'prettier';
 import { isBlockComment, isLineComment } from '../slang-utils/is-comment.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { AstNode, Comment } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { Comment } from '../types';
 
 const { hardline, join, literalline } = doc.builders;
 

src/slang-nodes/AdditiveExpression.ts

@@ -6,7 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, PrintFunction, SlangNode } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { PrintFunction, SlangNode } from '../types';
 
 const tryToHug = createHugFunction(['%']);
 

src/slang-nodes/AndExpression.ts

@@ -5,7 +5,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, PrintFunction, SlangNode } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { PrintFunction, SlangNode } from '../types';
 
 export class AndExpression implements SlangNode {
   readonly kind = NonterminalKind.AndExpression;

src/slang-nodes/ArgumentsDeclaration.ts

@@ -5,7 +5,8 @@ import { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, PrintFunction, SlangNode } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { PrintFunction, SlangNode } from '../types';
 
 export class ArgumentsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.ArgumentsDeclaration;

src/slang-nodes/ArrayExpression.ts

@@ -5,7 +5,8 @@ import { ArrayValues } from './ArrayValues.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, PrintFunction, SlangNode } from '../types';
+import type { AstNode } from '../slang-nodes';
+import type { PrintFunction, SlangNode } from '../types';
 
 const { group } = doc.builders;