.npmignore

@@ -1,2 +0,0 @@
-yarn-error.log
-yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
   "license": "MIT",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.9",
   "name": "@flaschengeist/types",
   "author": "Ferdinand Thiessen <rpm@fthiessen.de>",
   "homepage": "https://flaschengeist.dev/",
@@ -19,11 +19,11 @@
     "pretty": "prettier --config ./package.json  --write '{,!(node_modules)/**/}*.ts'"
   },
   "peerDependencies": {
-    "vue": "^3.2.20",
+    "vue": "^3.2.4",
     "vue-router": "^4.0.11"
   },
   "devDependencies": {
-    "prettier": "^2.5.1",
+    "prettier": "^2.4.1",
     "typescript": "^4.5.2"
   },
   "prettier": {

types/PEP440.d.ts

@@ -11,4 +11,4 @@ type PreRelease = Join<[['a' | 'b' | 'rc'], number], '.'>;
 type PRVersion = BaseVersion | `${BaseVersion}${PreRelease}`;
 
 /** A PEP440 subset used to describe backend module versions */
-declare type PEP440Version = PRVersion | `${PRVersion}.dev${number}`;
+declare type PEP440Version = PRVersion | `${PRVersion}.dev${number}`;

types/api.d.ts

@@ -1,27 +0,0 @@
-/// <reference path="PEP440.d.ts" />
-/**
- * Types used for communicating with the API
- */
-
-declare namespace FG {
-  interface BackendPlugin {
-    permissions: string[];
-    version: PEP440Version;
-  }
-  interface Backend {
-    plugins: { [key: string]: BackendPlugin };
-    version: PEP440Version;
-  }
-  interface PaginationFilter {
-    limit?: number;
-    offset?: number;
-    from?: Date;
-    to?: Date;
-    /** Default to ascending */
-    descending?: boolean;
-  }
-  interface PaginationResponse<T> {
-    result: T[];
-    count: number;
-  }
-}

types/flaschengeist.d.ts

@@ -1,5 +1,17 @@
-/** Models exported from backend */
+/// <reference path="PEP440.d.ts" />
+/**
+ * Types used for communicating with the API
+ */
+
 declare namespace FG {
+  interface BackendPlugin {
+    permissions: string[];
+    version: PEP440Version;
+  }
+  interface Backend {
+    plugins: {[key: string]: BackendPlugin};
+    version: PEP440Version;
+  }
   interface Notification {
     id: number;
     plugin: string;
@@ -9,7 +21,6 @@ declare namespace FG {
   }
   interface User {
     userid: string;
-    deleted: boolean;
     display_name: string;
     firstname: string;
     lastname: string;
@@ -17,6 +28,7 @@ declare namespace FG {
     birthday?: Date;
     roles: Array<string>;
     permissions?: Array<string>;
+    avatar_url?: string;
   }
   interface Session {
     expires: Date;
@@ -32,4 +44,16 @@ declare namespace FG {
     name: string;
     permissions: Array<Permission>;
   }
+  interface PaginationFilter {
+    limit?: number;
+    offset?: number;
+    from?: Date;
+    to?: Date;
+    /** Default to ascending */
+    descending?: boolean;
+  }
+  interface PaginationResponse<T> {
+    result: T[];
+    count: number;
+  }
 }

types/index.d.ts

@@ -1,5 +1,4 @@
-/// <reference path="api.d.ts" />
-/// <reference path="models.d.ts" />
+/// <reference path="flaschengeist.d.ts" />
 /// <reference path="PEP440.d.ts" />
 
 export * from './plugin';