Merged

GenType: support @deriving(accessors) #6537

Show file tree
Hide file tree
Changes from all commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7e05ea
GenType: support `@deriving(accessors)` outputs
cometkimDec 21, 2023
409dbdb
[skip ci] changelog
cometkimDec 21, 2023
d840939
changed to not recycle loc unintentinonlly
cometkimDec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Failed to load files.
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,10 @@

# 11.0.0-rc.9 ()

#### :rocket: New Feature

- GenType: support `@deriving(accessors)` outputs. https://.com/rescript-lang/rescript-compiler/pull/6537

# 11.0.0-rc.8

#### :rocket: New Feature
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -373,3 +373,10 @@ let bs_return_undefined : attr =
pstr_loc = locg;
};
] )

let is_gentype (attr : attr) =
match attr with
| {Location.txt = "genType" | "gentype"; _}, _ -> true
| _ -> false

let gentype : attr = ({txt = "genType"; loc = locg}, Ast_payload.empty)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this is not used?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahhh right. I think it's better to use it instead of copying the original attrs

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done. can you push the changelog commit again? I forgot pull.

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,3 +90,7 @@ val internal_expansive : attr
val rs_externals : t -> string list -> bool

val process_send_pipe : t -> (Parsetree.core_type * t) option

val is_gentype : attr -> bool

val gentype : attr
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ let to_js_re_type loc = Typ.constr ~loc {txt = re_id; loc} []
let to_undefined_type loc x =
Typ.constr ~loc {txt = Ast_literal.Lid.js_undefined; loc} [x]

let single_non_rec_value name exp =
Str.value Nonrecursive [Vb.mk (Pat.var name) exp]
let single_non_rec_value ?(attrs = []) name exp =
Str.value Nonrecursive [Vb.mk ~attrs (Pat.var name) exp]

let single_non_rec_val name ty = Sig.value (Val.mk name ty)
let single_non_rec_val ?(attrs = []) name ty = Sig.value (Val.mk ~attrs name ty)
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,14 @@ let init () =
let core_type =
Ast_derive_util.core_type_of_type_declaration tdcl
in
let gentype_attrs =
match
Ext_list.exists core_type.ptyp_attributes
Ast_attributes.is_gentype
with
| true -> Some [Ast_attributes.gentype]
| false -> None
in
match tdcl.ptype_kind with
| Ptype_record label_declarations ->
Ext_list.map label_declarations
Expand All@@ -26,7 +34,7 @@ let init () =
Parsetree.label_declaration)
->
let txt = "param" in
Ast_comb.single_non_rec_value pld_name
Ast_comb.single_non_rec_value ?attrs:gentype_attrs pld_name
(Ast_compatible.fun_
(Pat.constraint_ (Pat.var {txt; loc}) core_type)
(Exp.field
Expand DownExpand Up@@ -57,7 +65,7 @@ let init () =
| None -> core_type
| Some x -> x
in
Ast_comb.single_non_rec_value
Ast_comb.single_non_rec_value ?attrs:gentype_attrs
{loc; txt = little_con_name}
(if arity = 0 then
(*TODO: add a prefix, better inter-op with FFI *)
Expand DownExpand Up@@ -99,10 +107,18 @@ let init () =
let core_type =
Ast_derive_util.core_type_of_type_declaration tdcl
in
let gentype_attrs =
match
Ext_list.exists core_type.ptyp_attributes
Ast_attributes.is_gentype
with
| true -> Some [Ast_attributes.gentype]
| false -> None
in
match tdcl.ptype_kind with
| Ptype_record label_declarations ->
Ext_list.map label_declarations (fun {pld_name; pld_type} ->
Ast_comb.single_non_rec_val pld_name
Ast_comb.single_non_rec_val ?attrs:gentype_attrs pld_name
(Ast_compatible.arrow core_type pld_type))
| Ptype_variant constructor_declarations ->
Ext_list.map constructor_declarations
Expand All@@ -124,7 +140,7 @@ let init () =
| Some x -> x
| None -> core_type
in
Ast_comb.single_non_rec_val
Ast_comb.single_non_rec_val ?attrs:gentype_attrs
{loc; txt = Ext_string.uncapitalize_ascii con_name}
(Ext_list.fold_right pcd_args annotate_type (fun x acc ->
Ast_compatible.arrow x acc)))
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,8 +26,8 @@ open Ast_helper

let core_type_of_type_declaration (tdcl : Parsetree.type_declaration) =
match tdcl with
| {ptype_name = {txt; loc}; ptype_params} ->
Typ.constr {txt = Lident txt; loc} (Ext_list.map ptype_params fst)
| {ptype_name = {txt; loc}; ptype_params; ptype_attributes = attrs} ->
Typ.constr ~attrs {txt = Lident txt; loc} (Ext_list.map ptype_params fst)

let new_type_of_type_declaration (tdcl : Parsetree.type_declaration) newName =
match tdcl with
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
/* TypeScript file generated from Derivings.res by genType. */

/* eslint-disable */
/* tslint:disable */

import * as DerivingsBS from './Derivings.bs';

export type action =
"Click"
| "Cancel"
| { TAG: "Submit"; _0: string };

export const click: action = DerivingsBS.click as any;

export const submit: (_1:string) => action = DerivingsBS.submit as any;

export const cancel: action = DerivingsBS.cancel as any;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
@genType @deriving(accessors)
type action =
| Click
| Submit(string)
| Cancel