Skip to content

feat(wit): Restructure the WIT definitions into deps #29

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
celarye wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(wit): Restructure the WIT definitions into deps #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 0 additions & 113 deletions wit/core.wit
View file
Open in desktop

This file was deleted.

51 changes: 25 additions & 26 deletions wit/discord.wit → wit/deps/wpbs-services:discord/types.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/* SPDX-License-Identifier: GPL-3.0-or-later */
/* Copyright © 2026 Eduard Smet */

use wpbs:shared/shared-types@0.1.0-rc.1;

@since(version = 0.1.0-rc.1)
interface discord-types {
type snowflake = u64;
}
use shared-types.{host-error, json, plugin-error};

interface discord-import-types {
use core-types.{host-error, json};
use discord-types.{snowflake};
@since(version = 0.1.0-rc.1)
type snowflake = u64;

@since(version = 0.1.0-rc.1)
enum discord-event-kinds {
message-create,
interaction-create,
Expand All @@ -21,63 +23,76 @@ interface discord-import-types {
}

// Registrations
@since(version = 0.1.0-rc.1)
record discord-registrations {
events: option<discord-registrations-events>,
interactions: option<discord-registrations-interactions>,
}

@since(version = 0.1.0-rc.1)
type discord-registrations-events = list<discord-event-kinds>;

@since(version = 0.1.0-rc.1)
record discord-registrations-interactions {
application-commands: option<list<json>>,
message-components: option<u16>,
modals: option<u16>,
}

// Registrations Result
@since(version = 0.1.0-rc.1)
record discord-registrations-result {
events: option<discord-registrations-events-result>,
interactions: option<discord-registrations-interactions-result>,
}

// Map keys can only be component model primitives
@since(version = 0.1.0-rc.1)
type discord-registrations-events-result = result<list<tuple<discord-event-kinds, result<_, host-error>>>, host-error>;

@since(version = 0.1.0-rc.1)
record discord-registrations-interactions-result {
application-commands: option<result<_, host-error>>,
message-components: option<result<list<string>, host-error>>,
modals: option<result<list<string>, host-error>>,
}

// Deregistrations
@since(version = 0.1.0-rc.1)
record discord-deregistrations {
events: option<discord-deregistrations-events>,
interactions: option<discord-deregistrations-interactions>,
}

@since(version = 0.1.0-rc.1)
type discord-deregistrations-events = list<discord-event-kinds>;

@since(version = 0.1.0-rc.1)
record discord-deregistrations-interactions {
application-commands: option<list<string>>,
message-components: option<list<string>>,
modals: option<list<string>>,
}

// Deregistrations Result
@since(version = 0.1.0-rc.1)
record discord-deregistrations-result {
events: option<discord-deregistrations-events-result>,
interactions: option<discord-deregistrations-interactions-result>
}

@since(version = 0.1.0-rc.1)
type discord-deregistrations-events-result = list<tuple<discord-event-kinds, result<_, host-error>>>;

@since(version = 0.1.0-rc.1)
record discord-deregistrations-interactions-result {
application-commands: option<result<list<string>, host-error>>,
message-components: option<result<list<string>, host-error>>,
modals: option<result<list<string>, host-error>>,
}

// Discord Requests
@since(version = 0.1.0-rc.1)
variant discord-requests {
// Gateway commands
request-guild-members(tuple<snowflake, json>),
Expand Down Expand Up @@ -108,28 +123,28 @@ interface discord-import-types {
update-interaction-original(tuple<snowflake, string, json>),
}

@since(version = 0.1.0-rc.1)
variant body {
json(json),
form(form),
}

@since(version = 0.1.0-rc.1)
record form {
boundary: list<u8>,
buffer: list<u8>,
}

// Discord Responses
@since(version = 0.1.0-rc.1)
type discord-responses = json;
}

interface discord-export-types {
use core-types.{json, plugin-error};
use discord-types.{snowflake};

// Discord Application Command Registrations Result
@since(version = 0.1.0-rc.1)
type discord-registrations-result-application-commands = map<string, result<snowflake, plugin-error>>;

// Discord Events
@since(version = 0.1.0-rc.1)
variant discord-events {
interaction-create(json),
message-create(json),
Expand All @@ -141,19 +156,3 @@ interface discord-export-types {
thread-update(json),
}
}

interface discord-import-functions {
use core-types.{host-error};
use discord-import-types.{discord-requests, discord-responses};

discord-request: func(request: discord-requests) -> result<option<discord-responses>, host-error>;
}

interface discord-export-functions {
use core-types.{plugin-error};
use discord-export-types.{discord-events, discord-registrations-result-application-commands};

discord-application-commands: func(registrations-result: discord-registrations-result-application-commands);

discord-event: func(event: discord-events) -> result<_, plugin-error>;
}
40 changes: 40 additions & 0 deletions wit/deps/wpbs-services:discord/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/* SPDX-License-Identifier: GPL-3.0-or-later */
/* Copyright © 2026 Eduard Smet */

package wpbs-services:discord@0.1.0-rc.1;

use wpbs:shared/shared-types@0.1.0-rc.1;

@since(version = 0.1.0-rc.1)
world discord {
@since(version = 0.1.0-rc.1)
import discord-import-functions;
@since(version = 0.1.0-rc.1)
export discord-export-functions;
}

@since(version = 0.1.0-rc.1)
interface discord-import-functions {
use discord-types.{discord-deregistrations, discord-deregistrations-result, discord-registrations, discord-registrations-result, discord-requests, discord-responses};
use shared-types.{host-error};

@since(version = 0.1.0-rc.1)
register: func(registrations: discord-registrations) -> discord-registrations-result;
@since(version = 0.1.0-rc.1)
deregister: func(deregistrations: discord-deregistrations) -> discord-deregistrations-result;

@since(version = 0.1.0-rc.1)
discord-request: func(request: discord-requests) -> result<option<discord-responses>, host-error>;
}

@since(version = 0.1.0-rc.1)
interface discord-export-functions {
use discord-types.{discord-events, discord-registrations-result-application-commands};
use shared-types.{host-error, plugin-error};

@since(version = 0.1.0-rc.1)
discord-application-commands: func(registrations-result: discord-registrations-result-application-commands) -> result<_, plugin-error>;

@since(version = 0.1.0-rc.1)
discord-event: func(event: discord-events) -> result<_, plugin-error>;
}
21 changes: 21 additions & 0 deletions wit/deps/wpbs-services:job-scheduler/types.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* SPDX-License-Identifier: GPL-3.0-or-later */
/* Copyright © 2026 Eduard Smet */

use wpbs:shared/shared-types@0.1.0-rc.1;

@since(version = 0.1.0-rc.1)
interface job-scheduler-types {
use shared-types.{host-error};

@since(version = 0.1.0-rc.1)
type registrations = list<string>;

@since(version = 0.1.0-rc.1)
type registrations-result = result<map<string, result<string, host-error>>, host-error>;

@since(version = 0.1.0-rc.1)
type deregistrations = list<string>;

@since(version = 0.1.0-rc.1)
type deregistrations-result = result<map<string, result<_, host-error>>, host-error>;
}
32 changes: 32 additions & 0 deletions wit/deps/wpbs-services:job-scheduler/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* SPDX-License-Identifier: GPL-3.0-or-later */
/* Copyright © 2026 Eduard Smet */

package wpbs-services:job-scheduler@0.1.0-rc.1;

use wpbs:shared/shared-types@0.1.0-rc.1;

@since(version = 0.1.0-rc.1)
world job-scheduler {
@since(version = 0.1.0-rc.1)
import job-scheduler-import-functions;
@since(version = 0.1.0-rc.1)
export job-scheduler-export-functions;
}

@since(version = 0.1.0-rc.1)
interface job-scheduler-import-functions {
use job-scheduler-types.{deregistrations, deregistrations-result, registrations, registrations-result};

@since(version = 0.1.0-rc.1)
register: func(registrations: registrations) -> registrations-result;
@since(version = 0.1.0-rc.1)
deregister: func(deregistrations: deregistrations) -> deregistrations-result;
}

@since(version = 0.1.0-rc.1)
interface job-scheduler-export-functions {
use shared-types.{plugin-error};

@since(version = 0.1.0-rc.1)
scheduled-job: func(job-id: string) -> result<_, plugin-error>;
}
14 changes: 14 additions & 0 deletions wit/deps/wpbs:core/types.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: GPL-3.0-or-later */
/* Copyright © 2026 Eduard Smet */

@since(version = 0.1.0-rc.1)
interface core-types {
@since(version = 0.1.0-rc.1)
enum log-levels {
trace,
debug,
info,
warn,
error,
}
}
Loading
Loading