@builder6/rooms 3.0.5 → 3.0.7

package/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@builder6/rooms",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "",
   "author": "",
   "license": "MIT",
   "main": "dist/plugin.module.js",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "format": "prettier --write \"src/**/*.ts\"",
     "build": "rimraf dist && tsc",
     "build:watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "3.0.5",
-    "@builder6/email": "3.0.5",
-    "@builder6/files": "3.0.5",
-    "@builder6/moleculer": "3.0.5",
-    "@builder6/pages": "3.0.5",
+    "@builder6/core": "3.0.7",
+    "@builder6/email": "3.0.7",
+    "@builder6/files": "3.0.7",
+    "@builder6/moleculer": "3.0.7",
+    "@builder6/pages": "3.0.7",
     "@liveblocks/emails": "2.12.0",
     "@liveblocks/node": "2.12.0",
     "@react-email/components": "^0.0.31",
@@ -54,5 +57,5 @@
   "devDependencies": {
     "@types/lodash": "^4.17.13"
   },
-  "gitHead": "6ec7bdd489b9b2be5271e2142f3cf08ca3c156ae"
+  "gitHead": "eb1dd820e3365f743ee927bb2d178256b6ec36d2"
 }

package/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all"
-}

package/src/emails/UnreadMention.tsx

@@ -1,37 +0,0 @@
-import { Section, Text } from '@react-email/components';
-import type { CommentEmailAsReactData } from '@liveblocks/emails';
-
-import type { CompanyInfo, RoomInfo } from './_lib/types';
-
-import { Layout } from './_components/layout';
-import { Header } from './_components/header';
-import { Headline } from './_components/headline';
-import { Comment } from './_components/comment';
-import {
-  getUnreadMentionHeadlineParts,
-  getUnreadMentionPreviewText,
-} from './_utils/comments';
-import * as React from 'react';
-
-type UnreadMentionEmailProps = {
-  company: CompanyInfo;
-  room: RoomInfo;
-  comment: CommentEmailAsReactData;
-};
-
-export default function UnreadMentionEmail(props: UnreadMentionEmailProps) {
-  const { company, room, comment } = props;
-
-  const previewText = getUnreadMentionPreviewText(comment, room.name);
-  const headlineParts = getUnreadMentionHeadlineParts(comment, room.name);
-
-  return (
-    <Layout preview={previewText}>
-      <Header {...company} />
-      <Section>
-        <Headline className="mb-4" parts={headlineParts} />
-        <Comment {...comment} isHighlighted />
-      </Section>
-    </Layout>
-  );
-}

package/src/emails/UnreadReplies.tsx

@@ -1,49 +0,0 @@
-import { Section, Text } from '@react-email/components';
-import type { CommentEmailAsReactData } from '@liveblocks/emails';
-
-import type { CompanyInfo, RoomInfo } from './_lib/types';
-import { getProps } from './_utils/getProps';
-import { Layout } from './_components/layout';
-import { Header } from './_components/header';
-import { Headline } from './_components/headline';
-import { Comment } from './_components/comment';
-import {
-  getUnreadRepliesHeadlineParts,
-  getUnreadRepliesPreviewText,
-} from './_utils/comments';
-
-type UnreadRepliesEmailProps = {
-  company: CompanyInfo;
-  room: RoomInfo;
-  comments: CommentEmailAsReactData[];
-};
-import * as React from 'react';
-
-
-const UnreadRepliesEmail = (
-  props: UnreadRepliesEmailProps,
-): React.ReactElement => {
-  const { company, room, comments } = props;
-
-  const previewText = getUnreadRepliesPreviewText(comments, room.name);
-  const headlineParts = getUnreadRepliesHeadlineParts(comments, room.name);
-
-  return (
-    <Layout preview={previewText}>
-      <Header {...company} />
-      <Section>
-        <Headline className="mb-4" parts={headlineParts} />
-        {comments.map((comment, index) => (
-          <Comment
-            key={comment.id}
-            className={index > 0 ? 'mt-3' : undefined}
-            {...comment}
-            isHighlighted={comments.length === 1}
-          />
-        ))}
-      </Section>
-    </Layout>
-  );
-};
-
-export default UnreadRepliesEmail;

package/src/emails/_components/comment.tsx

@@ -1,70 +0,0 @@
-import { CommentEmailAsReactData } from "@liveblocks/emails";
-import { Section, Row, Column, Img, Button } from "@react-email/components";
-import { cn } from "../_utils/cn";
-import * as React from "react";
-
-type CommentProps = CommentEmailAsReactData & {
-  isHighlighted?: boolean;
-  className?: string;
-};
-
-export function Comment({
-  id,
-  author,
-  createdAt,
-  reactBody,
-  url,
-  isHighlighted,
-  className,
-}: any) {
-  const creationDate = createdAt
-    .toLocaleString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-      hour12: true,
-    })
-    .replace(",", "");
-
-  return (
-    <Section
-      key={id}
-      className={cn("rounded-md py-4 pl-4 pr-8", className)}
-      // NOTE: `react-email` do not interpret correctly borders
-      // in `className` attribute w/ `tailwindcss`.
-      style={{ border: "solid 1px rgba(23, 23, 23, 0.10)" }}
-    >
-      <Row>
-        <Column className="w-10">
-          <Img
-            className="rounded-full bg-black/5"
-            width={28}
-            height={28}
-            src={author.info.avatar}
-          />
-        </Column>
-        <Column className="text-black">
-          <span className="text-sm font-medium">{author.info.name}</span>
-          <span className="ml-1.5 opacity-60 text-xs">{creationDate}</span>
-        </Column>
-      </Row>
-      <Row>
-        <Column className="w-10" />
-        <Column>
-          {reactBody}
-          <Button
-            className={cn(
-              "rounded px-3.5 py-2 text-sm font-medium w-max mt-4",
-              isHighlighted ? "bg-black text-white" : "bg-black/5 text-black"
-            )}
-            href={url}
-          >
-            View comment
-          </Button>
-        </Column>
-      </Row>
-    </Section>
-  );
-}

package/src/emails/_components/header.tsx

@@ -1,26 +0,0 @@
-import { Row, Column, Heading, Img, Link } from "@react-email/components";
-import { CompanyInfo } from "../_lib/types";
-import * as React from "react";
-
-export function Header(company: CompanyInfo) {
-  return (
-    <Row className="mb-10">
-      <Column className="w-10">
-        <Link href={company.url} target="_blank">
-          {/* TODO: Update img name by creating a new one for this specific example to work without to deploy this example. */}
-          <Img
-            src={company.logoUrl}
-            alt="Company logo"
-            className="rounded-md"
-            height={28}
-          />
-        </Link>
-      </Column>
-      <Column>
-        <Heading as="h1" className="m-0 text-lg text-black">
-          {company.name}
-        </Heading>
-      </Column>
-    </Row>
-  );
-}

package/src/emails/_components/headline.tsx

@@ -1,20 +0,0 @@
-import { Text } from "@react-email/components";
-import { cn } from "../_utils/cn";
-import type { HeadlineParts } from "../_utils/comments";
-import * as React from "react";
-
-export function Headline({
-  parts,
-  className,
-}: {
-  parts: HeadlineParts;
-  className?: string;
-}) {
-  const [start, middle, end] = parts;
-
-  return (
-    <Text className={cn("text-sm text-black font-medium m-0", className)}>
-      {start} <span className="font-normal">{middle}</span> {end}
-    </Text>
-  );
-}

package/src/emails/_components/layout.tsx

@@ -1,45 +0,0 @@
-import {
-  Body,
-  Container,
-  Head,
-  Html,
-  Preview,
-  Tailwind,
-} from "@react-email/components";
-import { emailColors } from "../_styles/colors";
-import * as React from "react";
-
-export function Layout({
-  preview,
-  children,
-}: {
-  preview: string;
-  children?: React.ReactNode;
-}) {
-  return (
-    <Html lang="en">
-      <Head />
-      <Preview>{preview}</Preview>
-      {/**
-       * This component wraps emails with `TailwindCSS`.
-       * Import your shared config here to make common tw classes usable at email's html generation
-       * and usable in your code editor.
-       */}
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: {
-                email: { ...emailColors },
-              },
-            },
-          },
-        }}
-      >
-        <Body className="bg-white my-auto mx-auto font-sans antialiased px-5">
-          <Container className="py-8">{children}</Container>
-        </Body>
-      </Tailwind>
-    </Html>
-  );
-}

package/src/emails/_lib/types.ts

@@ -1,10 +0,0 @@
-export type RoomInfo = {
-  name?: string;
-  url?: string;
-};
-
-export type CompanyInfo = {
-  name: string;
-  url: string;
-  logoUrl?: string;
-};

package/src/emails/_styles/colors.ts

@@ -1,7 +0,0 @@
-import type { RecursiveKeyValuePair } from "tailwindcss/types/config";
-
-// Export config specific to emails and define them to make them
-// usable in your code editor.
-export const emailColors: RecursiveKeyValuePair = {
-  accent: "#1667FF",
-};

package/src/emails/_utils/cn.ts

@@ -1,6 +0,0 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}

package/src/emails/_utils/comments.ts

@@ -1,61 +0,0 @@
-import type { CommentEmailAsReactData } from "@liveblocks/emails";
-import { RoomInfo } from "../_lib/types";
-
-const UNKNOWN_ROOM = "Unknown room" as const;
-
-export type HeadlineParts = [string, string, string];
-
-const getDisplayName = (author: CommentEmailAsReactData["author"]): string =>
-  author.info.name;
-
-const getRoomName = (roomName: RoomInfo["name"]): string =>
-  roomName ?? UNKNOWN_ROOM;
-
-const createMentionPreview = (authorName: string, roomName: string): string =>
-  `${authorName} mentioned you in ${roomName}`;
-
-const createRepliesPreview = (
-  commentCount: number,
-  authorName: string,
-  roomName: string
-): string =>
-  commentCount === 1
-    ? `${authorName} left a comment in ${roomName}`
-    : `${commentCount} new comments in ${roomName}`;
-
-export const getUnreadMentionPreviewText = (
-  comment: CommentEmailAsReactData,
-  roomName: RoomInfo["name"]
-): string =>
-  createMentionPreview(getDisplayName(comment.author), getRoomName(roomName));
-
-export const getUnreadMentionHeadlineParts = (
-  comment: CommentEmailAsReactData,
-  roomName: RoomInfo["name"]
-): HeadlineParts => [
-  getDisplayName(comment.author),
-  "mentioned you in",
-  getRoomName(roomName),
-];
-
-export const getUnreadRepliesPreviewText = (
-  comments: CommentEmailAsReactData[],
-  roomName: RoomInfo["name"]
-): string =>
-  createRepliesPreview(
-    comments.length,
-    getDisplayName(comments[0].author),
-    getRoomName(roomName)
-  );
-
-export const getUnreadRepliesHeadlineParts = (
-  comments: CommentEmailAsReactData[],
-  roomName: RoomInfo["name"]
-): HeadlineParts => {
-  const commentCount = comments.length;
-  const displayRoomName = getRoomName(roomName);
-
-  return commentCount === 1
-    ? [getDisplayName(comments[0].author), "left a comment in", displayRoomName]
-    : [`${commentCount} new comments`, "in", displayRoomName];
-};

package/src/emails/_utils/getProps.ts

@@ -1,7 +0,0 @@
-export const getProps = <P>(external: P, preview: P): P => {
-  if (!external || Object.keys(external).length <= 0) {
-    return preview;
-  }
-
-  return external;
-};

package/src/plugin.module.ts

@@ -1,3 +0,0 @@
-export { RoomsModule as default } from './rooms/rooms.module';
-
-export * from './rooms';

package/src/rooms/app.controller.ts

@@ -1,89 +0,0 @@
-import {
-  Controller,
-  Get,
-  Param,
-  Res,
-  Query,
-  UseGuards,
-  Req,
-} from '@nestjs/common';
-import { Response } from 'express';
-import { ConfigService } from '@nestjs/config';
-import { AuthGuard } from '@builder6/core';
-import { PagesService } from '@builder6/pages';
-import { RoomsService } from './rooms.service';
-import { ApiBearerAuth, ApiBody, ApiTags } from '@nestjs/swagger';
-
-// 兼容 Steedos OpenAPI v1 格式的 api
-@ApiTags('Rooms')
-@Controller('b6/rooms/')
-@UseGuards(AuthGuard)
-export class RoomsAppController {
-  constructor(
-    private readonly pagesService: PagesService,
-    private readonly roomsService: RoomsService,
-    private configService: ConfigService,
-  ) {}
-
-  @Get(':roomId')
-  async getRooms(
-    @Param('roomId') roomId: string = 'test',
-    @Query() query: Record<string, any>,
-    @Req() req: Request,
-    @Res() res: Response,
-  ) {
-    const user = req['user'];
-    const room = await this.roomsService.resolveRoomInfo({ roomId });
-    const roomName = room?.name || roomId;
-    try {
-      const schema = {
-        type: 'page',
-        title: roomName,
-        regions: ['body', 'toolbar', 'header'],
-        toolbar: [
-          {
-            type: 'rooms-provider',
-            baseUrl: '',
-            body: {
-              type: 'wrapper',
-              className: 'p-4',
-              body: {
-                type: 'rooms-inbox-popover',
-              },
-            },
-          },
-        ],
-        body: [
-          {
-            type: 'rooms-provider',
-            baseUrl: '',
-            body: [
-              {
-                type: 'rooms-comments',
-                className: 'flex flex-col m-3 gap-3',
-                roomId: `${roomId}`,
-              },
-            ],
-          },
-        ],
-      };
-      const data = {};
-      const env = {
-        assetUrls: [
-          `https://unpkg.com/@steedos-widgets/liveblocks@6.3.12-beta.6/dist/assets.json`,
-        ],
-      };
-      const rendered = await this.pagesService.renderAmis(
-        schema,
-        data,
-        env,
-        user,
-      );
-
-      res.status(200).send(rendered); // 返回渲染后的字符串
-    } catch (error) {
-      console.log(error);
-      return { error: 'Rooms rendering failed', details: error.message };
-    }
-  }
-}

package/src/rooms/dtos/inbox_notifications.dto.ts

@@ -1,13 +0,0 @@
-export class InboxNotificationDTO {
-  _id?: string;
-  userId: string;
-  kind: string;
-  notifiedAt?: Date;
-  readAt?: Date;
-  roomId: string;
-  threadId: string;
-  created?: Date;
-  created_by?: string;
-  modified?: Date;
-  modified_by?: string;
-}

package/src/rooms/dtos/notifications.dto.ts

@@ -1,14 +0,0 @@
-export class NotificationDTO {
-  _id?: string;
-  name: string;
-  body: string;
-  related_to: {
-    o: string;
-    ids: string[];
-  };
-  related_name: string;
-  from: string;
-  space: string;
-  owner: string;
-  is_read: boolean;
-}

package/src/rooms/dtos/room_members.dto.ts

@@ -1,32 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { FULL_ACCESS } from './rooms.dto';
-
-export class RoomMemberDTO {
-  @ApiProperty()
-  _id?: string;
-
-  @ApiProperty()
-  userId: string;
-
-  @ApiProperty()
-  roomId: string;
-
-  // 可选范围为：['owner']
-  @ApiProperty({
-    enum: ['owner'],
-    default: [],
-  })
-  roles?: string[] = [];
-
-  @ApiProperty({
-    enum: ['all', 'replies', 'mentions'],
-    default: ['replies', 'mentions'],
-  })
-  notifications?: string[] = ['replies', 'mentions'];
-
-  @ApiProperty({
-    enum: ['room:read', 'room:write'],
-    default: FULL_ACCESS,
-  })
-  scopes?: string[] = FULL_ACCESS;
-}

package/src/rooms/dtos/rooms.dto.ts

@@ -1,51 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { RoomMemberDTO } from './room_members.dto';
-
-/**
- * Assign this to a room (or wildcard pattern) if you want to grant the user
- * read permissions to the storage and comments data for this room. (Note that
- * the user will still have permissions to update their own presence.)
- */
-export const READ_ACCESS = [
-  'room:read',
-  'room:presence:write',
-  'comments:read',
-];
-
-/**
- * Assign this to a room (or wildcard pattern) if you want to grant the user
- * permissions to read and write to the room's storage and comments.
- */
-export const FULL_ACCESS = ['room:write', 'comments:write'];
-
-export class RoomDTO {
-  @ApiProperty()
-  _id?: string;
-
-  @ApiProperty()
-  name: string;
-
-  @ApiProperty()
-  description?: string;
-
-  // https://learn.microsoft.com/en-us/microsoftteams/teams-channels-overview
-  @ApiProperty({
-    enum: ['standard', 'private', 'shared'],
-    default: 'standard',
-  })
-  membershipType?: string;
-
-  members?: RoomMemberDTO[];
-
-  @ApiProperty({
-    enum: ['room:read', 'room:write'],
-    default: FULL_ACCESS,
-  })
-  defaultScopes?: string[] = FULL_ACCESS;
-
-  @ApiProperty({
-    enum: ['all', 'replies', 'mentions'],
-    default: ['replies', 'mentions'],
-  })
-  defaultNotifications?: string[];
-}