Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quest/m2/ts-model/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ Public API: the translator's output for moq-net's model.
- [Shared ownership](/quest/m2/ts-shared.md) - kio's waiters are `Arc`/`Weak` with observable counts, and its atomics and locks are plain values
- [Translate safe dependencies with the package](/quest/m2/ts-model/crates.md) - kio, moq-clock, moq-pattern, and rangemap translate as one program with moq-net
- [Std gaps the model reaches](/quest/m2/ts-model/std-more.md) - ranges, wrappers, and `Vec`'s editing methods
- [Options of values that can be undefined](/quest/m2/ts-model/nested-option.md) - `Option<Option<T>>` and `Option<()>` keep `None` apart from `Some(None)`
- [Std's mutable references to values JS copies](/quest/m2/ts-model/std-places.md) - `as_mut`, `get_or_insert`, `iter_mut`, and the rest give an `rt.Place`
- [The rest of std the model reaches](/quest/m2/ts-model/std-rest.md) - the std calls the census still refuses
- [Well-known crates without config](/quest/m2/ts-model/stock.md) - rust2-ts maps `bytes`, `rand`, and `tracing` itself, so `model.toml` stops binding and ignoring them
Expand Down
19 changes: 0 additions & 19 deletions quest/m2/ts-model/nested-option.md

This file was deleted.

14 changes: 11 additions & 3 deletions ts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ what they reach. A construct outside the subset is a compile error with its span
then nothing is written. A type without a JS value is refused where a value of it is made
or received, such as a parameter, a field, or a call, rather than again at each variable
holding one; any variable or temporary that holds a type whose JS value is ambiguous, such
as `Option<()>`, is refused at its own span.
as `Option<Option<()>>`, is refused at its own span.

```toml
# ts.toml, beside the package's Cargo.toml unless --manifest-path says otherwise.
Expand Down Expand Up @@ -74,7 +74,7 @@ in `rt/str.ts`, collections in `rt/collections.ts`, ownership and async in
| `struct` | a plain object, typed by an interface; a class if it may drop |
| `enum` without data | a union of strings: `"Lite01" \| "Lite02"`, or `never` without variants |
| `enum` | a union of objects tagged by variant |
| `Option<T>` | `T \| undefined`; refused if `T` can already be `undefined`, as `()` and `Option` can |
| `Option<T>` | `T \| undefined`; `T \| rt.None` where `T` can already be `undefined`, as `()` and `Option` can, so `Option<()>` and `Option<Option<u64>>` keep `None` apart from each `Some` |
| `Result<T, E>` | `rt.Result<T, E>`: `{ ok: true, value }` or `{ ok: false, error }`; `rt.OK` or `rt.ERR` where the payload is `undefined`, as in `Ok(())` |
| `ControlFlow<B, C>` | `rt.Result<C, B>`, `Ok` to continue; what `?` branches on is the value it was applied to |
| tuple, `[T; N]`, `&[T]`, `Vec<T>` | an array; for bytes, `Uint8Array` for `[u8; N]`, `rt.ByteSlice` for `&[u8]` and `&[u8; N]`, and `rt.ByteVec` for `Vec<u8>` |
Expand Down Expand Up @@ -345,6 +345,10 @@ they need.
function of it is one instance's, typed by its `self`. A type per instance
(`Wrap$Pair`) would rename the type for callers, and TS generics with trait
dictionaries would undo monomorphization.
- `None` is `undefined`, so a TS caller reads an `Option` with `?.` and `??`, except where
the `Some` can already be `undefined`: there it is `rt.None`, as `Pending` is
`rt.Pending`, chosen by the type alone, so every function agrees on it. A `rt.None`
for every `Option` would cost callers `?.` and `??` everywhere for the few that need it.
- A `Cow<str>` is a JS string, as `str` and `String` are, rather than an object tagged by
its variant: no `Cow<str>` in moq-net or kio tells its variants apart, and a tag would
wrap every value and unwrap it at every read.
Expand Down Expand Up @@ -425,7 +429,11 @@ hand-written TS ([bindings](#bindings)).
These fail translation: floats, statics, async closures, a closure that owns a value
that drops given to std's iterators or collections, and values that drop in some
iterators ([Drop](/quest/m2/ts-drop.md)), a `Cow` of other than `str`,
a collection holding a type that can be `undefined`, as `()` and `Option` can, a collection's `capacity`, looking up a key by
a collection holding a type that can be `undefined`, as `()` and `Option` can, a std
function without a mapping of its own that makes or reads an `Option` whose `None` is
`rt.None`, as `find` over `Option`s does, an `Option` of an `Option` of `()` or another
`Option`, an instance of a generic type whose field is an `Option` of a type parameter
that can be `undefined`, a collection's `capacity`, looking up a key by
another type it borrows as through the crate's own `Borrow`, a `&mut` to a value JS
copies that std makes, other than a map's, or hands a closure, as `iter_mut` and
`and_modify` do, one into a `Result`'s payload passed on or kept, `Hasher::write` of bytes, the adaptors
Expand Down
6 changes: 3 additions & 3 deletions ts/fixtures/lang/expected/combinators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as rt from "./rt.ts";
import { copy$Result_u32s_u16, copy$u32s } from "./lib.ts";
import { isSomeAnd$Option_u8_options_closure0, isNoneOr$Option_u8_options_closure1, unwrapOr$Option_u8, unwrapOrElse$Option_String_owned_closure3, unwrapOrElse$Option_u8_options_closure9, unwrapOrDefault$Option_String, unwrapOrDefault$Option_Vec_u8, unwrapOrDefault$Option_u8, map$Option_u8_String_owned_closure0, map$Option_u8_Vec_u8_owned_closure4, map$Option_u8_u32s_owned_closure9, map$Option_u8_u8_options_closure3_closure0, inspect$Option_u8_options_closure11, mapOr$Option_u16_u8_hash_maps_closure0, mapOr$Option_u8_u8_options_closure5, mapOr$Option_u8_u8_u8_btree_maps_closure0, mapOrElse$Option_u8_u8_options_closure7_options_closure8, okOr$Option_u32s_u8, okOr$Option_u8_u16, okOr$Option_u8_u8, okOrElse$Option_Vec_u8_String_owned_closure5, okOrElse$Option_u8_u16_options_closure12, and$Option_u8_u8, andThen$Option_u8_u8_options_closure2, filter$Option_String_owned_closure1, filter$Option_u8_combinators_closure0, or$Option_u8, orElse$Option_String_owned_closure2, orElse$Option_u8_options_closure6, xor$Option_u8, zip$Option_u8_u8, clone$Clone_Option_String } from "./core/option.ts";
import { isSomeAnd$Option_u8_options_closure0, isNoneOr$Option_u8_options_closure1, unwrapOr$Option_u8, unwrapOrElse$Option_String_owned_closure3, unwrapOrElse$Option_u8_options_closure9, unwrapOrDefault$Option_String, unwrapOrDefault$Option_Vec_u8, unwrapOrDefault$Option_u8, map$Option_u8_String_owned_closure0, map$Option_u8_Vec_u8_owned_closure4, map$Option_u8_u32s_owned_closure9, map$Option_u8_u8_made_closure0_closure0, inspect$Option_u8_options_closure11, mapOr$Option_u16_u8_hash_maps_closure0, mapOr$Option_u8_u8_iters_closure3, mapOr$Option_u8_u8_u8_btree_maps_closure0, mapOrElse$Option_u8_u8_options_closure7_options_closure8, okOr$Option_u32s_u8, okOr$Option_u8_u16, okOr$Option_u8_u8, okOrElse$Option_Vec_u8_String_owned_closure5, okOrElse$Option_u8_u16_options_closure12, and$Option_u8_u8, andThen$Option_u8_u8_options_closure2, filter$Option_String_owned_closure1, filter$Option_u8_combinators_closure0, or$Option_u8, orElse$Option_String_owned_closure2, orElse$Option_u8_options_closure6, xor$Option_u8, zip$Option_u8_u8, clone$Clone_Option_String } from "./core/option.ts";
import { isOkAnd$Result_u8_u16_results_closure5, isErrAnd$Result_u8_u16_results_closure6, ok$Result_u8_u16, err$Result_u8_u16, asRef$Result_u8_u16, map$Result_Vec_u8_String_Vec_u8_owned_closure6, map$Result_u8_u16_u8_options_closure13, mapOr$Result_u8_u16_u8_results_closure7, mapOrElse$Result_u8_u16_u8_results_closure8_results_closure9, mapErr$Result_u32s_u8_u16_from, mapErr$Result_u8_u16_u16_results_closure14, inspect$Result_u8_u16_results_closure12, inspectErr$Result_u8_u16_results_closure13, unwrapOrDefault$Result_u8_u16, and$Result_u8_u16_u8, andThen$Result_u8_u16_u8_results_closure3, or$Result_u8_u16_u16, orElse$Result_u8_u16_u16_results_closure4, unwrapOr$Result_u8_u16, unwrapOrElse$Result_u8_u16_results_closure11, unwrapOrElse$Result_u8_u8_panics_closure1, copied$Result_u8_u16, clone$Clone_Result_Vec_u8_String } from "./core/result.ts";

/** Run case `kind % 4` over `data`, whose bytes pick each `Some` or `None`, `Ok` or `Err`. */
Expand Down Expand Up @@ -39,11 +39,11 @@ export function options(a: rt.u8 | undefined, b: rt.u8 | undefined, limit: rt.u8
return rt.u8CheckedAdd(x3, limit);
}), (x4: rt.u8): rt.u8 | undefined => {
rt.byteVecPush(out, 162);
return map$Option_u8_u8_options_closure3_closure0(b, (y: rt.u8): rt.u8 => {
return map$Option_u8_u8_made_closure0_closure0(b, (y: rt.u8): rt.u8 => {
return x4 ^ y;
});
}), 238));
rt.byteVecPush(out, mapOr$Option_u8_u8_options_closure5(filter$Option_u8_combinators_closure0(a, (x5: rt.u8): boolean => {
rt.byteVecPush(out, mapOr$Option_u8_u8_iters_closure3(filter$Option_u8_combinators_closure0(a, (x5: rt.u8): boolean => {
rt.byteVecPush(out, 163);
return x5 > limit;
}), 221, (x6: rt.u8): rt.u8 => {
Expand Down
82 changes: 79 additions & 3 deletions ts/fixtures/lang/expected/core/option.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,13 @@ export function map$Option_Hop_u64_u64_options_closure0(self: Hop.Hop | undefine
return f(self);
}

export function map$Option_Option_u8_Option_u8_made_closure0(self: rt.u8 | undefined | rt.None, f: (a0: rt.u8 | undefined) => rt.u8 | undefined): rt.u8 | undefined | rt.None {
if (self === rt.None) {
return rt.None;
}
return f(self);
}

export function map$Option_Way_bool_defaults_closure2(self: Way.Way | undefined, f: (a0: Way.Way) => boolean): boolean | undefined {
if (self === undefined) {
return undefined;
Expand All @@ -156,6 +163,13 @@ export function map$Option_str_Cow_str_Borrowed(self: string | undefined, _: (a0
return self;
}

export function map$Option_u8_Option_u8_made_closure1_closure0(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8 | undefined): rt.u8 | undefined | rt.None {
if (self === undefined) {
return rt.None;
}
return f(self);
}

export function map$Option_u8_Side_side(self: rt.u8 | undefined, _: (a0: rt.u8) => Side.Side): Side.Side | undefined {
if (self === undefined) {
return undefined;
Expand Down Expand Up @@ -184,13 +198,20 @@ export function map$Option_u8_u32s_owned_closure9(self: rt.u8 | undefined, f: (a
return f(self);
}

export function map$Option_u8_u8_options_closure3_closure0(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8): rt.u8 | undefined {
export function map$Option_u8_u8_made_closure0_closure0(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8): rt.u8 | undefined {
if (self === undefined) {
return undefined;
}
return f(self);
}

export function map$Option_unit_Option_u8_made_closure3(self: undefined | rt.None, f: (a0: undefined) => rt.u8 | undefined): rt.u8 | undefined | rt.None {
if (self === rt.None) {
return rt.None;
}
return f(undefined);
}

export function map$Option_usize_str_str_slices_closure2(self: [rt.usize, string] | undefined, f: (a0: [rt.usize, string]) => string): string | undefined {
if (self === undefined) {
return undefined;
Expand Down Expand Up @@ -296,7 +317,7 @@ export function mapOr$Option_u8_bool_take_largest_closure0(self: rt.u8 | undefin
return f(self);
}

export function mapOr$Option_u8_u8_options_closure5(self: rt.u8 | undefined, default_: rt.u8, f: (a0: rt.u8) => rt.u8): rt.u8 {
export function mapOr$Option_u8_u8_iters_closure3(self: rt.u8 | undefined, default_: rt.u8, f: (a0: rt.u8) => rt.u8): rt.u8 {
if (self === undefined) {
return default_;
}
Expand All @@ -317,7 +338,7 @@ export function mapOr$Option_u8_u8_u8s_stores_closure2_closure0(self: [rt.u8, rt
return f(self);
}

export function mapOr$Option_u8_usize_shares_closure1(self: rt.u8 | undefined, default_: rt.usize, f: (a0: rt.u8) => rt.usize): rt.usize {
export function mapOr$Option_u8_usize_iters_closure1(self: rt.u8 | undefined, default_: rt.usize, f: (a0: rt.u8) => rt.usize): rt.usize {
if (self === undefined) {
return default_;
}
Expand Down Expand Up @@ -345,6 +366,13 @@ export function mapOr$Option_u8s_u8s_u8s_chunks_closure0(self: [rt.ByteSlice, rt
return f(self);
}

export function mapOr$Option_unit_u8_made_closure4(self: undefined | rt.None, default_: rt.u8, f: (a0: undefined) => rt.u8): rt.u8 {
if (self === rt.None) {
return default_;
}
return f(undefined);
}

export function mapOr$Option_usize_str_slices_closure1_closure0_closure0(self: rt.usize | undefined, default_: string, f: (a0: rt.usize) => string): string {
if (self === undefined) {
return default_;
Expand Down Expand Up @@ -443,13 +471,30 @@ export function and$Option_u8_u8(self: rt.u8 | undefined, optb: rt.u8 | undefine
return optb;
}

export function andThen$Option_Option_u8_Option_u8_made_closure1(self: rt.u8 | undefined | rt.None, f: (a0: rt.u8 | undefined) => rt.u8 | undefined | rt.None): rt.u8 | undefined | rt.None {
if (self === rt.None) {
return rt.None;
}
return f(self);
}

export function andThen$Option_u8_u8_options_closure2(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8 | undefined): rt.u8 | undefined {
if (self === undefined) {
return undefined;
}
return f(self);
}

export function filter$Option_Option_u8_made_closure2(self: rt.u8 | undefined | rt.None, predicate: (a0: rt.u8 | undefined) => boolean): rt.u8 | undefined | rt.None {
if (self !== rt.None) {
const x: rt.u8 | undefined = self;
if (predicate(x)) {
return x;
}
}
return rt.None;
}

export function filter$Option_String_owned_closure1(self: string | undefined, predicate: (a0: string) => boolean): string | undefined {
if (self !== undefined) {
const x: string = self;
Expand All @@ -470,6 +515,13 @@ export function filter$Option_u8_combinators_closure0(self: rt.u8 | undefined, p
return undefined;
}

export function or$Option_Option_u8(self: rt.u8 | undefined | rt.None, optb: rt.u8 | undefined | rt.None): rt.u8 | undefined | rt.None {
if (self === rt.None) {
return optb;
}
return self;
}

export function or$Option_u8(self: rt.u8 | undefined, optb: rt.u8 | undefined): rt.u8 | undefined {
if (self === undefined) {
return optb;
Expand All @@ -491,6 +543,23 @@ export function orElse$Option_u8_options_closure6(self: rt.u8 | undefined, f: ()
return self;
}

export function xor$Option_Option_u8(self: rt.u8 | undefined | rt.None, optb: rt.u8 | undefined | rt.None): rt.u8 | undefined | rt.None {
let _0!: rt.u8 | undefined | rt.None;
b0: {
if (self === rt.None) {
if (optb !== rt.None) {
_0 = optb;
break b0;
}
} else if (optb === rt.None) {
_0 = self;
break b0;
}
_0 = rt.None;
}
return _0;
}

export function xor$Option_u8(self: rt.u8 | undefined, optb: rt.u8 | undefined): rt.u8 | undefined {
let _0!: rt.u8 | undefined;
b0: {
Expand Down Expand Up @@ -529,4 +598,11 @@ export function clone$Clone_Option_String(self: string | undefined): string | un
return self;
}

export function flatten$Option_Option_u8(self: rt.u8 | undefined | rt.None): rt.u8 | undefined {
if (self === rt.None) {
return undefined;
}
return self;
}

//# sourceMappingURL=option.ts.map
9 changes: 6 additions & 3 deletions ts/fixtures/lang/expected/harness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { methods } from "./generics.ts";
import { u8Op, u16Op, u32Op, u64Op, u128Op, usizeOp, i8Op, i16Op, i32Op, i64Op, i128Op, isizeOp, i8Neg, i16Neg, i32Neg, i64Neg, i128Neg, isizeNeg, cast, convert } from "./ints.ts";
import { adaptors, consumers, skips, ranges, options, own, values } from "./iters.ts";
import { keys } from "./keys.ts";
import { nested } from "./nested.ts";
import { refs } from "./refs.ts";
import { copies, order, discriminants, loops, patterns, closures, library, flows } from "./shapes.ts";
import { splits } from "./splits.ts";
Expand All @@ -26,7 +27,7 @@ export function run(input: rt.ByteSlice): rt.ByteVec {
const _10: [rt.u8, rt.u8] = [input.data[input.start], input.data[input.start + 1]];
const op: rt.u8 = _10[0];
const kind: rt.u8 = _10[1];
const _14: rt.u8 = rt.u8Rem(op, 54);
const _14: rt.u8 = rt.u8Rem(op, 55);
if (_14 === 0) {
u8Op(kind, new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
} else if (_14 === 1) {
Expand Down Expand Up @@ -145,10 +146,12 @@ export function run(input: rt.ByteSlice): rt.ByteVec {
} else if (_14 === 49) {
splits(kind, new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
} else if (_14 === 50) {
refs(new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
nested(kind, new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
} else if (_14 === 51) {
counts(new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
refs(new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
} else if (_14 === 52) {
counts(new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
} else if (_14 === 53) {
rounding(out);
} else {
skips(kind, new rt.ByteSlice(input.data, input.start + 2, input.length - 2), out);
Expand Down
Loading