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
2 changes: 1 addition & 1 deletion .dprint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"./types/meteor",
"./types/microsoft-graph",
"./types/nginstack__engine",
"./types/node/**/inspector.d.ts",
"./types/node/**/inspector.generated.d.ts",
"./types/office-js-preview",
"./types/office-js",
"./types/office-runtime",
Expand Down
24 changes: 23 additions & 1 deletion types/google-apps-script/google-apps-script.card-service.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ declare namespace GoogleAppsScript {
newImageCropStyle(): ImageCropStyle;
newKeyValue(): KeyValue;
newLinkPreview(): LinkPreview;
newMaterialIcon(): MaterialIcon;
newNavigation(): Navigation;
newNotification(): Notification;
newOpenLink(): OpenLink;
Expand Down Expand Up @@ -415,7 +416,7 @@ declare namespace GoogleAppsScript {
VIDEO_PLAY,
}
/**
* A widget that shows an icon image.
* A predefined icon, a material design icon, or an icon from a URL with a customizable crop style.
*
* var icon = CardService.newIconImage().setAltText("A nice icon").setIconUrl("https://example.com/icon.png");
*/
Expand All @@ -424,6 +425,7 @@ declare namespace GoogleAppsScript {
setIcon(icon: Icon): IconImage;
setIconUrl(url: string): IconImage;
setImageCropType(imageCropType: ImageCropType): IconImage;
setMaterialIcon(icon: MaterialIcon): IconImage;
}
/**
* A widget that shows a single image.
Expand Down Expand Up @@ -454,6 +456,7 @@ declare namespace GoogleAppsScript {
setComposeAction(action: Action, composedEmailType: ComposedEmailType): ImageButton;
setIcon(icon: Icon): ImageButton;
setIconUrl(url: string): ImageButton;
setMaterialIcon(icon: MaterialIcon): ImageButton;
setOnClickAction(action: Action): ImageButton;
setOnClickOpenLinkAction(action: Action): ImageButton;
setOpenLink(openLink: OpenLink): ImageButton;
Expand Down Expand Up @@ -534,6 +537,25 @@ declare namespace GoogleAppsScript {
SPINNER,
NONE,
}

/**
* An object that supports all Google Font Icons ({@link https://fonts.google.com/icons}).
*
* Available for Google Workspace add-ons and Google Chat apps.
*
* const materialIcon = CardService.newMaterialIcon()
* .setName('search')
* .setFill(true)
* .setWeight(400)
* .setGrade(0);
*/
interface MaterialIcon {
setFill(fill: boolean): MaterialIcon;
setGrade(grade: Integer): MaterialIcon;
setName(name: string): MaterialIcon;
setWeight(weight: Integer): MaterialIcon;
}

/**
* A helper object that controls card navigation. See the card navigation guide for more details.
*/
Expand Down
6 changes: 6 additions & 0 deletions types/google-apps-script/test/google-apps-script-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,12 @@ CardService.newTimePicker().setMinutes(0); // $ExpectType TimePicker
CardService.newTimePicker().setOnChangeAction(CardService.newAction()); // $ExpectType TimePicker
CardService.newTimePicker().setTitle(""); // $ExpectType TimePicker

CardService.newMaterialIcon(); // $ExpectType MaterialIcon
CardService.newMaterialIcon().setFill(true); // $ExpectType MaterialIcon
CardService.newMaterialIcon().setGrade(100); // $ExpectType MaterialIcon
CardService.newMaterialIcon().setName(""); // $ExpectType MaterialIcon
CardService.newMaterialIcon().setWeight(100); // $ExpectType MaterialIcon

// CardService.newCardBuilder().setDisplayStyle(CardService.DisplayStyle.PEEK)
CardService.DisplayStyle.PEEK;
CardService.DisplayStyle.REPLACE;
Expand Down
5 changes: 5 additions & 0 deletions types/node/dns.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,11 @@ declare module "dns" {
* @default 4
*/
tries?: number;
/**
* The max retry timeout, in milliseconds.
* @default 0
*/
maxTimeout?: number | undefined;
}
/**
* An independent resolver for DNS requests.
Expand Down
24 changes: 24 additions & 0 deletions types/node/http.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,14 @@ declare module "http" {
*/
destroy(error?: Error): this;
}
interface ProxyEnv extends NodeJS.ProcessEnv {
HTTP_PROXY?: string | undefined;
HTTPS_PROXY?: string | undefined;
NO_PROXY?: string | undefined;
http_proxy?: string | undefined;
https_proxy?: string | undefined;
no_proxy?: string | undefined;
}
interface AgentOptions extends Partial<TcpSocketConnectOpts> {
/**
* Keep sockets around in a pool to be used by other requests in the future. Default = false
Expand Down Expand Up @@ -1450,6 +1458,22 @@ declare module "http" {
* @default `lifo`
*/
scheduling?: "fifo" | "lifo" | undefined;
/**
* Environment variables for proxy configuration. See
* [Built-in Proxy Support](https://nodejs.org/docs/latest-v24.x/api/http.html#built-in-proxy-support) for details.
* @since v24.5.0
*/
proxyEnv?: ProxyEnv | undefined;
/**
* Default port to use when the port is not specified in requests.
* @since v24.5.0
*/
defaultPort?: number | undefined;
/**
* The protocol to use for the agent.
* @since v24.5.0
*/
protocol?: string | undefined;
}
/**
* An `Agent` is responsible for managing connection persistence
Expand Down
2 changes: 1 addition & 1 deletion types/node/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
/// <reference path="diagnostics_channel.d.ts" />
/// <reference path="dns.d.ts" />
/// <reference path="dns/promises.d.ts" />
/// <reference path="dns/promises.d.ts" />
/// <reference path="domain.d.ts" />
/// <reference path="events.d.ts" />
/// <reference path="fs.d.ts" />
Expand All @@ -66,6 +65,7 @@
/// <reference path="http2.d.ts" />
/// <reference path="https.d.ts" />
/// <reference path="inspector.d.ts" />
/// <reference path="inspector.generated.d.ts" />
/// <reference path="module.d.ts" />
/// <reference path="net.d.ts" />
/// <reference path="os.d.ts" />
Expand Down
Loading