umami-api-js 0.1.1 → 0.1.3

package/README.md

@@ -1,5 +1,5 @@
-A package to interact with [the API of self-hosted instances of Umami v3.0.0](https://umami.is/docs/api). It is a lightweight alternative to [@umami/api-client](https://github.com/umami-software/api-client), forked from [osu-api-v2-js](https://github.com/TTTaevas/osu-api-v2-js).
+A package to interact with [the API of self-hosted instances of Umami v3.0.1](https://umami.is/docs/api). It is a lightweight alternative to [@umami/api-client](https://github.com/umami-software/api-client), forked from [osu-api-v2-js](https://github.com/TTTaevas/osu-api-v2-js).
 
-If you are reading this from the [package's documentation](https://umami-api-js.taevas.xyz/), please be aware that the documentation is for **umami-api-js@0.1.1**, so make sure your package is up to date! Report any bug on [Codeberg](https://codeberg.org/Taevas/umami-api-js/issues).
+If you are reading this from the [package's documentation](https://umami-api-js.taevas.xyz/), please be aware that the documentation is for **umami-api-js@0.1.3**, so make sure your package is up to date! Report any bug on [Codeberg](https://codeberg.org/Taevas/umami-api-js/issues).
 
-Please note that this package is expected to work with self-hosted instances of **Umami v3.0.0**, and is *not* expected to work with [Umami Cloud](https://umami.is/docs/cloud), the instance of Umami hosted by its creators.
+Please note that this package is expected to work with self-hosted instances of **Umami v3.0.1**, and is *not* expected to work with [Umami Cloud](https://umami.is/docs/cloud), the instance of Umami hosted by its creators.

package/dist/index.d.ts

@@ -20,19 +20,9 @@ export interface GenericObject {
 export interface DeletionResult {
     ok: boolean;
 }
-export interface Website extends GenericObject {
-    name: string;
-    domain: string;
-    shareId: string | null;
-    resetAt: Date | null;
-    /** @remarks Is null if the website is under a team (has a `teamId`) */
-    userId: Users.User["id"] | null;
-    teamId: string | null;
-    createdBy: Users.User["id"];
-}
 export interface Report extends Omit<GenericObject, "deletedAt"> {
     userId: Users.User["id"];
-    websiteId: string;
+    websiteId: Websites.Website["id"];
     type: string;
     name: string;
     description: string;
@@ -102,7 +92,6 @@ export interface Filters {
     /** UUID of cohort */
     cohort?: string;
 }
-export type TeamRole = "team-manager" | "team-member" | "team-view-only";
 /** If the {@link API} throws an error, it should always be an {@link APIError}! */
 export declare class APIError extends Error {
     message: string;
@@ -154,7 +143,10 @@ export declare class API {
     get server(): string;
     set server(server: string);
     private _headers;
-    /** Used in practically all requests, those are all the headers the package uses excluding `Authorization`, the one with the token */
+    /**
+     * Used in practically all requests, those are all the headers the package uses excluding `Authorization`, the one with the token
+     * @remarks If the User-Agent is not liked by https://isbot.js.org/, Umami might give responses akin to `{beep: "boop"}`
+     */
     get headers(): {
         [key: string]: any;
     };
@@ -258,37 +250,34 @@ export declare class API {
     }): Promise<any>;
     /**
      * To register an event
-     * (TODO UNTESTED)
      * @group Sending stats
      */
-    sendStats(payload: {
+    sendStats(websiteId: Websites.Website["id"], payload?: {
         /** Name of host */
-        hostname: string;
+        hostname?: Events.Event["hostname"];
         /** Screen resolution (ex. "1920x1080") */
-        screen: string;
+        screen?: string;
         /** Language of visitor (ex. "en-US") */
-        language: string;
+        language?: string;
         /** Page URL */
-        url: string;
+        url?: string;
         /** Referrer URL */
-        referrer: string;
+        referrer?: string;
         /** Page title */
-        title: string;
+        title?: string;
         /** Additional tag description */
-        tag: string;
+        tag?: string;
         /** Session identifier */
-        id: string;
-        /** Website ID */
-        website: string;
+        id?: Events.Event["sessionId"];
         /** Name of the event */
-        name: string;
+        name?: Events.Event["eventName"];
         /** Additional data for the event */
         data?: {
             [k: string]: any;
         };
     }): Promise<{
         cache: string;
-        sessionid: string;
+        sessionId: Events.Event["sessionId"];
         visitId: string;
     }>;
     /** @group Admin endpoints */

package/dist/index.js

@@ -94,9 +94,12 @@ export class API {
         "Accept": "application/json",
         "Accept-Encoding": "gzip",
         "Content-Type": "application/json",
-        "User-Agent": "umami-api-js (https://codeberg.org/Taevas/umami-api-js)",
+        "User-Agent": "umami-api-js (codeberg.org/Taevas/umami-api-js)",
     };
-    /** Used in practically all requests, those are all the headers the package uses excluding `Authorization`, the one with the token */
+    /**
+     * Used in practically all requests, those are all the headers the package uses excluding `Authorization`, the one with the token
+     * @remarks If the User-Agent is not liked by https://isbot.js.org/, Umami might give responses akin to `{beep: "boop"}`
+     */
     get headers() { return this._headers; }
     set headers(headers) { this._headers = headers; }
     _user = {
@@ -384,11 +387,10 @@ export class API {
     // UNCATEGORIZED
     /**
      * To register an event
-     * (TODO UNTESTED)
      * @group Sending stats
      */
-    async sendStats(payload) {
-        return await this.request("post", ["send"], { payload, type: "event" });
+    async sendStats(websiteId, payload) {
+        return await this.request("post", ["send"], { payload: { website: websiteId, ...payload }, type: "event" });
     }
     // ADMIN
     /** @group Admin endpoints */

package/dist/namespaces/Admin.d.ts

@@ -1,4 +1,4 @@
-import { API, GenericObject, GenericRequestParameters, Teams, Users, Website } from "../index.js";
+import { API, GenericObject, GenericRequestParameters, Teams, Users, Websites } from "../index.js";
 /** Operations around admin management: https://umami.is/docs/api/admin */
 export declare namespace Admin {
     /** Returns all users: https://umami.is/docs/api/admin#get-apiadminusers */
@@ -12,20 +12,10 @@ export declare namespace Admin {
         };
     })[]>;
     /** Returns all websites: https://umami.is/docs/api/admin#get-apiadminwebsites */
-    function getWebsites(this: API, parameters?: GenericRequestParameters): Promise<(Website & {
-        user: Users.MinimalUser;
+    function getWebsites(this: API, parameters?: GenericRequestParameters): Promise<(Websites.WebsiteWithUser & {
         /** @remarks TODO Documentation says it can be null but doesn't actually say what else it can be, ***presumed* to be string**, check */
         team: string | null;
     })[]>;
     /** Returns all teams: https://umami.is/docs/api/admin#get-apiadminteams */
-    function getTeams(this: API, parameters?: GenericRequestParameters): Promise<(GenericObject & {
-        name: string;
-        accessCode: string;
-        logoUrl: string | null;
-        members: Teams.TeamMember[];
-        _count: {
-            websites: number;
-            members: number;
-        };
-    })[]>;
+    function getTeams(this: API, parameters?: GenericRequestParameters): Promise<Teams.TeamWithMembersCount[]>;
 }

package/dist/namespaces/Events.d.ts

@@ -1,35 +1,36 @@
-import { API, Filters, GenericRequestParameters, Timestamps } from "../index.js";
+import { API, Filters, GenericRequestParameters, Sessions, Timestamps, Websites } from "../index.js";
 /** Operations around Events and Event data: https://umami.is/docs/api/events */
 export declare namespace Events {
-    /** Gets website event details within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevents (TODO UNTESTED) */
-    function get_WEBSITEID_Events(this: API, websiteId: string, parameters: Filters & Timestamps & GenericRequestParameters): Promise<{
+    interface Event {
         id: string;
-        websiteId: string;
-        sessionId: string;
+        websiteId: Websites.Website["id"];
+        sessionId: Sessions.Session["id"];
         createdAt: Date;
         hostname: string;
         urlPath: string;
         urlQuery: string;
-        referrerPath: string;
-        referrerQuery: string;
-        referrerDomain: string;
+        referrerPath: string | null;
+        referrerQuery: string | null;
+        referrerDomain: string | null;
         country: string;
         city: string;
         device: string;
-        os: string;
-        browser: string;
-        pageTitle: string;
+        os: string | null;
+        browser: string | null;
+        pageTitle: string | null;
         eventType: number;
         eventName: string;
-        hasData: number;
-    }[]>;
-    /** Gets event-data for a individual event: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataeventid (TODO UNTESTED) */
-    function get_WEBSITEID_Eventdata_EVENTID(this: API, websiteId: string, eventId: string): Promise<{
-        websiteId: string;
-        sessionId: string;
-        eventId: string;
-        urlPath: string;
-        eventName: string;
+        hasData?: number;
+    }
+    /** Gets website event details within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevents */
+    function get_WEBSITEID_Events(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & GenericRequestParameters): Promise<Event[]>;
+    /** Gets event-data for a individual event: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataeventid */
+    function get_WEBSITEID_Eventdata_EVENTID(this: API, websiteId: Websites.Website["id"], eventId: Event["id"]): Promise<{
+        websiteId: Websites.Website["id"];
+        sessionId?: Sessions.Session["id"];
+        eventId: Event["id"];
+        urlPath?: string;
+        eventName: Event["eventName"];
         dataKey: string;
         stringValue: string;
         numberValue: number | null;
@@ -37,43 +38,43 @@ export declare namespace Events {
         dataType: number;
         createdAt: Date;
     }[]>;
-    /** Gets event data names, properties, and counts: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataevents (TODO UNTESTED) */
-    function get_WEBSITEID_EventdataEvents(this: API, websiteId: string, parameters: Filters & Timestamps & {
+    /** Gets event data names, properties, and counts: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataevents (TODO Server returns a 500) */
+    function get_WEBSITEID_EventdataEvents(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & {
         /** Event name filter */
-        event?: string;
+        event?: Event["eventName"];
     }): Promise<{
-        eventName: string;
+        eventName: Event["eventName"];
         propertyName: string;
         dataType: number;
         total: number;
     }[]>;
-    /** Gets event data property and value counts within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datafields (TODO UNTESTED) */
-    function get_WEBSITEID_EventdataFields(this: API, websiteId: string, parameters: Filters & Timestamps): Promise<{
+    /** Gets event data property and value counts within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datafields */
+    function get_WEBSITEID_EventdataFields(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps): Promise<{
         propertyName: string;
         dataType: number;
         value: string;
         total: number;
     }[]>;
-    /** Gets event name and property counts for a website: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataproperties (TODO UNTESTED) */
-    function get_WEBSITEID_EventdataProperties(this: API, websiteId: string, parameters: Filters & Timestamps): Promise<{
-        eventName: string;
+    /** Gets event name and property counts for a website: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataproperties */
+    function get_WEBSITEID_EventdataProperties(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps): Promise<{
+        eventName: Event["eventName"] | null;
         propertyName: string;
         total: number;
     }[]>;
-    /** Gets event data counts for a given event and property: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datavalues (TODO UNTESTED) */
-    function get_WEBSITEID_EventdataValues(this: API, websiteId: string, parameters: Filters & Timestamps & {
+    /** Gets event data counts for a given event and property: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datavalues */
+    function get_WEBSITEID_EventdataValues(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & {
         /** Event name filter */
-        event: string;
+        event: Event["eventName"];
         /** Property name */
         propertyName: string;
     }): Promise<{
         value: string;
         total: number;
-    }>;
-    /** Gets aggregated website events, properties, and records within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datastats (TODO UNTESTED) */
-    function get_WEBSITEID_EventdataStats(this: API, websiteId: string, parameters: Filters & Timestamps): Promise<{
+    }[]>;
+    /** Gets aggregated website events, properties, and records within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datastats */
+    function get_WEBSITEID_EventdataStats(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps): Promise<{
         events: number;
         properties: number;
         records: number;
-    }[]>;
+    }>;
 }

package/dist/namespaces/Events.js

@@ -1,38 +1,38 @@
 /** Operations around Events and Event data: https://umami.is/docs/api/events */
 export var Events;
 (function (Events) {
-    /** Gets website event details within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevents (TODO UNTESTED) */
+    /** Gets website event details within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevents */
     async function get_WEBSITEID_Events(websiteId, parameters) {
         const response = await this.request("get", ["websites", websiteId, "events"], parameters);
         return response.data;
     }
     Events.get_WEBSITEID_Events = get_WEBSITEID_Events;
-    /** Gets event-data for a individual event: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataeventid (TODO UNTESTED) */
+    /** Gets event-data for a individual event: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataeventid */
     async function get_WEBSITEID_Eventdata_EVENTID(websiteId, eventId) {
         return await this.request("get", ["websites", websiteId, "event-data", eventId]);
     }
     Events.get_WEBSITEID_Eventdata_EVENTID = get_WEBSITEID_Eventdata_EVENTID;
-    /** Gets event data names, properties, and counts: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataevents (TODO UNTESTED) */
+    /** Gets event data names, properties, and counts: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataevents (TODO Server returns a 500) */
     async function get_WEBSITEID_EventdataEvents(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "event-data", "events"], parameters);
     }
     Events.get_WEBSITEID_EventdataEvents = get_WEBSITEID_EventdataEvents;
-    /** Gets event data property and value counts within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datafields (TODO UNTESTED) */
+    /** Gets event data property and value counts within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datafields */
     async function get_WEBSITEID_EventdataFields(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "event-data", "fields"], parameters);
     }
     Events.get_WEBSITEID_EventdataFields = get_WEBSITEID_EventdataFields;
-    /** Gets event name and property counts for a website: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataproperties (TODO UNTESTED) */
+    /** Gets event name and property counts for a website: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-dataproperties */
     async function get_WEBSITEID_EventdataProperties(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "event-data", "properties"], parameters);
     }
     Events.get_WEBSITEID_EventdataProperties = get_WEBSITEID_EventdataProperties;
-    /** Gets event data counts for a given event and property: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datavalues (TODO UNTESTED) */
+    /** Gets event data counts for a given event and property: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datavalues */
     async function get_WEBSITEID_EventdataValues(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "event-data", "values"], parameters);
     }
     Events.get_WEBSITEID_EventdataValues = get_WEBSITEID_EventdataValues;
-    /** Gets aggregated website events, properties, and records within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datastats (TODO UNTESTED) */
+    /** Gets aggregated website events, properties, and records within a given time range: https://umami.is/docs/api/events#get-apiwebsiteswebsiteidevent-datastats */
     async function get_WEBSITEID_EventdataStats(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "event-data", "stats"], parameters);
     }

package/dist/namespaces/Links.d.ts

@@ -15,11 +15,11 @@ export declare namespace Links {
     /** Updates a link: https://umami.is/docs/api/links#post-apilinkslinkid (TODO UNTESTED) */
     function post_LINKID(this: API, linkId: Link["id"], parameters: {
         /** The link's name */
-        name?: string;
+        name?: Link["name"];
         /** The link's destination URL */
-        url?: string;
+        url?: Link["url"];
         /** The link's URL slug, **with a minimum of 8 characters** */
-        slug?: string;
+        slug?: Link["slug"];
     }): Promise<Link>;
     /** Deletes a link: https://umami.is/docs/api/links#delete-apilinkslinkid (TODO UNTESTED) */
     function delete_LINKID(this: API, linkId: Link["id"]): Promise<DeletionResult>;

package/dist/namespaces/Me.d.ts

@@ -1,4 +1,4 @@
-import { API, GenericObject, TeamRole, Users } from "../index.js";
+import { API, Teams, Users, Websites } from "../index.js";
 /** All information about your session: https://umami.is/docs/api/me */
 export declare namespace Me {
     /** Get information based on your auth token: https://umami.is/docs/api/me#get-apime */
@@ -9,30 +9,7 @@ export declare namespace Me {
         user: Users.User;
     }>;
     /** Get all your teams: https://umami.is/docs/api/me#get-apimeteams */
-    function getTeams(this: API): Promise<(GenericObject & {
-        name: string;
-        accessCode: string;
-        logoUrl: string | null;
-        members: (Omit<GenericObject, "deletedAt"> & {
-            teamId: string;
-            userId: Users.User["id"];
-            role: TeamRole;
-            user: Users.MinimalUser;
-        })[];
-        _count: {
-            websites: number;
-            members: number;
-        };
-    })[]>;
+    function getTeams(this: API): Promise<Teams.TeamWithMembersCount[]>;
     /** Get all your websites: https://umami.is/docs/api/me#get-apimeteams */
-    function getWebsites(this: API): Promise<(GenericObject & {
-        name: string;
-        domain: string;
-        shareId: string | null;
-        resetAt: Date | null;
-        userId: Users.User["id"];
-        teamId: string | null;
-        createdBy: string;
-        user: Users.MinimalUser;
-    })[]>;
+    function getWebsites(this: API): Promise<Websites.WebsiteWithUser[]>;
 }

package/dist/namespaces/Pixels.d.ts

@@ -14,9 +14,9 @@ export declare namespace Pixels {
     /** Updates a pixel: https://umami.is/docs/api/pixels#post-apipixelspixelid (TODO UNTESTED) */
     function post_PIXELID(this: API, pixelId: Pixel["id"], parameters: {
         /** The pixel's name */
-        name?: string;
+        name?: Pixel["name"];
         /** The pixel's URL slug, **with a minimum of 8 characters** */
-        slug?: string;
+        slug?: Pixel["slug"];
     }): Promise<Pixel>;
     /** Deletes a pixel: https://umami.is/docs/api/pixels#delete-apipixelspixelid (TODO UNTESTED) */
     function delete_PIXELID(this: API, pixelId: Pixel["id"]): Promise<DeletionResult>;

package/dist/namespaces/Realtime.d.ts

@@ -1,8 +1,8 @@
-import { API } from "../index.js";
+import { API, Sessions, Websites } from "../index.js";
 /** Realtime data for your website: https://umami.is/docs/api/realtime */
 export declare namespace Realtime {
     /** Realtime stats within the last 30 minutes: https://umami.is/docs/api/realtime#get-apirealtimewebsiteid (TODO UNTESTED) */
-    function get_WEBSITEID(this: API, websiteId: string): Promise<{
+    function get_WEBSITEID(this: API, websiteId: Websites.Website["id"]): Promise<{
         countries: {
             [k: string]: number;
         };
@@ -14,7 +14,7 @@ export declare namespace Realtime {
         };
         events: {
             __type: string;
-            sessionId: string;
+            sessionId: Sessions.Session["id"];
             eventName: string;
             createdAt: Date;
             browser: string;

package/dist/namespaces/Reports.d.ts

@@ -1,4 +1,4 @@
-import { API, DeletionResult, Filters, GenericRequestParameters, NameValue, Report, Timestamps, XTY } from "../index.js";
+import { API, DeletionResult, Filters, GenericRequestParameters, NameValue, Report, Timestamps, Websites, XTY } from "../index.js";
 /** Using reports throught the api: https://umami.is/docs/api/reports */
 export declare namespace Reports {
     type ReportType = {
@@ -9,9 +9,9 @@ export declare namespace Reports {
         views: number;
     }
     /** Get all reports by website ID: https://umami.is/docs/api/reports#get-apireports (TODO UNTESTED) */
-    function get(this: API, websiteId: string, parameters: ReportType & Omit<GenericRequestParameters, "search">): Promise<Report[]>;
+    function get(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Omit<GenericRequestParameters, "search">): Promise<Report[]>;
     /** Creates a report: https://umami.is/docs/api/reports#post-apireports (TODO UNTESTED) */
-    function post(this: API, websiteId: string, parameters: ReportType & {
+    function post(this: API, websiteId: Websites.Website["id"], parameters: ReportType & {
         /** Name of report */
         name: string;
         /** Description of report */
@@ -22,7 +22,7 @@ export declare namespace Reports {
     /** Gets a report by ID: https://umami.is/docs/api/reports#get-apireportsreportid (TODO UNTESTED) */
     function get_REPORTID(this: API, reportId: string): Promise<Report>;
     /** Updates a report: https://umami.is/docs/api/reports#post-apireportsreportid (TODO UNTESTED) */
-    function post_REPORTID(this: API, reportId: string, websiteId: string, parameters: ReportType & {
+    function post_REPORTID(this: API, reportId: string, websiteId: Websites.Website["id"], parameters: ReportType & {
         /** Name of report */
         name: string;
         /** Description of report */
@@ -33,7 +33,7 @@ export declare namespace Reports {
     /** Deletes a report: https://umami.is/docs/api/reports#delete-apireportsreportid (TODO UNTESTED) */
     function delete_REPORTID(this: API, reportId: string): Promise<DeletionResult>;
     /** See how users engage with your marketing and what drives conversions: https://umami.is/docs/api/reports#post-apireportsattribution (TODO UNTESTED) */
-    function postAttribution(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postAttribution(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Attribution model */
         model: "firstClick" | "lastClick";
         /** Conversion type */
@@ -55,7 +55,7 @@ export declare namespace Reports {
         };
     }>;
     /** Dive deeper into your data by using segments and filters: https://umami.is/docs/api/reports#post-apireportsbreakdown (TODO UNTESTED) */
-    function postBreakdown(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postBreakdown(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         fields: ("path" | "title" | "query" | "referrer" | "browser" | "os" | "device" | "country" | "region" | "city" | "hostname" | "tag" | "event")[];
     }): Promise<{
         views: number;
@@ -67,7 +67,7 @@ export declare namespace Reports {
         country: string;
     }[]>;
     /** Understand the conversion and drop-off rate of users: https://umami.is/docs/api/reports#post-apireportsfunnel (TODO UNTESTED) */
-    function postFunnel(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postFunnel(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Type of event and conversion step */
         steps: {
             type: "path" | "event";
@@ -85,7 +85,7 @@ export declare namespace Reports {
         remaining: number;
     }[]>;
     /** Track your goals for pageviews and events: https://umami.is/docs/api/reports#post-apireportsgoals (TODO UNTESTED) */
-    function postGoals(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postGoals(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Conversion type */
         type: ("path" | "event")[];
         /** Conversion step value */
@@ -95,7 +95,7 @@ export declare namespace Reports {
         total: number;
     }>;
     /** Understand how users nagivate through your website: https://umami.is/docs/api/reports#post-apireportsjourney (TODO UNTESTED) */
-    function postJourney(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postJourney(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Number of steps from 3 to 7 */
         steps: number;
         /** Starting step URL or event name */
@@ -107,7 +107,7 @@ export declare namespace Reports {
         count: number;
     }[]>;
     /** Measure your website stickiness by tracking how often users return: https://umami.is/docs/api/reports#post-apireportsretention (TODO UNTESTED) */
-    function postRetention(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postRetention(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
     }): Promise<{
@@ -118,7 +118,7 @@ export declare namespace Reports {
         percentage: number;
     }[]>;
     /** Get currency for given range. Needed for Revenue and optional in Attribution reports: https://umami.is/docs/api/reports#post-apireportsrevenue (TODO UNTESTED) */
-    function postRevenue(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps & {
+    function postRevenue(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
         /** Currency code (ISO 4217) */
@@ -134,7 +134,7 @@ export declare namespace Reports {
         };
     }>;
     /** Track your campaigns through UTM parameters: https://umami.is/docs/api/reports#post-apireportsutm (TODO UNTESTED) */
-    function postUTM(this: API, websiteId: string, parameters: ReportType & Filters & Timestamps): Promise<{
+    function postUTM(this: API, websiteId: Websites.Website["id"], parameters: ReportType & Filters & Timestamps): Promise<{
         utm_source: UTM[];
         utm_medium: UTM[];
         utm_campaign: UTM[];

package/dist/namespaces/Sessions.d.ts

@@ -1,14 +1,14 @@
-import { API, Filters, GenericRequestParameters, Timestamps } from "../index.js";
+import { API, Events, Filters, GenericRequestParameters, Timestamps, Websites } from "../index.js";
 /** Operations around Sessions and Session data: https://umami.is/docs/api/sessions */
 export declare namespace Sessions {
-    interface GenericSession {
+    interface Session {
         id: string;
-        websiteId: string;
-        browser: string;
-        os: string;
+        websiteId: Websites.Website["id"];
+        browser: string | null;
+        os: string | null;
         device: string;
         screen: string;
-        language: string;
+        language: string | null;
         country: string;
         region: string;
         city: string;
@@ -17,13 +17,19 @@ export declare namespace Sessions {
         visits: number;
         views: number;
     }
-    /** Gets website session details within a given time range: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessions (TODO UNTESTED) */
-    function get_WEBSITEID_Sessions(this: API, websiteId: string, parameters: Filters & Timestamps & GenericRequestParameters): Promise<(GenericSession & {
+    interface SessionWithHostnameCreatedat extends Session {
         hostname: string;
         createdAt: Date;
-    })[]>;
-    /** Gets summarized website session statistics: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsstats (TODO UNTESTED) */
-    function get_WEBSITEID_SessionsStats(this: API, websiteId: string, parameters: Filters & Timestamps): Promise<{
+    }
+    interface SessionWithDistinctidEventsTotaltime extends Session {
+        distinctId: string | null;
+        events: number;
+        totaltime: number;
+    }
+    /** Gets website session details within a given time range: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessions */
+    function get_WEBSITEID_Sessions(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & GenericRequestParameters): Promise<SessionWithHostnameCreatedat[]>;
+    /** Gets summarized website session statistics: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsstats */
+    function get_WEBSITEID_SessionsStats(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps): Promise<{
         /** Pages hits */
         pageviews: {
             value: number;
@@ -36,41 +42,51 @@ export declare namespace Sessions {
         visits: {
             value: number;
         };
-        /** Number of visitors who only visit a single page */
-        bounces: {
+        /** @remarks Undocumented */
+        countries: {
+            value: number;
+        };
+        /** @remarks Undocumented */
+        events: {
             value: number;
         };
-        /** Time spent on the website */
-        totaltime: {
+        /**
+         * Number of visitors who only visit a single page
+         * @remarks While featured in the documentation, it doesn't seem to exist
+         */
+        bounces?: {
+            value: number;
+        };
+        /**
+         * Time spent on the website
+         * @remarks While featured in the documentation, it doesn't seem to exist
+         */
+        totaltime?: {
             value: number;
         };
     }>;
-    /** Get collected count of sessions by hour of weekday: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsweekly (TODO UNTESTED) */
-    function get_WEBSITEID_SessionsWeekly(this: API, websiteId: string, parameters: Filters & Timestamps & {
+    /** Get collected count of sessions by hour of weekday: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsweekly */
+    function get_WEBSITEID_SessionsWeekly(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & {
         timezone: string;
     }): Promise<number[][]>;
-    /** Gets session details for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionid (TODO UNTESTED) */
-    function get_WEBSITEID_Sessions_SESSIONID(this: API, websiteId: string, sessionId: string): Promise<GenericSession & {
-        distinctId: string;
-        events: number;
-        totaltime: number;
-    }>;
-    /** Gets session activity for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidactivity (TODO UNTESTED) */
-    function get_WEBSITEID_Sessions_SESSIONID_Activity(this: API, websiteId: string, sessionId: string, parameters: Timestamps): Promise<{
+    /** Gets session details for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionid */
+    function get_WEBSITEID_Sessions_SESSIONID(this: API, websiteId: Websites.Website["id"], sessionId: Session["id"]): Promise<SessionWithDistinctidEventsTotaltime>;
+    /** Gets session activity for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidactivity */
+    function get_WEBSITEID_Sessions_SESSIONID_Activity(this: API, websiteId: Websites.Website["id"], sessionId: Session["id"], parameters: Timestamps): Promise<{
         createdAt: Date;
         urlPath: string;
         urlQuery: string;
-        referrerDomain: string;
-        eventId: string;
-        eventType: number;
-        eventName: string;
+        referrerDomain: string | null;
+        eventId: Events.Event["id"];
+        eventType: Events.Event["eventType"];
+        eventName: Events.Event["eventName"] | null;
         visitId: string;
-        hasData: number;
+        hasData: boolean;
     }[]>;
-    /** Gets session properties for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidproperties (TODO UNTESTED) */
-    function get_WEBSITEID_Sessions_SESSIONID_Properties(this: API, websiteId: string, sessionId: string): Promise<{
-        websiteId: string;
-        sessionid: string;
+    /** Gets session properties for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidproperties (TODO Server returns empty array) */
+    function get_WEBSITEID_Sessions_SESSIONID_Properties(this: API, websiteId: Websites.Website["id"], sessionId: Session["id"]): Promise<{
+        websiteId: Websites.Website["id"];
+        sessionId: Session["id"];
         dataKey: string;
         dataType: number;
         stringValue: string;
@@ -78,13 +94,13 @@ export declare namespace Sessions {
         dateValue: Date | null;
         createdAt: Date;
     }[]>;
-    /** Gets session data counts by property name: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-dataproperties (TODO UNTESTED) */
-    function get_WEBSITEID_SessiondataProperties(this: API, websiteId: string, parameters: Filters & Timestamps): Promise<{
+    /** Gets session data counts by property name: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-dataproperties (TODO Server returns empty array) */
+    function get_WEBSITEID_SessiondataProperties(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps): Promise<{
         propertyName: string;
         total: number;
     }[]>;
-    /** Gets session data counts for a given property: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-datavalues (TODO UNTESTED) */
-    function get_WEBSITEID_SessiondataValues(this: API, websiteId: string, parameters: Filters & Timestamps & {
+    /** Gets session data counts for a given property: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-datavalues (TODO Server returns empty array) */
+    function get_WEBSITEID_SessiondataValues(this: API, websiteId: Websites.Website["id"], parameters: Filters & Timestamps & {
         propertyName: string;
     }): Promise<{
         value: string;

package/dist/namespaces/Sessions.js

@@ -1,43 +1,45 @@
 /** Operations around Sessions and Session data: https://umami.is/docs/api/sessions */
 export var Sessions;
 (function (Sessions) {
-    /** Gets website session details within a given time range: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessions (TODO UNTESTED) */
+    /** Gets website session details within a given time range: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessions */
     async function get_WEBSITEID_Sessions(websiteId, parameters) {
         const response = await this.request("get", ["websites", websiteId, "sessions"], parameters);
         return response.data;
     }
     Sessions.get_WEBSITEID_Sessions = get_WEBSITEID_Sessions;
-    /** Gets summarized website session statistics: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsstats (TODO UNTESTED) */
+    /** Gets summarized website session statistics: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsstats */
     async function get_WEBSITEID_SessionsStats(websiteId, parameters) {
-        return await this.request("get", ["websites", websiteId, "sessions"], parameters);
+        const response = await this.request("get", ["websites", websiteId, "sessions", "stats"], parameters);
+        Object.values(response).forEach((v) => { v.value = Number(v.value); });
+        return response;
     }
     Sessions.get_WEBSITEID_SessionsStats = get_WEBSITEID_SessionsStats;
-    /** Get collected count of sessions by hour of weekday: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsweekly (TODO UNTESTED) */
+    /** Get collected count of sessions by hour of weekday: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionsweekly */
     async function get_WEBSITEID_SessionsWeekly(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "sessions", "weekly"], parameters);
     }
     Sessions.get_WEBSITEID_SessionsWeekly = get_WEBSITEID_SessionsWeekly;
-    /** Gets session details for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionid (TODO UNTESTED) */
+    /** Gets session details for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionid */
     async function get_WEBSITEID_Sessions_SESSIONID(websiteId, sessionId) {
         return await this.request("get", ["websites", websiteId, "sessions", sessionId]);
     }
     Sessions.get_WEBSITEID_Sessions_SESSIONID = get_WEBSITEID_Sessions_SESSIONID;
-    /** Gets session activity for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidactivity (TODO UNTESTED) */
+    /** Gets session activity for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidactivity */
     async function get_WEBSITEID_Sessions_SESSIONID_Activity(websiteId, sessionId, parameters) {
         return await this.request("get", ["websites", websiteId, "sessions", sessionId, "activity"], parameters);
     }
     Sessions.get_WEBSITEID_Sessions_SESSIONID_Activity = get_WEBSITEID_Sessions_SESSIONID_Activity;
-    /** Gets session properties for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidproperties (TODO UNTESTED) */
+    /** Gets session properties for a individual session: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsessionssessionidproperties (TODO Server returns empty array) */
     async function get_WEBSITEID_Sessions_SESSIONID_Properties(websiteId, sessionId) {
-        return await this.request("get", ["websites", websiteId, "sessions", sessionId, "activity", "properties"]);
+        return await this.request("get", ["websites", websiteId, "sessions", sessionId, "properties"]);
     }
     Sessions.get_WEBSITEID_Sessions_SESSIONID_Properties = get_WEBSITEID_Sessions_SESSIONID_Properties;
-    /** Gets session data counts by property name: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-dataproperties (TODO UNTESTED) */
+    /** Gets session data counts by property name: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-dataproperties (TODO Server returns empty array) */
     async function get_WEBSITEID_SessiondataProperties(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "session-data", "properties"], parameters);
     }
     Sessions.get_WEBSITEID_SessiondataProperties = get_WEBSITEID_SessiondataProperties;
-    /** Gets session data counts for a given property: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-datavalues (TODO UNTESTED) */
+    /** Gets session data counts for a given property: https://umami.is/docs/api/sessions#get-apiwebsiteswebsiteidsession-datavalues (TODO Server returns empty array) */
     async function get_WEBSITEID_SessiondataValues(websiteId, parameters) {
         return await this.request("get", ["websites", websiteId, "session-data", "values"], parameters);
     }

package/dist/namespaces/Teams.d.ts

@@ -1,72 +1,71 @@
-import { API, DeletionResult, GenericObject, GenericRequestParameters, TeamRole, Users } from "../index.js";
+import { API, DeletionResult, GenericRequestParameters, Users, Websites } from "../index.js";
 /** Operations around Team management: https://umami.is/docs/api/teams */
 export declare namespace Teams {
-    interface GenericTeam extends GenericObject {
+    interface Team {
+        id: string;
         name: string;
         accessCode: string;
         logoUrl: string | null;
+        createdAt: Date;
+        updatedAt: Date;
+        deletedAt: Date | null;
     }
-    interface TeamMember extends Omit<GenericObject, "deletedAt"> {
-        teamId: string;
+    interface TeamMember {
+        id: string;
+        teamId: Team["id"];
         userId: Users.User["id"];
         role: TeamRole;
-        user: {
-            id: string;
-            username: string;
-        };
+        createdAt: Date;
+        updatedAt: Date;
+    }
+    interface TeamMemberWithUser extends TeamMember {
+        user: Users.MinimalUser;
     }
-    /** Returns all teams: https://umami.is/docs/api/teams#get-apiteams (TODO UNTESTED) */
-    function get(this: API, parameters?: Omit<GenericRequestParameters, "search">): Promise<(GenericTeam & {
-        members: TeamMember[];
+    interface TeamWithMembers extends Team {
+        members: TeamMemberWithUser[];
+    }
+    interface TeamWithMembersCount extends TeamWithMembers {
         _count: {
             websites: number;
             members: number;
         };
-    })[]>;
-    /** Creates a team: https://umami.is/docs/api/teams#post-apiteams (TODO UNTESTED) */
-    function post(this: API, name: string): Promise<[GenericTeam, Omit<TeamMember, "user">]>;
-    /** Join a team: https://umami.is/docs/api/teams#post-apiteamsjoin (TODO UNTESTED) */
-    function postJoin(this: API, accessCode: string): Promise<Omit<TeamMember, "user">>;
-    /** Get a team: https://umami.is/docs/api/teams#get-apiteamsteamid (TODO UNTESTED) */
-    function get_TEAMID(this: API, teamId: string): Promise<GenericTeam & {
-        members: Omit<TeamMember, "user">[];
-    }>;
-    /** Update a team: https://umami.is/docs/api/teams#post-apiteamsteamid (TODO UNTESTED) */
-    function post_TEAMID(this: API, teamId: string, parameters: {
+    }
+    type TeamRole = "team-owner" | "team-manager" | "team-member" | "team-view-only";
+    /** Returns all teams: https://umami.is/docs/api/teams#get-apiteams */
+    function get(this: API, parameters?: Omit<GenericRequestParameters, "search">): Promise<TeamWithMembersCount[]>;
+    /**
+     * Creates a team: https://umami.is/docs/api/teams#post-apiteams
+     * @returns An Array where its first element is the created team, and its second element is its owner
+     */
+    function post(this: API, name: Team["name"]): Promise<[Team, TeamMember]>;
+    /** Join a team: https://umami.is/docs/api/teams#post-apiteamsjoin */
+    function postJoin(this: API, accessCode: Team["accessCode"]): Promise<TeamMember>;
+    /** Get a team: https://umami.is/docs/api/teams#get-apiteamsteamid */
+    function get_TEAMID(this: API, teamId: Team["id"]): Promise<TeamWithMembers>;
+    /** Update a team: https://umami.is/docs/api/teams#post-apiteamsteamid */
+    function post_TEAMID(this: API, teamId: Team["id"], parameters: {
         /** The team's name */
-        name?: string;
+        name?: Team["name"];
         /** The team's access code */
-        accessCode?: string;
-    }): Promise<GenericTeam>;
-    /** Delete a team: https://umami.is/docs/api/teams#delete-apiteamsteamid (TODO UNTESTED) */
-    function delete_TEAMID(this: API, teamId: string): Promise<DeletionResult>;
-    /** Get all users that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusers (TODO UNTESTED) */
-    function get_TEAMID_Users(this: API, teamId: string, parameters: GenericRequestParameters): Promise<TeamMember[]>;
-    /** Add a user to a team: https://umami.is/docs/api/teams#post-apiteamsteamidusers (TODO UNTESTED) */
-    function post_TEAMID_Users(this: API, teamId: string, parameters: {
+        accessCode?: Team["accessCode"];
+    }): Promise<Team>;
+    /** Delete a team: https://umami.is/docs/api/teams#delete-apiteamsteamid */
+    function delete_TEAMID(this: API, teamId: Team["id"]): Promise<DeletionResult>;
+    /** Get all users that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusers */
+    function get_TEAMID_Users(this: API, teamId: Team["id"], parameters?: GenericRequestParameters): Promise<TeamMemberWithUser[]>;
+    /** Add a user to a team: https://umami.is/docs/api/teams#post-apiteamsteamidusers */
+    function post_TEAMID_Users(this: API, teamId: Team["id"], parameters: {
         /** ID of user to be added */
         userId: Users.User["id"];
         /** Team role for user */
-        role: TeamRole;
-    }): Promise<Omit<TeamMember, "user">>;
-    /** Get a user belonging to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusersuserid (TODO UNTESTED) */
-    function get_TEAMID_Users_USERID(this: API, teamId: string, userId: Users.User["id"]): Promise<Omit<TeamMember, "user">>;
-    /** Update a user's role on a team: https://umami.is/docs/api/teams#post-apiteamsteamidusersuserid (TODO UNTESTED) */
-    function post_TEAMID_Users_USERID(this: API, teamId: string, userId: Users.User["id"], role: TeamRole): Promise<Omit<TeamMember, "user">>;
-    /** Remove a user from a team: https://umami.is/docs/api/teams#delete-apiteamsteamidusersuserid (TODO UNTESTED) */
-    function delete_TEAMID_Users_USERID(this: API, teamId: string, userId: Users.User["id"]): Promise<DeletionResult>;
-    /** Get all websites that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidwebsites (TODO UNTESTED) */
-    function get_TEAMID_Websites(this: API, teamId: string, parameters: GenericRequestParameters): Promise<(GenericObject & {
-        name: string;
-        domain: string;
-        shareId: string;
-        resetAt: Date | null;
-        userId: Users.User["id"] | null;
-        teamId: string | null;
-        createdBy: string;
-        createUser: {
-            id: string;
-            username: string;
-        };
-    })[]>;
+        role: Exclude<TeamRole, "team-owner">;
+    }): Promise<TeamMember>;
+    /** Get a user belonging to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusersuserid */
+    function get_TEAMID_Users_USERID(this: API, teamId: Team["id"], userId: Users.User["id"]): Promise<TeamMember>;
+    /** Update a user's role on a team: https://umami.is/docs/api/teams#post-apiteamsteamidusersuserid */
+    function post_TEAMID_Users_USERID(this: API, teamId: Team["id"], userId: Users.User["id"], role: Exclude<TeamRole, "team-owner">): Promise<TeamMember>;
+    /** Remove a user from a team: https://umami.is/docs/api/teams#delete-apiteamsteamidusersuserid */
+    function delete_TEAMID_Users_USERID(this: API, teamId: Team["id"], userId: Users.User["id"]): Promise<DeletionResult>;
+    /** Get all websites that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidwebsites */
+    function get_TEAMID_Websites(this: API, teamId: Team["id"], parameters?: GenericRequestParameters): Promise<Websites.WebsiteWithCreateuser[]>;
 }

package/dist/namespaces/Teams.js

@@ -1,64 +1,67 @@
 /** Operations around Team management: https://umami.is/docs/api/teams */
 export var Teams;
 (function (Teams) {
-    /** Returns all teams: https://umami.is/docs/api/teams#get-apiteams (TODO UNTESTED) */
+    /** Returns all teams: https://umami.is/docs/api/teams#get-apiteams */
     async function get(parameters) {
         const response = await this.request("get", ["teams"], parameters);
         return response.data;
     }
     Teams.get = get;
-    /** Creates a team: https://umami.is/docs/api/teams#post-apiteams (TODO UNTESTED) */
+    /**
+     * Creates a team: https://umami.is/docs/api/teams#post-apiteams
+     * @returns An Array where its first element is the created team, and its second element is its owner
+     */
     async function post(name) {
         return await this.request("post", ["teams"], { name });
     }
     Teams.post = post;
-    /** Join a team: https://umami.is/docs/api/teams#post-apiteamsjoin (TODO UNTESTED) */
+    /** Join a team: https://umami.is/docs/api/teams#post-apiteamsjoin */
     async function postJoin(accessCode) {
         return await this.request("post", ["teams", "join"], { accessCode });
     }
     Teams.postJoin = postJoin;
-    /** Get a team: https://umami.is/docs/api/teams#get-apiteamsteamid (TODO UNTESTED) */
+    /** Get a team: https://umami.is/docs/api/teams#get-apiteamsteamid */
     async function get_TEAMID(teamId) {
         return await this.request("get", ["teams", teamId]);
     }
     Teams.get_TEAMID = get_TEAMID;
-    /** Update a team: https://umami.is/docs/api/teams#post-apiteamsteamid (TODO UNTESTED) */
+    /** Update a team: https://umami.is/docs/api/teams#post-apiteamsteamid */
     async function post_TEAMID(teamId, parameters) {
         return await this.request("post", ["teams", teamId], parameters);
     }
     Teams.post_TEAMID = post_TEAMID;
-    /** Delete a team: https://umami.is/docs/api/teams#delete-apiteamsteamid (TODO UNTESTED) */
+    /** Delete a team: https://umami.is/docs/api/teams#delete-apiteamsteamid */
     async function delete_TEAMID(teamId) {
         return await this.request("delete", ["teams", teamId]);
     }
     Teams.delete_TEAMID = delete_TEAMID;
-    /** Get all users that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusers (TODO UNTESTED) */
+    /** Get all users that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusers */
     async function get_TEAMID_Users(teamId, parameters) {
         const response = await this.request("get", ["teams", teamId, "users"], parameters);
         return response.data;
     }
     Teams.get_TEAMID_Users = get_TEAMID_Users;
-    /** Add a user to a team: https://umami.is/docs/api/teams#post-apiteamsteamidusers (TODO UNTESTED) */
+    /** Add a user to a team: https://umami.is/docs/api/teams#post-apiteamsteamidusers */
     async function post_TEAMID_Users(teamId, parameters) {
         return await this.request("post", ["teams", teamId, "users"], parameters);
     }
     Teams.post_TEAMID_Users = post_TEAMID_Users;
-    /** Get a user belonging to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusersuserid (TODO UNTESTED) */
+    /** Get a user belonging to a team: https://umami.is/docs/api/teams#get-apiteamsteamidusersuserid */
     async function get_TEAMID_Users_USERID(teamId, userId) {
         return await this.request("get", ["teams", teamId, "users", userId]);
     }
     Teams.get_TEAMID_Users_USERID = get_TEAMID_Users_USERID;
-    /** Update a user's role on a team: https://umami.is/docs/api/teams#post-apiteamsteamidusersuserid (TODO UNTESTED) */
+    /** Update a user's role on a team: https://umami.is/docs/api/teams#post-apiteamsteamidusersuserid */
     async function post_TEAMID_Users_USERID(teamId, userId, role) {
         return await this.request("post", ["teams", teamId, "users", userId], { role });
     }
     Teams.post_TEAMID_Users_USERID = post_TEAMID_Users_USERID;
-    /** Remove a user from a team: https://umami.is/docs/api/teams#delete-apiteamsteamidusersuserid (TODO UNTESTED) */
+    /** Remove a user from a team: https://umami.is/docs/api/teams#delete-apiteamsteamidusersuserid */
     async function delete_TEAMID_Users_USERID(teamId, userId) {
         return await this.request("delete", ["teams", teamId, "users", userId]);
     }
     Teams.delete_TEAMID_Users_USERID = delete_TEAMID_Users_USERID;
-    /** Get all websites that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidwebsites (TODO UNTESTED) */
+    /** Get all websites that belong to a team: https://umami.is/docs/api/teams#get-apiteamsteamidwebsites */
     async function get_TEAMID_Websites(teamId, parameters) {
         const response = await this.request("get", ["teams", teamId, "websites"], parameters);
         return response.data;

package/dist/namespaces/Users.d.ts

@@ -1,4 +1,4 @@
-import { API, DeletionResult, GenericObject, GenericRequestParameters, TeamRole, Website } from "../index.js";
+import { API, DeletionResult, GenericRequestParameters, Teams, Websites } from "../index.js";
 /** Operations around User management: https://umami.is/docs/api/users */
 export declare namespace Users {
     type Role = "admin" | "user" | "view-only";
@@ -44,23 +44,7 @@ export declare namespace Users {
     /** Gets all websites that belong to a user: https://umami.is/docs/api/users#get-apiusersuseridwebsites */
     function get_USERID_Websites(this: API, userId: User["id"], parameters?: GenericRequestParameters & {
         includeTeams?: boolean;
-    }): Promise<(Website & {
-        user: MinimalUser;
-    })[]>;
+    }): Promise<Websites.WebsiteWithUser[]>;
     /** Gets all teams that belong to a user: https://umami.is/docs/api/users#get-apiusersuseridteams */
-    function get_USERID_Teams(this: API, userId: User["id"], parameters?: Omit<GenericRequestParameters, "search">): Promise<(GenericObject & {
-        name: string;
-        accessCode: string;
-        logoUrl: string | null;
-        members: Omit<GenericObject, "deletedAt"> & {
-            teamId: string;
-            userId: User["id"];
-            role: TeamRole;
-            user: MinimalUser;
-        }[];
-        _count: {
-            websites: number;
-            members: number;
-        };
-    })[]>;
+    function get_USERID_Teams(this: API, userId: User["id"], parameters?: Omit<GenericRequestParameters, "search">): Promise<Teams.TeamWithMembersCount[]>;
 }

package/dist/namespaces/WebsiteStats.d.ts

@@ -1,4 +1,4 @@
-import { API, Filters, Timestamps, XTY } from "../index.js";
+import { API, Filters, Timestamps, Websites, XTY } from "../index.js";
 /** Operations around Website statistics: https://umami.is/docs/api/website-stats */
 export declare namespace WebsiteStats {
     /**
@@ -31,16 +31,16 @@ export declare namespace WebsiteStats {
     }
     type MetricsTypes = "path" | "entry" | "exit" | "title" | "query" | "referrer" | "channel" | "domain" | "country" | "region" | "city" | "browser" | "os" | "device" | "language" | "screen" | "event" | "hostname" | "tag";
     /** Gets the number of active users on a website: https://umami.is/docs/api/website-stats#get-apiwebsiteswebsiteidactive (TODO UNTESTED) */
-    function get_WEBSITEID_Active(this: API, websiteId: string): Promise<{
+    function get_WEBSITEID_Active(this: API, websiteId: Websites.Website["id"]): Promise<{
         visitors: number;
     }>;
     /** Gets events within a given time range: https://umami.is/docs/api/website-stats#get-apiwebsiteswebsiteideventsseries (TODO UNTESTED) */
-    function get_WEBSITEID_EventsSeries(this: API, websiteId: string, parameters: Timestamps & Units & Filters & {
+    function get_WEBSITEID_EventsSeries(this: API, websiteId: Websites.Website["id"], parameters: Timestamps & Units & Filters & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
     }): Promise<XTY[]>;
     /** Gets metrics for a given time range: https://umami.is/docs/api/website-stats#get-apiwebsiteswebsiteidmetrics (TODO UNTESTED) */
-    function get_WEBSITEID_Metrics(this: API, websiteId: string, parameters: Timestamps & Units & Filters & {
+    function get_WEBSITEID_Metrics(this: API, websiteId: Websites.Website["id"], parameters: Timestamps & Units & Filters & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
         /** Metrics type */
@@ -61,7 +61,7 @@ export declare namespace WebsiteStats {
         name: string;
     })[]>;
     /** Gets pageviews within a given time range: https://umami.is/docs/api/website-stats#get-apiwebsiteswebsiteidpageviews (TODO UNTESTED) */
-    function get_WEBSITEID_Pageviews(this: API, websiteId: string, parameters: Timestamps & Units & Filters & {
+    function get_WEBSITEID_Pageviews(this: API, websiteId: Websites.Website["id"], parameters: Timestamps & Units & Filters & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
         /** Comparison value `prev` | `yoy` */
@@ -81,7 +81,7 @@ export declare namespace WebsiteStats {
         }[];
     }>;
     /** Gets summarized website statistics: https://umami.is/docs/api/website-stats#get-apiwebsiteswebsiteidstats (TODO UNTESTED) */
-    function get_WEBSITEID_Stats(this: API, websiteId: string, parameters: Timestamps & Filters & Units & {
+    function get_WEBSITEID_Stats(this: API, websiteId: Websites.Website["id"], parameters: Timestamps & Filters & Units & {
         /** Timezone (ex. America/Los_Angeles) */
         timezone: string;
     }): Promise<Stats & {

package/dist/namespaces/Websites.d.ts

@@ -1,39 +1,57 @@
-import { API, DeletionResult, GenericRequestParameters, Users, Website } from "../index.js";
+import { API, DeletionResult, GenericRequestParameters, Teams, Users } from "../index.js";
 /** Operations around Website management and statistics: https://umami.is/docs/api/websites */
 export declare namespace Websites {
+    interface Website {
+        id: string;
+        name: string;
+        domain: string;
+        shareId: string | null;
+        resetAt: Date | null;
+        /** @remarks Is null if the website is under a team (has a `teamId`) */
+        userId: Users.User["id"] | null;
+        teamId: Teams.Team["id"] | null;
+        createdBy: Users.User["id"];
+        createdAt: Date;
+        updatedAt: Date | null;
+        deletedAt: Date | null;
+    }
+    interface WebsiteWithCreateuser extends Website {
+        createUser: Users.MinimalUser;
+    }
+    interface WebsiteWithUser extends Website {
+        user: Users.MinimalUser;
+    }
     /** Returns all user websites: https://umami.is/docs/api/websites#get-apiwebsites */
     function get(this: API, parameters?: GenericRequestParameters & {
         /** Set to true if you want to include websites where you are the team owner */
         includeTeams?: boolean;
-    }): Promise<(Website & {
-        user: Users.MinimalUser;
-    })[]>;
+    }): Promise<WebsiteWithUser[]>;
     /** Creates a website: https://umami.is/docs/api/websites#post-apiwebsites */
     function post(this: API, parameters: {
         /** The name of the website in Umami */
-        name: string;
+        name: Website["name"];
         /** The full domain of the tracked website */
-        domain: string;
+        domain: Website["domain"];
         /** A unique string to enable a share url. Set `null` to unshare */
-        shareId?: string | null;
+        shareId?: Website["shareId"];
         /** The ID of the team the website will be created under */
-        teamId?: string;
+        teamId?: Website["teamId"];
         /** Force a UUID assignment to the website */
-        id?: string;
+        id?: Website["id"];
     }): Promise<Website>;
     /** Gets a website by ID: https://umami.is/docs/api/websites#get-apiwebsiteswebsiteid */
-    function get_WEBSITEID(this: API, websiteId: string): Promise<Website>;
+    function get_WEBSITEID(this: API, websiteId: Website["id"]): Promise<Website>;
     /** Updates a website: https://umami.is/docs/api/websites#post-apiwebsiteswebsiteid */
-    function post_WEBSITEID(this: API, websiteId: string, parameters: {
+    function post_WEBSITEID(this: API, websiteId: Website["id"], parameters: {
         /** The name of the website in Umami */
-        name?: string;
+        name?: Website["name"];
         /** The full domain of the tracked website */
-        domain?: string;
+        domain?: Website["domain"];
         /** A unique string to enable a share url. Set `null` to unshare */
-        shareId?: string | null;
+        shareId?: Website["shareId"];
     }): Promise<Website>;
     /** Deletes a website: https://umami.is/docs/api/websites#delete-apiwebsiteswebsiteid */
-    function delete_WEBSITEID(this: API, websiteId: string): Promise<DeletionResult>;
+    function delete_WEBSITEID(this: API, websiteId: Website["id"]): Promise<DeletionResult>;
     /** Resets a website by removing all data related to the website: https://umami.is/docs/api/websites#post-apiwebsiteswebsiteidreset */
-    function post_WEBSITEID_Reset(this: API, websiteId: string): Promise<DeletionResult>;
+    function post_WEBSITEID_Reset(this: API, websiteId: Website["id"]): Promise<DeletionResult>;
 }

package/dist/utilities.js

@@ -56,7 +56,7 @@ export function correctType(x, force_string) {
         const vals = Object.values(x);
         // If a key is any of those, the value is expected to be a string, so we use `force_string` to make correctType convert them to string for us
         const unconvertables = ["value"];
-        const unconvertables_substrings = ["string", "name"]; // or if the key contains any of those substrings
+        const unconvertables_substrings = ["string", "name", "Id"]; // or if the key contains any of those substrings
         for (let i = 0; i < keys.length; i++) {
             x[keys[i]] = correctType(vals[i], unconvertables.some((u) => keys[i] === u) || unconvertables_substrings.some((s) => keys[i].toLowerCase().includes(s)));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami-api-js",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Package to easily access the umami api!",
   "type": "module",
   "main": "dist/index.js",