diff --git a/package-lock.json b/package-lock.json index 71d1c8636..a7e32b093 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "ts-loader": "^9.5.2", "ts-node": "^10.9.2", "typescript": "^5.8.3", - "webpack": "^5.100.2", + "webpack": "^5.101.1", "webpack-cli": "^6.0.1" }, "engines": { @@ -2937,9 +2937,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001727", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", - "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==", + "version": "1.0.30001731", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz", + "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==", "dev": true, "funding": [ { @@ -6826,9 +6826,9 @@ } }, "node_modules/webpack": { - "version": "5.100.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.100.2.tgz", - "integrity": "sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==", + "version": "5.101.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.1.tgz", + "integrity": "sha512-rHY3vHXRbkSfhG6fH8zYQdth/BtDgXXuR2pHF++1f/EBkI8zkgM5XWfsC3BvOoW9pr1CvZ1qQCxhCEsbNgT50g==", "dev": true, "license": "MIT", "dependencies": { @@ -6842,7 +6842,7 @@ "acorn-import-phases": "^1.0.3", "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.17.2", + "enhanced-resolve": "^5.17.3", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", diff --git a/package.json b/package.json index 87cab19c4..713c8d88b 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "ts-loader": "^9.5.2", "ts-node": "^10.9.2", "typescript": "^5.8.3", - "webpack": "^5.100.2", + "webpack": "^5.101.1", "webpack-cli": "^6.0.1" }, "dependencies": { diff --git a/src/slang-comments/handlers/handle-block-comments.ts b/src/slang-comments/handlers/handle-block-comments.ts index 5ad4085a5..fb806ef7a 100644 --- a/src/slang-comments/handlers/handle-block-comments.ts +++ b/src/slang-comments/handlers/handle-block-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import addCollectionFirstComment from './add-collection-first-comment.js'; import addCollectionLastComment from './add-collection-last-comment.js'; diff --git a/src/slang-comments/handlers/handle-contract-definition-comments.ts b/src/slang-comments/handlers/handle-contract-definition-comments.ts index a8dc0a21d..272e92a03 100644 --- a/src/slang-comments/handlers/handle-contract-definition-comments.ts +++ b/src/slang-comments/handlers/handle-contract-definition-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionLastComment from './add-collection-last-comment.js'; diff --git a/src/slang-comments/handlers/handle-contract-specifiers-comments.ts b/src/slang-comments/handlers/handle-contract-specifiers-comments.ts index 0af5a6df3..c077dbfe2 100644 --- a/src/slang-comments/handlers/handle-contract-specifiers-comments.ts +++ b/src/slang-comments/handlers/handle-contract-specifiers-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import addCollectionLastComment from './add-collection-last-comment.js'; diff --git a/src/slang-comments/handlers/handle-else-branch-comments.ts b/src/slang-comments/handlers/handle-else-branch-comments.ts index a3ee7b865..5e605072a 100644 --- a/src/slang-comments/handlers/handle-else-branch-comments.ts +++ b/src/slang-comments/handlers/handle-else-branch-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-if-statement-comments.ts b/src/slang-comments/handlers/handle-if-statement-comments.ts index 4a702cc51..3b6d30d53 100644 --- a/src/slang-comments/handlers/handle-if-statement-comments.ts +++ b/src/slang-comments/handlers/handle-if-statement-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-interface-definition-comments.ts b/src/slang-comments/handlers/handle-interface-definition-comments.ts index 356cfc328..30f686cf8 100644 --- a/src/slang-comments/handlers/handle-interface-definition-comments.ts +++ b/src/slang-comments/handlers/handle-interface-definition-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-library-definition-comments.ts b/src/slang-comments/handlers/handle-library-definition-comments.ts index dfe5bafe1..186e6d5b7 100644 --- a/src/slang-comments/handlers/handle-library-definition-comments.ts +++ b/src/slang-comments/handlers/handle-library-definition-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-modifier-invocation-comments.ts b/src/slang-comments/handlers/handle-modifier-invocation-comments.ts index 06e8d749a..da8615a83 100644 --- a/src/slang-comments/handlers/handle-modifier-invocation-comments.ts +++ b/src/slang-comments/handlers/handle-modifier-invocation-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-parameters-declaration-comments.ts b/src/slang-comments/handlers/handle-parameters-declaration-comments.ts index 0100e853e..6e2b72963 100644 --- a/src/slang-comments/handlers/handle-parameters-declaration-comments.ts +++ b/src/slang-comments/handlers/handle-parameters-declaration-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import addCollectionFirstComment from './add-collection-first-comment.js'; import addCollectionLastComment from './add-collection-last-comment.js'; diff --git a/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts b/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts index 865b93fb9..3e3266d9c 100644 --- a/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts +++ b/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import addCollectionFirstComment from './add-collection-first-comment.js'; import addCollectionLastComment from './add-collection-last-comment.js'; diff --git a/src/slang-comments/handlers/handle-storage-layout-specifier-comments.ts b/src/slang-comments/handlers/handle-storage-layout-specifier-comments.ts index 498201eac..f8a07b76a 100644 --- a/src/slang-comments/handlers/handle-storage-layout-specifier-comments.ts +++ b/src/slang-comments/handlers/handle-storage-layout-specifier-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import type { HandlerParams } from './types.d.ts'; diff --git a/src/slang-comments/handlers/handle-struct-comments.ts b/src/slang-comments/handlers/handle-struct-comments.ts index 90adc260a..38e73e179 100644 --- a/src/slang-comments/handlers/handle-struct-comments.ts +++ b/src/slang-comments/handlers/handle-struct-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-while-statement-comments.ts b/src/slang-comments/handlers/handle-while-statement-comments.ts index 3f40dc12c..dd9dd9506 100644 --- a/src/slang-comments/handlers/handle-while-statement-comments.ts +++ b/src/slang-comments/handlers/handle-while-statement-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import { locEnd } from '../../slang-utils/loc.js'; import addCollectionFirstComment from './add-collection-first-comment.js'; diff --git a/src/slang-comments/handlers/handle-yul-block-comments.ts b/src/slang-comments/handlers/handle-yul-block-comments.ts index edaf07f0f..a8d1bd3f0 100644 --- a/src/slang-comments/handlers/handle-yul-block-comments.ts +++ b/src/slang-comments/handlers/handle-yul-block-comments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { util } from 'prettier'; import type { HandlerParams } from './types.d.ts'; diff --git a/src/slang-nodes/AbicoderPragma.ts b/src/slang-nodes/AbicoderPragma.ts index 4ac460a1f..d9e7811a3 100644 --- a/src/slang-nodes/AbicoderPragma.ts +++ b/src/slang-nodes/AbicoderPragma.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/AdditiveExpression.ts b/src/slang-nodes/AdditiveExpression.ts index e31d346b3..baef053c6 100644 --- a/src/slang-nodes/AdditiveExpression.ts +++ b/src/slang-nodes/AdditiveExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/AddressType.ts b/src/slang-nodes/AddressType.ts index 735bb13cb..bf1ed5236 100644 --- a/src/slang-nodes/AddressType.ts +++ b/src/slang-nodes/AddressType.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/AndExpression.ts b/src/slang-nodes/AndExpression.ts index cdd916aee..f0d3e0112 100644 --- a/src/slang-nodes/AndExpression.ts +++ b/src/slang-nodes/AndExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printLogicalOperation } from '../slang-printers/print-logical-operation.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/ArgumentsDeclaration.ts b/src/slang-nodes/ArgumentsDeclaration.ts index 5c2967544..1209692a4 100644 --- a/src/slang-nodes/ArgumentsDeclaration.ts +++ b/src/slang-nodes/ArgumentsDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration.js'; import { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.js'; diff --git a/src/slang-nodes/ArrayExpression.ts b/src/slang-nodes/ArrayExpression.ts index 0f7bb46f2..343b1c6d4 100644 --- a/src/slang-nodes/ArrayExpression.ts +++ b/src/slang-nodes/ArrayExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { ArrayValues } from './ArrayValues.js'; diff --git a/src/slang-nodes/ArrayTypeName.ts b/src/slang-nodes/ArrayTypeName.ts index fb6fc2417..bf26d8761 100644 --- a/src/slang-nodes/ArrayTypeName.ts +++ b/src/slang-nodes/ArrayTypeName.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/ArrayValues.ts b/src/slang-nodes/ArrayValues.ts index b985034ab..67eba310b 100644 --- a/src/slang-nodes/ArrayValues.ts +++ b/src/slang-nodes/ArrayValues.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/AssemblyFlags.ts b/src/slang-nodes/AssemblyFlags.ts index 3ca2c8013..939392d62 100644 --- a/src/slang-nodes/AssemblyFlags.ts +++ b/src/slang-nodes/AssemblyFlags.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/AssemblyFlagsDeclaration.ts b/src/slang-nodes/AssemblyFlagsDeclaration.ts index 4b2b382ac..ebc58f856 100644 --- a/src/slang-nodes/AssemblyFlagsDeclaration.ts +++ b/src/slang-nodes/AssemblyFlagsDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { AssemblyFlags } from './AssemblyFlags.js'; diff --git a/src/slang-nodes/AssemblyStatement.ts b/src/slang-nodes/AssemblyStatement.ts index 9a3535fdb..4d5375310 100644 --- a/src/slang-nodes/AssemblyStatement.ts +++ b/src/slang-nodes/AssemblyStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/AssignmentExpression.ts b/src/slang-nodes/AssignmentExpression.ts index aecb2ad64..98cfe933c 100644 --- a/src/slang-nodes/AssignmentExpression.ts +++ b/src/slang-nodes/AssignmentExpression.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind } = await import( + '@nomicfoundation/slang/cst' +); import { doc } from 'prettier'; import { isBinaryOperation } from '../slang-utils/is-binary-operation.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/BitwiseAndExpression.ts b/src/slang-nodes/BitwiseAndExpression.ts index b2e721fc0..2fcd637c7 100644 --- a/src/slang-nodes/BitwiseAndExpression.ts +++ b/src/slang-nodes/BitwiseAndExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/BitwiseOrExpression.ts b/src/slang-nodes/BitwiseOrExpression.ts index 34b6ac9f2..8d4adb106 100644 --- a/src/slang-nodes/BitwiseOrExpression.ts +++ b/src/slang-nodes/BitwiseOrExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/BitwiseXorExpression.ts b/src/slang-nodes/BitwiseXorExpression.ts index 443ce60c5..faa26cc4b 100644 --- a/src/slang-nodes/BitwiseXorExpression.ts +++ b/src/slang-nodes/BitwiseXorExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/Block.ts b/src/slang-nodes/Block.ts index c7e72ddc9..196e9f0fc 100644 --- a/src/slang-nodes/Block.ts +++ b/src/slang-nodes/Block.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Statements } from './Statements.js'; diff --git a/src/slang-nodes/BreakStatement.ts b/src/slang-nodes/BreakStatement.ts index 2e8eb523d..f08a70d97 100644 --- a/src/slang-nodes/BreakStatement.ts +++ b/src/slang-nodes/BreakStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/CallOptions.ts b/src/slang-nodes/CallOptions.ts index 936af9da6..af89c155d 100644 --- a/src/slang-nodes/CallOptions.ts +++ b/src/slang-nodes/CallOptions.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { NamedArgument } from './NamedArgument.js'; diff --git a/src/slang-nodes/CallOptionsExpression.ts b/src/slang-nodes/CallOptionsExpression.ts index c13270aea..0596bb9d4 100644 --- a/src/slang-nodes/CallOptionsExpression.ts +++ b/src/slang-nodes/CallOptionsExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; import { CallOptions } from './CallOptions.js'; diff --git a/src/slang-nodes/CatchClause.ts b/src/slang-nodes/CatchClause.ts index caecbb096..be84659ec 100644 --- a/src/slang-nodes/CatchClause.ts +++ b/src/slang-nodes/CatchClause.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { CatchClauseError } from './CatchClauseError.js'; import { Block } from './Block.js'; diff --git a/src/slang-nodes/CatchClauseError.ts b/src/slang-nodes/CatchClauseError.ts index 5646f2534..7f716b0ae 100644 --- a/src/slang-nodes/CatchClauseError.ts +++ b/src/slang-nodes/CatchClauseError.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/CatchClauses.ts b/src/slang-nodes/CatchClauses.ts index dbac2e255..d9591cd55 100644 --- a/src/slang-nodes/CatchClauses.ts +++ b/src/slang-nodes/CatchClauses.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { CatchClause } from './CatchClause.js'; diff --git a/src/slang-nodes/ConditionalExpression.ts b/src/slang-nodes/ConditionalExpression.ts index 102635b5b..c93ad481d 100644 --- a/src/slang-nodes/ConditionalExpression.ts +++ b/src/slang-nodes/ConditionalExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/ConstantDefinition.ts b/src/slang-nodes/ConstantDefinition.ts index 529bd2eb5..77c6f8351 100644 --- a/src/slang-nodes/ConstantDefinition.ts +++ b/src/slang-nodes/ConstantDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/ConstructorAttribute.ts b/src/slang-nodes/ConstructorAttribute.ts index b050d45cf..ae6eb999e 100644 --- a/src/slang-nodes/ConstructorAttribute.ts +++ b/src/slang-nodes/ConstructorAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ModifierInvocation } from './ModifierInvocation.js'; diff --git a/src/slang-nodes/ConstructorAttributes.ts b/src/slang-nodes/ConstructorAttributes.ts index 003b4dbe2..143a781ec 100644 --- a/src/slang-nodes/ConstructorAttributes.ts +++ b/src/slang-nodes/ConstructorAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { ConstructorAttribute } from './ConstructorAttribute.js'; diff --git a/src/slang-nodes/ConstructorDefinition.ts b/src/slang-nodes/ConstructorDefinition.ts index 7bc9759e1..8513ad10d 100644 --- a/src/slang-nodes/ConstructorDefinition.ts +++ b/src/slang-nodes/ConstructorDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/ContinueStatement.ts b/src/slang-nodes/ContinueStatement.ts index 5e856cb49..5ceb18b59 100644 --- a/src/slang-nodes/ContinueStatement.ts +++ b/src/slang-nodes/ContinueStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/ContractDefinition.ts b/src/slang-nodes/ContractDefinition.ts index 363746997..288421bd8 100644 --- a/src/slang-nodes/ContractDefinition.ts +++ b/src/slang-nodes/ContractDefinition.ts @@ -1,6 +1,6 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { satisfies } from 'semver'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { ContractSpecifiers } from './ContractSpecifiers.js'; diff --git a/src/slang-nodes/ContractMember.ts b/src/slang-nodes/ContractMember.ts index b74ed3393..85c07221c 100644 --- a/src/slang-nodes/ContractMember.ts +++ b/src/slang-nodes/ContractMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { UsingDirective } from './UsingDirective.js'; import { FunctionDefinition } from './FunctionDefinition.js'; diff --git a/src/slang-nodes/ContractMembers.ts b/src/slang-nodes/ContractMembers.ts index cd82c186c..17a3b0c40 100644 --- a/src/slang-nodes/ContractMembers.ts +++ b/src/slang-nodes/ContractMembers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printComments } from '../slang-printers/print-comments.js'; import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; diff --git a/src/slang-nodes/ContractSpecifier.ts b/src/slang-nodes/ContractSpecifier.ts index 0b0030378..21117b652 100644 --- a/src/slang-nodes/ContractSpecifier.ts +++ b/src/slang-nodes/ContractSpecifier.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { InheritanceSpecifier } from './InheritanceSpecifier.js'; import { StorageLayoutSpecifier } from './StorageLayoutSpecifier.js'; diff --git a/src/slang-nodes/ContractSpecifiers.ts b/src/slang-nodes/ContractSpecifiers.ts index fc3cae149..287338be7 100644 --- a/src/slang-nodes/ContractSpecifiers.ts +++ b/src/slang-nodes/ContractSpecifiers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortContractSpecifiers } from '../slang-utils/sort-contract-specifiers.js'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/DecimalNumberExpression.ts b/src/slang-nodes/DecimalNumberExpression.ts index 211fb2bee..b9d4f2dd7 100644 --- a/src/slang-nodes/DecimalNumberExpression.ts +++ b/src/slang-nodes/DecimalNumberExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { NumberUnit } from './NumberUnit.js'; diff --git a/src/slang-nodes/DoWhileStatement.ts b/src/slang-nodes/DoWhileStatement.ts index 2685f206b..1a4143926 100644 --- a/src/slang-nodes/DoWhileStatement.ts +++ b/src/slang-nodes/DoWhileStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; import { Statement } from './Statement.js'; diff --git a/src/slang-nodes/ElementaryType.ts b/src/slang-nodes/ElementaryType.ts index 1e28c45b1..65afe77cd 100644 --- a/src/slang-nodes/ElementaryType.ts +++ b/src/slang-nodes/ElementaryType.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { AddressType } from './AddressType.js'; diff --git a/src/slang-nodes/ElseBranch.ts b/src/slang-nodes/ElseBranch.ts index dc657f05f..984edbd53 100644 --- a/src/slang-nodes/ElseBranch.ts +++ b/src/slang-nodes/ElseBranch.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; import { SlangNode } from './SlangNode.js'; import { Statement } from './Statement.js'; diff --git a/src/slang-nodes/EmitStatement.ts b/src/slang-nodes/EmitStatement.ts index 6b3d217b0..da26dc6b2 100644 --- a/src/slang-nodes/EmitStatement.ts +++ b/src/slang-nodes/EmitStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; import { ArgumentsDeclaration } from './ArgumentsDeclaration.js'; diff --git a/src/slang-nodes/EnumDefinition.ts b/src/slang-nodes/EnumDefinition.ts index 7df5b8fe7..563f2c524 100644 --- a/src/slang-nodes/EnumDefinition.ts +++ b/src/slang-nodes/EnumDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { EnumMembers } from './EnumMembers.js'; diff --git a/src/slang-nodes/EnumMembers.ts b/src/slang-nodes/EnumMembers.ts index 1925635d6..88772a440 100644 --- a/src/slang-nodes/EnumMembers.ts +++ b/src/slang-nodes/EnumMembers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/EqualityExpression.ts b/src/slang-nodes/EqualityExpression.ts index 6dd6bf401..ee4ea4c03 100644 --- a/src/slang-nodes/EqualityExpression.ts +++ b/src/slang-nodes/EqualityExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; diff --git a/src/slang-nodes/ErrorDefinition.ts b/src/slang-nodes/ErrorDefinition.ts index e1534cd3c..384540619 100644 --- a/src/slang-nodes/ErrorDefinition.ts +++ b/src/slang-nodes/ErrorDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { ErrorParametersDeclaration } from './ErrorParametersDeclaration.js'; diff --git a/src/slang-nodes/ErrorParameter.ts b/src/slang-nodes/ErrorParameter.ts index 4f65a94f4..e0cd96589 100644 --- a/src/slang-nodes/ErrorParameter.ts +++ b/src/slang-nodes/ErrorParameter.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/ErrorParameters.ts b/src/slang-nodes/ErrorParameters.ts index bbbdaf711..fde30bb0c 100644 --- a/src/slang-nodes/ErrorParameters.ts +++ b/src/slang-nodes/ErrorParameters.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { ErrorParameter } from './ErrorParameter.js'; diff --git a/src/slang-nodes/ErrorParametersDeclaration.ts b/src/slang-nodes/ErrorParametersDeclaration.ts index 39a0784fe..dc6bc8985 100644 --- a/src/slang-nodes/ErrorParametersDeclaration.ts +++ b/src/slang-nodes/ErrorParametersDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ErrorParameters } from './ErrorParameters.js'; diff --git a/src/slang-nodes/EventDefinition.ts b/src/slang-nodes/EventDefinition.ts index 77837800e..9a047806f 100644 --- a/src/slang-nodes/EventDefinition.ts +++ b/src/slang-nodes/EventDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { EventParametersDeclaration } from './EventParametersDeclaration.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/EventParameter.ts b/src/slang-nodes/EventParameter.ts index 43b917691..f22bcc646 100644 --- a/src/slang-nodes/EventParameter.ts +++ b/src/slang-nodes/EventParameter.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/EventParameters.ts b/src/slang-nodes/EventParameters.ts index 6c03aaba1..d257bb2ac 100644 --- a/src/slang-nodes/EventParameters.ts +++ b/src/slang-nodes/EventParameters.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { EventParameter } from './EventParameter.js'; diff --git a/src/slang-nodes/EventParametersDeclaration.ts b/src/slang-nodes/EventParametersDeclaration.ts index f6fc717f0..622715e6e 100644 --- a/src/slang-nodes/EventParametersDeclaration.ts +++ b/src/slang-nodes/EventParametersDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { EventParameters } from './EventParameters.js'; diff --git a/src/slang-nodes/ExperimentalFeature.ts b/src/slang-nodes/ExperimentalFeature.ts index fbf84674a..25f8cea9c 100644 --- a/src/slang-nodes/ExperimentalFeature.ts +++ b/src/slang-nodes/ExperimentalFeature.ts @@ -1,8 +1,6 @@ -import { - NonterminalKind, - TerminalKind, - TerminalNode -} from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/ExperimentalPragma.ts b/src/slang-nodes/ExperimentalPragma.ts index 5ba3a05f4..d882e7f3c 100644 --- a/src/slang-nodes/ExperimentalPragma.ts +++ b/src/slang-nodes/ExperimentalPragma.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ExperimentalFeature } from './ExperimentalFeature.js'; diff --git a/src/slang-nodes/ExponentiationExpression.ts b/src/slang-nodes/ExponentiationExpression.ts index 9d8d82448..364c7df98 100644 --- a/src/slang-nodes/ExponentiationExpression.ts +++ b/src/slang-nodes/ExponentiationExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { createBinaryOperationPrinter } from '../slang-printers/create-binary-operation-printer.js'; import { binaryIndentRulesBuilder } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; diff --git a/src/slang-nodes/Expression.ts b/src/slang-nodes/Expression.ts index 008c52e44..e7388a7b7 100644 --- a/src/slang-nodes/Expression.ts +++ b/src/slang-nodes/Expression.ts @@ -1,8 +1,6 @@ -import { - NonterminalKind, - TerminalKind, - TerminalNode -} from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { AssignmentExpression } from './AssignmentExpression.js'; import { ConditionalExpression } from './ConditionalExpression.js'; diff --git a/src/slang-nodes/ExpressionStatement.ts b/src/slang-nodes/ExpressionStatement.ts index bc3e17f25..087bfa43d 100644 --- a/src/slang-nodes/ExpressionStatement.ts +++ b/src/slang-nodes/ExpressionStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/FallbackFunctionAttribute.ts b/src/slang-nodes/FallbackFunctionAttribute.ts index e346aef99..d82d3dc4f 100644 --- a/src/slang-nodes/FallbackFunctionAttribute.ts +++ b/src/slang-nodes/FallbackFunctionAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ModifierInvocation } from './ModifierInvocation.js'; import { OverrideSpecifier } from './OverrideSpecifier.js'; diff --git a/src/slang-nodes/FallbackFunctionAttributes.ts b/src/slang-nodes/FallbackFunctionAttributes.ts index 0f48bfdb6..5b8fb70d2 100644 --- a/src/slang-nodes/FallbackFunctionAttributes.ts +++ b/src/slang-nodes/FallbackFunctionAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { FallbackFunctionAttribute } from './FallbackFunctionAttribute.js'; diff --git a/src/slang-nodes/FallbackFunctionDefinition.ts b/src/slang-nodes/FallbackFunctionDefinition.ts index 4504370b5..99f6ec044 100644 --- a/src/slang-nodes/FallbackFunctionDefinition.ts +++ b/src/slang-nodes/FallbackFunctionDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/ForStatement.ts b/src/slang-nodes/ForStatement.ts index 26d3cb9ca..51d37babb 100644 --- a/src/slang-nodes/ForStatement.ts +++ b/src/slang-nodes/ForStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/ForStatementCondition.ts b/src/slang-nodes/ForStatementCondition.ts index 4aae16e23..093c2f105 100644 --- a/src/slang-nodes/ForStatementCondition.ts +++ b/src/slang-nodes/ForStatementCondition.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ExpressionStatement } from './ExpressionStatement.js'; diff --git a/src/slang-nodes/ForStatementInitialization.ts b/src/slang-nodes/ForStatementInitialization.ts index 95a7a879d..2926bc8ca 100644 --- a/src/slang-nodes/ForStatementInitialization.ts +++ b/src/slang-nodes/ForStatementInitialization.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ExpressionStatement } from './ExpressionStatement.js'; import { VariableDeclarationStatement } from './VariableDeclarationStatement.js'; diff --git a/src/slang-nodes/FunctionAttribute.ts b/src/slang-nodes/FunctionAttribute.ts index 55769bb44..43ce3696b 100644 --- a/src/slang-nodes/FunctionAttribute.ts +++ b/src/slang-nodes/FunctionAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ModifierInvocation } from './ModifierInvocation.js'; import { OverrideSpecifier } from './OverrideSpecifier.js'; diff --git a/src/slang-nodes/FunctionAttributes.ts b/src/slang-nodes/FunctionAttributes.ts index 6ecac12b4..d8dad9baf 100644 --- a/src/slang-nodes/FunctionAttributes.ts +++ b/src/slang-nodes/FunctionAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { FunctionAttribute } from './FunctionAttribute.js'; diff --git a/src/slang-nodes/FunctionBody.ts b/src/slang-nodes/FunctionBody.ts index 9ab675215..793b19ec3 100644 --- a/src/slang-nodes/FunctionBody.ts +++ b/src/slang-nodes/FunctionBody.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { Block } from './Block.js'; diff --git a/src/slang-nodes/FunctionCallExpression.ts b/src/slang-nodes/FunctionCallExpression.ts index 7facaa062..636e47b03 100644 --- a/src/slang-nodes/FunctionCallExpression.ts +++ b/src/slang-nodes/FunctionCallExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { isLabel } from '../slang-utils/is-label.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/FunctionDefinition.ts b/src/slang-nodes/FunctionDefinition.ts index 077e79d82..687397fbb 100644 --- a/src/slang-nodes/FunctionDefinition.ts +++ b/src/slang-nodes/FunctionDefinition.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { satisfies } from 'semver'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { FunctionName } from './FunctionName.js'; diff --git a/src/slang-nodes/FunctionName.ts b/src/slang-nodes/FunctionName.ts index aadb33458..2697ac389 100644 --- a/src/slang-nodes/FunctionName.ts +++ b/src/slang-nodes/FunctionName.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/FunctionType.ts b/src/slang-nodes/FunctionType.ts index 5480767e0..fe7ee08c6 100644 --- a/src/slang-nodes/FunctionType.ts +++ b/src/slang-nodes/FunctionType.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/FunctionTypeAttribute.ts b/src/slang-nodes/FunctionTypeAttribute.ts index a0c4efb8f..1e1e2333b 100644 --- a/src/slang-nodes/FunctionTypeAttribute.ts +++ b/src/slang-nodes/FunctionTypeAttribute.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/FunctionTypeAttributes.ts b/src/slang-nodes/FunctionTypeAttributes.ts index 06a17acfe..f35a890e7 100644 --- a/src/slang-nodes/FunctionTypeAttributes.ts +++ b/src/slang-nodes/FunctionTypeAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { FunctionTypeAttribute } from './FunctionTypeAttribute.js'; diff --git a/src/slang-nodes/HexNumberExpression.ts b/src/slang-nodes/HexNumberExpression.ts index 1308f9c5f..4ef68e63d 100644 --- a/src/slang-nodes/HexNumberExpression.ts +++ b/src/slang-nodes/HexNumberExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { NumberUnit } from './NumberUnit.js'; diff --git a/src/slang-nodes/HexStringLiteral.ts b/src/slang-nodes/HexStringLiteral.ts index d2f0b767c..8e7241b40 100644 --- a/src/slang-nodes/HexStringLiteral.ts +++ b/src/slang-nodes/HexStringLiteral.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printString } from '../slang-printers/print-string.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/HexStringLiterals.ts b/src/slang-nodes/HexStringLiterals.ts index 1b6fefed9..f1f79b3f0 100644 --- a/src/slang-nodes/HexStringLiterals.ts +++ b/src/slang-nodes/HexStringLiterals.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { HexStringLiteral } from './HexStringLiteral.js'; diff --git a/src/slang-nodes/Identifier.ts b/src/slang-nodes/Identifier.ts index 4adeef1b0..fdc576bb5 100644 --- a/src/slang-nodes/Identifier.ts +++ b/src/slang-nodes/Identifier.ts @@ -1,6 +1,7 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; export class Identifier extends SlangNode { diff --git a/src/slang-nodes/IdentifierPath.ts b/src/slang-nodes/IdentifierPath.ts index 5406c7909..d160916eb 100644 --- a/src/slang-nodes/IdentifierPath.ts +++ b/src/slang-nodes/IdentifierPath.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/IfStatement.ts b/src/slang-nodes/IfStatement.ts index ddbf54446..2b17799d3 100644 --- a/src/slang-nodes/IfStatement.ts +++ b/src/slang-nodes/IfStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { isBlockComment } from '../slang-utils/is-comment.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/ImportAlias.ts b/src/slang-nodes/ImportAlias.ts index 0287674d5..e71c90e35 100644 --- a/src/slang-nodes/ImportAlias.ts +++ b/src/slang-nodes/ImportAlias.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/ImportClause.ts b/src/slang-nodes/ImportClause.ts index 945229810..107d2413f 100644 --- a/src/slang-nodes/ImportClause.ts +++ b/src/slang-nodes/ImportClause.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { PathImport } from './PathImport.js'; import { NamedImport } from './NamedImport.js'; diff --git a/src/slang-nodes/ImportDeconstruction.ts b/src/slang-nodes/ImportDeconstruction.ts index c8a6ff140..bf3259225 100644 --- a/src/slang-nodes/ImportDeconstruction.ts +++ b/src/slang-nodes/ImportDeconstruction.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ImportDeconstructionSymbols } from './ImportDeconstructionSymbols.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/ImportDeconstructionSymbol.ts b/src/slang-nodes/ImportDeconstructionSymbol.ts index 250a28c1d..f69c976b1 100644 --- a/src/slang-nodes/ImportDeconstructionSymbol.ts +++ b/src/slang-nodes/ImportDeconstructionSymbol.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { ImportAlias } from './ImportAlias.js'; diff --git a/src/slang-nodes/ImportDeconstructionSymbols.ts b/src/slang-nodes/ImportDeconstructionSymbols.ts index a5ebf0f7b..5cde7dbac 100644 --- a/src/slang-nodes/ImportDeconstructionSymbols.ts +++ b/src/slang-nodes/ImportDeconstructionSymbols.ts @@ -1,6 +1,6 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { satisfies } from 'semver'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { ImportDeconstructionSymbol } from './ImportDeconstructionSymbol.js'; diff --git a/src/slang-nodes/ImportDirective.ts b/src/slang-nodes/ImportDirective.ts index 1ae6051b3..596701a2e 100644 --- a/src/slang-nodes/ImportDirective.ts +++ b/src/slang-nodes/ImportDirective.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ImportClause } from './ImportClause.js'; diff --git a/src/slang-nodes/IndexAccessEnd.ts b/src/slang-nodes/IndexAccessEnd.ts index a90194910..1dc0f47aa 100644 --- a/src/slang-nodes/IndexAccessEnd.ts +++ b/src/slang-nodes/IndexAccessEnd.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/IndexAccessExpression.ts b/src/slang-nodes/IndexAccessExpression.ts index 4efc5a4dc..0d1529806 100644 --- a/src/slang-nodes/IndexAccessExpression.ts +++ b/src/slang-nodes/IndexAccessExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { isLabel } from '../slang-utils/is-label.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/InequalityExpression.ts b/src/slang-nodes/InequalityExpression.ts index 5af48cc66..9c3f67669 100644 --- a/src/slang-nodes/InequalityExpression.ts +++ b/src/slang-nodes/InequalityExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/InheritanceSpecifier.ts b/src/slang-nodes/InheritanceSpecifier.ts index 48bf09f8d..e25172e8a 100644 --- a/src/slang-nodes/InheritanceSpecifier.ts +++ b/src/slang-nodes/InheritanceSpecifier.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { InheritanceTypes } from './InheritanceTypes.js'; diff --git a/src/slang-nodes/InheritanceType.ts b/src/slang-nodes/InheritanceType.ts index e66839012..77a866b6f 100644 --- a/src/slang-nodes/InheritanceType.ts +++ b/src/slang-nodes/InheritanceType.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; import { ArgumentsDeclaration } from './ArgumentsDeclaration.js'; diff --git a/src/slang-nodes/InheritanceTypes.ts b/src/slang-nodes/InheritanceTypes.ts index e9b04e66d..2027daeca 100644 --- a/src/slang-nodes/InheritanceTypes.ts +++ b/src/slang-nodes/InheritanceTypes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { InheritanceType } from './InheritanceType.js'; diff --git a/src/slang-nodes/InterfaceDefinition.ts b/src/slang-nodes/InterfaceDefinition.ts index 547668125..d1e806e35 100644 --- a/src/slang-nodes/InterfaceDefinition.ts +++ b/src/slang-nodes/InterfaceDefinition.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { InheritanceSpecifier } from './InheritanceSpecifier.js'; diff --git a/src/slang-nodes/InterfaceMembers.ts b/src/slang-nodes/InterfaceMembers.ts index 6ee398a26..cb532f196 100644 --- a/src/slang-nodes/InterfaceMembers.ts +++ b/src/slang-nodes/InterfaceMembers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/LibraryDefinition.ts b/src/slang-nodes/LibraryDefinition.ts index 01fff5014..2a2d59b4e 100644 --- a/src/slang-nodes/LibraryDefinition.ts +++ b/src/slang-nodes/LibraryDefinition.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { LibraryMembers } from './LibraryMembers.js'; diff --git a/src/slang-nodes/LibraryMembers.ts b/src/slang-nodes/LibraryMembers.ts index 92ccfd0ed..ee5d554af 100644 --- a/src/slang-nodes/LibraryMembers.ts +++ b/src/slang-nodes/LibraryMembers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/MappingKey.ts b/src/slang-nodes/MappingKey.ts index 6b35477d2..8e47172f0 100644 --- a/src/slang-nodes/MappingKey.ts +++ b/src/slang-nodes/MappingKey.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { MappingKeyType } from './MappingKeyType.js'; diff --git a/src/slang-nodes/MappingKeyType.ts b/src/slang-nodes/MappingKeyType.ts index c2b25067e..3f6159c0e 100644 --- a/src/slang-nodes/MappingKeyType.ts +++ b/src/slang-nodes/MappingKeyType.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ElementaryType } from './ElementaryType.js'; import { IdentifierPath } from './IdentifierPath.js'; diff --git a/src/slang-nodes/MappingType.ts b/src/slang-nodes/MappingType.ts index 3a95e54f0..ab6b2649b 100644 --- a/src/slang-nodes/MappingType.ts +++ b/src/slang-nodes/MappingType.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { MappingKey } from './MappingKey.js'; import { MappingValue } from './MappingValue.js'; diff --git a/src/slang-nodes/MappingValue.ts b/src/slang-nodes/MappingValue.ts index 5b266d5d5..0a8358a66 100644 --- a/src/slang-nodes/MappingValue.ts +++ b/src/slang-nodes/MappingValue.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/MemberAccessExpression.ts b/src/slang-nodes/MemberAccessExpression.ts index f71e1782c..7ce4d28d5 100644 --- a/src/slang-nodes/MemberAccessExpression.ts +++ b/src/slang-nodes/MemberAccessExpression.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { isLabel } from '../slang-utils/is-label.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/ModifierAttribute.ts b/src/slang-nodes/ModifierAttribute.ts index e49c3e2e4..5db1a624f 100644 --- a/src/slang-nodes/ModifierAttribute.ts +++ b/src/slang-nodes/ModifierAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { OverrideSpecifier } from './OverrideSpecifier.js'; diff --git a/src/slang-nodes/ModifierAttributes.ts b/src/slang-nodes/ModifierAttributes.ts index 6340fdb4d..abee01cc8 100644 --- a/src/slang-nodes/ModifierAttributes.ts +++ b/src/slang-nodes/ModifierAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { ModifierAttribute } from './ModifierAttribute.js'; diff --git a/src/slang-nodes/ModifierDefinition.ts b/src/slang-nodes/ModifierDefinition.ts index dc290a8eb..a2c381ac8 100644 --- a/src/slang-nodes/ModifierDefinition.ts +++ b/src/slang-nodes/ModifierDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/ModifierInvocation.ts b/src/slang-nodes/ModifierInvocation.ts index b5404623b..a187cb2a4 100644 --- a/src/slang-nodes/ModifierInvocation.ts +++ b/src/slang-nodes/ModifierInvocation.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; import { ArgumentsDeclaration } from './ArgumentsDeclaration.js'; diff --git a/src/slang-nodes/MultiLineComment.ts b/src/slang-nodes/MultiLineComment.ts index 307d89f7f..0e416455a 100644 --- a/src/slang-nodes/MultiLineComment.ts +++ b/src/slang-nodes/MultiLineComment.ts @@ -1,9 +1,10 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { CommentNode } from './CommentNode.js'; import { isIndentableBlockComment } from '../slang-utils/is-indentable-block-comment.js'; import { printIndentableBlockComment } from '../slang-printers/print-indentable-block-comment.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; const { join, literalline } = doc.builders; diff --git a/src/slang-nodes/MultiLineNatSpecComment.ts b/src/slang-nodes/MultiLineNatSpecComment.ts index 0881c823f..b3378fac4 100644 --- a/src/slang-nodes/MultiLineNatSpecComment.ts +++ b/src/slang-nodes/MultiLineNatSpecComment.ts @@ -1,9 +1,10 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { CommentNode } from './CommentNode.js'; import { isIndentableBlockComment } from '../slang-utils/is-indentable-block-comment.js'; import { printIndentableBlockComment } from '../slang-printers/print-indentable-block-comment.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; const { join, literalline } = doc.builders; diff --git a/src/slang-nodes/MultiplicativeExpression.ts b/src/slang-nodes/MultiplicativeExpression.ts index 6c31ccfa8..254d94822 100644 --- a/src/slang-nodes/MultiplicativeExpression.ts +++ b/src/slang-nodes/MultiplicativeExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/NamedArgument.ts b/src/slang-nodes/NamedArgument.ts index 3d00709f8..671f66d77 100644 --- a/src/slang-nodes/NamedArgument.ts +++ b/src/slang-nodes/NamedArgument.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/NamedArgumentGroup.ts b/src/slang-nodes/NamedArgumentGroup.ts index a2631867e..5c5c243a4 100644 --- a/src/slang-nodes/NamedArgumentGroup.ts +++ b/src/slang-nodes/NamedArgumentGroup.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { NamedArguments } from './NamedArguments.js'; diff --git a/src/slang-nodes/NamedArguments.ts b/src/slang-nodes/NamedArguments.ts index 521f40ece..4b1fe3a94 100644 --- a/src/slang-nodes/NamedArguments.ts +++ b/src/slang-nodes/NamedArguments.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { NamedArgument } from './NamedArgument.js'; diff --git a/src/slang-nodes/NamedArgumentsDeclaration.ts b/src/slang-nodes/NamedArgumentsDeclaration.ts index ca321b7b3..dca1885bf 100644 --- a/src/slang-nodes/NamedArgumentsDeclaration.ts +++ b/src/slang-nodes/NamedArgumentsDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { NamedArgumentGroup } from './NamedArgumentGroup.js'; diff --git a/src/slang-nodes/NamedImport.ts b/src/slang-nodes/NamedImport.ts index 9c91b1d9b..bc0c98f21 100644 --- a/src/slang-nodes/NamedImport.ts +++ b/src/slang-nodes/NamedImport.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ImportAlias } from './ImportAlias.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/NewExpression.ts b/src/slang-nodes/NewExpression.ts index 0c40af11d..4ff777188 100644 --- a/src/slang-nodes/NewExpression.ts +++ b/src/slang-nodes/NewExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/NumberUnit.ts b/src/slang-nodes/NumberUnit.ts index 6bfb73f81..03f966b1b 100644 --- a/src/slang-nodes/NumberUnit.ts +++ b/src/slang-nodes/NumberUnit.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/OrExpression.ts b/src/slang-nodes/OrExpression.ts index 432e876c0..2d43cbf1a 100644 --- a/src/slang-nodes/OrExpression.ts +++ b/src/slang-nodes/OrExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printLogicalOperation } from '../slang-printers/print-logical-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/OverridePaths.ts b/src/slang-nodes/OverridePaths.ts index 3feb11dd1..4363dab14 100644 --- a/src/slang-nodes/OverridePaths.ts +++ b/src/slang-nodes/OverridePaths.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; diff --git a/src/slang-nodes/OverridePathsDeclaration.ts b/src/slang-nodes/OverridePathsDeclaration.ts index 8335f117f..442e1d23d 100644 --- a/src/slang-nodes/OverridePathsDeclaration.ts +++ b/src/slang-nodes/OverridePathsDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { OverridePaths } from './OverridePaths.js'; diff --git a/src/slang-nodes/OverrideSpecifier.ts b/src/slang-nodes/OverrideSpecifier.ts index fe6971762..bb6ffdc9c 100644 --- a/src/slang-nodes/OverrideSpecifier.ts +++ b/src/slang-nodes/OverrideSpecifier.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { OverridePathsDeclaration } from './OverridePathsDeclaration.js'; diff --git a/src/slang-nodes/Parameter.ts b/src/slang-nodes/Parameter.ts index 45b693048..a99cef525 100644 --- a/src/slang-nodes/Parameter.ts +++ b/src/slang-nodes/Parameter.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/Parameters.ts b/src/slang-nodes/Parameters.ts index 9d95fabd7..fde91063b 100644 --- a/src/slang-nodes/Parameters.ts +++ b/src/slang-nodes/Parameters.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printComments } from '../slang-printers/print-comments.js'; diff --git a/src/slang-nodes/ParametersDeclaration.ts b/src/slang-nodes/ParametersDeclaration.ts index 433289d5b..f4816f454 100644 --- a/src/slang-nodes/ParametersDeclaration.ts +++ b/src/slang-nodes/ParametersDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Parameters } from './Parameters.js'; diff --git a/src/slang-nodes/PathImport.ts b/src/slang-nodes/PathImport.ts index bd4442dbe..1b0b4cf5d 100644 --- a/src/slang-nodes/PathImport.ts +++ b/src/slang-nodes/PathImport.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; import { ImportAlias } from './ImportAlias.js'; diff --git a/src/slang-nodes/PositionalArguments.ts b/src/slang-nodes/PositionalArguments.ts index 51a198e73..d6d0b6bd7 100644 --- a/src/slang-nodes/PositionalArguments.ts +++ b/src/slang-nodes/PositionalArguments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printComments } from '../slang-printers/print-comments.js'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; diff --git a/src/slang-nodes/PositionalArgumentsDeclaration.ts b/src/slang-nodes/PositionalArgumentsDeclaration.ts index 01f7871b3..a149215f8 100644 --- a/src/slang-nodes/PositionalArgumentsDeclaration.ts +++ b/src/slang-nodes/PositionalArgumentsDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { isBlockComment } from '../slang-utils/is-comment.js'; import { SlangNode } from './SlangNode.js'; import { PositionalArguments } from './PositionalArguments.js'; diff --git a/src/slang-nodes/PostfixExpression.ts b/src/slang-nodes/PostfixExpression.ts index a6dfcad49..38e48abbf 100644 --- a/src/slang-nodes/PostfixExpression.ts +++ b/src/slang-nodes/PostfixExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/Pragma.ts b/src/slang-nodes/Pragma.ts index 00f8ed5b4..5060f03c7 100644 --- a/src/slang-nodes/Pragma.ts +++ b/src/slang-nodes/Pragma.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { AbicoderPragma } from './AbicoderPragma.js'; import { ExperimentalPragma } from './ExperimentalPragma.js'; diff --git a/src/slang-nodes/PragmaDirective.ts b/src/slang-nodes/PragmaDirective.ts index 071411bb8..e97276231 100644 --- a/src/slang-nodes/PragmaDirective.ts +++ b/src/slang-nodes/PragmaDirective.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Pragma } from './Pragma.js'; diff --git a/src/slang-nodes/PrefixExpression.ts b/src/slang-nodes/PrefixExpression.ts index 6e278f3ae..e069fcfc1 100644 --- a/src/slang-nodes/PrefixExpression.ts +++ b/src/slang-nodes/PrefixExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/ReceiveFunctionAttribute.ts b/src/slang-nodes/ReceiveFunctionAttribute.ts index 5c6138663..4955699d2 100644 --- a/src/slang-nodes/ReceiveFunctionAttribute.ts +++ b/src/slang-nodes/ReceiveFunctionAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ModifierInvocation } from './ModifierInvocation.js'; import { OverrideSpecifier } from './OverrideSpecifier.js'; diff --git a/src/slang-nodes/ReceiveFunctionAttributes.ts b/src/slang-nodes/ReceiveFunctionAttributes.ts index 7ec5c13a4..208f51d02 100644 --- a/src/slang-nodes/ReceiveFunctionAttributes.ts +++ b/src/slang-nodes/ReceiveFunctionAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { ReceiveFunctionAttribute } from './ReceiveFunctionAttribute.js'; diff --git a/src/slang-nodes/ReceiveFunctionDefinition.ts b/src/slang-nodes/ReceiveFunctionDefinition.ts index b3637aaf4..c5465dc2a 100644 --- a/src/slang-nodes/ReceiveFunctionDefinition.ts +++ b/src/slang-nodes/ReceiveFunctionDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/ReturnStatement.ts b/src/slang-nodes/ReturnStatement.ts index 8523d0f4f..5f295b766 100644 --- a/src/slang-nodes/ReturnStatement.ts +++ b/src/slang-nodes/ReturnStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/ReturnsDeclaration.ts b/src/slang-nodes/ReturnsDeclaration.ts index 939609dc9..a5d81d451 100644 --- a/src/slang-nodes/ReturnsDeclaration.ts +++ b/src/slang-nodes/ReturnsDeclaration.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/RevertStatement.ts b/src/slang-nodes/RevertStatement.ts index 3beadb315..96ee4c26d 100644 --- a/src/slang-nodes/RevertStatement.ts +++ b/src/slang-nodes/RevertStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; diff --git a/src/slang-nodes/ShiftExpression.ts b/src/slang-nodes/ShiftExpression.ts index 4292fd367..e6a86eabb 100644 --- a/src/slang-nodes/ShiftExpression.ts +++ b/src/slang-nodes/ShiftExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printBinaryOperation } from '../slang-printers/print-binary-operation.js'; import { createHugFunction } from '../slang-utils/create-hug-function.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-nodes/SimpleVersionLiteral.ts b/src/slang-nodes/SimpleVersionLiteral.ts index 4e65775d0..47c019729 100644 --- a/src/slang-nodes/SimpleVersionLiteral.ts +++ b/src/slang-nodes/SimpleVersionLiteral.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/SingleLineComment.ts b/src/slang-nodes/SingleLineComment.ts index 68958761e..2a1fe174a 100644 --- a/src/slang-nodes/SingleLineComment.ts +++ b/src/slang-nodes/SingleLineComment.ts @@ -1,6 +1,7 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { CommentNode } from './CommentNode.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; export class SingleLineComment extends CommentNode { diff --git a/src/slang-nodes/SingleLineNatSpecComment.ts b/src/slang-nodes/SingleLineNatSpecComment.ts index ccafa2443..b13b87497 100644 --- a/src/slang-nodes/SingleLineNatSpecComment.ts +++ b/src/slang-nodes/SingleLineNatSpecComment.ts @@ -1,6 +1,7 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { CommentNode } from './CommentNode.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; export class SingleLineNatSpecComment extends CommentNode { diff --git a/src/slang-nodes/SlangNode.ts b/src/slang-nodes/SlangNode.ts index 4a9d936cf..139458a4f 100644 --- a/src/slang-nodes/SlangNode.ts +++ b/src/slang-nodes/SlangNode.ts @@ -1,11 +1,16 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; import { MultiLineComment } from '../slang-nodes/MultiLineComment.js'; import { MultiLineNatSpecComment } from '../slang-nodes/MultiLineNatSpecComment.js'; import { SingleLineComment } from '../slang-nodes/SingleLineComment.js'; import { SingleLineNatSpecComment } from '../slang-nodes/SingleLineNatSpecComment.js'; -import type { Edge } from '@nomicfoundation/slang/cst'; +import type { + Edge, + TerminalNode as TerminalNodeType +} from '@nomicfoundation/slang/cst'; import type { Comment, StrictAstNode } from '../slang-nodes/types.d.ts'; import type { AstLocation, SlangAstNode } from '../types.d.ts'; @@ -71,7 +76,7 @@ export class SlangNode { loc: AstLocation; constructor( - ast: SlangAstNode | TerminalNode, + ast: SlangAstNode | TerminalNodeType, enclosePeripheralComments = false ) { if (ast instanceof TerminalNode) { diff --git a/src/slang-nodes/SourceUnit.ts b/src/slang-nodes/SourceUnit.ts index 56a3e5f55..e1abc2b54 100644 --- a/src/slang-nodes/SourceUnit.ts +++ b/src/slang-nodes/SourceUnit.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { SourceUnitMembers } from './SourceUnitMembers.js'; diff --git a/src/slang-nodes/SourceUnitMember.ts b/src/slang-nodes/SourceUnitMember.ts index 9a61b639e..a031e475c 100644 --- a/src/slang-nodes/SourceUnitMember.ts +++ b/src/slang-nodes/SourceUnitMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { PragmaDirective } from './PragmaDirective.js'; import { ImportDirective } from './ImportDirective.js'; diff --git a/src/slang-nodes/SourceUnitMembers.ts b/src/slang-nodes/SourceUnitMembers.ts index 6f60c9e42..a0c853f20 100644 --- a/src/slang-nodes/SourceUnitMembers.ts +++ b/src/slang-nodes/SourceUnitMembers.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; import { SlangNode } from './SlangNode.js'; import { SourceUnitMember } from './SourceUnitMember.js'; diff --git a/src/slang-nodes/StateVariableAttribute.ts b/src/slang-nodes/StateVariableAttribute.ts index b25a90968..eb478f8c0 100644 --- a/src/slang-nodes/StateVariableAttribute.ts +++ b/src/slang-nodes/StateVariableAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { OverrideSpecifier } from './OverrideSpecifier.js'; diff --git a/src/slang-nodes/StateVariableAttributes.ts b/src/slang-nodes/StateVariableAttributes.ts index f59439def..f9d243275 100644 --- a/src/slang-nodes/StateVariableAttributes.ts +++ b/src/slang-nodes/StateVariableAttributes.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/StateVariableDefinition.ts b/src/slang-nodes/StateVariableDefinition.ts index a8b406716..f2c459415 100644 --- a/src/slang-nodes/StateVariableDefinition.ts +++ b/src/slang-nodes/StateVariableDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/StateVariableDefinitionValue.ts b/src/slang-nodes/StateVariableDefinitionValue.ts index 77ef4c41f..97e11f191 100644 --- a/src/slang-nodes/StateVariableDefinitionValue.ts +++ b/src/slang-nodes/StateVariableDefinitionValue.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/Statement.ts b/src/slang-nodes/Statement.ts index 293dbdc00..a4456b5e0 100644 --- a/src/slang-nodes/Statement.ts +++ b/src/slang-nodes/Statement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ExpressionStatement } from './ExpressionStatement.js'; import { VariableDeclarationStatement } from './VariableDeclarationStatement.js'; diff --git a/src/slang-nodes/Statements.ts b/src/slang-nodes/Statements.ts index 0c32e3c18..ca66b438b 100644 --- a/src/slang-nodes/Statements.ts +++ b/src/slang-nodes/Statements.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printComments } from '../slang-printers/print-comments.js'; import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; diff --git a/src/slang-nodes/StorageLayoutSpecifier.ts b/src/slang-nodes/StorageLayoutSpecifier.ts index 5dda52a3f..8f9a134d0 100644 --- a/src/slang-nodes/StorageLayoutSpecifier.ts +++ b/src/slang-nodes/StorageLayoutSpecifier.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/StorageLocation.ts b/src/slang-nodes/StorageLocation.ts index 64d048a03..fa2613264 100644 --- a/src/slang-nodes/StorageLocation.ts +++ b/src/slang-nodes/StorageLocation.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/StringExpression.ts b/src/slang-nodes/StringExpression.ts index fb4563d0c..d9cf7a854 100644 --- a/src/slang-nodes/StringExpression.ts +++ b/src/slang-nodes/StringExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; import { StringLiterals } from './StringLiterals.js'; diff --git a/src/slang-nodes/StringLiteral.ts b/src/slang-nodes/StringLiteral.ts index aee53e230..f25f63215 100644 --- a/src/slang-nodes/StringLiteral.ts +++ b/src/slang-nodes/StringLiteral.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printString } from '../slang-printers/print-string.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/StringLiterals.ts b/src/slang-nodes/StringLiterals.ts index a99d3ca48..54c265887 100644 --- a/src/slang-nodes/StringLiterals.ts +++ b/src/slang-nodes/StringLiterals.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/StructDefinition.ts b/src/slang-nodes/StructDefinition.ts index 3ad3a4c00..65ad9cce8 100644 --- a/src/slang-nodes/StructDefinition.ts +++ b/src/slang-nodes/StructDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { StructMembers } from './StructMembers.js'; diff --git a/src/slang-nodes/StructMember.ts b/src/slang-nodes/StructMember.ts index a6e5e5f91..881fa1dd7 100644 --- a/src/slang-nodes/StructMember.ts +++ b/src/slang-nodes/StructMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; import { Identifier } from './Identifier.js'; diff --git a/src/slang-nodes/StructMembers.ts b/src/slang-nodes/StructMembers.ts index 2d8a8060c..365f56707 100644 --- a/src/slang-nodes/StructMembers.ts +++ b/src/slang-nodes/StructMembers.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { StructMember } from './StructMember.js'; diff --git a/src/slang-nodes/ThrowStatement.ts b/src/slang-nodes/ThrowStatement.ts index c59252f59..332fe0b10 100644 --- a/src/slang-nodes/ThrowStatement.ts +++ b/src/slang-nodes/ThrowStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/TryStatement.ts b/src/slang-nodes/TryStatement.ts index cbc00714f..343724061 100644 --- a/src/slang-nodes/TryStatement.ts +++ b/src/slang-nodes/TryStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/TupleDeconstructionElement.ts b/src/slang-nodes/TupleDeconstructionElement.ts index 615baca72..f40ffba2d 100644 --- a/src/slang-nodes/TupleDeconstructionElement.ts +++ b/src/slang-nodes/TupleDeconstructionElement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TupleMember } from './TupleMember.js'; diff --git a/src/slang-nodes/TupleDeconstructionElements.ts b/src/slang-nodes/TupleDeconstructionElements.ts index 674f62a4f..0bf54fb5e 100644 --- a/src/slang-nodes/TupleDeconstructionElements.ts +++ b/src/slang-nodes/TupleDeconstructionElements.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { TupleDeconstructionElement } from './TupleDeconstructionElement.js'; diff --git a/src/slang-nodes/TupleDeconstructionStatement.ts b/src/slang-nodes/TupleDeconstructionStatement.ts index 74e167602..5de494ec2 100644 --- a/src/slang-nodes/TupleDeconstructionStatement.ts +++ b/src/slang-nodes/TupleDeconstructionStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { TupleDeconstructionElements } from './TupleDeconstructionElements.js'; diff --git a/src/slang-nodes/TupleExpression.ts b/src/slang-nodes/TupleExpression.ts index d3c75a086..d04177460 100644 --- a/src/slang-nodes/TupleExpression.ts +++ b/src/slang-nodes/TupleExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TupleValues } from './TupleValues.js'; diff --git a/src/slang-nodes/TupleMember.ts b/src/slang-nodes/TupleMember.ts index 31f84a284..0876e16a0 100644 --- a/src/slang-nodes/TupleMember.ts +++ b/src/slang-nodes/TupleMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypedTupleMember } from './TypedTupleMember.js'; import { UntypedTupleMember } from './UntypedTupleMember.js'; diff --git a/src/slang-nodes/TupleValue.ts b/src/slang-nodes/TupleValue.ts index bb4acbd2a..dad78fd40 100644 --- a/src/slang-nodes/TupleValue.ts +++ b/src/slang-nodes/TupleValue.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/TupleValues.ts b/src/slang-nodes/TupleValues.ts index 686dca1b0..9a59730c7 100644 --- a/src/slang-nodes/TupleValues.ts +++ b/src/slang-nodes/TupleValues.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind } = await import( + '@nomicfoundation/slang/cst' +); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { isBinaryOperation } from '../slang-utils/is-binary-operation.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/TypeExpression.ts b/src/slang-nodes/TypeExpression.ts index 80b76dcbc..af631abba 100644 --- a/src/slang-nodes/TypeExpression.ts +++ b/src/slang-nodes/TypeExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/TypeName.ts b/src/slang-nodes/TypeName.ts index 75aa619f4..eebba83e0 100644 --- a/src/slang-nodes/TypeName.ts +++ b/src/slang-nodes/TypeName.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { ArrayTypeName } from './ArrayTypeName.js'; import { FunctionType } from './FunctionType.js'; diff --git a/src/slang-nodes/TypedTupleMember.ts b/src/slang-nodes/TypedTupleMember.ts index 691f05445..b1959ca96 100644 --- a/src/slang-nodes/TypedTupleMember.ts +++ b/src/slang-nodes/TypedTupleMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/UncheckedBlock.ts b/src/slang-nodes/UncheckedBlock.ts index 3f8fee8e0..c1a559a4e 100644 --- a/src/slang-nodes/UncheckedBlock.ts +++ b/src/slang-nodes/UncheckedBlock.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Block } from './Block.js'; diff --git a/src/slang-nodes/UnicodeStringLiteral.ts b/src/slang-nodes/UnicodeStringLiteral.ts index 68144b674..f45ca74b8 100644 --- a/src/slang-nodes/UnicodeStringLiteral.ts +++ b/src/slang-nodes/UnicodeStringLiteral.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printString } from '../slang-printers/print-string.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/UnicodeStringLiterals.ts b/src/slang-nodes/UnicodeStringLiterals.ts index 025957424..3e2e7e41d 100644 --- a/src/slang-nodes/UnicodeStringLiterals.ts +++ b/src/slang-nodes/UnicodeStringLiterals.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { UnicodeStringLiteral } from './UnicodeStringLiteral.js'; diff --git a/src/slang-nodes/UnnamedFunctionAttribute.ts b/src/slang-nodes/UnnamedFunctionAttribute.ts index d25bbc7de..a982deef5 100644 --- a/src/slang-nodes/UnnamedFunctionAttribute.ts +++ b/src/slang-nodes/UnnamedFunctionAttribute.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { ModifierInvocation } from './ModifierInvocation.js'; diff --git a/src/slang-nodes/UnnamedFunctionAttributes.ts b/src/slang-nodes/UnnamedFunctionAttributes.ts index 82f45d924..224b35620 100644 --- a/src/slang-nodes/UnnamedFunctionAttributes.ts +++ b/src/slang-nodes/UnnamedFunctionAttributes.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js'; import { SlangNode } from './SlangNode.js'; import { UnnamedFunctionAttribute } from './UnnamedFunctionAttribute.js'; diff --git a/src/slang-nodes/UnnamedFunctionDefinition.ts b/src/slang-nodes/UnnamedFunctionDefinition.ts index ca235104f..f4bc9d3cd 100644 --- a/src/slang-nodes/UnnamedFunctionDefinition.ts +++ b/src/slang-nodes/UnnamedFunctionDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printFunction } from '../slang-printers/print-function.js'; import { SlangNode } from './SlangNode.js'; import { ParametersDeclaration } from './ParametersDeclaration.js'; diff --git a/src/slang-nodes/UntypedTupleMember.ts b/src/slang-nodes/UntypedTupleMember.ts index bdd157831..685daf3a5 100644 --- a/src/slang-nodes/UntypedTupleMember.ts +++ b/src/slang-nodes/UntypedTupleMember.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { StorageLocation } from './StorageLocation.js'; diff --git a/src/slang-nodes/UserDefinedValueTypeDefinition.ts b/src/slang-nodes/UserDefinedValueTypeDefinition.ts index 3bdd73c08..ee6f9e3ea 100644 --- a/src/slang-nodes/UserDefinedValueTypeDefinition.ts +++ b/src/slang-nodes/UserDefinedValueTypeDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Identifier } from './Identifier.js'; import { ElementaryType } from './ElementaryType.js'; diff --git a/src/slang-nodes/UsingAlias.ts b/src/slang-nodes/UsingAlias.ts index f1823b6c4..0ece6ea86 100644 --- a/src/slang-nodes/UsingAlias.ts +++ b/src/slang-nodes/UsingAlias.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { UsingOperator } from './UsingOperator.js'; diff --git a/src/slang-nodes/UsingClause.ts b/src/slang-nodes/UsingClause.ts index 17ffc5c75..1db128c60 100644 --- a/src/slang-nodes/UsingClause.ts +++ b/src/slang-nodes/UsingClause.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; import { UsingDeconstruction } from './UsingDeconstruction.js'; diff --git a/src/slang-nodes/UsingDeconstruction.ts b/src/slang-nodes/UsingDeconstruction.ts index 940290fc1..347521268 100644 --- a/src/slang-nodes/UsingDeconstruction.ts +++ b/src/slang-nodes/UsingDeconstruction.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { UsingDeconstructionSymbols } from './UsingDeconstructionSymbols.js'; diff --git a/src/slang-nodes/UsingDeconstructionSymbol.ts b/src/slang-nodes/UsingDeconstructionSymbol.ts index 6158ee528..ff2f3c701 100644 --- a/src/slang-nodes/UsingDeconstructionSymbol.ts +++ b/src/slang-nodes/UsingDeconstructionSymbol.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { IdentifierPath } from './IdentifierPath.js'; import { UsingAlias } from './UsingAlias.js'; diff --git a/src/slang-nodes/UsingDeconstructionSymbols.ts b/src/slang-nodes/UsingDeconstructionSymbols.ts index b73d9d3f5..f9772a9c0 100644 --- a/src/slang-nodes/UsingDeconstructionSymbols.ts +++ b/src/slang-nodes/UsingDeconstructionSymbols.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { UsingDeconstructionSymbol } from './UsingDeconstructionSymbol.js'; diff --git a/src/slang-nodes/UsingDirective.ts b/src/slang-nodes/UsingDirective.ts index 6201516d0..099fdda43 100644 --- a/src/slang-nodes/UsingDirective.ts +++ b/src/slang-nodes/UsingDirective.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { UsingClause } from './UsingClause.js'; diff --git a/src/slang-nodes/UsingOperator.ts b/src/slang-nodes/UsingOperator.ts index 48cbbe861..6cf6fba48 100644 --- a/src/slang-nodes/UsingOperator.ts +++ b/src/slang-nodes/UsingOperator.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/UsingTarget.ts b/src/slang-nodes/UsingTarget.ts index 77acd9c0a..bd68353ee 100644 --- a/src/slang-nodes/UsingTarget.ts +++ b/src/slang-nodes/UsingTarget.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/VariableDeclarationStatement.ts b/src/slang-nodes/VariableDeclarationStatement.ts index 4312cc45f..6b8735cbb 100644 --- a/src/slang-nodes/VariableDeclarationStatement.ts +++ b/src/slang-nodes/VariableDeclarationStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { VariableDeclarationType } from './VariableDeclarationType.js'; diff --git a/src/slang-nodes/VariableDeclarationType.ts b/src/slang-nodes/VariableDeclarationType.ts index 7e1f04bb0..c51116132 100644 --- a/src/slang-nodes/VariableDeclarationType.ts +++ b/src/slang-nodes/VariableDeclarationType.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { TypeName } from './TypeName.js'; diff --git a/src/slang-nodes/VariableDeclarationValue.ts b/src/slang-nodes/VariableDeclarationValue.ts index 860a529dd..ec0f672e1 100644 --- a/src/slang-nodes/VariableDeclarationValue.ts +++ b/src/slang-nodes/VariableDeclarationValue.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/VersionExpression.ts b/src/slang-nodes/VersionExpression.ts index 3c87be7ae..96fd3a59b 100644 --- a/src/slang-nodes/VersionExpression.ts +++ b/src/slang-nodes/VersionExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { VersionRange } from './VersionRange.js'; import { VersionTerm } from './VersionTerm.js'; diff --git a/src/slang-nodes/VersionExpressionSet.ts b/src/slang-nodes/VersionExpressionSet.ts index b8a6dc275..228c22483 100644 --- a/src/slang-nodes/VersionExpressionSet.ts +++ b/src/slang-nodes/VersionExpressionSet.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { VersionExpression } from './VersionExpression.js'; diff --git a/src/slang-nodes/VersionExpressionSets.ts b/src/slang-nodes/VersionExpressionSets.ts index 1b880571b..23acc00f1 100644 --- a/src/slang-nodes/VersionExpressionSets.ts +++ b/src/slang-nodes/VersionExpressionSets.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { VersionExpressionSet } from './VersionExpressionSet.js'; diff --git a/src/slang-nodes/VersionLiteral.ts b/src/slang-nodes/VersionLiteral.ts index 2a47b818c..1581a7fb0 100644 --- a/src/slang-nodes/VersionLiteral.ts +++ b/src/slang-nodes/VersionLiteral.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { SimpleVersionLiteral } from './SimpleVersionLiteral.js'; diff --git a/src/slang-nodes/VersionOperator.ts b/src/slang-nodes/VersionOperator.ts index a94a213f0..00f95d61a 100644 --- a/src/slang-nodes/VersionOperator.ts +++ b/src/slang-nodes/VersionOperator.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/VersionPragma.ts b/src/slang-nodes/VersionPragma.ts index 3f7fecf86..efb461fcf 100644 --- a/src/slang-nodes/VersionPragma.ts +++ b/src/slang-nodes/VersionPragma.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { VersionExpressionSets } from './VersionExpressionSets.js'; diff --git a/src/slang-nodes/VersionRange.ts b/src/slang-nodes/VersionRange.ts index 968a69007..57fb73737 100644 --- a/src/slang-nodes/VersionRange.ts +++ b/src/slang-nodes/VersionRange.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { VersionLiteral } from './VersionLiteral.js'; diff --git a/src/slang-nodes/VersionTerm.ts b/src/slang-nodes/VersionTerm.ts index bdba3ee88..646d6a0dd 100644 --- a/src/slang-nodes/VersionTerm.ts +++ b/src/slang-nodes/VersionTerm.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { VersionOperator } from './VersionOperator.js'; import { VersionLiteral } from './VersionLiteral.js'; diff --git a/src/slang-nodes/WhileStatement.ts b/src/slang-nodes/WhileStatement.ts index f303b5ce1..931d07a53 100644 --- a/src/slang-nodes/WhileStatement.ts +++ b/src/slang-nodes/WhileStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; import { Expression } from './Expression.js'; diff --git a/src/slang-nodes/YulArguments.ts b/src/slang-nodes/YulArguments.ts index 69a6539d5..3343c3453 100644 --- a/src/slang-nodes/YulArguments.ts +++ b/src/slang-nodes/YulArguments.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { YulExpression } from './YulExpression.js'; diff --git a/src/slang-nodes/YulAssignmentOperator.ts b/src/slang-nodes/YulAssignmentOperator.ts index ac6be165a..a564a6e4b 100644 --- a/src/slang-nodes/YulAssignmentOperator.ts +++ b/src/slang-nodes/YulAssignmentOperator.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { YulColonAndEqual } from './YulColonAndEqual.js'; diff --git a/src/slang-nodes/YulBlock.ts b/src/slang-nodes/YulBlock.ts index c8dfdf147..9743b01d8 100644 --- a/src/slang-nodes/YulBlock.ts +++ b/src/slang-nodes/YulBlock.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulStatements } from './YulStatements.js'; diff --git a/src/slang-nodes/YulBreakStatement.ts b/src/slang-nodes/YulBreakStatement.ts index 96a48843c..ce7d4451a 100644 --- a/src/slang-nodes/YulBreakStatement.ts +++ b/src/slang-nodes/YulBreakStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/YulColonAndEqual.ts b/src/slang-nodes/YulColonAndEqual.ts index 3e9f49d2f..b2ad63e24 100644 --- a/src/slang-nodes/YulColonAndEqual.ts +++ b/src/slang-nodes/YulColonAndEqual.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/YulContinueStatement.ts b/src/slang-nodes/YulContinueStatement.ts index 93bbd3eb2..0442237b0 100644 --- a/src/slang-nodes/YulContinueStatement.ts +++ b/src/slang-nodes/YulContinueStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/YulDefaultCase.ts b/src/slang-nodes/YulDefaultCase.ts index 0ba6a9389..9cf0cf931 100644 --- a/src/slang-nodes/YulDefaultCase.ts +++ b/src/slang-nodes/YulDefaultCase.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulBlock } from './YulBlock.js'; diff --git a/src/slang-nodes/YulEqualAndColon.ts b/src/slang-nodes/YulEqualAndColon.ts index eac4d384d..5942e7645 100644 --- a/src/slang-nodes/YulEqualAndColon.ts +++ b/src/slang-nodes/YulEqualAndColon.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/YulExpression.ts b/src/slang-nodes/YulExpression.ts index 55dceb456..6403a3b5e 100644 --- a/src/slang-nodes/YulExpression.ts +++ b/src/slang-nodes/YulExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulFunctionCallExpression } from './YulFunctionCallExpression.js'; import { YulLiteral } from './YulLiteral.js'; diff --git a/src/slang-nodes/YulForStatement.ts b/src/slang-nodes/YulForStatement.ts index 1bd85479a..0b9884fed 100644 --- a/src/slang-nodes/YulForStatement.ts +++ b/src/slang-nodes/YulForStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { YulBlock } from './YulBlock.js'; diff --git a/src/slang-nodes/YulFunctionCallExpression.ts b/src/slang-nodes/YulFunctionCallExpression.ts index 43dc99a8d..8acdf7f82 100644 --- a/src/slang-nodes/YulFunctionCallExpression.ts +++ b/src/slang-nodes/YulFunctionCallExpression.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulExpression } from './YulExpression.js'; import { YulArguments } from './YulArguments.js'; diff --git a/src/slang-nodes/YulFunctionDefinition.ts b/src/slang-nodes/YulFunctionDefinition.ts index dbc381e94..f7703343c 100644 --- a/src/slang-nodes/YulFunctionDefinition.ts +++ b/src/slang-nodes/YulFunctionDefinition.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulIdentifier } from './YulIdentifier.js'; import { YulParametersDeclaration } from './YulParametersDeclaration.js'; diff --git a/src/slang-nodes/YulIdentifier.ts b/src/slang-nodes/YulIdentifier.ts index fac6a0d1a..29c1c0e26 100644 --- a/src/slang-nodes/YulIdentifier.ts +++ b/src/slang-nodes/YulIdentifier.ts @@ -1,6 +1,7 @@ -import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; +import type { TerminalNode } from '@nomicfoundation/slang/cst'; import type { Doc } from 'prettier'; export class YulIdentifier extends SlangNode { diff --git a/src/slang-nodes/YulIfStatement.ts b/src/slang-nodes/YulIfStatement.ts index 3b73da5b9..e21a00b95 100644 --- a/src/slang-nodes/YulIfStatement.ts +++ b/src/slang-nodes/YulIfStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulExpression } from './YulExpression.js'; import { YulBlock } from './YulBlock.js'; diff --git a/src/slang-nodes/YulLabel.ts b/src/slang-nodes/YulLabel.ts index 12e12b1df..2b4571af4 100644 --- a/src/slang-nodes/YulLabel.ts +++ b/src/slang-nodes/YulLabel.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { YulIdentifier } from './YulIdentifier.js'; diff --git a/src/slang-nodes/YulLeaveStatement.ts b/src/slang-nodes/YulLeaveStatement.ts index eccf192b8..9a1569d32 100644 --- a/src/slang-nodes/YulLeaveStatement.ts +++ b/src/slang-nodes/YulLeaveStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import type * as ast from '@nomicfoundation/slang/ast'; diff --git a/src/slang-nodes/YulLiteral.ts b/src/slang-nodes/YulLiteral.ts index eeb03505d..ee230ff86 100644 --- a/src/slang-nodes/YulLiteral.ts +++ b/src/slang-nodes/YulLiteral.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { HexStringLiteral } from './HexStringLiteral.js'; import { StringLiteral } from './StringLiteral.js'; diff --git a/src/slang-nodes/YulParameters.ts b/src/slang-nodes/YulParameters.ts index 8492a6352..758c12081 100644 --- a/src/slang-nodes/YulParameters.ts +++ b/src/slang-nodes/YulParameters.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; import { YulIdentifier } from './YulIdentifier.js'; diff --git a/src/slang-nodes/YulParametersDeclaration.ts b/src/slang-nodes/YulParametersDeclaration.ts index 1f283930f..dd2865750 100644 --- a/src/slang-nodes/YulParametersDeclaration.ts +++ b/src/slang-nodes/YulParametersDeclaration.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulParameters } from './YulParameters.js'; diff --git a/src/slang-nodes/YulPath.ts b/src/slang-nodes/YulPath.ts index 6719693f8..37dbaa7cc 100644 --- a/src/slang-nodes/YulPath.ts +++ b/src/slang-nodes/YulPath.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { YulIdentifier } from './YulIdentifier.js'; diff --git a/src/slang-nodes/YulPaths.ts b/src/slang-nodes/YulPaths.ts index 22161d5a7..b4aa23c96 100644 --- a/src/slang-nodes/YulPaths.ts +++ b/src/slang-nodes/YulPaths.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { YulPath } from './YulPath.js'; diff --git a/src/slang-nodes/YulReturnsDeclaration.ts b/src/slang-nodes/YulReturnsDeclaration.ts index 69351ef2e..467e5d390 100644 --- a/src/slang-nodes/YulReturnsDeclaration.ts +++ b/src/slang-nodes/YulReturnsDeclaration.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; import { YulVariableNames } from './YulVariableNames.js'; diff --git a/src/slang-nodes/YulStackAssignmentOperator.ts b/src/slang-nodes/YulStackAssignmentOperator.ts index b14b28065..1c412a4cf 100644 --- a/src/slang-nodes/YulStackAssignmentOperator.ts +++ b/src/slang-nodes/YulStackAssignmentOperator.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalNode } = await import( + '@nomicfoundation/slang/cst' +); import { SlangNode } from './SlangNode.js'; import { YulEqualAndColon } from './YulEqualAndColon.js'; diff --git a/src/slang-nodes/YulStackAssignmentStatement.ts b/src/slang-nodes/YulStackAssignmentStatement.ts index 1b0cd4cc1..6423783af 100644 --- a/src/slang-nodes/YulStackAssignmentStatement.ts +++ b/src/slang-nodes/YulStackAssignmentStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-nodes/YulStatement.ts b/src/slang-nodes/YulStatement.ts index 100a406b1..2dc3e3e6f 100644 --- a/src/slang-nodes/YulStatement.ts +++ b/src/slang-nodes/YulStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulBlock } from './YulBlock.js'; import { YulFunctionDefinition } from './YulFunctionDefinition.js'; diff --git a/src/slang-nodes/YulStatements.ts b/src/slang-nodes/YulStatements.ts index 516a0485e..1b471e8a9 100644 --- a/src/slang-nodes/YulStatements.ts +++ b/src/slang-nodes/YulStatements.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { printSeparatedItem } from '../slang-printers/print-separated-item.js'; import { printComments } from '../slang-printers/print-comments.js'; import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js'; diff --git a/src/slang-nodes/YulSwitchCase.ts b/src/slang-nodes/YulSwitchCase.ts index f881c7093..317339329 100644 --- a/src/slang-nodes/YulSwitchCase.ts +++ b/src/slang-nodes/YulSwitchCase.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulDefaultCase } from './YulDefaultCase.js'; import { YulValueCase } from './YulValueCase.js'; diff --git a/src/slang-nodes/YulSwitchCases.ts b/src/slang-nodes/YulSwitchCases.ts index b5510c929..bed520fd8 100644 --- a/src/slang-nodes/YulSwitchCases.ts +++ b/src/slang-nodes/YulSwitchCases.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { YulSwitchCase } from './YulSwitchCase.js'; diff --git a/src/slang-nodes/YulSwitchStatement.ts b/src/slang-nodes/YulSwitchStatement.ts index 0cb4686e3..d93fd9824 100644 --- a/src/slang-nodes/YulSwitchStatement.ts +++ b/src/slang-nodes/YulSwitchStatement.ts @@ -1,5 +1,5 @@ +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; -import { NonterminalKind } from '@nomicfoundation/slang/cst'; import { SlangNode } from './SlangNode.js'; import { YulExpression } from './YulExpression.js'; import { YulSwitchCases } from './YulSwitchCases.js'; diff --git a/src/slang-nodes/YulValueCase.ts b/src/slang-nodes/YulValueCase.ts index 536832178..27395433f 100644 --- a/src/slang-nodes/YulValueCase.ts +++ b/src/slang-nodes/YulValueCase.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulLiteral } from './YulLiteral.js'; import { YulBlock } from './YulBlock.js'; diff --git a/src/slang-nodes/YulVariableAssignmentStatement.ts b/src/slang-nodes/YulVariableAssignmentStatement.ts index 1ca5c0771..6ec932a2f 100644 --- a/src/slang-nodes/YulVariableAssignmentStatement.ts +++ b/src/slang-nodes/YulVariableAssignmentStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { SlangNode } from './SlangNode.js'; import { YulPaths } from './YulPaths.js'; diff --git a/src/slang-nodes/YulVariableDeclarationStatement.ts b/src/slang-nodes/YulVariableDeclarationStatement.ts index ab449abb2..72a377a96 100644 --- a/src/slang-nodes/YulVariableDeclarationStatement.ts +++ b/src/slang-nodes/YulVariableDeclarationStatement.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { joinExisting } from '../slang-utils/join-existing.js'; import { SlangNode } from './SlangNode.js'; import { YulVariableDeclarationValue } from './YulVariableDeclarationValue.js'; diff --git a/src/slang-nodes/YulVariableDeclarationValue.ts b/src/slang-nodes/YulVariableDeclarationValue.ts index 008005481..e7b47826c 100644 --- a/src/slang-nodes/YulVariableDeclarationValue.ts +++ b/src/slang-nodes/YulVariableDeclarationValue.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { SlangNode } from './SlangNode.js'; import { YulAssignmentOperator } from './YulAssignmentOperator.js'; import { YulExpression } from './YulExpression.js'; diff --git a/src/slang-nodes/YulVariableNames.ts b/src/slang-nodes/YulVariableNames.ts index 6b2ae7626..938020c47 100644 --- a/src/slang-nodes/YulVariableNames.ts +++ b/src/slang-nodes/YulVariableNames.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { printSeparatedList } from '../slang-printers/print-separated-list.js'; import { SlangNode } from './SlangNode.js'; diff --git a/src/slang-printers/create-binary-operation-printer.ts b/src/slang-printers/create-binary-operation-printer.ts index b33f23c32..497b89ab5 100644 --- a/src/slang-printers/create-binary-operation-printer.ts +++ b/src/slang-printers/create-binary-operation-printer.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind } = await import( + '@nomicfoundation/slang/cst' +); import { doc } from 'prettier'; import { isBinaryOperation } from '../slang-utils/is-binary-operation.js'; diff --git a/src/slang-printers/print-binary-operation.ts b/src/slang-printers/print-binary-operation.ts index 7cc419b7d..abaf9bb20 100644 --- a/src/slang-printers/print-binary-operation.ts +++ b/src/slang-printers/print-binary-operation.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { createBinaryOperationPrinter } from './create-binary-operation-printer.js'; import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js'; diff --git a/src/slang-printers/print-logical-operation.ts b/src/slang-printers/print-logical-operation.ts index efdeacd32..fc5819539 100644 --- a/src/slang-printers/print-logical-operation.ts +++ b/src/slang-printers/print-logical-operation.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc } from 'prettier'; import { isBinaryOperation } from '../slang-utils/is-binary-operation.js'; import { createBinaryOperationPrinter } from './create-binary-operation-printer.js'; diff --git a/src/slang-printers/print-preserving-empty-lines.ts b/src/slang-printers/print-preserving-empty-lines.ts index bd43449db..cdbdd1719 100644 --- a/src/slang-printers/print-preserving-empty-lines.ts +++ b/src/slang-printers/print-preserving-empty-lines.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { doc, util } from 'prettier'; import { locEnd } from '../slang-utils/loc.js'; diff --git a/src/slang-utils/create-hug-function.ts b/src/slang-utils/create-hug-function.ts index 7e316550d..bfffcf8ff 100644 --- a/src/slang-utils/create-hug-function.ts +++ b/src/slang-utils/create-hug-function.ts @@ -1,4 +1,6 @@ -import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind, TerminalKind } = await import( + '@nomicfoundation/slang/cst' +); import { isBinaryOperation } from './is-binary-operation.js'; import { Expression } from '../slang-nodes/Expression.js'; import { TupleExpression } from '../slang-nodes/TupleExpression.js'; diff --git a/src/slang-utils/create-parser.ts b/src/slang-utils/create-parser.ts index 088676e00..a6aa8633a 100644 --- a/src/slang-utils/create-parser.ts +++ b/src/slang-utils/create-parser.ts @@ -1,9 +1,12 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; -import { Parser } from '@nomicfoundation/slang/parser'; -import { LanguageFacts } from '@nomicfoundation/slang/utils'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); +const { Parser } = await import('@nomicfoundation/slang/parser'); +const { LanguageFacts } = await import('@nomicfoundation/slang/utils'); import { minSatisfying } from 'semver'; -import type { ParseOutput } from '@nomicfoundation/slang/parser'; +import type { + Parser as SlangParser, + ParseOutput +} from '@nomicfoundation/slang/parser'; import type { ParserOptions } from 'prettier'; import type { AstNode } from '../slang-nodes/types.d.ts'; @@ -13,7 +16,7 @@ const supportedLength = supportedVersions.length; function parserAndOutput( text: string, version: string -): { parser: Parser; parseOutput: ParseOutput } { +): { parser: SlangParser; parseOutput: ParseOutput } { const parser = Parser.create(version); return { parser, @@ -33,7 +36,7 @@ function createError( export function createParser( text: string, options: ParserOptions -): { parser: Parser; parseOutput: ParseOutput } { +): { parser: SlangParser; parseOutput: ParseOutput } { const compiler = minSatisfying(supportedVersions, options.compiler); if (compiler) { const result = parserAndOutput(text, compiler); diff --git a/src/slang-utils/is-binary-operation.ts b/src/slang-utils/is-binary-operation.ts index 961f2cb19..82a01f462 100644 --- a/src/slang-utils/is-binary-operation.ts +++ b/src/slang-utils/is-binary-operation.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import { createKindCheckFunction } from './create-kind-check-function.js'; import type { BinaryOperation, StrictAstNode } from '../slang-nodes/types.d.ts'; diff --git a/src/slang-utils/is-comment.ts b/src/slang-utils/is-comment.ts index b2ce5e6da..201ea700a 100644 --- a/src/slang-utils/is-comment.ts +++ b/src/slang-utils/is-comment.ts @@ -1,4 +1,4 @@ -import { TerminalKind } from '@nomicfoundation/slang/cst'; +const { TerminalKind } = await import('@nomicfoundation/slang/cst'); import { createKindCheckFunction } from './create-kind-check-function.js'; import type { Node } from '@nomicfoundation/slang/cst'; diff --git a/src/slang-utils/sort-contract-specifiers.ts b/src/slang-utils/sort-contract-specifiers.ts index 7f0614b65..1b61d1849 100644 --- a/src/slang-utils/sort-contract-specifiers.ts +++ b/src/slang-utils/sort-contract-specifiers.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import type { ContractSpecifier } from '../slang-nodes/ContractSpecifier.js'; diff --git a/src/slang-utils/sort-function-attributes.ts b/src/slang-utils/sort-function-attributes.ts index 3b39415d4..4a33ce6f1 100644 --- a/src/slang-utils/sort-function-attributes.ts +++ b/src/slang-utils/sort-function-attributes.ts @@ -1,4 +1,4 @@ -import { NonterminalKind } from '@nomicfoundation/slang/cst'; +const { NonterminalKind } = await import('@nomicfoundation/slang/cst'); import type { SortableAttribute } from './types.d.ts'; diff --git a/src/slangSolidityParser.ts b/src/slangSolidityParser.ts index e52da506f..89eb8d99e 100644 --- a/src/slangSolidityParser.ts +++ b/src/slangSolidityParser.ts @@ -1,5 +1,7 @@ // https://prettier.io/docs/en/plugins.html#parsers -import { SourceUnit as SlangSourceUnit } from '@nomicfoundation/slang/ast'; +const { SourceUnit: SlangSourceUnit } = await import( + '@nomicfoundation/slang/ast' +); import { clearOffsets } from './slang-nodes/SlangNode.js'; import { createParser } from './slang-utils/create-parser.js'; import { SourceUnit } from './slang-nodes/SourceUnit.js'; diff --git a/tests/unit/slang-utils/create-parser.test.js b/tests/unit/slang-utils/create-parser.test.js index ed318b31e..9fd4f96b6 100644 --- a/tests/unit/slang-utils/create-parser.test.js +++ b/tests/unit/slang-utils/create-parser.test.js @@ -1,4 +1,4 @@ -import { LanguageFacts } from '@nomicfoundation/slang/utils'; +const { LanguageFacts } = await import('@nomicfoundation/slang/utils'); import { createParser } from '../../../src/slang-utils/create-parser.js'; describe('inferLanguage', function () { diff --git a/tsconfig.json b/tsconfig.json index 7449a88e3..f0c01599e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "noImplicitAny": true, "strictPropertyInitialization": true, "sourceMap": true, - "target": "es6", + "target": "es2017", "module": "NodeNext", "moduleResolution": "NodeNext", "strict": true,