Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TypeScript definition should use unions type over base type #221

Closed
joshuaavalon opened this issue Jan 8, 2021 · 7 comments
Closed

TypeScript definition should use unions type over base type #221

joshuaavalon opened this issue Jan 8, 2021 · 7 comments
Labels
docs Documentation should be improved

Comments

@joshuaavalon
Copy link

Describe the bug
After you parse an document, you cannot narrow down the return type but check type.

To Reproduce

const doc = yaml.parseDocument(str);
const { type } = doc.contents || {};
if (doc.contents?.type === Type.MAP) {
    // doc.contents is detected as Node
}

Expected behaviour

const doc = yaml.parseDocument(str);
const { type } = doc.contents || {};
if (doc.contents?.type === Type.MAP) {
    // doc.contents is detected as BlockMap
}

Versions (please complete the following information):

  • Environment: Node.js 14
  • yaml: 1.10.0 or 2.0.0-1

Additional context
This can be fixed by replacing type of Parsed.contents to union type.

type AllNodeType = AST.FlowMap | AST.BlockMap; // Union of all possible types
interface Parsed extends Document {
  contents: AllNodeType | null
  /** The schema used with the document. */
  schema: Schema
 }

This is work as long as type is not duplicated. This is pretty common in TypeScript. You can read more at the official document.

@joshuaavalon joshuaavalon added the bug Something isn't working label Jan 8, 2021
@eemeli
Copy link
Owner

eemeli commented Jan 8, 2021

A PR for this would be welcome. The same issue is probably repeated in other parts of the library as well. With #203 I'm starting to introduce more TS code into the source of yaml, but there isn't a schedule for if/when that might extend to replacing all of the current JS codebase, which necessitates these hand-crafted d.ts files.

@eemeli
Copy link
Owner

eemeli commented Jan 29, 2021

@joshuaavalon I specified the parsed content type a bit, to Scalar | YAMLMap | YAMLSeq | null. Is that enough for your purposes, or were you doing something even more specific?

@joshuaavalon
Copy link
Author

joshuaavalon commented Jan 30, 2021

@eemeli If you use the base type (i.e. YAMLMap) instead of the implementation type (i.e. FlowMap), TypeScript can only detected it as YAMLMap. It is better to create a type that contain all implementation types.

type Scalars = BlockFolded | BlockLiteral  | PlainValue | QuoteDouble | QuoteSingle;
type Maps = FlowMap | BlockMap;
type Seqs = FlowSeq | BlockSeq;

type AllNodeTypes = Scalars | Maps | Seqs;

From TypeScript compiler's view, if you don't state the implementation types, it does not know what is the possible implementation types.

If you want to support custom nodes better, you can even use generics:

interface Parsed<T extends AllNodeTypes = AllNodeTypes> extends Document {
  contents: T | null
  schema: Schema
 }

This will allows users to add their custom types.

@eemeli
Copy link
Owner

eemeli commented Jan 30, 2021

Ah, but there's the rub; at this level, Scalar, YAMLMap and YAMLSeq are the implementation types. The last of those, for instance, is internally constructed by calling new YAMLSeq() for both flow & block sequences. It's also perfectly fine to switch the type of a node within its supported range, so e.g. this works:

const doc = YAML.parseDocument('- one\n- two\n')
doc.contents.type = 'FLOW_SEQ'
String(doc) === '[ one, two ]\n'

@joshuaavalon
Copy link
Author

I still think using implementation type is better. Since that use case is not documented, there is no need to expose internal api. If others want to use internal api, they can cast the type themselves.

@eemeli eemeli added docs Documentation should be improved and removed bug Something isn't working labels Jan 30, 2021
@eemeli
Copy link
Owner

eemeli commented Jan 30, 2021

The perhaps the documentation ought to be improved to make it even clearer, as the behaviour of the stringifier is documented e.g. here: https://eemeli.org/yaml/#collections

And, as I mentioned before, in the AST, Scalar, YAMLMap and YAMLSeq are the actual implementations of the nodes. In the source JS code there are not different Node descendants for e.g. flow & block sequences, just the one YAMLSeq. This is what the TS typings are intended to convey.

@eemeli
Copy link
Owner

eemeli commented Jan 31, 2021

The docs now mention type modifications more explicitly: https://eemeli.org/yaml/#modifying-nodes

@eemeli eemeli closed this as completed Jan 31, 2021
mergify bot referenced this issue in projen/projen Mar 15, 2021
Bumps [yaml](https://github.com/eemeli/yaml) from 1.10.0 to 1.10.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/eemeli/yaml/releases">yaml's releases</a>.</em></p>
<blockquote>
<h2>v1.10.2</h2>
<ul>
<li>Allow for unindented comment after node props (prettier/prettier#10510)</li>
</ul>
<h2>v1.10.1</h2>
<p>This release backports the following non-breaking fixes made during the work on <code>yaml@2</code> on top of <code>[email protected]</code>:</p>
<ul>
<li>Support for<code> __proto__</code> as mapping key &amp; anchor identifier (<a href="https://github.com/eemeli/yaml/issues/192">#192</a>)</li>
<li>Fix broken TS type for BigInt toggle</li>
<li>Dump long keys properly (<a href="https://github.com/eemeli/yaml/issues/195">#195</a>)</li>
<li>When folding highly indented lines, require at least <code>minContentWidth</code> chars on the first line (<a href="https://github.com/eemeli/yaml/issues/196">#196</a>)</li>
<li>Fix <code>YAML.stringify()</code> for certain null values (<a href="https://github.com/eemeli/yaml/issues/197">#197</a>)</li>
<li>Do not break escaped chars with escaped newlines (<a href="https://github.com/eemeli/yaml/issues/237">#237</a>, <a href="https://github.com/awslabs/cdk8s/issues/8">awslabs/cdk8s8</a>)</li>
<li>Set <code>type: &quot;module&quot;</code> within browser/dist/ (<a href="https://github.com/eemeli/yaml/issues/208">#208</a>)</li>
<li>Use CommonJS for the browser endpoints <code>yaml/types</code> &amp; <code>yaml/util</code> (<a href="https://github.com/eemeli/yaml/issues/208">#208</a>)</li>
<li>Always stringify non-Node object keys using explicit notation (<a href="https://github.com/eemeli/yaml/issues/218">#218</a>)</li>
<li>Specify node type of <code>Document.Parsed.contents</code> (<a href="https://github.com/eemeli/yaml/issues/221">#221</a>)</li>
<li>Add missing type for CST <code>Node.rangeAsLinePos</code> (<a href="https://github.com/eemeli/yaml/issues/222">#222</a>)</li>
<li>Prefer literal over folded block scalar when <code>lineWidth=0</code> is set (<a href="https://github.com/eemeli/yaml/issues/232">#232</a>)</li>
<li>Allow for empty lines after node props (<a href="https://github.com/eemeli/yaml/issues/242">#242</a>)</li>
<li>Update dev dependencies</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/eemeli/yaml/commit/4cdcde632ece71155f3108ec0120c1a0329a6914"><code>4cdcde6</code></a> 1.10.2</li>
<li><a href="https://github.com/eemeli/yaml/commit/7c0e08316d82f167ac0a054428627f6e1f20ac6e"><code>7c0e083</code></a> Allow for unindented comment after node props (<a href="https://github.com/eemeli/yaml/issues/242">#242</a>)</li>
<li><a href="https://github.com/eemeli/yaml/commit/8ef015788b219a4b249736f4bb8968dafe68dcc4"><code>8ef0157</code></a> 1.10.1</li>
<li><a href="https://github.com/eemeli/yaml/commit/6296dae2e5f61a4aa4605b4a374bd94ec5713c3a"><code>6296dae</code></a> Update links in docs</li>
<li><a href="https://github.com/eemeli/yaml/commit/b1d2b287e80caeb262c4dc81459f52b982a5e741"><code>b1d2b28</code></a> Allow for empty lines after node props (Fixes <a href="https://github.com/eemeli/yaml/issues/242">#242</a>)</li>
<li><a href="https://github.com/eemeli/yaml/commit/3e5a64098791ea7a7c01a5465a0794049b511367"><code>3e5a640</code></a> Satisfy Prettier</li>
<li><a href="https://github.com/eemeli/yaml/commit/bd031cb67f4411826bd61cc2b3bbe21b1b398755"><code>bd031cb</code></a> Update dev dependencies + switch to lockfileVersion 2</li>
<li><a href="https://github.com/eemeli/yaml/commit/9c6e7d0ed367b2af439cfc52936e65b2fc3e5ecc"><code>9c6e7d0</code></a> Use CommonJS for browser endpoints yaml/types &amp; yaml/util (<a href="https://github.com/eemeli/yaml/issues/208">#208</a>)</li>
<li><a href="https://github.com/eemeli/yaml/commit/7ddb18b4e18d4d4625b94af8f64738a4725cbbb5"><code>7ddb18b</code></a> Prefer literal over folded block scalar when lineWidth=0 is set (<a href="https://github.com/eemeli/yaml/issues/232">#232</a>)</li>
<li><a href="https://github.com/eemeli/yaml/commit/fd817be1774145aec9354a30c4b48cc08fe98e41"><code>fd817be</code></a> Update dev dependencies</li>
<li>Additional commits viewable in <a href="https://github.com/eemeli/yaml/compare/v1.10.0...v1.10.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=yaml&package-manager=npm_and_yarn&previous-version=1.10.0&new-version=1.10.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually


</details>
This was referenced Mar 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation should be improved
Projects
None yet
Development

No branches or pull requests

2 participants