diff --git a/README.md b/README.md index b5069d324e5..cedc257c18d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@

- npm Downloads + npm Downloads undefined diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/.swcrc b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/.swcrc new file mode 100644 index 00000000000..85a9eadbe88 --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/.swcrc @@ -0,0 +1,22 @@ +{ + "test": ".*.ts$", + "jsc": { + "target": "es2020", + "parser": { + "syntax": "typescript", + "tsx": false, + "decorators": false, + "dynamicImport": false + }, + "externalHelpers": true, + "transform": { + "hidden": { + "jest": true + } + } + }, + "module": { + "type": "commonjs" + }, + "sourceMaps": true +} \ No newline at end of file diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/index.ts new file mode 100644 index 00000000000..0ffd16b7223 --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/input/index.ts @@ -0,0 +1,256 @@ +import { AbstractBuilder, AbstractSeqBuilder } from './AbstractBuilders'; +import { hash, mapBuildArg, mapBuildArgs } from './Builder.utils'; +import { image } from './ElementBuilder'; + +import type { + Body, + BodyStage, + TrustBox, + RichText, + Opener, + BodyHeader, + Stage, + ArticleSource, + ArticleSources, +} from '@paper/models'; +import type { BuildArg, BuildArgs, CreateBuilder, SeqElement, SeqNextElementConverter } from './types'; + +/** + * @deprecated use {Builder.body.node.img()} + */ +export * from './BodyNodesBuilder'; +export * as node from './BodyNodesBuilder'; + +export const create: CreateBuilder = () => new BodyBuilder(); +export const trustBox: CreateBuilder = () => new TrustBoxBuilder(); +export const opener: CreateBuilder = () => new OpenerBuilder(); +export const stage: CreateBuilder = () => new BodyStageBuilder(); +export const header: CreateBuilder = () => new BodyHeaderBuilder(); +export const source: CreateBuilder> = ( + nodes: BuildArgs = [], +) => new ArticleSourceBuilder(...nodes); +export const sources: CreateBuilder = () => new ArticleSourcesBuilder(); + +export const seq = { + stage: (() => new BodyStageSeqBuilder()) as CreateBuilder, + source: (() => new ArticleSourceSeqBuilder()) as CreateBuilder, +} as const; + +class BodyBuilder extends AbstractBuilder { + #stages: BodyStage[] = []; + #trustBox?: TrustBox = undefined; + #disclaimer?: RichText.Node[] = undefined; + #articleSources?: ArticleSources = undefined; + + stages(...stages: BuildArgs): this { + this.#stages = stages.map(mapBuildArg); + return this; + } + + trustBox(trustBox?: BuildArg): this { + this.#trustBox = mapBuildArg(trustBox); + return this; + } + + disclaimer(disclaimer?: BuildArgs): this { + this.#disclaimer = disclaimer?.map(mapBuildArg); + return this; + } + + articleSources(articleSources?: BuildArg): this { + this.#articleSources = mapBuildArg(articleSources); + return this; + } + + build(): Body { + return { + stages: this.#stages, + trustBox: this.#trustBox, + disclaimer: this.#disclaimer, + articleSources: this.#articleSources, + }; + } +} + +class TrustBoxBuilder extends AbstractBuilder { + #nodes: RichText.Node[] = []; + #hidden: RichText.Node[] = []; + + nodes(nodes: BuildArgs): this { + this.#nodes = nodes.map(mapBuildArg); + return this; + } + + hidden(hidden: BuildArgs): this { + this.#hidden = hidden.map(mapBuildArg); + return this; + } + + build(): TrustBox { + return { + nodes: this.#nodes, + hidden: this.#hidden, + }; + } +} + +class OpenerBuilder extends AbstractBuilder { + #element: Opener['element'] = image().build(); + + element(element: BuildArg): this { + this.#element = mapBuildArg(element); + return this; + } + + build(): Opener { + return { + element: this.#element, + }; + } +} + +class BodyStageSeqBuilder extends AbstractSeqBuilder { + #nodes: SeqElement = []; + #header?: SeqElement = undefined; + #companions: SeqElement = []; + #commercialsEndOfStage: SeqElement = []; + + nodes(nodes: SeqElement>): this { + this.#nodes = nodes.map(mapBuildArgs); + return this; + } + + header(header?: SeqElement>): this { + this.#header = mapBuildArgs(header ?? []); + return this; + } + + companions(companions: SeqElement>): this { + this.#companions = companions.map(mapBuildArgs); + return this; + } + + commercialsEndOfStage(commercialsEndOfStage: SeqElement>): this { + this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs); + return this; + } + + buildListItem(seqNextElement: SeqNextElementConverter): BodyStage { + return { + id: hash('bodyStage', this.#nodes, this.#companions, this.#commercialsEndOfStage, this.#header), + nodes: seqNextElement.array(this.#nodes), + header: seqNextElement.maybe(this.#header), + companions: seqNextElement.array(this.#companions), + commercialsEndOfStage: seqNextElement.array(this.#commercialsEndOfStage), + }; + } +} + +class BodyStageBuilder extends AbstractBuilder { + #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder(); + + nodes(nodes: BuildArgs): this { + this.#seqBuilder.nodes([nodes]); + return this; + } + + header(header?: BuildArg): this { + if (header) { + this.#seqBuilder.header([header]); + } + return this; + } + + companions(companions: BuildArgs): this { + this.#seqBuilder.companions([companions]); + return this; + } + + commercialsEndOfStage(commercialsEndOfStage: BuildArgs): this { + this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]); + return this; + } + + build(): BodyStage { + return this.#seqBuilder.build(); + } +} + +class BodyHeaderBuilder extends AbstractBuilder { + #variant: BodyHeader['variant'] = 'full'; + #opener?: Opener = undefined; + + variant(variant: BodyHeader['variant']): this { + this.#variant = variant; + return this; + } + + opener(opener: BuildArg): this { + this.#opener = mapBuildArg(opener); + return this; + } + + build(): BodyHeader { + return { + variant: this.#variant, + opener: this.#opener, + }; + } +} + +class ArticleSourceSeqBuilder extends AbstractSeqBuilder { + #nodes: SeqElement = []; + + nodes(nodes: SeqElement>): this { + this.#nodes = nodes.map(mapBuildArgs); + return this; + } + + buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource { + const id = hash('article-source', this.#nodes); + return { + id, + nodes: seqNextElement.array(this.#nodes), + }; + } +} + +class ArticleSourceBuilder extends AbstractBuilder { + #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder(); + + constructor(...nodes: BuildArgs) { + super(); + this.nodes(...nodes); + } + + nodes(...nodes: BuildArgs): this { + this.#seqBuilder.nodes([nodes]); + return this; + } + + build(): ArticleSource { + return this.#seqBuilder.build(); + } +} + +class ArticleSourcesBuilder extends AbstractBuilder { + #nodes: ArticleSource[] = []; + #hidden: ArticleSource[] = []; + + nodes(...nodes: BuildArgs): this { + this.#nodes = nodes.map(mapBuildArg); + return this; + } + + hidden(...hidden: BuildArgs): this { + this.#hidden = hidden.map(mapBuildArg); + return this; + } + + build(): ArticleSources { + return { + nodes: this.#nodes, + hidden: this.#hidden, + }; + } +} \ No newline at end of file diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map new file mode 100644 index 00000000000..d66d12fca51 --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.map @@ -0,0 +1,54 @@ +{ + "mappings": "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", + "names": [ + "node", + "create", + "BodyBuilder", + "trustBox", + "TrustBoxBuilder", + "opener", + "OpenerBuilder", + "stage", + "BodyStageBuilder", + "header", + "BodyHeaderBuilder", + "source", + "nodes", + "ArticleSourceBuilder", + "sources", + "ArticleSourcesBuilder", + "seq", + "BodyStageSeqBuilder", + "ArticleSourceSeqBuilder", + "AbstractBuilder", + "stages", + "map", + "mapBuildArg", + "disclaimer", + "articleSources", + "build", + "undefined", + "hidden", + "element", + "image", + "AbstractSeqBuilder", + "mapBuildArgs", + "companions", + "commercialsEndOfStage", + "buildListItem", + "seqNextElement", + "id", + "hash", + "array", + "maybe", + "seqBuilder", + "variant" + ], + "sources": [ + "../../input/index.ts" + ], + "sourcesContent": [ + "import { AbstractBuilder, AbstractSeqBuilder } from './AbstractBuilders';\nimport { hash, mapBuildArg, mapBuildArgs } from './Builder.utils';\nimport { image } from './ElementBuilder';\n\nimport type {\n Body,\n BodyStage,\n TrustBox,\n RichText,\n Opener,\n BodyHeader,\n Stage,\n ArticleSource,\n ArticleSources,\n} from '@paper/models';\nimport type { BuildArg, BuildArgs, CreateBuilder, SeqElement, SeqNextElementConverter } from './types';\n\n/**\n * @deprecated use {Builder.body.node.img()}\n */\nexport * from './BodyNodesBuilder';\nexport * as node from './BodyNodesBuilder';\n\nexport const create: CreateBuilder = () => new BodyBuilder();\nexport const trustBox: CreateBuilder = () => new TrustBoxBuilder();\nexport const opener: CreateBuilder = () => new OpenerBuilder();\nexport const stage: CreateBuilder = () => new BodyStageBuilder();\nexport const header: CreateBuilder = () => new BodyHeaderBuilder();\nexport const source: CreateBuilder> = (\n nodes: BuildArgs = [],\n) => new ArticleSourceBuilder(...nodes);\nexport const sources: CreateBuilder = () => new ArticleSourcesBuilder();\n\nexport const seq = {\n stage: (() => new BodyStageSeqBuilder()) as CreateBuilder,\n source: (() => new ArticleSourceSeqBuilder()) as CreateBuilder,\n} as const;\n\nclass BodyBuilder extends AbstractBuilder {\n #stages: BodyStage[] = [];\n #trustBox?: TrustBox = undefined;\n #disclaimer?: RichText.Node[] = undefined;\n #articleSources?: ArticleSources = undefined;\n\n stages(...stages: BuildArgs): this {\n this.#stages = stages.map(mapBuildArg);\n return this;\n }\n\n trustBox(trustBox?: BuildArg): this {\n this.#trustBox = mapBuildArg(trustBox);\n return this;\n }\n\n disclaimer(disclaimer?: BuildArgs): this {\n this.#disclaimer = disclaimer?.map(mapBuildArg);\n return this;\n }\n\n articleSources(articleSources?: BuildArg): this {\n this.#articleSources = mapBuildArg(articleSources);\n return this;\n }\n\n build(): Body {\n return {\n stages: this.#stages,\n trustBox: this.#trustBox,\n disclaimer: this.#disclaimer,\n articleSources: this.#articleSources,\n };\n }\n}\n\nclass TrustBoxBuilder extends AbstractBuilder {\n #nodes: RichText.Node[] = [];\n #hidden: RichText.Node[] = [];\n\n nodes(nodes: BuildArgs): this {\n this.#nodes = nodes.map(mapBuildArg);\n return this;\n }\n\n hidden(hidden: BuildArgs): this {\n this.#hidden = hidden.map(mapBuildArg);\n return this;\n }\n\n build(): TrustBox {\n return {\n nodes: this.#nodes,\n hidden: this.#hidden,\n };\n }\n}\n\nclass OpenerBuilder extends AbstractBuilder {\n #element: Opener['element'] = image().build();\n\n element(element: BuildArg): this {\n this.#element = mapBuildArg(element);\n return this;\n }\n\n build(): Opener {\n return {\n element: this.#element,\n };\n }\n}\n\nclass BodyStageSeqBuilder extends AbstractSeqBuilder {\n #nodes: SeqElement = [];\n #header?: SeqElement = undefined;\n #companions: SeqElement = [];\n #commercialsEndOfStage: SeqElement = [];\n\n nodes(nodes: SeqElement>): this {\n this.#nodes = nodes.map(mapBuildArgs);\n return this;\n }\n\n header(header?: SeqElement>): this {\n this.#header = mapBuildArgs(header ?? []);\n return this;\n }\n\n companions(companions: SeqElement>): this {\n this.#companions = companions.map(mapBuildArgs);\n return this;\n }\n\n commercialsEndOfStage(commercialsEndOfStage: SeqElement>): this {\n this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs);\n return this;\n }\n\n buildListItem(seqNextElement: SeqNextElementConverter): BodyStage {\n return {\n id: hash('bodyStage', this.#nodes, this.#companions, this.#commercialsEndOfStage, this.#header),\n nodes: seqNextElement.array(this.#nodes),\n header: seqNextElement.maybe(this.#header),\n companions: seqNextElement.array(this.#companions),\n commercialsEndOfStage: seqNextElement.array(this.#commercialsEndOfStage),\n };\n }\n}\n\nclass BodyStageBuilder extends AbstractBuilder {\n #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder();\n\n nodes(nodes: BuildArgs): this {\n this.#seqBuilder.nodes([nodes]);\n return this;\n }\n\n header(header?: BuildArg): this {\n if (header) {\n this.#seqBuilder.header([header]);\n }\n return this;\n }\n\n companions(companions: BuildArgs): this {\n this.#seqBuilder.companions([companions]);\n return this;\n }\n\n commercialsEndOfStage(commercialsEndOfStage: BuildArgs): this {\n this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]);\n return this;\n }\n\n build(): BodyStage {\n return this.#seqBuilder.build();\n }\n}\n\nclass BodyHeaderBuilder extends AbstractBuilder {\n #variant: BodyHeader['variant'] = 'full';\n #opener?: Opener = undefined;\n\n variant(variant: BodyHeader['variant']): this {\n this.#variant = variant;\n return this;\n }\n\n opener(opener: BuildArg): this {\n this.#opener = mapBuildArg(opener);\n return this;\n }\n\n build(): BodyHeader {\n return {\n variant: this.#variant,\n opener: this.#opener,\n };\n }\n}\n\nclass ArticleSourceSeqBuilder extends AbstractSeqBuilder {\n #nodes: SeqElement = [];\n\n nodes(nodes: SeqElement>): this {\n this.#nodes = nodes.map(mapBuildArgs);\n return this;\n }\n\n buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource {\n const id = hash('article-source', this.#nodes);\n return {\n id,\n nodes: seqNextElement.array(this.#nodes),\n };\n }\n}\n\nclass ArticleSourceBuilder extends AbstractBuilder {\n #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder();\n\n constructor(...nodes: BuildArgs) {\n super();\n this.nodes(...nodes);\n }\n\n nodes(...nodes: BuildArgs): this {\n this.#seqBuilder.nodes([nodes]);\n return this;\n }\n\n build(): ArticleSource {\n return this.#seqBuilder.build();\n }\n}\n\nclass ArticleSourcesBuilder extends AbstractBuilder {\n #nodes: ArticleSource[] = [];\n #hidden: ArticleSource[] = [];\n\n nodes(...nodes: BuildArgs): this {\n this.#nodes = nodes.map(mapBuildArg);\n return this;\n }\n\n hidden(...hidden: BuildArgs): this {\n this.#hidden = hidden.map(mapBuildArg);\n return this;\n }\n\n build(): ArticleSources {\n return {\n nodes: this.#nodes,\n hidden: this.#hidden,\n };\n }\n}" + ], + "version": 3 +} diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts new file mode 100644 index 00000000000..0bfb00e093c --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/1-true/output/index.ts @@ -0,0 +1,329 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); +var _exportNames = { + node: true, + node: true +}; +exports.seq = exports.sources = exports.source = exports.header = exports.stage = exports.opener = exports.trustBox = exports.create = exports.node = void 0; +var swcHelpers = require("@swc/helpers"); +var _abstractBuilders = require("./AbstractBuilders"); +var _builderUtils = require("./Builder.utils"); +var _elementBuilder = require("./ElementBuilder"); +var _node = swcHelpers.interopRequireWildcard(require("./BodyNodesBuilder")); +Object.keys(_node).forEach(function(key) { + if (key === "default" || key === "__esModule") return; + if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; + if (key in exports && exports[key] === _node[key]) return; + Object.defineProperty(exports, key, { + enumerable: true, + get: function() { + return _node[key]; + } + }); +}); +exports.node = _node; +const create = ()=>new BodyBuilder() +; +exports.create = create; +const trustBox = ()=>new TrustBoxBuilder() +; +exports.trustBox = trustBox; +const opener = ()=>new OpenerBuilder() +; +exports.opener = opener; +const stage = ()=>new BodyStageBuilder() +; +exports.stage = stage; +const header = ()=>new BodyHeaderBuilder() +; +exports.header = header; +const source = (nodes = [])=>new ArticleSourceBuilder(...nodes) +; +exports.source = source; +const sources = ()=>new ArticleSourcesBuilder() +; +exports.sources = sources; +const seq = { + stage: ()=>new BodyStageSeqBuilder() + , + source: ()=>new ArticleSourceSeqBuilder() +}; +exports.seq = seq; +var _stages = new WeakMap(), _trustBox = new WeakMap(), _disclaimer = new WeakMap(), _articleSources = new WeakMap(); +class BodyBuilder extends _abstractBuilders.AbstractBuilder { + stages(...stages) { + swcHelpers.classPrivateFieldSet(this, _stages, stages.map(_builderUtils.mapBuildArg)); + return this; + } + trustBox(trustBox1) { + swcHelpers.classPrivateFieldSet(this, _trustBox, (0, _builderUtils).mapBuildArg(trustBox1)); + return this; + } + disclaimer(disclaimer) { + swcHelpers.classPrivateFieldSet(this, _disclaimer, disclaimer?.map(_builderUtils.mapBuildArg)); + return this; + } + articleSources(articleSources) { + swcHelpers.classPrivateFieldSet(this, _articleSources, (0, _builderUtils).mapBuildArg(articleSources)); + return this; + } + build() { + return { + stages: swcHelpers.classPrivateFieldGet(this, _stages), + trustBox: swcHelpers.classPrivateFieldGet(this, _trustBox), + disclaimer: swcHelpers.classPrivateFieldGet(this, _disclaimer), + articleSources: swcHelpers.classPrivateFieldGet(this, _articleSources) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _stages, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _trustBox, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _disclaimer, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _articleSources, { + writable: true, + value: undefined + }); + } +} +var _nodes = new WeakMap(), _hidden = new WeakMap(); +class TrustBoxBuilder extends _abstractBuilders.AbstractBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes, nodes.map(_builderUtils.mapBuildArg)); + return this; + } + hidden(hidden) { + swcHelpers.classPrivateFieldSet(this, _hidden, hidden.map(_builderUtils.mapBuildArg)); + return this; + } + build() { + return { + nodes: swcHelpers.classPrivateFieldGet(this, _nodes), + hidden: swcHelpers.classPrivateFieldGet(this, _hidden) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _hidden, { + writable: true, + value: [] + }); + } +} +var _element = new WeakMap(); +class OpenerBuilder extends _abstractBuilders.AbstractBuilder { + element(element) { + swcHelpers.classPrivateFieldSet(this, _element, (0, _builderUtils).mapBuildArg(element)); + return this; + } + build() { + return { + element: swcHelpers.classPrivateFieldGet(this, _element) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _element, { + writable: true, + value: (0, _elementBuilder).image().build() + }); + } +} +var _nodes1 = new WeakMap(), _header = new WeakMap(), _companions = new WeakMap(), _commercialsEndOfStage = new WeakMap(); +class BodyStageSeqBuilder extends _abstractBuilders.AbstractSeqBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes1, nodes.map(_builderUtils.mapBuildArgs)); + return this; + } + header(header1) { + swcHelpers.classPrivateFieldSet(this, _header, (0, _builderUtils).mapBuildArgs(header1 ?? [])); + return this; + } + companions(companions) { + swcHelpers.classPrivateFieldSet(this, _companions, companions.map(_builderUtils.mapBuildArgs)); + return this; + } + commercialsEndOfStage(commercialsEndOfStage) { + swcHelpers.classPrivateFieldSet(this, _commercialsEndOfStage, commercialsEndOfStage.map(_builderUtils.mapBuildArgs)); + return this; + } + buildListItem(seqNextElement) { + return { + id: (0, _builderUtils).hash('bodyStage', swcHelpers.classPrivateFieldGet(this, _nodes1), swcHelpers.classPrivateFieldGet(this, _companions), swcHelpers.classPrivateFieldGet(this, _commercialsEndOfStage), swcHelpers.classPrivateFieldGet(this, _header)), + nodes: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _nodes1)), + header: seqNextElement.maybe(swcHelpers.classPrivateFieldGet(this, _header)), + companions: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _companions)), + commercialsEndOfStage: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _commercialsEndOfStage)) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes1, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _header, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _companions, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _commercialsEndOfStage, { + writable: true, + value: [] + }); + } +} +var _seqBuilder = new WeakMap(); +class BodyStageBuilder extends _abstractBuilders.AbstractBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).nodes([ + nodes + ]); + return this; + } + header(header2) { + if (header2) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).header([ + header2 + ]); + } + return this; + } + companions(companions) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).companions([ + companions + ]); + return this; + } + commercialsEndOfStage(commercialsEndOfStage) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).commercialsEndOfStage([ + commercialsEndOfStage + ]); + return this; + } + build() { + return swcHelpers.classPrivateFieldGet(this, _seqBuilder).build(); + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _seqBuilder, { + writable: true, + value: new BodyStageSeqBuilder() + }); + } +} +var _variant = new WeakMap(), _opener = new WeakMap(); +class BodyHeaderBuilder extends _abstractBuilders.AbstractBuilder { + variant(variant) { + swcHelpers.classPrivateFieldSet(this, _variant, variant); + return this; + } + opener(opener1) { + swcHelpers.classPrivateFieldSet(this, _opener, (0, _builderUtils).mapBuildArg(opener1)); + return this; + } + build() { + return { + variant: swcHelpers.classPrivateFieldGet(this, _variant), + opener: swcHelpers.classPrivateFieldGet(this, _opener) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _variant, { + writable: true, + value: 'full' + }); + swcHelpers.classPrivateFieldInit(this, _opener, { + writable: true, + value: undefined + }); + } +} +var _nodes2 = new WeakMap(); +class ArticleSourceSeqBuilder extends _abstractBuilders.AbstractSeqBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes2, nodes.map(_builderUtils.mapBuildArgs)); + return this; + } + buildListItem(seqNextElement) { + const id = (0, _builderUtils).hash('article-source', swcHelpers.classPrivateFieldGet(this, _nodes2)); + return { + id, + nodes: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _nodes2)) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes2, { + writable: true, + value: [] + }); + } +} +var _seqBuilder1 = new WeakMap(); +class ArticleSourceBuilder extends _abstractBuilders.AbstractBuilder { + nodes(...nodes) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder1).nodes([ + nodes + ]); + return this; + } + build() { + return swcHelpers.classPrivateFieldGet(this, _seqBuilder1).build(); + } + constructor(...nodes){ + super(); + swcHelpers.classPrivateFieldInit(this, _seqBuilder1, { + writable: true, + value: new ArticleSourceSeqBuilder() + }); + this.nodes(...nodes); + } +} +var _nodes3 = new WeakMap(), _hidden1 = new WeakMap(); +class ArticleSourcesBuilder extends _abstractBuilders.AbstractBuilder { + nodes(...nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes3, nodes.map(_builderUtils.mapBuildArg)); + return this; + } + hidden(...hidden) { + swcHelpers.classPrivateFieldSet(this, _hidden1, hidden.map(_builderUtils.mapBuildArg)); + return this; + } + build() { + return { + nodes: swcHelpers.classPrivateFieldGet(this, _nodes3), + hidden: swcHelpers.classPrivateFieldGet(this, _hidden1) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes3, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _hidden1, { + writable: true, + value: [] + }); + } +} diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/.swcrc b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/.swcrc new file mode 100644 index 00000000000..98c93ceb85e --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/.swcrc @@ -0,0 +1,22 @@ +{ + "test": ".*.ts$", + "jsc": { + "target": "es2020", + "parser": { + "syntax": "typescript", + "tsx": false, + "decorators": false, + "dynamicImport": false + }, + "externalHelpers": true, + "transform": { + "hidden": { + "jest": true + } + } + }, + "module": { + "type": "commonjs" + }, + "sourceMaps": "inline" +} \ No newline at end of file diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/index.ts new file mode 100644 index 00000000000..0ffd16b7223 --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/input/index.ts @@ -0,0 +1,256 @@ +import { AbstractBuilder, AbstractSeqBuilder } from './AbstractBuilders'; +import { hash, mapBuildArg, mapBuildArgs } from './Builder.utils'; +import { image } from './ElementBuilder'; + +import type { + Body, + BodyStage, + TrustBox, + RichText, + Opener, + BodyHeader, + Stage, + ArticleSource, + ArticleSources, +} from '@paper/models'; +import type { BuildArg, BuildArgs, CreateBuilder, SeqElement, SeqNextElementConverter } from './types'; + +/** + * @deprecated use {Builder.body.node.img()} + */ +export * from './BodyNodesBuilder'; +export * as node from './BodyNodesBuilder'; + +export const create: CreateBuilder = () => new BodyBuilder(); +export const trustBox: CreateBuilder = () => new TrustBoxBuilder(); +export const opener: CreateBuilder = () => new OpenerBuilder(); +export const stage: CreateBuilder = () => new BodyStageBuilder(); +export const header: CreateBuilder = () => new BodyHeaderBuilder(); +export const source: CreateBuilder> = ( + nodes: BuildArgs = [], +) => new ArticleSourceBuilder(...nodes); +export const sources: CreateBuilder = () => new ArticleSourcesBuilder(); + +export const seq = { + stage: (() => new BodyStageSeqBuilder()) as CreateBuilder, + source: (() => new ArticleSourceSeqBuilder()) as CreateBuilder, +} as const; + +class BodyBuilder extends AbstractBuilder { + #stages: BodyStage[] = []; + #trustBox?: TrustBox = undefined; + #disclaimer?: RichText.Node[] = undefined; + #articleSources?: ArticleSources = undefined; + + stages(...stages: BuildArgs): this { + this.#stages = stages.map(mapBuildArg); + return this; + } + + trustBox(trustBox?: BuildArg): this { + this.#trustBox = mapBuildArg(trustBox); + return this; + } + + disclaimer(disclaimer?: BuildArgs): this { + this.#disclaimer = disclaimer?.map(mapBuildArg); + return this; + } + + articleSources(articleSources?: BuildArg): this { + this.#articleSources = mapBuildArg(articleSources); + return this; + } + + build(): Body { + return { + stages: this.#stages, + trustBox: this.#trustBox, + disclaimer: this.#disclaimer, + articleSources: this.#articleSources, + }; + } +} + +class TrustBoxBuilder extends AbstractBuilder { + #nodes: RichText.Node[] = []; + #hidden: RichText.Node[] = []; + + nodes(nodes: BuildArgs): this { + this.#nodes = nodes.map(mapBuildArg); + return this; + } + + hidden(hidden: BuildArgs): this { + this.#hidden = hidden.map(mapBuildArg); + return this; + } + + build(): TrustBox { + return { + nodes: this.#nodes, + hidden: this.#hidden, + }; + } +} + +class OpenerBuilder extends AbstractBuilder { + #element: Opener['element'] = image().build(); + + element(element: BuildArg): this { + this.#element = mapBuildArg(element); + return this; + } + + build(): Opener { + return { + element: this.#element, + }; + } +} + +class BodyStageSeqBuilder extends AbstractSeqBuilder { + #nodes: SeqElement = []; + #header?: SeqElement = undefined; + #companions: SeqElement = []; + #commercialsEndOfStage: SeqElement = []; + + nodes(nodes: SeqElement>): this { + this.#nodes = nodes.map(mapBuildArgs); + return this; + } + + header(header?: SeqElement>): this { + this.#header = mapBuildArgs(header ?? []); + return this; + } + + companions(companions: SeqElement>): this { + this.#companions = companions.map(mapBuildArgs); + return this; + } + + commercialsEndOfStage(commercialsEndOfStage: SeqElement>): this { + this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs); + return this; + } + + buildListItem(seqNextElement: SeqNextElementConverter): BodyStage { + return { + id: hash('bodyStage', this.#nodes, this.#companions, this.#commercialsEndOfStage, this.#header), + nodes: seqNextElement.array(this.#nodes), + header: seqNextElement.maybe(this.#header), + companions: seqNextElement.array(this.#companions), + commercialsEndOfStage: seqNextElement.array(this.#commercialsEndOfStage), + }; + } +} + +class BodyStageBuilder extends AbstractBuilder { + #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder(); + + nodes(nodes: BuildArgs): this { + this.#seqBuilder.nodes([nodes]); + return this; + } + + header(header?: BuildArg): this { + if (header) { + this.#seqBuilder.header([header]); + } + return this; + } + + companions(companions: BuildArgs): this { + this.#seqBuilder.companions([companions]); + return this; + } + + commercialsEndOfStage(commercialsEndOfStage: BuildArgs): this { + this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]); + return this; + } + + build(): BodyStage { + return this.#seqBuilder.build(); + } +} + +class BodyHeaderBuilder extends AbstractBuilder { + #variant: BodyHeader['variant'] = 'full'; + #opener?: Opener = undefined; + + variant(variant: BodyHeader['variant']): this { + this.#variant = variant; + return this; + } + + opener(opener: BuildArg): this { + this.#opener = mapBuildArg(opener); + return this; + } + + build(): BodyHeader { + return { + variant: this.#variant, + opener: this.#opener, + }; + } +} + +class ArticleSourceSeqBuilder extends AbstractSeqBuilder { + #nodes: SeqElement = []; + + nodes(nodes: SeqElement>): this { + this.#nodes = nodes.map(mapBuildArgs); + return this; + } + + buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource { + const id = hash('article-source', this.#nodes); + return { + id, + nodes: seqNextElement.array(this.#nodes), + }; + } +} + +class ArticleSourceBuilder extends AbstractBuilder { + #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder(); + + constructor(...nodes: BuildArgs) { + super(); + this.nodes(...nodes); + } + + nodes(...nodes: BuildArgs): this { + this.#seqBuilder.nodes([nodes]); + return this; + } + + build(): ArticleSource { + return this.#seqBuilder.build(); + } +} + +class ArticleSourcesBuilder extends AbstractBuilder { + #nodes: ArticleSource[] = []; + #hidden: ArticleSource[] = []; + + nodes(...nodes: BuildArgs): this { + this.#nodes = nodes.map(mapBuildArg); + return this; + } + + hidden(...hidden: BuildArgs): this { + this.#hidden = hidden.map(mapBuildArg); + return this; + } + + build(): ArticleSources { + return { + nodes: this.#nodes, + hidden: this.#hidden, + }; + } +} \ No newline at end of file diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.map b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.map new file mode 100644 index 00000000000..e69de29bb2d diff --git a/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts new file mode 100644 index 00000000000..9d3cf1c2c59 --- /dev/null +++ b/crates/swc/tests/fixture/sourcemap/issue-3854/2-inline/output/index.ts @@ -0,0 +1,331 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); +var _exportNames = { + node: true, + node: true +}; +exports.seq = exports.sources = exports.source = exports.header = exports.stage = exports.opener = exports.trustBox = exports.create = exports.node = void 0; +var swcHelpers = require("@swc/helpers"); +var _abstractBuilders = require("./AbstractBuilders"); +var _builderUtils = require("./Builder.utils"); +var _elementBuilder = require("./ElementBuilder"); +var _node = swcHelpers.interopRequireWildcard(require("./BodyNodesBuilder")); +Object.keys(_node).forEach(function(key) { + if (key === "default" || key === "__esModule") return; + if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; + if (key in exports && exports[key] === _node[key]) return; + Object.defineProperty(exports, key, { + enumerable: true, + get: function() { + return _node[key]; + } + }); +}); +exports.node = _node; +const create = ()=>new BodyBuilder() +; +exports.create = create; +const trustBox = ()=>new TrustBoxBuilder() +; +exports.trustBox = trustBox; +const opener = ()=>new OpenerBuilder() +; +exports.opener = opener; +const stage = ()=>new BodyStageBuilder() +; +exports.stage = stage; +const header = ()=>new BodyHeaderBuilder() +; +exports.header = header; +const source = (nodes = [])=>new ArticleSourceBuilder(...nodes) +; +exports.source = source; +const sources = ()=>new ArticleSourcesBuilder() +; +exports.sources = sources; +const seq = { + stage: ()=>new BodyStageSeqBuilder() + , + source: ()=>new ArticleSourceSeqBuilder() +}; +exports.seq = seq; +var _stages = new WeakMap(), _trustBox = new WeakMap(), _disclaimer = new WeakMap(), _articleSources = new WeakMap(); +class BodyBuilder extends _abstractBuilders.AbstractBuilder { + stages(...stages) { + swcHelpers.classPrivateFieldSet(this, _stages, stages.map(_builderUtils.mapBuildArg)); + return this; + } + trustBox(trustBox1) { + swcHelpers.classPrivateFieldSet(this, _trustBox, (0, _builderUtils).mapBuildArg(trustBox1)); + return this; + } + disclaimer(disclaimer) { + swcHelpers.classPrivateFieldSet(this, _disclaimer, disclaimer?.map(_builderUtils.mapBuildArg)); + return this; + } + articleSources(articleSources) { + swcHelpers.classPrivateFieldSet(this, _articleSources, (0, _builderUtils).mapBuildArg(articleSources)); + return this; + } + build() { + return { + stages: swcHelpers.classPrivateFieldGet(this, _stages), + trustBox: swcHelpers.classPrivateFieldGet(this, _trustBox), + disclaimer: swcHelpers.classPrivateFieldGet(this, _disclaimer), + articleSources: swcHelpers.classPrivateFieldGet(this, _articleSources) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _stages, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _trustBox, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _disclaimer, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _articleSources, { + writable: true, + value: undefined + }); + } +} +var _nodes = new WeakMap(), _hidden = new WeakMap(); +class TrustBoxBuilder extends _abstractBuilders.AbstractBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes, nodes.map(_builderUtils.mapBuildArg)); + return this; + } + hidden(hidden) { + swcHelpers.classPrivateFieldSet(this, _hidden, hidden.map(_builderUtils.mapBuildArg)); + return this; + } + build() { + return { + nodes: swcHelpers.classPrivateFieldGet(this, _nodes), + hidden: swcHelpers.classPrivateFieldGet(this, _hidden) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _hidden, { + writable: true, + value: [] + }); + } +} +var _element = new WeakMap(); +class OpenerBuilder extends _abstractBuilders.AbstractBuilder { + element(element) { + swcHelpers.classPrivateFieldSet(this, _element, (0, _builderUtils).mapBuildArg(element)); + return this; + } + build() { + return { + element: swcHelpers.classPrivateFieldGet(this, _element) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _element, { + writable: true, + value: (0, _elementBuilder).image().build() + }); + } +} +var _nodes1 = new WeakMap(), _header = new WeakMap(), _companions = new WeakMap(), _commercialsEndOfStage = new WeakMap(); +class BodyStageSeqBuilder extends _abstractBuilders.AbstractSeqBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes1, nodes.map(_builderUtils.mapBuildArgs)); + return this; + } + header(header1) { + swcHelpers.classPrivateFieldSet(this, _header, (0, _builderUtils).mapBuildArgs(header1 ?? [])); + return this; + } + companions(companions) { + swcHelpers.classPrivateFieldSet(this, _companions, companions.map(_builderUtils.mapBuildArgs)); + return this; + } + commercialsEndOfStage(commercialsEndOfStage) { + swcHelpers.classPrivateFieldSet(this, _commercialsEndOfStage, commercialsEndOfStage.map(_builderUtils.mapBuildArgs)); + return this; + } + buildListItem(seqNextElement) { + return { + id: (0, _builderUtils).hash('bodyStage', swcHelpers.classPrivateFieldGet(this, _nodes1), swcHelpers.classPrivateFieldGet(this, _companions), swcHelpers.classPrivateFieldGet(this, _commercialsEndOfStage), swcHelpers.classPrivateFieldGet(this, _header)), + nodes: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _nodes1)), + header: seqNextElement.maybe(swcHelpers.classPrivateFieldGet(this, _header)), + companions: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _companions)), + commercialsEndOfStage: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _commercialsEndOfStage)) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes1, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _header, { + writable: true, + value: undefined + }); + swcHelpers.classPrivateFieldInit(this, _companions, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _commercialsEndOfStage, { + writable: true, + value: [] + }); + } +} +var _seqBuilder = new WeakMap(); +class BodyStageBuilder extends _abstractBuilders.AbstractBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).nodes([ + nodes + ]); + return this; + } + header(header2) { + if (header2) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).header([ + header2 + ]); + } + return this; + } + companions(companions) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).companions([ + companions + ]); + return this; + } + commercialsEndOfStage(commercialsEndOfStage) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder).commercialsEndOfStage([ + commercialsEndOfStage + ]); + return this; + } + build() { + return swcHelpers.classPrivateFieldGet(this, _seqBuilder).build(); + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _seqBuilder, { + writable: true, + value: new BodyStageSeqBuilder() + }); + } +} +var _variant = new WeakMap(), _opener = new WeakMap(); +class BodyHeaderBuilder extends _abstractBuilders.AbstractBuilder { + variant(variant) { + swcHelpers.classPrivateFieldSet(this, _variant, variant); + return this; + } + opener(opener1) { + swcHelpers.classPrivateFieldSet(this, _opener, (0, _builderUtils).mapBuildArg(opener1)); + return this; + } + build() { + return { + variant: swcHelpers.classPrivateFieldGet(this, _variant), + opener: swcHelpers.classPrivateFieldGet(this, _opener) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _variant, { + writable: true, + value: 'full' + }); + swcHelpers.classPrivateFieldInit(this, _opener, { + writable: true, + value: undefined + }); + } +} +var _nodes2 = new WeakMap(); +class ArticleSourceSeqBuilder extends _abstractBuilders.AbstractSeqBuilder { + nodes(nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes2, nodes.map(_builderUtils.mapBuildArgs)); + return this; + } + buildListItem(seqNextElement) { + const id = (0, _builderUtils).hash('article-source', swcHelpers.classPrivateFieldGet(this, _nodes2)); + return { + id, + nodes: seqNextElement.array(swcHelpers.classPrivateFieldGet(this, _nodes2)) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes2, { + writable: true, + value: [] + }); + } +} +var _seqBuilder1 = new WeakMap(); +class ArticleSourceBuilder extends _abstractBuilders.AbstractBuilder { + nodes(...nodes) { + swcHelpers.classPrivateFieldGet(this, _seqBuilder1).nodes([ + nodes + ]); + return this; + } + build() { + return swcHelpers.classPrivateFieldGet(this, _seqBuilder1).build(); + } + constructor(...nodes){ + super(); + swcHelpers.classPrivateFieldInit(this, _seqBuilder1, { + writable: true, + value: new ArticleSourceSeqBuilder() + }); + this.nodes(...nodes); + } +} +var _nodes3 = new WeakMap(), _hidden1 = new WeakMap(); +class ArticleSourcesBuilder extends _abstractBuilders.AbstractBuilder { + nodes(...nodes) { + swcHelpers.classPrivateFieldSet(this, _nodes3, nodes.map(_builderUtils.mapBuildArg)); + return this; + } + hidden(...hidden) { + swcHelpers.classPrivateFieldSet(this, _hidden1, hidden.map(_builderUtils.mapBuildArg)); + return this; + } + build() { + return { + nodes: swcHelpers.classPrivateFieldGet(this, _nodes3), + hidden: swcHelpers.classPrivateFieldGet(this, _hidden1) + }; + } + constructor(...args){ + super(...args); + swcHelpers.classPrivateFieldInit(this, _nodes3, { + writable: true, + value: [] + }); + swcHelpers.classPrivateFieldInit(this, _hidden1, { + writable: true, + value: [] + }); + } +} + +//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../input/index.ts"],"sourcesContent":["import { AbstractBuilder, AbstractSeqBuilder } from './AbstractBuilders';\nimport { hash, mapBuildArg, mapBuildArgs } from './Builder.utils';\nimport { image } from './ElementBuilder';\n\nimport type {\n    Body,\n    BodyStage,\n    TrustBox,\n    RichText,\n    Opener,\n    BodyHeader,\n    Stage,\n    ArticleSource,\n    ArticleSources,\n} from '@paper/models';\nimport type { BuildArg, BuildArgs, CreateBuilder, SeqElement, SeqNextElementConverter } from './types';\n\n/**\n * @deprecated use {Builder.body.node.img()}\n */\nexport * from './BodyNodesBuilder';\nexport * as node from './BodyNodesBuilder';\n\nexport const create: CreateBuilder<BodyBuilder> = () => new BodyBuilder();\nexport const trustBox: CreateBuilder<TrustBoxBuilder> = () => new TrustBoxBuilder();\nexport const opener: CreateBuilder<OpenerBuilder> = () => new OpenerBuilder();\nexport const stage: CreateBuilder<BodyStageBuilder> = () => new BodyStageBuilder();\nexport const header: CreateBuilder<BodyHeaderBuilder> = () => new BodyHeaderBuilder();\nexport const source: CreateBuilder<ArticleSourceBuilder, BuildArgs<RichText.Node>> = (\n    nodes: BuildArgs<RichText.Node> = [],\n) => new ArticleSourceBuilder(...nodes);\nexport const sources: CreateBuilder<ArticleSourcesBuilder> = () => new ArticleSourcesBuilder();\n\nexport const seq = {\n    stage: (() => new BodyStageSeqBuilder()) as CreateBuilder<BodyStageSeqBuilder>,\n    source: (() => new ArticleSourceSeqBuilder()) as CreateBuilder<ArticleSourceSeqBuilder>,\n} as const;\n\nclass BodyBuilder extends AbstractBuilder<Body> {\n    #stages: BodyStage[] = [];\n    #trustBox?: TrustBox = undefined;\n    #disclaimer?: RichText.Node[] = undefined;\n    #articleSources?: ArticleSources = undefined;\n\n    stages(...stages: BuildArgs<BodyStage>): this {\n        this.#stages = stages.map(mapBuildArg);\n        return this;\n    }\n\n    trustBox(trustBox?: BuildArg<TrustBox>): this {\n        this.#trustBox = mapBuildArg(trustBox);\n        return this;\n    }\n\n    disclaimer(disclaimer?: BuildArgs<RichText.Node>): this {\n        this.#disclaimer = disclaimer?.map(mapBuildArg);\n        return this;\n    }\n\n    articleSources(articleSources?: BuildArg<ArticleSources>): this {\n        this.#articleSources = mapBuildArg(articleSources);\n        return this;\n    }\n\n    build(): Body {\n        return {\n            stages: this.#stages,\n            trustBox: this.#trustBox,\n            disclaimer: this.#disclaimer,\n            articleSources: this.#articleSources,\n        };\n    }\n}\n\nclass TrustBoxBuilder extends AbstractBuilder<TrustBox> {\n    #nodes: RichText.Node[] = [];\n    #hidden: RichText.Node[] = [];\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(hidden: BuildArgs<RichText.Node>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): TrustBox {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}\n\nclass OpenerBuilder extends AbstractBuilder<Opener> {\n    #element: Opener['element'] = image().build();\n\n    element(element: BuildArg<Opener['element']>): this {\n        this.#element = mapBuildArg(element);\n        return this;\n    }\n\n    build(): Opener {\n        return {\n            element: this.#element,\n        };\n    }\n}\n\nclass BodyStageSeqBuilder extends AbstractSeqBuilder<BodyStage> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n    #header?: SeqElement<BodyHeader> = undefined;\n    #companions: SeqElement<Stage.CompanionItem[]> = [];\n    #commercialsEndOfStage: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    header(header?: SeqElement<BuildArg<BodyHeader>>): this {\n        this.#header = mapBuildArgs(header ?? []);\n        return this;\n    }\n\n    companions(companions: SeqElement<BuildArgs<Stage.CompanionItem>>): this {\n        this.#companions = companions.map(mapBuildArgs);\n        return this;\n    }\n\n    commercialsEndOfStage(commercialsEndOfStage: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#commercialsEndOfStage = commercialsEndOfStage.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): BodyStage {\n        return {\n            id: hash('bodyStage', this.#nodes, this.#companions, this.#commercialsEndOfStage, this.#header),\n            nodes: seqNextElement.array(this.#nodes),\n            header: seqNextElement.maybe(this.#header),\n            companions: seqNextElement.array(this.#companions),\n            commercialsEndOfStage: seqNextElement.array(this.#commercialsEndOfStage),\n        };\n    }\n}\n\nclass BodyStageBuilder extends AbstractBuilder<BodyStage> {\n    #seqBuilder: BodyStageSeqBuilder = new BodyStageSeqBuilder();\n\n    nodes(nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    header(header?: BuildArg<BodyHeader>): this {\n        if (header) {\n            this.#seqBuilder.header([header]);\n        }\n        return this;\n    }\n\n    companions(companions: BuildArgs<Stage.CompanionItem>): this {\n        this.#seqBuilder.companions([companions]);\n        return this;\n    }\n\n    commercialsEndOfStage(commercialsEndOfStage: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.commercialsEndOfStage([commercialsEndOfStage]);\n        return this;\n    }\n\n    build(): BodyStage {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass BodyHeaderBuilder extends AbstractBuilder<BodyHeader> {\n    #variant: BodyHeader['variant'] = 'full';\n    #opener?: Opener = undefined;\n\n    variant(variant: BodyHeader['variant']): this {\n        this.#variant = variant;\n        return this;\n    }\n\n    opener(opener: BuildArg<Opener>): this {\n        this.#opener = mapBuildArg(opener);\n        return this;\n    }\n\n    build(): BodyHeader {\n        return {\n            variant: this.#variant,\n            opener: this.#opener,\n        };\n    }\n}\n\nclass ArticleSourceSeqBuilder extends AbstractSeqBuilder<ArticleSource> {\n    #nodes: SeqElement<RichText.Node[]> = [];\n\n    nodes(nodes: SeqElement<BuildArgs<RichText.Node>>): this {\n        this.#nodes = nodes.map(mapBuildArgs);\n        return this;\n    }\n\n    buildListItem(seqNextElement: SeqNextElementConverter): ArticleSource {\n        const id = hash('article-source', this.#nodes);\n        return {\n            id,\n            nodes: seqNextElement.array(this.#nodes),\n        };\n    }\n}\n\nclass ArticleSourceBuilder extends AbstractBuilder<ArticleSource> {\n    #seqBuilder: ArticleSourceSeqBuilder = new ArticleSourceSeqBuilder();\n\n    constructor(...nodes: BuildArgs<RichText.Node>) {\n        super();\n        this.nodes(...nodes);\n    }\n\n    nodes(...nodes: BuildArgs<RichText.Node>): this {\n        this.#seqBuilder.nodes([nodes]);\n        return this;\n    }\n\n    build(): ArticleSource {\n        return this.#seqBuilder.build();\n    }\n}\n\nclass ArticleSourcesBuilder extends AbstractBuilder<ArticleSources> {\n    #nodes: ArticleSource[] = [];\n    #hidden: ArticleSource[] = [];\n\n    nodes(...nodes: BuildArgs<ArticleSource>): this {\n        this.#nodes = nodes.map(mapBuildArg);\n        return this;\n    }\n\n    hidden(...hidden: BuildArgs<ArticleSource>): this {\n        this.#hidden = hidden.map(mapBuildArg);\n        return this;\n    }\n\n    build(): ArticleSources {\n        return {\n            nodes: this.#nodes,\n            hidden: this.#hidden,\n        };\n    }\n}"],"names":["node","create","BodyBuilder","trustBox","TrustBoxBuilder","opener","OpenerBuilder","stage","BodyStageBuilder","header","BodyHeaderBuilder","source","nodes","ArticleSourceBuilder","sources","ArticleSourcesBuilder","seq","BodyStageSeqBuilder","ArticleSourceSeqBuilder","AbstractBuilder","stages","map","mapBuildArg","disclaimer","articleSources","build","undefined","hidden","element","image","AbstractSeqBuilder","mapBuildArgs","companions","commercialsEndOfStage","buildListItem","seqNextElement","id","hash","array","maybe","seqBuilder","variant"],"mappings":"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"}