feat(type): chat

core/type/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alwatr/type",
   "version": "0.27.0",
-  "description": "Alwatr Types",
+  "description": "Alwatr Global Types",
   "private": true,
   "keywords": [
     "type",
@@ -10,6 +10,8 @@
     "alwatr"
   ],
   "type": "module",
+  "main": "type.js",
+  "types": "type.d.ts",
   "author": "S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com)",
   "license": "MIT",
   "files": [
@@ -26,5 +28,8 @@
   "homepage": "https://github.com/AliMD/alwatr/tree/main/core/type#readme",
   "bugs": {
     "url": "https://github.com/AliMD/alwatr/issues"
+  },
+  "devDependencies": {
+    "@alwatr/fetch": "~0.27.0"
   }
 }

core/type/src/chat.ts

@@ -0,0 +1,20 @@
+import type {AlwatrDocumentStorage, AlwatrDocumentObject} from '@alwatr/fetch/type.js';
+
+type CommonMessage = AlwatrDocumentObject & {
+  from: string;
+  replyId?: string;
+};
+
+export type ChatTextMessage = CommonMessage & {
+  type: 'text';
+  text: string;
+};
+
+export type ChatPhotoMessage = CommonMessage & {
+  type: 'photo';
+  photo: unknown;
+};
+
+export type ChatMessage = ChatTextMessage | ChatPhotoMessage;
+
+export type ChatStorage = AlwatrDocumentStorage<ChatTextMessage>;

core/type/src/type.ts

@@ -0,0 +1 @@
+export * from './chat.js';

core/type/tsconfig.json

@@ -9,5 +9,7 @@
   // files, include and exclude from the inheriting config are always overwritten.
   "include": ["src/**/*.ts"],
   "exclude": [],
-  "references": []
+  "references": [
+    {"path": "../fetch"}
+  ]
 }

services/comment/package.json

@@ -54,6 +54,7 @@
   "devDependencies": {
     "@alwatr/logger": "^0.27.0",
     "@alwatr/nano-server": "^0.27.0",
+    "@alwatr/type": "^0.27.0",
     "@alwatr/storage-client": "^0.27.0",
     "@types/node": "~18.11.18",
     "esbuild": "~0.16.11",

services/comment/src/lib/storage.ts

@@ -1,6 +1,8 @@
 import {AlwatrStorageClient} from '@alwatr/storage-client';
 
 import {config} from '../config.js';
-import {Message} from './type.js';
 
-export const storageClient = new AlwatrStorageClient<Message>(config.storage);
+import type {ChatMessage} from '@alwatr/type';
+
+
+export const storageClient = new AlwatrStorageClient<ChatMessage>(config.storage);

services/comment/src/route/patch.ts

@@ -1,9 +1,9 @@
 import {config, logger} from '../config.js';
 import {nanoServer} from '../lib/nano-server.js';
 import {storageClient} from '../lib/storage.js';
-import {Message} from '../lib/type.js';
 
 import type {AlwatrConnection, AlwatrServiceResponse} from '@alwatr/nano-server';
+import type {ChatMessage} from '@alwatr/type';
 
 nanoServer.route('PATCH', '/', setComment);
 
@@ -14,7 +14,7 @@ async function setComment(connection: AlwatrConnection): Promise<AlwatrServiceRe
 
   const params = connection.requireQueryParams<{storage: string}>({storage: 'string'});
 
-  const bodyJson = await connection.requireJsonBody<Message>();
+  const bodyJson = await connection.requireJsonBody<ChatMessage>();
 
   bodyJson.id ??= 'auto_increment';
 

services/comment/tsconfig.json

@@ -15,5 +15,6 @@
     {"path": "../../core/nano-server"},
     {"path": "../../core/logger"},
     {"path": "../../core/storage-client"},
+    {"path": "../../core/type"},
   ]
 }

ui/ui-kit/package.json

@@ -36,5 +36,8 @@
     "@alwatr/element": "^0.27.0",
     "@alwatr/fetch": "^0.27.0",
     "tslib": "~2.4.1"
+  },
+  "devDependencies": {
+    "@alwatr/type": "^0.27.0"
   }
 }

ui/ui-kit/src/chat/chat-list.ts

@@ -1,18 +1,14 @@
 import {AlwatrDummyElement, css, customElement, html, nothing, property} from '@alwatr/element';
 import './chat-message.js';
 
-import type {ChatMessage as _ChatMessage} from './chat-message.js';
-import type {AlwatrDocumentObject, AlwatrDocumentStorage} from '@alwatr/fetch/type.js';
+import type {ChatStorage} from '@alwatr/type';
 
 declare global {
   interface HTMLElementTagNameMap {
     'alwatr-chat-list': AlwatrChatList;
   }
 }
 
-export type ChatMessage = AlwatrDocumentObject & _ChatMessage;
-export type ChatStorage = AlwatrDocumentStorage<ChatMessage>;
-
 export function* map<T>(
     items: Record<string, T> | undefined,
     func: (value: T, index: string) => unknown,

ui/ui-kit/src/chat/chat-message.ts

@@ -1,4 +1,7 @@
 import {AlwatrDummyElement, css, customElement, html, nothing, property, DirectionMixin} from '@alwatr/element';
+
+import type {ChatTextMessage} from '@alwatr/type';
+
 import './chat-avatar.js';
 import './chat-bubble.js';
 
@@ -8,14 +11,6 @@ declare global {
   }
 }
 
-export type ChatTextMessage = {
-  from: string;
-  type: 'text';
-  text: string;
-};
-
-export type ChatMessage = ChatTextMessage; // TODO: ChatPhotoMessage
-
 /**
  * Alwatr chat message box element.
  *

ui/ui-kit/src/chat/chat.ts

@@ -3,7 +3,7 @@ import {customElement, AlwatrSmartElement, css, html} from '@alwatr/element';
 import './chat-footer.js';
 import './chat-list.js';
 
-import type {ChatStorage} from './chat-list.js';
+import type {ChatStorage} from '@alwatr/type';
 
 declare global {
   interface HTMLElementTagNameMap {

ui/ui-kit/tsconfig.json

@@ -19,5 +19,6 @@
     {"path": "../element"},
     {"path": "../icon"},
     {"path": "../../core/fetch"},
+    {"path": "../../core/type"},
   ]
 }