From c4c49f9e95db811a6fe7fd529647cb2659f150d0 Mon Sep 17 00:00:00 2001 From: Eemeli Aro Date: Fri, 29 Nov 2024 11:56:19 +0200 Subject: [PATCH] fix: Use separate rather than inline type keyword for TS compatibility --- eslint.config.mjs | 2 +- src/cli.ts | 8 +++++--- src/compose/compose-collection.ts | 2 +- src/compose/composer.ts | 3 ++- src/compose/resolve-block-map.ts | 2 +- src/compose/resolve-block-scalar.ts | 2 +- src/compose/resolve-block-seq.ts | 2 +- src/compose/resolve-flow-collection.ts | 4 ++-- src/compose/resolve-flow-scalar.ts | 4 ++-- src/compose/util-flow-indent-check.ts | 4 ++-- src/doc/Document.ts | 6 ++++-- src/doc/anchors.ts | 2 +- src/nodes/Alias.ts | 6 ++++-- src/nodes/Node.ts | 5 +++-- src/nodes/Pair.ts | 3 ++- src/nodes/Scalar.ts | 6 ++++-- src/nodes/YAMLMap.ts | 5 +++-- src/nodes/YAMLSeq.ts | 9 ++++++--- src/nodes/addPairToJSMap.ts | 3 ++- src/parse/cst-scalar.ts | 5 +++-- src/parse/parser.ts | 25 ++++++++++++------------- src/public-api.ts | 3 ++- src/schema/yaml-1.1/omap.ts | 7 ++++--- src/schema/yaml-1.1/set.ts | 3 ++- src/stringify/stringifyCollection.ts | 3 ++- src/stringify/stringifyPair.ts | 3 ++- src/util.ts | 1 - tests/clone.ts | 3 ++- tests/directives.ts | 3 ++- tests/doc/anchors.ts | 3 ++- tests/doc/createNode.ts | 3 ++- tests/doc/foldFlowLines.ts | 3 ++- tests/node-to-js.ts | 3 ++- tests/stream.ts | 3 ++- tests/visit.ts | 3 ++- tests/yaml-test-suite.ts | 3 ++- 36 files changed, 92 insertions(+), 63 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 8d15f809..326b24c2 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -55,7 +55,7 @@ export default [ '@typescript-eslint/consistent-type-exports': 'error', '@typescript-eslint/consistent-type-imports': [ 'error', - { fixStyle: 'inline-type-imports' } + { fixStyle: 'separate-type-imports' } ], '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-namespace': 'off', diff --git a/src/cli.ts b/src/cli.ts index 0ad15356..9e80f32a 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,14 +1,16 @@ import { resolve } from 'node:path' import { parseArgs } from 'node:util' -import { type Token, prettyToken } from './parse/cst.ts' +import type { Token } from './parse/cst.ts' +import { prettyToken } from './parse/cst.ts' import { Lexer } from './parse/lexer.ts' import { Parser } from './parse/parser.ts' import { Composer } from './compose/composer.ts' import { LineCounter } from './parse/line-counter.ts' -import { type Document } from './doc/Document.ts' +import type { Document } from './doc/Document.ts' import { prettifyError } from './errors.ts' -import { visit, type visitor } from './visit.ts' +import type { visitor } from './visit.ts' +import { visit } from './visit.ts' export const help = `\ yaml: A command-line YAML processor and inspector diff --git a/src/compose/compose-collection.ts b/src/compose/compose-collection.ts index 08f0e1a9..82459191 100644 --- a/src/compose/compose-collection.ts +++ b/src/compose/compose-collection.ts @@ -9,7 +9,7 @@ import type { FlowCollection, SourceToken } from '../parse/cst.ts' -import { type CollectionTag } from '../schema/types.ts' +import type { CollectionTag } from '../schema/types.ts' import type { ComposeContext, ComposeNode } from './compose-node.ts' import type { ComposeErrorHandler } from './composer.ts' import { resolveBlockMap } from './resolve-block-map.ts' diff --git a/src/compose/composer.ts b/src/compose/composer.ts index 493cceb2..598ba78b 100644 --- a/src/compose/composer.ts +++ b/src/compose/composer.ts @@ -1,6 +1,7 @@ import { Directives } from '../doc/directives.ts' import { Document } from '../doc/Document.ts' -import { type ErrorCode, YAMLParseError, YAMLWarning } from '../errors.ts' +import type { ErrorCode } from '../errors.ts' +import { YAMLParseError, YAMLWarning } from '../errors.ts' import { isCollection, isPair } from '../nodes/identity.ts' import type { ParsedNode, Range } from '../nodes/Node.ts' import type { diff --git a/src/compose/resolve-block-map.ts b/src/compose/resolve-block-map.ts index 8ec303f9..d01c7a66 100644 --- a/src/compose/resolve-block-map.ts +++ b/src/compose/resolve-block-map.ts @@ -2,7 +2,7 @@ import type { ParsedNode } from '../nodes/Node.ts' import { Pair } from '../nodes/Pair.ts' import { YAMLMap } from '../nodes/YAMLMap.ts' import type { BlockMap } from '../parse/cst.ts' -import { type CollectionTag } from '../schema/types.ts' +import type { CollectionTag } from '../schema/types.ts' import type { ComposeContext, ComposeNode } from './compose-node.ts' import type { ComposeErrorHandler } from './composer.ts' import { resolveProps } from './resolve-props.ts' diff --git a/src/compose/resolve-block-scalar.ts b/src/compose/resolve-block-scalar.ts index 06c9c7e0..1fb3036b 100644 --- a/src/compose/resolve-block-scalar.ts +++ b/src/compose/resolve-block-scalar.ts @@ -1,4 +1,4 @@ -import { type Range } from '../nodes/Node.ts' +import type { Range } from '../nodes/Node.ts' import { Scalar } from '../nodes/Scalar.ts' import type { BlockScalar } from '../parse/cst.ts' import type { ComposeContext } from './compose-node.ts' diff --git a/src/compose/resolve-block-seq.ts b/src/compose/resolve-block-seq.ts index 03814810..c34a0f48 100644 --- a/src/compose/resolve-block-seq.ts +++ b/src/compose/resolve-block-seq.ts @@ -1,6 +1,6 @@ import { YAMLSeq } from '../nodes/YAMLSeq.ts' import type { BlockSequence } from '../parse/cst.ts' -import { type CollectionTag } from '../schema/types.ts' +import type { CollectionTag } from '../schema/types.ts' import type { ComposeContext, ComposeNode } from './compose-node.ts' import type { ComposeErrorHandler } from './composer.ts' import { resolveProps } from './resolve-props.ts' diff --git a/src/compose/resolve-flow-collection.ts b/src/compose/resolve-flow-collection.ts index 0d51d73e..651fa4e0 100644 --- a/src/compose/resolve-flow-collection.ts +++ b/src/compose/resolve-flow-collection.ts @@ -3,8 +3,8 @@ import { Pair } from '../nodes/Pair.ts' import { YAMLMap } from '../nodes/YAMLMap.ts' import { YAMLSeq } from '../nodes/YAMLSeq.ts' import type { FlowCollection, Token } from '../parse/cst.ts' -import { type Schema } from '../schema/Schema.ts' -import { type CollectionTag } from '../schema/types.ts' +import type { Schema } from '../schema/Schema.ts' +import type { CollectionTag } from '../schema/types.ts' import type { ComposeContext, ComposeNode } from './compose-node.ts' import type { ComposeErrorHandler } from './composer.ts' import { resolveEnd } from './resolve-end.ts' diff --git a/src/compose/resolve-flow-scalar.ts b/src/compose/resolve-flow-scalar.ts index 49582442..5568d63c 100644 --- a/src/compose/resolve-flow-scalar.ts +++ b/src/compose/resolve-flow-scalar.ts @@ -1,5 +1,5 @@ -import { type ErrorCode } from '../errors.ts' -import { type Range } from '../nodes/Node.ts' +import type { ErrorCode } from '../errors.ts' +import type { Range } from '../nodes/Node.ts' import { Scalar } from '../nodes/Scalar.ts' import type { FlowScalar } from '../parse/cst.ts' import type { ComposeErrorHandler } from './composer.ts' diff --git a/src/compose/util-flow-indent-check.ts b/src/compose/util-flow-indent-check.ts index aece0698..2f0e4076 100644 --- a/src/compose/util-flow-indent-check.ts +++ b/src/compose/util-flow-indent-check.ts @@ -1,5 +1,5 @@ -import { type Token } from '../parse/cst.ts' -import { type ComposeErrorHandler } from './composer.ts' +import type { Token } from '../parse/cst.ts' +import type { ComposeErrorHandler } from './composer.ts' import { containsNewline } from './util-contains-newline.ts' export function flowIndentCheck( diff --git a/src/doc/Document.ts b/src/doc/Document.ts index 66b52895..14456486 100644 --- a/src/doc/Document.ts +++ b/src/doc/Document.ts @@ -11,7 +11,8 @@ import { import type { Node, NodeType, ParsedNode, Range } from '../nodes/Node.ts' import { Pair } from '../nodes/Pair.ts' import type { Scalar } from '../nodes/Scalar.ts' -import { toJS, type ToJSContext } from '../nodes/toJS.ts' +import type { ToJSContext } from '../nodes/toJS.ts' +import { toJS } from '../nodes/toJS.ts' import type { YAMLMap } from '../nodes/YAMLMap.ts' import type { YAMLSeq } from '../nodes/YAMLSeq.ts' import type { @@ -26,7 +27,8 @@ import { Schema } from '../schema/Schema.ts' import { stringifyDocument } from '../stringify/stringifyDocument.ts' import { anchorNames, createNodeAnchors, findNewAnchor } from './anchors.ts' import { applyReviver } from './applyReviver.ts' -import { createNode, type CreateNodeContext } from './createNode.ts' +import type { CreateNodeContext } from './createNode.ts' +import { createNode } from './createNode.ts' import { Directives } from './directives.ts' export type Replacer = any[] | ((key: any, value: any) => unknown) diff --git a/src/doc/anchors.ts b/src/doc/anchors.ts index af996d47..8379494a 100644 --- a/src/doc/anchors.ts +++ b/src/doc/anchors.ts @@ -4,7 +4,7 @@ import type { Scalar } from '../nodes/Scalar.ts' import type { YAMLMap } from '../nodes/YAMLMap.ts' import type { YAMLSeq } from '../nodes/YAMLSeq.ts' import { visit } from '../visit.ts' -import { type CreateNodeContext } from './createNode.ts' +import type { CreateNodeContext } from './createNode.ts' import type { Document } from './Document.ts' /** diff --git a/src/nodes/Alias.ts b/src/nodes/Alias.ts index 969fd7b5..8461c3df 100644 --- a/src/nodes/Alias.ts +++ b/src/nodes/Alias.ts @@ -4,9 +4,11 @@ import type { FlowScalar } from '../parse/cst.ts' import type { StringifyContext } from '../stringify/stringify.ts' import { visit } from '../visit.ts' import { ALIAS, isAlias, isCollection, isPair } from './identity.ts' -import { type Node, NodeBase, type Range } from './Node.ts' +import type { Node, Range } from './Node.ts' +import { NodeBase } from './Node.ts' import type { Scalar } from './Scalar.ts' -import { toJS, type ToJSContext } from './toJS.ts' +import type { ToJSContext } from './toJS.ts' +import { toJS } from './toJS.ts' import type { YAMLMap } from './YAMLMap.ts' import type { YAMLSeq } from './YAMLSeq.ts' diff --git a/src/nodes/Node.ts b/src/nodes/Node.ts index 1e46d490..0ecfbe8a 100644 --- a/src/nodes/Node.ts +++ b/src/nodes/Node.ts @@ -1,12 +1,13 @@ import { applyReviver } from '../doc/applyReviver.ts' import type { Document } from '../doc/Document.ts' import type { ToJSOptions } from '../options.ts' -import { type Token } from '../parse/cst.ts' +import type { Token } from '../parse/cst.ts' import type { StringifyContext } from '../stringify/stringify.ts' import type { Alias } from './Alias.ts' import { isDocument, NODE_TYPE } from './identity.ts' import type { Scalar } from './Scalar.ts' -import { toJS, type ToJSContext } from './toJS.ts' +import type { ToJSContext } from './toJS.ts' +import { toJS } from './toJS.ts' import type { MapLike, YAMLMap } from './YAMLMap.ts' import type { YAMLSeq } from './YAMLSeq.ts' diff --git a/src/nodes/Pair.ts b/src/nodes/Pair.ts index 5eadfcf1..e3f369f2 100644 --- a/src/nodes/Pair.ts +++ b/src/nodes/Pair.ts @@ -1,4 +1,5 @@ -import { createNode, type CreateNodeContext } from '../doc/createNode.ts' +import type { CreateNodeContext } from '../doc/createNode.ts' +import { createNode } from '../doc/createNode.ts' import type { CollectionItem } from '../parse/cst.ts' import type { Schema } from '../schema/Schema.ts' import type { StringifyContext } from '../stringify/stringify.ts' diff --git a/src/nodes/Scalar.ts b/src/nodes/Scalar.ts index d2f862b8..b9d92cd6 100644 --- a/src/nodes/Scalar.ts +++ b/src/nodes/Scalar.ts @@ -1,7 +1,9 @@ import type { BlockScalar, FlowScalar } from '../parse/cst.ts' import { SCALAR } from './identity.ts' -import { NodeBase, type Range } from './Node.ts' -import { toJS, type ToJSContext } from './toJS.ts' +import type { Range } from './Node.ts' +import { NodeBase } from './Node.ts' +import type { ToJSContext } from './toJS.ts' +import { toJS } from './toJS.ts' export const isScalarValue = (value: unknown) => !value || (typeof value !== 'function' && typeof value !== 'object') diff --git a/src/nodes/YAMLMap.ts b/src/nodes/YAMLMap.ts index db8ffff7..23df326f 100644 --- a/src/nodes/YAMLMap.ts +++ b/src/nodes/YAMLMap.ts @@ -2,13 +2,14 @@ import type { BlockMap, FlowCollection } from '../parse/cst.ts' import type { Schema } from '../schema/Schema.ts' import type { StringifyContext } from '../stringify/stringify.ts' import { stringifyCollection } from '../stringify/stringifyCollection.ts' -import { type CreateNodeContext } from '../util.ts' +import type { CreateNodeContext } from '../util.ts' import { addPairToJSMap } from './addPairToJSMap.ts' import { Collection } from './Collection.ts' import { isPair, isScalar, MAP } from './identity.ts' import type { ParsedNode, Range } from './Node.ts' import { createPair, Pair } from './Pair.ts' -import { isScalarValue, type Scalar } from './Scalar.ts' +import type { Scalar } from './Scalar.ts' +import { isScalarValue } from './Scalar.ts' import type { ToJSContext } from './toJS.ts' export type MapLike = diff --git a/src/nodes/YAMLSeq.ts b/src/nodes/YAMLSeq.ts index 31fd20e5..39e78dfb 100644 --- a/src/nodes/YAMLSeq.ts +++ b/src/nodes/YAMLSeq.ts @@ -1,4 +1,5 @@ -import { createNode, type CreateNodeContext } from '../doc/createNode.ts' +import type { CreateNodeContext } from '../doc/createNode.ts' +import { createNode } from '../doc/createNode.ts' import type { BlockSequence, FlowCollection } from '../parse/cst.ts' import type { Schema } from '../schema/Schema.ts' import type { StringifyContext } from '../stringify/stringify.ts' @@ -7,8 +8,10 @@ import { Collection } from './Collection.ts' import { isScalar, SEQ } from './identity.ts' import type { ParsedNode, Range } from './Node.ts' import type { Pair } from './Pair.ts' -import { isScalarValue, type Scalar } from './Scalar.ts' -import { toJS, type ToJSContext } from './toJS.ts' +import type { Scalar } from './Scalar.ts' +import { isScalarValue } from './Scalar.ts' +import type { ToJSContext } from './toJS.ts' +import { toJS } from './toJS.ts' export declare namespace YAMLSeq { interface Parsed< diff --git a/src/nodes/addPairToJSMap.ts b/src/nodes/addPairToJSMap.ts index 73568ca1..08bb0608 100644 --- a/src/nodes/addPairToJSMap.ts +++ b/src/nodes/addPairToJSMap.ts @@ -3,7 +3,8 @@ import { addMergeToJSMap, isMergeKey } from '../schema/yaml-1.1/merge.ts' import { createStringifyContext } from '../stringify/stringify.ts' import { isNode } from './identity.ts' import type { Pair } from './Pair.ts' -import { toJS, type ToJSContext } from './toJS.ts' +import type { ToJSContext } from './toJS.ts' +import { toJS } from './toJS.ts' import type { MapLike } from './YAMLMap.ts' export function addPairToJSMap( diff --git a/src/parse/cst-scalar.ts b/src/parse/cst-scalar.ts index 1854cf7a..e10d3a6d 100644 --- a/src/parse/cst-scalar.ts +++ b/src/parse/cst-scalar.ts @@ -2,8 +2,9 @@ import type { ComposeContext } from '../compose/compose-node.ts' import type { ComposeErrorHandler } from '../compose/composer.ts' import { resolveBlockScalar } from '../compose/resolve-block-scalar.ts' import { resolveFlowScalar } from '../compose/resolve-flow-scalar.ts' -import { type ErrorCode, YAMLParseError } from '../errors.ts' -import { type Range } from '../nodes/Node.ts' +import type { ErrorCode } from '../errors.ts' +import { YAMLParseError } from '../errors.ts' +import type { Range } from '../nodes/Node.ts' import type { Scalar } from '../nodes/Scalar.ts' import type { StringifyContext } from '../stringify/stringify.ts' import { stringifyString } from '../stringify/stringifyString.ts' diff --git a/src/parse/parser.ts b/src/parse/parser.ts index 415020c7..3859d655 100644 --- a/src/parse/parser.ts +++ b/src/parse/parser.ts @@ -1,17 +1,16 @@ -import { - type SourceToken, - type Token, - type FlowScalar, - type FlowCollection, - type Document, - type BlockMap, - type BlockScalar, - type BlockSequence, - type DocumentEnd, - prettyToken, - tokenType, - type TokenType +import type { + SourceToken, + Token, + FlowScalar, + FlowCollection, + Document, + BlockMap, + BlockScalar, + BlockSequence, + DocumentEnd, + TokenType } from './cst.ts' +import { prettyToken, tokenType } from './cst.ts' import { Lexer } from './lexer.ts' function includesToken(list: SourceToken[], type: SourceToken['type']) { diff --git a/src/public-api.ts b/src/public-api.ts index 33a4ddb4..407fb496 100644 --- a/src/public-api.ts +++ b/src/public-api.ts @@ -1,6 +1,7 @@ import { Composer } from './compose/composer.ts' import type { Reviver } from './doc/applyReviver.ts' -import { Document, type Replacer } from './doc/Document.ts' +import type { Replacer } from './doc/Document.ts' +import { Document } from './doc/Document.ts' import { prettifyError, YAMLParseError } from './errors.ts' import { warn } from './log.ts' import { isDocument } from './nodes/identity.ts' diff --git a/src/schema/yaml-1.1/omap.ts b/src/schema/yaml-1.1/omap.ts index eae9bfdd..f3baa1a8 100644 --- a/src/schema/yaml-1.1/omap.ts +++ b/src/schema/yaml-1.1/omap.ts @@ -1,10 +1,11 @@ import { isPair, isScalar } from '../../nodes/identity.ts' -import { toJS, type ToJSContext } from '../../nodes/toJS.ts' +import type { ToJSContext } from '../../nodes/toJS.ts' +import { toJS } from '../../nodes/toJS.ts' import { YAMLMap } from '../../nodes/YAMLMap.ts' import { YAMLSeq } from '../../nodes/YAMLSeq.ts' -import { type CreateNodeContext } from '../../util.ts' +import type { CreateNodeContext } from '../../util.ts' import type { Schema } from '../Schema.ts' -import { type CollectionTag } from '../types.ts' +import type { CollectionTag } from '../types.ts' import { createPairs, resolvePairs } from './pairs.ts' export class YAMLOMap extends YAMLSeq { diff --git a/src/schema/yaml-1.1/set.ts b/src/schema/yaml-1.1/set.ts index e64c1616..b1396fde 100644 --- a/src/schema/yaml-1.1/set.ts +++ b/src/schema/yaml-1.1/set.ts @@ -5,7 +5,8 @@ import type { ToJSContext } from '../../nodes/toJS.ts' import { findPair, YAMLMap } from '../../nodes/YAMLMap.ts' import type { Schema } from '../../schema/Schema.ts' import type { StringifyContext } from '../../stringify/stringify.ts' -import { type CreateNodeContext, createPair } from '../../util.ts' +import type { CreateNodeContext } from '../../util.ts' +import { createPair } from '../../util.ts' import type { CollectionTag } from '../types.ts' export class YAMLSet extends YAMLMap | null> { diff --git a/src/stringify/stringifyCollection.ts b/src/stringify/stringifyCollection.ts index 4d3890b6..a920fe34 100644 --- a/src/stringify/stringifyCollection.ts +++ b/src/stringify/stringifyCollection.ts @@ -1,6 +1,7 @@ import type { Collection } from '../nodes/Collection.ts' import { isNode, isPair } from '../nodes/identity.ts' -import { stringify, type StringifyContext } from './stringify.ts' +import type { StringifyContext } from './stringify.ts' +import { stringify } from './stringify.ts' import { indentComment, lineComment } from './stringifyComment.ts' interface StringifyCollectionOptions { diff --git a/src/stringify/stringifyPair.ts b/src/stringify/stringifyPair.ts index 7b76f4f7..fddcb1b7 100644 --- a/src/stringify/stringifyPair.ts +++ b/src/stringify/stringifyPair.ts @@ -1,7 +1,8 @@ import { isCollection, isNode, isScalar, isSeq } from '../nodes/identity.ts' import type { Pair } from '../nodes/Pair.ts' import { Scalar } from '../nodes/Scalar.ts' -import { stringify, type StringifyContext } from './stringify.ts' +import type { StringifyContext } from './stringify.ts' +import { stringify } from './stringify.ts' import { indentComment, lineComment } from './stringifyComment.ts' export function stringifyPair( diff --git a/src/util.ts b/src/util.ts index 46ec5a10..d1b9aa83 100644 --- a/src/util.ts +++ b/src/util.ts @@ -14,4 +14,3 @@ export type { FoldOptions } from './stringify/foldFlowLines.ts' export type { StringifyContext } from './stringify/stringify.ts' export { stringifyNumber } from './stringify/stringifyNumber.ts' export { stringifyString } from './stringify/stringifyString.ts' - diff --git a/tests/clone.ts b/tests/clone.ts index 283f4751..63dfb11a 100644 --- a/tests/clone.ts +++ b/tests/clone.ts @@ -1,4 +1,5 @@ -import { isAlias, isScalar, parseDocument, type Scalar, visit, type YAMLMap } from 'yaml' +import type { Scalar, YAMLMap } from 'yaml' +import { isAlias, isScalar, parseDocument, visit } from 'yaml' import { source } from './_utils.ts' describe('doc.clone()', () => { diff --git a/tests/directives.ts b/tests/directives.ts index 6399c79b..058875ec 100644 --- a/tests/directives.ts +++ b/tests/directives.ts @@ -1,4 +1,5 @@ -import { parseDocument, type Scalar } from 'yaml' +import type { Scalar } from 'yaml' +import { parseDocument } from 'yaml' import { source } from './_utils.ts' describe('%TAG', () => { diff --git a/tests/doc/anchors.ts b/tests/doc/anchors.ts index e25d4b66..39460832 100644 --- a/tests/doc/anchors.ts +++ b/tests/doc/anchors.ts @@ -1,4 +1,5 @@ -import { type Alias, Document, parse, parseDocument, type YAMLMap, type YAMLSeq } from 'yaml' +import type { Alias, YAMLMap, YAMLSeq } from 'yaml' +import { Document, parse, parseDocument } from 'yaml' test('basic', () => { const src = `- &a 1\n- *a\n` diff --git a/tests/doc/createNode.ts b/tests/doc/createNode.ts index 7eb19bdc..5b070fd8 100644 --- a/tests/doc/createNode.ts +++ b/tests/doc/createNode.ts @@ -1,4 +1,5 @@ -import { type Alias, Document, type Node, Scalar, YAMLMap, YAMLSeq } from 'yaml' +import type { Alias, Node } from 'yaml' +import { Document, Scalar, YAMLMap, YAMLSeq } from 'yaml' import { source } from '../_utils.ts' describe('createNode(value)', () => { diff --git a/tests/doc/foldFlowLines.ts b/tests/doc/foldFlowLines.ts index ad281891..3068b7cf 100644 --- a/tests/doc/foldFlowLines.ts +++ b/tests/doc/foldFlowLines.ts @@ -1,5 +1,6 @@ import * as YAML from 'yaml' -import { foldFlowLines as fold, type FoldOptions } from 'yaml/util' +import type { FoldOptions } from 'yaml/util' +import { foldFlowLines as fold } from 'yaml/util' import { source } from '../_utils.ts' const FOLD_FLOW = 'flow' diff --git a/tests/node-to-js.ts b/tests/node-to-js.ts index 95321b70..bc392b25 100644 --- a/tests/node-to-js.ts +++ b/tests/node-to-js.ts @@ -1,4 +1,5 @@ -import { parseDocument, type YAMLMap, type YAMLSeq } from 'yaml' +import type { YAMLMap, YAMLSeq } from 'yaml' +import { parseDocument } from 'yaml' import { source } from './_utils.ts' describe('scalars', () => { diff --git a/tests/stream.ts b/tests/stream.ts index 17af0083..b4e44c34 100644 --- a/tests/stream.ts +++ b/tests/stream.ts @@ -1,4 +1,5 @@ -import { Composer, type Document, Parser, parseDocument } from 'yaml' +import type { Document } from 'yaml' +import { Composer, Parser, parseDocument } from 'yaml' const src = ` #c0\n \n diff --git a/tests/visit.ts b/tests/visit.ts index aa54b161..28e1c209 100644 --- a/tests/visit.ts +++ b/tests/visit.ts @@ -1,4 +1,5 @@ -import { Document, isSeq, parseDocument, type Scalar, visit, visitAsync } from 'yaml' +import type { Scalar } from 'yaml' +import { Document, isSeq, parseDocument, visit, visitAsync } from 'yaml' const coll = { items: {} } diff --git a/tests/yaml-test-suite.ts b/tests/yaml-test-suite.ts index af1fa02c..04783291 100644 --- a/tests/yaml-test-suite.ts +++ b/tests/yaml-test-suite.ts @@ -1,7 +1,8 @@ import { readdirSync, readFileSync } from 'fs' import { resolve } from 'path' -import { CST, type Document, Lexer, parse, parseAllDocuments, Parser } from 'yaml' +import type { Document } from 'yaml' +import { CST, Lexer, parse, parseAllDocuments, Parser } from 'yaml' import { testEvents } from '../src/test-events.ts' // no public export type TestCase = {