From 53b84632234ec12fb9211474faadfc660e77ddd7 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Thu, 19 Sep 2024 13:22:56 -0700 Subject: [PATCH] All generated TS models in two files --- plugin-runtime-types/src/gen/BootRequest.ts | 3 - plugin-runtime-types/src/gen/BootResponse.ts | 3 - .../src/gen/CallHttpRequestActionArgs.ts | 4 - .../src/gen/CallHttpRequestActionRequest.ts | 4 - .../src/gen/CallTemplateFunctionArgs.ts | 4 - .../src/gen/CallTemplateFunctionRequest.ts | 4 - .../src/gen/CallTemplateFunctionResponse.ts | 3 - plugin-runtime-types/src/gen/Cookie.ts | 5 - plugin-runtime-types/src/gen/CookieJar.ts | 4 - .../src/gen/CopyTextRequest.ts | 3 - plugin-runtime-types/src/gen/Environment.ts | 4 - .../src/gen/EnvironmentVariable.ts | 3 - .../src/gen/ExportHttpRequestRequest.ts | 4 - .../src/gen/ExportHttpRequestResponse.ts | 3 - plugin-runtime-types/src/gen/FilterRequest.ts | 3 - .../src/gen/FilterResponse.ts | 3 - .../src/gen/FindHttpResponsesRequest.ts | 3 - .../src/gen/FindHttpResponsesResponse.ts | 4 - plugin-runtime-types/src/gen/Folder.ts | 3 - .../src/gen/GetHttpRequestActionsRequest.ts | 3 - .../src/gen/GetHttpRequestActionsResponse.ts | 4 - .../src/gen/GetHttpRequestByIdRequest.ts | 3 - .../src/gen/GetHttpRequestByIdResponse.ts | 4 - .../src/gen/GetTemplateFunctionsResponse.ts | 4 - .../src/gen/GrpcConnection.ts | 3 - plugin-runtime-types/src/gen/GrpcEvent.ts | 4 - .../src/gen/GrpcMetadataEntry.ts | 3 - plugin-runtime-types/src/gen/GrpcRequest.ts | 4 - plugin-runtime-types/src/gen/HttpRequest.ts | 5 - .../src/gen/HttpRequestAction.ts | 3 - .../src/gen/HttpRequestHeader.ts | 3 - plugin-runtime-types/src/gen/HttpResponse.ts | 4 - .../src/gen/HttpResponseHeader.ts | 3 - .../src/gen/HttpUrlParameter.ts | 3 - plugin-runtime-types/src/gen/ImportRequest.ts | 3 - .../src/gen/ImportResources.ts | 8 -- .../src/gen/ImportResponse.ts | 4 - plugin-runtime-types/src/gen/InternalEvent.ts | 4 - .../src/gen/InternalEventPayload.ts | 27 ------ plugin-runtime-types/src/gen/KeyValue.ts | 3 - plugin-runtime-types/src/gen/Model.ts | 15 --- plugin-runtime-types/src/gen/Plugin.ts | 3 - .../src/gen/RenderHttpRequestRequest.ts | 5 - .../src/gen/RenderHttpRequestResponse.ts | 4 - plugin-runtime-types/src/gen/RenderPurpose.ts | 3 - .../src/gen/SendHttpRequestRequest.ts | 4 - .../src/gen/SendHttpRequestResponse.ts | 4 - .../src/gen/ShowToastRequest.ts | 4 - .../src/gen/TemplateFunction.ts | 4 - .../src/gen/TemplateFunctionArg.ts | 7 -- .../src/gen/TemplateFunctionBaseArg.ts | 3 - .../src/gen/TemplateFunctionCheckboxArg.ts | 3 - .../src/gen/TemplateFunctionHttpRequestArg.ts | 3 - .../src/gen/TemplateFunctionSelectArg.ts | 4 - .../src/gen/TemplateFunctionSelectOption.ts | 3 - .../src/gen/TemplateFunctionTextArg.ts | 3 - plugin-runtime-types/src/gen/ToastVariant.ts | 3 - plugin-runtime-types/src/gen/Workspace.ts | 4 - plugin-runtime-types/src/gen/events.ts | 95 +++++++++++++++++++ plugin-runtime-types/src/gen/models.ts | 43 +++++++++ plugin-runtime-types/src/index.ts | 64 +------------ src-tauri/Cargo.lock | 9 +- src-tauri/yaak_models/Cargo.toml | 2 +- .../yaak_models/bindings}/CookieDomain.ts | 0 .../yaak_models/bindings}/CookieExpires.ts | 0 .../yaak_models/bindings}/GrpcEventType.ts | 0 .../yaak_models/bindings/index.ts | 0 src-tauri/yaak_models/bindings/models.ts | 43 +++++++++ src-tauri/yaak_models/src/models.rs | 21 ++++ src-tauri/yaak_plugin_runtime/Cargo.toml | 4 +- src-tauri/yaak_plugin_runtime/build.rs | 4 +- src-tauri/yaak_plugin_runtime/src/events.rs | 82 ++++++++-------- src-tauri/yaak_templates/Cargo.toml | 2 +- 73 files changed, 256 insertions(+), 361 deletions(-) delete mode 100644 plugin-runtime-types/src/gen/BootRequest.ts delete mode 100644 plugin-runtime-types/src/gen/BootResponse.ts delete mode 100644 plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts delete mode 100644 plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts delete mode 100644 plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts delete mode 100644 plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts delete mode 100644 plugin-runtime-types/src/gen/CallTemplateFunctionResponse.ts delete mode 100644 plugin-runtime-types/src/gen/Cookie.ts delete mode 100644 plugin-runtime-types/src/gen/CookieJar.ts delete mode 100644 plugin-runtime-types/src/gen/CopyTextRequest.ts delete mode 100644 plugin-runtime-types/src/gen/Environment.ts delete mode 100644 plugin-runtime-types/src/gen/EnvironmentVariable.ts delete mode 100644 plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts delete mode 100644 plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts delete mode 100644 plugin-runtime-types/src/gen/FilterRequest.ts delete mode 100644 plugin-runtime-types/src/gen/FilterResponse.ts delete mode 100644 plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts delete mode 100644 plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts delete mode 100644 plugin-runtime-types/src/gen/Folder.ts delete mode 100644 plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts delete mode 100644 plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts delete mode 100644 plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts delete mode 100644 plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts delete mode 100644 plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts delete mode 100644 plugin-runtime-types/src/gen/GrpcConnection.ts delete mode 100644 plugin-runtime-types/src/gen/GrpcEvent.ts delete mode 100644 plugin-runtime-types/src/gen/GrpcMetadataEntry.ts delete mode 100644 plugin-runtime-types/src/gen/GrpcRequest.ts delete mode 100644 plugin-runtime-types/src/gen/HttpRequest.ts delete mode 100644 plugin-runtime-types/src/gen/HttpRequestAction.ts delete mode 100644 plugin-runtime-types/src/gen/HttpRequestHeader.ts delete mode 100644 plugin-runtime-types/src/gen/HttpResponse.ts delete mode 100644 plugin-runtime-types/src/gen/HttpResponseHeader.ts delete mode 100644 plugin-runtime-types/src/gen/HttpUrlParameter.ts delete mode 100644 plugin-runtime-types/src/gen/ImportRequest.ts delete mode 100644 plugin-runtime-types/src/gen/ImportResources.ts delete mode 100644 plugin-runtime-types/src/gen/ImportResponse.ts delete mode 100644 plugin-runtime-types/src/gen/InternalEvent.ts delete mode 100644 plugin-runtime-types/src/gen/InternalEventPayload.ts delete mode 100644 plugin-runtime-types/src/gen/KeyValue.ts delete mode 100644 plugin-runtime-types/src/gen/Model.ts delete mode 100644 plugin-runtime-types/src/gen/Plugin.ts delete mode 100644 plugin-runtime-types/src/gen/RenderHttpRequestRequest.ts delete mode 100644 plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts delete mode 100644 plugin-runtime-types/src/gen/RenderPurpose.ts delete mode 100644 plugin-runtime-types/src/gen/SendHttpRequestRequest.ts delete mode 100644 plugin-runtime-types/src/gen/SendHttpRequestResponse.ts delete mode 100644 plugin-runtime-types/src/gen/ShowToastRequest.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunction.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionArg.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts delete mode 100644 plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts delete mode 100644 plugin-runtime-types/src/gen/ToastVariant.ts delete mode 100644 plugin-runtime-types/src/gen/Workspace.ts create mode 100644 plugin-runtime-types/src/gen/events.ts create mode 100644 plugin-runtime-types/src/gen/models.ts rename {plugin-runtime-types/src/gen => src-tauri/yaak_models/bindings}/CookieDomain.ts (100%) rename {plugin-runtime-types/src/gen => src-tauri/yaak_models/bindings}/CookieExpires.ts (100%) rename {plugin-runtime-types/src/gen => src-tauri/yaak_models/bindings}/GrpcEventType.ts (100%) rename plugin-runtime-types/src/gen/Settings.ts => src-tauri/yaak_models/bindings/index.ts (100%) create mode 100644 src-tauri/yaak_models/bindings/models.ts diff --git a/plugin-runtime-types/src/gen/BootRequest.ts b/plugin-runtime-types/src/gen/BootRequest.ts deleted file mode 100644 index 398ca72c..00000000 --- a/plugin-runtime-types/src/gen/BootRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type BootRequest = { dir: string, }; diff --git a/plugin-runtime-types/src/gen/BootResponse.ts b/plugin-runtime-types/src/gen/BootResponse.ts deleted file mode 100644 index 1c1654de..00000000 --- a/plugin-runtime-types/src/gen/BootResponse.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type BootResponse = { name: string, version: string, capabilities: Array, }; diff --git a/plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts b/plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts deleted file mode 100644 index 08c0ea75..00000000 --- a/plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; - -export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, }; diff --git a/plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts b/plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts deleted file mode 100644 index a34da579..00000000 --- a/plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CallHttpRequestActionArgs } from "./CallHttpRequestActionArgs"; - -export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, }; diff --git a/plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts b/plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts deleted file mode 100644 index a4912f33..00000000 --- a/plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { RenderPurpose } from "./RenderPurpose"; - -export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key: string]: string }, }; diff --git a/plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts b/plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts deleted file mode 100644 index 0e1e640e..00000000 --- a/plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CallTemplateFunctionArgs } from "./CallTemplateFunctionArgs"; - -export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, }; diff --git a/plugin-runtime-types/src/gen/CallTemplateFunctionResponse.ts b/plugin-runtime-types/src/gen/CallTemplateFunctionResponse.ts deleted file mode 100644 index f89ef42f..00000000 --- a/plugin-runtime-types/src/gen/CallTemplateFunctionResponse.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type CallTemplateFunctionResponse = { value: string | null, }; diff --git a/plugin-runtime-types/src/gen/Cookie.ts b/plugin-runtime-types/src/gen/Cookie.ts deleted file mode 100644 index 6d2dfc77..00000000 --- a/plugin-runtime-types/src/gen/Cookie.ts +++ /dev/null @@ -1,5 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CookieDomain } from "./CookieDomain"; -import type { CookieExpires } from "./CookieExpires"; - -export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], }; diff --git a/plugin-runtime-types/src/gen/CookieJar.ts b/plugin-runtime-types/src/gen/CookieJar.ts deleted file mode 100644 index aa67f049..00000000 --- a/plugin-runtime-types/src/gen/CookieJar.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Cookie } from "./Cookie"; - -export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array, }; diff --git a/plugin-runtime-types/src/gen/CopyTextRequest.ts b/plugin-runtime-types/src/gen/CopyTextRequest.ts deleted file mode 100644 index 1f210dac..00000000 --- a/plugin-runtime-types/src/gen/CopyTextRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type CopyTextRequest = { text: string, }; diff --git a/plugin-runtime-types/src/gen/Environment.ts b/plugin-runtime-types/src/gen/Environment.ts deleted file mode 100644 index 900e596e..00000000 --- a/plugin-runtime-types/src/gen/Environment.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EnvironmentVariable } from "./EnvironmentVariable"; - -export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array, }; diff --git a/plugin-runtime-types/src/gen/EnvironmentVariable.ts b/plugin-runtime-types/src/gen/EnvironmentVariable.ts deleted file mode 100644 index 987f115c..00000000 --- a/plugin-runtime-types/src/gen/EnvironmentVariable.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts b/plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts deleted file mode 100644 index 994628bc..00000000 --- a/plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; - -export type ExportHttpRequestRequest = { httpRequest: HttpRequest, }; diff --git a/plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts b/plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts deleted file mode 100644 index c9953827..00000000 --- a/plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ExportHttpRequestResponse = { content: string, }; diff --git a/plugin-runtime-types/src/gen/FilterRequest.ts b/plugin-runtime-types/src/gen/FilterRequest.ts deleted file mode 100644 index 8fc8df60..00000000 --- a/plugin-runtime-types/src/gen/FilterRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type FilterRequest = { content: string, filter: string, }; diff --git a/plugin-runtime-types/src/gen/FilterResponse.ts b/plugin-runtime-types/src/gen/FilterResponse.ts deleted file mode 100644 index fa2fcc15..00000000 --- a/plugin-runtime-types/src/gen/FilterResponse.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type FilterResponse = { content: string, }; diff --git a/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts b/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts deleted file mode 100644 index 14439955..00000000 --- a/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type FindHttpResponsesRequest = { requestId: string, limit: number | null, }; diff --git a/plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts b/plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts deleted file mode 100644 index c97506ea..00000000 --- a/plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpResponse } from "./HttpResponse"; - -export type FindHttpResponsesResponse = { httpResponses: Array, }; diff --git a/plugin-runtime-types/src/gen/Folder.ts b/plugin-runtime-types/src/gen/Folder.ts deleted file mode 100644 index 859475cf..00000000 --- a/plugin-runtime-types/src/gen/Folder.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, }; diff --git a/plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts b/plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts deleted file mode 100644 index 570d7b77..00000000 --- a/plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type GetHttpRequestActionsRequest = Record; diff --git a/plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts b/plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts deleted file mode 100644 index e1619cd8..00000000 --- a/plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequestAction } from "./HttpRequestAction"; - -export type GetHttpRequestActionsResponse = { actions: Array, pluginRefId: string, }; diff --git a/plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts b/plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts deleted file mode 100644 index fdf0a5b0..00000000 --- a/plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type GetHttpRequestByIdRequest = { id: string, }; diff --git a/plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts b/plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts deleted file mode 100644 index e0a8af6d..00000000 --- a/plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; - -export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, }; diff --git a/plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts b/plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts deleted file mode 100644 index 144c2109..00000000 --- a/plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TemplateFunction } from "./TemplateFunction"; - -export type GetTemplateFunctionsResponse = { functions: Array, pluginRefId: string, }; diff --git a/plugin-runtime-types/src/gen/GrpcConnection.ts b/plugin-runtime-types/src/gen/GrpcConnection.ts deleted file mode 100644 index 595b5d00..00000000 --- a/plugin-runtime-types/src/gen/GrpcConnection.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key: string]: string }, }; diff --git a/plugin-runtime-types/src/gen/GrpcEvent.ts b/plugin-runtime-types/src/gen/GrpcEvent.ts deleted file mode 100644 index 60eb4fd6..00000000 --- a/plugin-runtime-types/src/gen/GrpcEvent.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { GrpcEventType } from "./GrpcEventType"; - -export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, updatedAt: string, content: string, eventType: GrpcEventType, metadata: { [key: string]: string }, status: number | null, error: string | null, }; diff --git a/plugin-runtime-types/src/gen/GrpcMetadataEntry.ts b/plugin-runtime-types/src/gen/GrpcMetadataEntry.ts deleted file mode 100644 index 04deaff0..00000000 --- a/plugin-runtime-types/src/gen/GrpcMetadataEntry.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/GrpcRequest.ts b/plugin-runtime-types/src/gen/GrpcRequest.ts deleted file mode 100644 index cbe23c7e..00000000 --- a/plugin-runtime-types/src/gen/GrpcRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { GrpcMetadataEntry } from "./GrpcMetadataEntry"; - -export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record, metadata: Array, }; diff --git a/plugin-runtime-types/src/gen/HttpRequest.ts b/plugin-runtime-types/src/gen/HttpRequest.ts deleted file mode 100644 index 0412dfdb..00000000 --- a/plugin-runtime-types/src/gen/HttpRequest.ts +++ /dev/null @@ -1,5 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequestHeader } from "./HttpRequestHeader"; -import type { HttpUrlParameter } from "./HttpUrlParameter"; - -export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array, method: string, body: Record, bodyType: string | null, authentication: Record, authenticationType: string | null, headers: Array, }; diff --git a/plugin-runtime-types/src/gen/HttpRequestAction.ts b/plugin-runtime-types/src/gen/HttpRequestAction.ts deleted file mode 100644 index fea59aed..00000000 --- a/plugin-runtime-types/src/gen/HttpRequestAction.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type HttpRequestAction = { key: string, label: string, icon: string | null, }; diff --git a/plugin-runtime-types/src/gen/HttpRequestHeader.ts b/plugin-runtime-types/src/gen/HttpRequestHeader.ts deleted file mode 100644 index f62074a4..00000000 --- a/plugin-runtime-types/src/gen/HttpRequestHeader.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/HttpResponse.ts b/plugin-runtime-types/src/gen/HttpResponse.ts deleted file mode 100644 index 60602fdd..00000000 --- a/plugin-runtime-types/src/gen/HttpResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpResponseHeader } from "./HttpResponseHeader"; - -export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array, }; diff --git a/plugin-runtime-types/src/gen/HttpResponseHeader.ts b/plugin-runtime-types/src/gen/HttpResponseHeader.ts deleted file mode 100644 index 55b3f979..00000000 --- a/plugin-runtime-types/src/gen/HttpResponseHeader.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type HttpResponseHeader = { name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/HttpUrlParameter.ts b/plugin-runtime-types/src/gen/HttpUrlParameter.ts deleted file mode 100644 index fbdde3f5..00000000 --- a/plugin-runtime-types/src/gen/HttpUrlParameter.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/ImportRequest.ts b/plugin-runtime-types/src/gen/ImportRequest.ts deleted file mode 100644 index c86eb371..00000000 --- a/plugin-runtime-types/src/gen/ImportRequest.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ImportRequest = { content: string, }; diff --git a/plugin-runtime-types/src/gen/ImportResources.ts b/plugin-runtime-types/src/gen/ImportResources.ts deleted file mode 100644 index f4cb87d7..00000000 --- a/plugin-runtime-types/src/gen/ImportResources.ts +++ /dev/null @@ -1,8 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Environment } from "./Environment"; -import type { Folder } from "./Folder"; -import type { GrpcRequest } from "./GrpcRequest"; -import type { HttpRequest } from "./HttpRequest"; -import type { Workspace } from "./Workspace"; - -export type ImportResources = { workspaces: Array, environments: Array, folders: Array, httpRequests: Array, grpcRequests: Array, }; diff --git a/plugin-runtime-types/src/gen/ImportResponse.ts b/plugin-runtime-types/src/gen/ImportResponse.ts deleted file mode 100644 index 421aac82..00000000 --- a/plugin-runtime-types/src/gen/ImportResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ImportResources } from "./ImportResources"; - -export type ImportResponse = { resources: ImportResources, }; diff --git a/plugin-runtime-types/src/gen/InternalEvent.ts b/plugin-runtime-types/src/gen/InternalEvent.ts deleted file mode 100644 index 74977b54..00000000 --- a/plugin-runtime-types/src/gen/InternalEvent.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { InternalEventPayload } from "./InternalEventPayload"; - -export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, }; diff --git a/plugin-runtime-types/src/gen/InternalEventPayload.ts b/plugin-runtime-types/src/gen/InternalEventPayload.ts deleted file mode 100644 index bf2237a9..00000000 --- a/plugin-runtime-types/src/gen/InternalEventPayload.ts +++ /dev/null @@ -1,27 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BootRequest } from "./BootRequest"; -import type { BootResponse } from "./BootResponse"; -import type { CallHttpRequestActionRequest } from "./CallHttpRequestActionRequest"; -import type { CallTemplateFunctionRequest } from "./CallTemplateFunctionRequest"; -import type { CallTemplateFunctionResponse } from "./CallTemplateFunctionResponse"; -import type { CopyTextRequest } from "./CopyTextRequest"; -import type { ExportHttpRequestRequest } from "./ExportHttpRequestRequest"; -import type { ExportHttpRequestResponse } from "./ExportHttpRequestResponse"; -import type { FilterRequest } from "./FilterRequest"; -import type { FilterResponse } from "./FilterResponse"; -import type { FindHttpResponsesRequest } from "./FindHttpResponsesRequest"; -import type { FindHttpResponsesResponse } from "./FindHttpResponsesResponse"; -import type { GetHttpRequestActionsRequest } from "./GetHttpRequestActionsRequest"; -import type { GetHttpRequestActionsResponse } from "./GetHttpRequestActionsResponse"; -import type { GetHttpRequestByIdRequest } from "./GetHttpRequestByIdRequest"; -import type { GetHttpRequestByIdResponse } from "./GetHttpRequestByIdResponse"; -import type { GetTemplateFunctionsResponse } from "./GetTemplateFunctionsResponse"; -import type { ImportRequest } from "./ImportRequest"; -import type { ImportResponse } from "./ImportResponse"; -import type { RenderHttpRequestRequest } from "./RenderHttpRequestRequest"; -import type { RenderHttpRequestResponse } from "./RenderHttpRequestResponse"; -import type { SendHttpRequestRequest } from "./SendHttpRequestRequest"; -import type { SendHttpRequestResponse } from "./SendHttpRequestResponse"; -import type { ShowToastRequest } from "./ShowToastRequest"; - -export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } | { "type": "reload_response" } | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & GetHttpRequestActionsRequest | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" }; diff --git a/plugin-runtime-types/src/gen/KeyValue.ts b/plugin-runtime-types/src/gen/KeyValue.ts deleted file mode 100644 index 301df19c..00000000 --- a/plugin-runtime-types/src/gen/KeyValue.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/Model.ts b/plugin-runtime-types/src/gen/Model.ts deleted file mode 100644 index 93110f52..00000000 --- a/plugin-runtime-types/src/gen/Model.ts +++ /dev/null @@ -1,15 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CookieJar } from "./CookieJar"; -import type { Environment } from "./Environment"; -import type { Folder } from "./Folder"; -import type { GrpcConnection } from "./GrpcConnection"; -import type { GrpcEvent } from "./GrpcEvent"; -import type { GrpcRequest } from "./GrpcRequest"; -import type { HttpRequest } from "./HttpRequest"; -import type { HttpResponse } from "./HttpResponse"; -import type { KeyValue } from "./KeyValue"; -import type { Plugin } from "./Plugin"; -import type { Settings } from "./Settings"; -import type { Workspace } from "./Workspace"; - -export type Model = Environment | Folder | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | KeyValue | Workspace | CookieJar | Settings | Plugin; diff --git a/plugin-runtime-types/src/gen/Plugin.ts b/plugin-runtime-types/src/gen/Plugin.ts deleted file mode 100644 index 08773c6c..00000000 --- a/plugin-runtime-types/src/gen/Plugin.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type Plugin = { id: string, model: "plugin", createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, url: string | null, enabled: boolean, }; diff --git a/plugin-runtime-types/src/gen/RenderHttpRequestRequest.ts b/plugin-runtime-types/src/gen/RenderHttpRequestRequest.ts deleted file mode 100644 index 6fa4c7f3..00000000 --- a/plugin-runtime-types/src/gen/RenderHttpRequestRequest.ts +++ /dev/null @@ -1,5 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; -import type { RenderPurpose } from "./RenderPurpose"; - -export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, }; diff --git a/plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts b/plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts deleted file mode 100644 index 06829a64..00000000 --- a/plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; - -export type RenderHttpRequestResponse = { httpRequest: HttpRequest, }; diff --git a/plugin-runtime-types/src/gen/RenderPurpose.ts b/plugin-runtime-types/src/gen/RenderPurpose.ts deleted file mode 100644 index ed6037ec..00000000 --- a/plugin-runtime-types/src/gen/RenderPurpose.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type RenderPurpose = "send" | "preview"; diff --git a/plugin-runtime-types/src/gen/SendHttpRequestRequest.ts b/plugin-runtime-types/src/gen/SendHttpRequestRequest.ts deleted file mode 100644 index 8979a592..00000000 --- a/plugin-runtime-types/src/gen/SendHttpRequestRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpRequest } from "./HttpRequest"; - -export type SendHttpRequestRequest = { httpRequest: HttpRequest, }; diff --git a/plugin-runtime-types/src/gen/SendHttpRequestResponse.ts b/plugin-runtime-types/src/gen/SendHttpRequestResponse.ts deleted file mode 100644 index 831483a9..00000000 --- a/plugin-runtime-types/src/gen/SendHttpRequestResponse.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { HttpResponse } from "./HttpResponse"; - -export type SendHttpRequestResponse = { httpResponse: HttpResponse, }; diff --git a/plugin-runtime-types/src/gen/ShowToastRequest.ts b/plugin-runtime-types/src/gen/ShowToastRequest.ts deleted file mode 100644 index 3cabd32b..00000000 --- a/plugin-runtime-types/src/gen/ShowToastRequest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ToastVariant } from "./ToastVariant"; - -export type ShowToastRequest = { message: string, variant: ToastVariant, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunction.ts b/plugin-runtime-types/src/gen/TemplateFunction.ts deleted file mode 100644 index 474a1cd8..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunction.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TemplateFunctionArg } from "./TemplateFunctionArg"; - -export type TemplateFunction = { name: string, args: Array, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionArg.ts deleted file mode 100644 index 8ebaf09d..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionArg.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TemplateFunctionCheckboxArg } from "./TemplateFunctionCheckboxArg"; -import type { TemplateFunctionHttpRequestArg } from "./TemplateFunctionHttpRequestArg"; -import type { TemplateFunctionSelectArg } from "./TemplateFunctionSelectArg"; -import type { TemplateFunctionTextArg } from "./TemplateFunctionTextArg"; - -export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts deleted file mode 100644 index 0dc8ba0a..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type TemplateFunctionBaseArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts deleted file mode 100644 index bf787d71..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type TemplateFunctionCheckboxArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts deleted file mode 100644 index 8c21b9e0..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type TemplateFunctionHttpRequestArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts deleted file mode 100644 index 8e1ceb89..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TemplateFunctionSelectOption } from "./TemplateFunctionSelectOption"; - -export type TemplateFunctionSelectArg = { options: Array, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts b/plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts deleted file mode 100644 index 27a13f42..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type TemplateFunctionSelectOption = { name: string, value: string, }; diff --git a/plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts b/plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts deleted file mode 100644 index c99edcfe..00000000 --- a/plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type TemplateFunctionTextArg = { placeholder?: string | null, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; diff --git a/plugin-runtime-types/src/gen/ToastVariant.ts b/plugin-runtime-types/src/gen/ToastVariant.ts deleted file mode 100644 index c302eed8..00000000 --- a/plugin-runtime-types/src/gen/ToastVariant.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ToastVariant = "custom" | "copied" | "success" | "info" | "warning" | "error"; diff --git a/plugin-runtime-types/src/gen/Workspace.ts b/plugin-runtime-types/src/gen/Workspace.ts deleted file mode 100644 index d35cce88..00000000 --- a/plugin-runtime-types/src/gen/Workspace.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EnvironmentVariable } from "./EnvironmentVariable"; - -export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, }; diff --git a/plugin-runtime-types/src/gen/events.ts b/plugin-runtime-types/src/gen/events.ts new file mode 100644 index 00000000..1e12b2df --- /dev/null +++ b/plugin-runtime-types/src/gen/events.ts @@ -0,0 +1,95 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { CookieJar } from "./models"; +import type { Environment } from "./models"; +import type { Folder } from "./models"; +import type { GrpcConnection } from "./models"; +import type { GrpcEvent } from "./models"; +import type { GrpcRequest } from "./models"; +import type { HttpRequest } from "./models"; +import type { HttpResponse } from "./models"; +import type { KeyValue } from "./models"; +import type { Plugin } from "./models"; +import type { Settings } from "./models"; +import type { Workspace } from "./models"; + +export type BootRequest = { dir: string, }; + +export type BootResponse = { name: string, version: string, capabilities: Array, }; + +export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, }; + +export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, }; + +export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key in string]?: string }, }; + +export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, }; + +export type CallTemplateFunctionResponse = { value: string | null, }; + +export type CopyTextRequest = { text: string, }; + +export type ExportHttpRequestRequest = { httpRequest: HttpRequest, }; + +export type ExportHttpRequestResponse = { content: string, }; + +export type FilterRequest = { content: string, filter: string, }; + +export type FilterResponse = { content: string, }; + +export type FindHttpResponsesRequest = { requestId: string, limit: number | null, }; + +export type FindHttpResponsesResponse = { httpResponses: Array, }; + +export type GetHttpRequestActionsRequest = Record; + +export type GetHttpRequestActionsResponse = { actions: Array, pluginRefId: string, }; + +export type GetHttpRequestByIdRequest = { id: string, }; + +export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, }; + +export type GetTemplateFunctionsResponse = { functions: Array, pluginRefId: string, }; + +export type HttpRequestAction = { key: string, label: string, icon: string | null, }; + +export type ImportRequest = { content: string, }; + +export type ImportResources = { workspaces: Array, environments: Array, folders: Array, httpRequests: Array, grpcRequests: Array, }; + +export type ImportResponse = { resources: ImportResources, }; + +export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, }; + +export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } | { "type": "reload_response" } | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & GetHttpRequestActionsRequest | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" }; + +export type Model = Environment | Folder | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | KeyValue | Workspace | CookieJar | Settings | Plugin; + +export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, }; + +export type RenderHttpRequestResponse = { httpRequest: HttpRequest, }; + +export type RenderPurpose = "send" | "preview"; + +export type SendHttpRequestRequest = { httpRequest: HttpRequest, }; + +export type SendHttpRequestResponse = { httpResponse: HttpResponse, }; + +export type ShowToastRequest = { message: string, variant: ToastVariant, }; + +export type TemplateFunction = { name: string, args: Array, }; + +export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg; + +export type TemplateFunctionBaseArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; + +export type TemplateFunctionCheckboxArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; + +export type TemplateFunctionHttpRequestArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; + +export type TemplateFunctionSelectArg = { options: Array, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; + +export type TemplateFunctionSelectOption = { name: string, value: string, }; + +export type TemplateFunctionTextArg = { placeholder?: string | null, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, }; + +export type ToastVariant = "custom" | "copied" | "success" | "info" | "warning" | "error"; diff --git a/plugin-runtime-types/src/gen/models.ts b/plugin-runtime-types/src/gen/models.ts new file mode 100644 index 00000000..7ba4c760 --- /dev/null +++ b/plugin-runtime-types/src/gen/models.ts @@ -0,0 +1,43 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], }; + +export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty"; + +export type CookieExpires = { "AtUtc": string } | "SessionEnd"; + +export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array, }; + +export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array, }; + +export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, }; + +export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, }; + +export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key in string]?: string }, }; + +export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, updatedAt: string, content: string, eventType: GrpcEventType, metadata: { [key in string]?: string }, status: number | null, error: string | null, }; + +export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end"; + +export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, }; + +export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record, metadata: Array, }; + +export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array, method: string, body: Record, bodyType: string | null, authentication: Record, authenticationType: string | null, headers: Array, }; + +export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, }; + +export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array, }; + +export type HttpResponseHeader = { name: string, value: string, }; + +export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, }; + +export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, }; + +export type Plugin = { id: string, model: "plugin", createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, url: string | null, enabled: boolean, }; + +export type Settings = { id: string, model: "settings", createdAt: string, updatedAt: string, theme: string, appearance: string, themeDark: string, themeLight: string, updateChannel: string, interfaceFontSize: number, interfaceScale: number, editorFontSize: number, editorSoftWrap: boolean, telemetry: boolean, openWorkspaceNewWindow: boolean | null, }; + +export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, }; diff --git a/plugin-runtime-types/src/index.ts b/plugin-runtime-types/src/index.ts index fffb3bb0..0fc12c92 100644 --- a/plugin-runtime-types/src/index.ts +++ b/plugin-runtime-types/src/index.ts @@ -1,65 +1,5 @@ export type * from './plugins'; export type * from './themes'; -// TODO: The next ts-rs release includes the ability to put everything in 1 file! -export * from './gen/CallHttpRequestActionArgs'; -export * from './gen/CallHttpRequestActionRequest'; -export * from './gen/CallTemplateFunctionRequest'; -export * from './gen/CallTemplateFunctionResponse'; -export * from './gen/CallTemplateFunctionArgs'; -export * from './gen/Cookie'; -export * from './gen/CookieDomain'; -export * from './gen/CookieExpires'; -export * from './gen/CookieJar'; -export * from './gen/CopyTextRequest'; -export * from './gen/Environment'; -export * from './gen/EnvironmentVariable'; -export * from './gen/ExportHttpRequestRequest'; -export * from './gen/ExportHttpRequestResponse'; -export * from './gen/FilterRequest'; -export * from './gen/FilterResponse'; -export * from './gen/Folder'; -export * from './gen/FindHttpResponsesRequest'; -export * from './gen/FindHttpResponsesResponse'; -export * from './gen/GetHttpRequestActionsResponse'; -export * from './gen/GetHttpRequestByIdRequest'; -export * from './gen/GetHttpRequestByIdResponse'; -export * from './gen/GetTemplateFunctionsResponse'; -export * from './gen/GrpcConnection'; -export * from './gen/GrpcEvent'; -export * from './gen/GrpcMetadataEntry'; -export * from './gen/GrpcRequest'; -export * from './gen/HttpRequest'; -export * from './gen/HttpRequestAction'; -export * from './gen/HttpRequestHeader'; -export * from './gen/HttpResponse'; -export * from './gen/HttpResponseHeader'; -export * from './gen/HttpUrlParameter'; -export * from './gen/ImportRequest'; -export * from './gen/ImportResources'; -export * from './gen/ImportResponse'; -export * from './gen/InternalEvent'; -export * from './gen/InternalEventPayload'; -export * from './gen/KeyValue'; -export * from './gen/Model'; -export * from './gen/BootRequest'; -export * from './gen/BootResponse'; -export * from './gen/RenderHttpRequestRequest'; -export * from './gen/RenderHttpRequestResponse'; -export * from './gen/RenderPurpose'; -export * from './gen/SendHttpRequestRequest'; -export * from './gen/SendHttpRequestResponse'; -export * from './gen/SendHttpRequestResponse'; -export * from './gen/Settings'; -export * from './gen/ShowToastRequest'; -export * from './gen/TemplateFunction'; -export * from './gen/TemplateFunctionArg'; -export * from './gen/TemplateFunctionBaseArg'; -export * from './gen/TemplateFunctionCheckboxArg'; -export * from './gen/TemplateFunctionHttpRequestArg'; -export * from './gen/TemplateFunctionSelectArg'; -export * from './gen/TemplateFunctionSelectOption'; -export * from './gen/TemplateFunctionTextArg'; -export * from './gen/ToastVariant'; -export * from './gen/Workspace'; -export * from './gen/Plugin'; +export * from './gen/models'; +export * from './gen/events'; diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ff612568..9987903d 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -6640,11 +6640,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ts-rs" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c" +checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9" dependencies = [ "chrono", + "lazy_static", "serde_json", "thiserror", "ts-rs-macros", @@ -6652,9 +6653,9 @@ dependencies = [ [[package]] name = "ts-rs-macros" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130" +checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e" dependencies = [ "proc-macro2", "quote", diff --git a/src-tauri/yaak_models/Cargo.toml b/src-tauri/yaak_models/Cargo.toml index 4eca077f..ec8d9a80 100644 --- a/src-tauri/yaak_models/Cargo.toml +++ b/src-tauri/yaak_models/Cargo.toml @@ -11,7 +11,7 @@ sea-query-rusqlite = { version = "0.6.0", features = ["with-chrono"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = "1.0.122" thiserror = "1.0.63" -ts-rs = { version = "9.0.1", features = ["chrono-impl", "serde-json-impl"] } +ts-rs = { version = "10.0.0", features = ["chrono-impl", "serde-json-impl"] } tauri = { workspace = true } sqlx = { version = "0.8.0", features = ["sqlite", "runtime-tokio-rustls"] } log = "0.4.22" diff --git a/plugin-runtime-types/src/gen/CookieDomain.ts b/src-tauri/yaak_models/bindings/CookieDomain.ts similarity index 100% rename from plugin-runtime-types/src/gen/CookieDomain.ts rename to src-tauri/yaak_models/bindings/CookieDomain.ts diff --git a/plugin-runtime-types/src/gen/CookieExpires.ts b/src-tauri/yaak_models/bindings/CookieExpires.ts similarity index 100% rename from plugin-runtime-types/src/gen/CookieExpires.ts rename to src-tauri/yaak_models/bindings/CookieExpires.ts diff --git a/plugin-runtime-types/src/gen/GrpcEventType.ts b/src-tauri/yaak_models/bindings/GrpcEventType.ts similarity index 100% rename from plugin-runtime-types/src/gen/GrpcEventType.ts rename to src-tauri/yaak_models/bindings/GrpcEventType.ts diff --git a/plugin-runtime-types/src/gen/Settings.ts b/src-tauri/yaak_models/bindings/index.ts similarity index 100% rename from plugin-runtime-types/src/gen/Settings.ts rename to src-tauri/yaak_models/bindings/index.ts diff --git a/src-tauri/yaak_models/bindings/models.ts b/src-tauri/yaak_models/bindings/models.ts new file mode 100644 index 00000000..7ba4c760 --- /dev/null +++ b/src-tauri/yaak_models/bindings/models.ts @@ -0,0 +1,43 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], }; + +export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty"; + +export type CookieExpires = { "AtUtc": string } | "SessionEnd"; + +export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array, }; + +export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array, }; + +export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, }; + +export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, }; + +export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key in string]?: string }, }; + +export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, updatedAt: string, content: string, eventType: GrpcEventType, metadata: { [key in string]?: string }, status: number | null, error: string | null, }; + +export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end"; + +export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, }; + +export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record, metadata: Array, }; + +export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array, method: string, body: Record, bodyType: string | null, authentication: Record, authenticationType: string | null, headers: Array, }; + +export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, }; + +export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array, }; + +export type HttpResponseHeader = { name: string, value: string, }; + +export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, }; + +export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, }; + +export type Plugin = { id: string, model: "plugin", createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, url: string | null, enabled: boolean, }; + +export type Settings = { id: string, model: "settings", createdAt: string, updatedAt: string, theme: string, appearance: string, themeDark: string, themeLight: string, updateChannel: string, interfaceFontSize: number, interfaceScale: number, editorFontSize: number, editorSoftWrap: boolean, telemetry: boolean, openWorkspaceNewWindow: boolean | null, }; + +export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, }; diff --git a/src-tauri/yaak_models/src/models.rs b/src-tauri/yaak_models/src/models.rs index d14abbf3..47b636a0 100644 --- a/src-tauri/yaak_models/src/models.rs +++ b/src-tauri/yaak_models/src/models.rs @@ -8,6 +8,7 @@ use ts_rs::TS; #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct Settings { pub id: String, #[ts(type = "\"settings\"")] @@ -74,6 +75,7 @@ impl<'s> TryFrom<&Row<'s>> for Settings { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct Workspace { pub id: String, #[ts(type = "\"workspace\"")] @@ -141,6 +143,7 @@ impl Workspace { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] +#[ts(export, export_to="models.ts")] enum CookieDomain { HostOnly(String), Suffix(String), @@ -149,12 +152,14 @@ enum CookieDomain { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] +#[ts(export, export_to="models.ts")] enum CookieExpires { AtUtc(String), SessionEnd, } #[derive(Debug, Clone, Serialize, Deserialize, TS)] +#[ts(export, export_to="models.ts")] pub struct Cookie { raw_cookie: String, domain: CookieDomain, @@ -164,6 +169,7 @@ pub struct Cookie { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct CookieJar { pub id: String, #[ts(type = "\"cookie_jar\"")] @@ -207,6 +213,7 @@ impl<'s> TryFrom<&Row<'s>> for CookieJar { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct Environment { pub id: String, pub workspace_id: String, @@ -250,6 +257,7 @@ impl<'s> TryFrom<&Row<'s>> for Environment { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct EnvironmentVariable { #[serde(default = "default_true")] #[ts(optional, as = "Option")] @@ -260,6 +268,7 @@ pub struct EnvironmentVariable { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct Folder { pub created_at: NaiveDateTime, pub updated_at: NaiveDateTime, @@ -305,6 +314,7 @@ impl<'s> TryFrom<&Row<'s>> for Folder { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct HttpRequestHeader { #[serde(default = "default_true")] #[ts(optional, as = "Option")] @@ -315,6 +325,7 @@ pub struct HttpRequestHeader { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct HttpUrlParameter { #[serde(default = "default_true")] #[ts(optional, as = "Option")] @@ -325,6 +336,7 @@ pub struct HttpUrlParameter { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct HttpRequest { pub created_at: NaiveDateTime, pub updated_at: NaiveDateTime, @@ -401,6 +413,7 @@ impl<'s> TryFrom<&Row<'s>> for HttpRequest { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct HttpResponseHeader { pub name: String, pub value: String, @@ -408,6 +421,7 @@ pub struct HttpResponseHeader { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct HttpResponse { pub id: String, #[ts(type = "\"http_response\"")] @@ -490,6 +504,7 @@ impl HttpResponse { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct GrpcMetadataEntry { #[serde(default = "default_true")] #[ts(optional, as = "Option")] @@ -500,6 +515,7 @@ pub struct GrpcMetadataEntry { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct GrpcRequest { pub id: String, #[ts(type = "\"grpc_request\"")] @@ -569,6 +585,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcRequest { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct GrpcConnection { pub id: String, #[ts(type = "\"grpc_connection\"")] @@ -630,6 +647,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcConnection { #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, TS)] #[serde(rename_all = "snake_case")] +#[ts(export, export_to="models.ts")] pub enum GrpcEventType { Info, Error, @@ -647,6 +665,7 @@ impl Default for GrpcEventType { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct GrpcEvent { pub id: String, #[ts(type = "\"grpc_event\"")] @@ -706,6 +725,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcEvent { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct Plugin { pub id: String, #[ts(type = "\"plugin\"")] @@ -751,6 +771,7 @@ impl<'s> TryFrom<&Row<'s>> for Plugin { #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)] #[serde(default, rename_all = "camelCase")] +#[ts(export, export_to="models.ts")] pub struct KeyValue { #[ts(type = "\"key_value\"")] pub model: String, diff --git a/src-tauri/yaak_plugin_runtime/Cargo.toml b/src-tauri/yaak_plugin_runtime/Cargo.toml index e4ea9309..2872c6a2 100644 --- a/src-tauri/yaak_plugin_runtime/Cargo.toml +++ b/src-tauri/yaak_plugin_runtime/Cargo.toml @@ -17,9 +17,9 @@ tauri = { workspace = true } tauri-plugin-shell = { workspace = true } tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "process"] } tonic = "0.12.1" -ts-rs = "9.0.1" +ts-rs = "10.0.0" thiserror = "1.0.63" -yaak_models = {workspace = true} +yaak_models = { workspace = true } regex = "1.10.6" path-slash = "0.2.1" diff --git a/src-tauri/yaak_plugin_runtime/build.rs b/src-tauri/yaak_plugin_runtime/build.rs index 6c56dcf1..13cdc77c 100644 --- a/src-tauri/yaak_plugin_runtime/build.rs +++ b/src-tauri/yaak_plugin_runtime/build.rs @@ -1,9 +1,9 @@ fn main() -> Result<(), Box> { // Tell ts-rs where to generate types to println!("cargo:rustc-env=TS_RS_EXPORT_DIR=../../plugin-runtime-types/src/gen"); - + // Compile protobuf types tonic_build::compile_protos("../../proto/plugins/runtime.proto")?; - + Ok(()) } diff --git a/src-tauri/yaak_plugin_runtime/src/events.rs b/src-tauri/yaak_plugin_runtime/src/events.rs index ceab0057..fe7d4c78 100644 --- a/src-tauri/yaak_plugin_runtime/src/events.rs +++ b/src-tauri/yaak_plugin_runtime/src/events.rs @@ -9,7 +9,7 @@ use yaak_models::models::{ #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct InternalEvent { pub id: String, pub plugin_ref_id: String, @@ -19,7 +19,7 @@ pub struct InternalEvent { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "snake_case", tag = "type")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub enum InternalEventPayload { BootRequest(BootRequest), BootResponse(BootResponse), @@ -71,14 +71,14 @@ pub enum InternalEventPayload { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct BootRequest { pub dir: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct BootResponse { pub name: String, pub version: String, @@ -87,21 +87,21 @@ pub struct BootResponse { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ImportRequest { pub content: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ImportResponse { pub resources: ImportResources, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct FilterRequest { pub content: String, pub filter: String, @@ -109,49 +109,49 @@ pub struct FilterRequest { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct FilterResponse { pub content: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ExportHttpRequestRequest { pub http_request: HttpRequest, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ExportHttpRequestResponse { pub content: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct SendHttpRequestRequest { pub http_request: HttpRequest, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct SendHttpRequestResponse { pub http_response: HttpResponse, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CopyTextRequest { pub text: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct RenderHttpRequestRequest { pub http_request: HttpRequest, pub purpose: RenderPurpose, @@ -159,14 +159,14 @@ pub struct RenderHttpRequestRequest { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct RenderHttpRequestResponse { pub http_request: HttpRequest, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ShowToastRequest { pub message: String, pub variant: ToastVariant, @@ -174,7 +174,7 @@ pub struct ShowToastRequest { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "snake_case")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub enum ToastVariant { Custom, Copied, @@ -192,7 +192,7 @@ impl Default for ToastVariant { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct GetTemplateFunctionsResponse { pub functions: Vec, pub plugin_ref_id: String, @@ -200,7 +200,7 @@ pub struct GetTemplateFunctionsResponse { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunction { pub name: String, pub args: Vec, @@ -208,7 +208,7 @@ pub struct TemplateFunction { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "snake_case", tag = "type")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub enum TemplateFunctionArg { Text(TemplateFunctionTextArg), Select(TemplateFunctionSelectArg), @@ -218,7 +218,7 @@ pub enum TemplateFunctionArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionBaseArg { pub name: String, #[ts(optional = nullable)] @@ -231,7 +231,7 @@ pub struct TemplateFunctionBaseArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionTextArg { #[serde(flatten)] pub base: TemplateFunctionBaseArg, @@ -241,7 +241,7 @@ pub struct TemplateFunctionTextArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionHttpRequestArg { #[serde(flatten)] pub base: TemplateFunctionBaseArg, @@ -249,7 +249,7 @@ pub struct TemplateFunctionHttpRequestArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionSelectArg { #[serde(flatten)] pub base: TemplateFunctionBaseArg, @@ -258,7 +258,7 @@ pub struct TemplateFunctionSelectArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionCheckboxArg { #[serde(flatten)] pub base: TemplateFunctionBaseArg, @@ -266,7 +266,7 @@ pub struct TemplateFunctionCheckboxArg { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct TemplateFunctionSelectOption { pub name: String, pub value: String, @@ -274,7 +274,7 @@ pub struct TemplateFunctionSelectOption { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CallTemplateFunctionRequest { pub name: String, pub args: CallTemplateFunctionArgs, @@ -282,14 +282,14 @@ pub struct CallTemplateFunctionRequest { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CallTemplateFunctionResponse { pub value: Option, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CallTemplateFunctionArgs { pub purpose: RenderPurpose, pub values: HashMap, @@ -297,7 +297,7 @@ pub struct CallTemplateFunctionArgs { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "snake_case")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub enum RenderPurpose { Send, Preview, @@ -311,12 +311,12 @@ impl Default for RenderPurpose { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default)] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct GetHttpRequestActionsRequest {} #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct GetHttpRequestActionsResponse { pub actions: Vec, pub plugin_ref_id: String, @@ -324,7 +324,7 @@ pub struct GetHttpRequestActionsResponse { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct HttpRequestAction { pub key: String, pub label: String, @@ -333,7 +333,7 @@ pub struct HttpRequestAction { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CallHttpRequestActionRequest { pub key: String, pub plugin_ref_id: String, @@ -342,28 +342,28 @@ pub struct CallHttpRequestActionRequest { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct CallHttpRequestActionArgs { pub http_request: HttpRequest, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct GetHttpRequestByIdRequest { pub id: String, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct GetHttpRequestByIdResponse { pub http_request: Option, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct FindHttpResponsesRequest { pub request_id: String, pub limit: Option, @@ -371,14 +371,14 @@ pub struct FindHttpResponsesRequest { #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct FindHttpResponsesResponse { pub http_responses: Vec, } #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)] #[serde(default, rename_all = "camelCase")] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub struct ImportResources { pub workspaces: Vec, pub environments: Vec, @@ -389,7 +389,7 @@ pub struct ImportResources { #[derive(Debug, Clone, Serialize, Deserialize, TS)] #[serde(rename_all = "camelCase", untagged)] -#[ts(export)] +#[ts(export, export_to="events.ts")] pub enum Model { Environment(Environment), Folder(Folder), diff --git a/src-tauri/yaak_templates/Cargo.toml b/src-tauri/yaak_templates/Cargo.toml index 82f7d291..e9d957c2 100644 --- a/src-tauri/yaak_templates/Cargo.toml +++ b/src-tauri/yaak_templates/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" log = "0.4.22" serde = { version = "1.0.208", features = ["derive"] } serde_json = "1.0.125" -ts-rs = { version = "9.0.1" } +ts-rs = { version = "10.0.0" } tokio = { version = "1.39.3", features = ["macros", "rt"] }