Support multiple @type value

Author: compulim

__tests__/html2/chatAdapter/layer/addCopyButton.html

@@ -36,7 +36,7 @@
           '@id' in entity &&
           entity['@id'] === '' &&
           '@type' in entity &&
-          entity['@type'] === 'Message'
+          entity['@type'].includes('Message')
         ) {
           return entity;
         }

__tests__/html2/feedbackStatus/feedbackActivityStatus.click.html

@@ -72,7 +72,7 @@
             entities: expect.arrayContaining([
               expect.objectContaining({
                 '@context': 'https://schema.org',
-                '@type': 'VoteAction',
+                '@type': ['VoteAction'],
                 actionOption: 'upvote',
                 type: 'https://schema.org/VoteAction'
               })
@@ -99,7 +99,7 @@
             entities: expect.arrayContaining([
               expect.objectContaining({
                 '@context': 'https://schema.org',
-                '@type': 'VoteAction',
+                '@type': ['VoteAction'],
                 type: 'https://schema.org/VoteAction',
                 actionOption: 'downvote'
               })
@@ -127,7 +127,7 @@
             entities: expect.arrayContaining([
               expect.objectContaining({
                 '@context': 'https://schema.org',
-                '@type': 'VoteAction',
+                '@type': ['VoteAction'],
                 type: 'https://schema.org/VoteAction',
                 actionOption: 'downvote'
               })

package-lock.json

@@ -22,6 +22,7 @@
     "packages/test/web-server",
     "packages/core-debug-api",
     "packages/core-graph",
+    "packages/core-json-ld",
     "packages/core",
     "packages/react-hooks",
     "packages/react-valibot",
@@ -85,6 +86,7 @@
     "precommit:eslint:core": "cd packages && cd core && npm run precommit:eslint",
     "precommit:eslint:core-debug-api": "cd packages && cd core-debug-api && npm run precommit:eslint",
     "precommit:eslint:core-graph": "cd packages && cd core-graph && npm run precommit:eslint",
+    "precommit:eslint:core-json-ld": "cd packages && cd core-json-ld && npm run precommit:eslint",
     "precommit:eslint:debug-theme": "cd packages && cd debug-theme && npm run precommit:eslint",
     "precommit:eslint:directlinespeech": "cd packages && cd directlinespeech && npm run precommit:eslint",
     "precommit:eslint:fluent-theme": "cd packages && cd fluent-theme && npm run precommit:eslint",
@@ -122,6 +124,7 @@
     "precommit:typecheck:core": "cd packages && cd core && npm run precommit:typecheck",
     "precommit:typecheck:core-debug-api": "cd packages && cd core-debug-api && npm run precommit:typecheck",
     "precommit:typecheck:core-graph": "cd packages && cd core-graph && npm run precommit:typecheck",
+    "precommit:typecheck:core-json-ld": "cd packages && cd core-json-ld && npm run precommit:typecheck",
     "precommit:typecheck:debug-theme": "cd packages && cd debug-theme && npm run precommit:typecheck",
     "precommit:typecheck:fluent-theme": "cd packages && cd fluent-theme && npm run precommit:typecheck",
     "precommit:typecheck:react-hooks": "cd packages && cd react-hooks && npm run precommit:typecheck",
@@ -151,6 +154,7 @@
     "start:core": "cd packages && cd core && npm start",
     "start:core-debug-api": "cd packages && cd core-debug-api && npm start",
     "start:core-graph": "cd packages && cd core-graph && npm start",
+    "start:core-json-ld": "cd packages && cd core-json-ld && npm start",
     "start:debug-theme": "cd packages && cd debug-theme && npm start",
     "start:directlinespeech": "cd packages && cd directlinespeech && npm start",
     "start:fluent-theme": "cd packages && cd fluent-theme && npm start",

package.json

@@ -137,7 +137,7 @@ const IGNORED_OWN_PACKAGES = [
 
   const { workspaces } = await readPackage({ cwd: resolve(fileURLToPath(import.meta.url), '../../../') });
 
-  const allOwnExports = new Set();
+  const allOwnExports = new Map();
 
   for (const path of workspaces) {
     // eslint-disable-next-line no-await-in-loop
@@ -147,14 +147,16 @@ const IGNORED_OWN_PACKAGES = [
       continue;
     }
 
+    const { name: packageName } = packageJson;
+
     for (const key of getKeysRecursive(packageJson.exports)) {
       if (key.startsWith('.')) {
         if (key === '.') {
-          allOwnExports.add(`${packageJson.name}`);
+          allOwnExports.set(packageName, packageName);
         } else if (key.endsWith('.js')) {
           // We need to remove .js suffix otherwise, esbuild will emit filename.js.js.
           // ./filename.js -> /filename
-          allOwnExports.add(`${packageJson.name}${key.slice(1, -3)}`);
+          allOwnExports.set(`${packageName}${key.slice(1, -3)}`, `${packageName}${key.slice(1)}`);
         }
       }
     }
@@ -175,7 +177,7 @@ const IGNORED_OWN_PACKAGES = [
     'botframework-webchat/middleware': './src/boot/exports/middleware.ts',
     'botframework-webchat/schema': './src/boot/exports/schema.ts',
     // TODO: [P2] We can remove the `Array.from()` after bumping Node.js.
-    ...Array.from(allOwnExports.keys()).reduce((entryPoints, key) => ({ ...entryPoints, [key]: key }), {})
+    ...Object.fromEntries(allOwnExports)
   };
 
   console.log('Exporting the following own entry points:');

packages/bundle/esbuild.static.mjs

@@ -19,4 +19,4 @@ export {
   type OrgSchemaSoftwareSourceCode,
   type OrgSchemaUserReview,
   type OrgSchemaVoteAction
-} from 'botframework-webchat-core';
+} from 'botframework-webchat-core/org-schema.js';

packages/bundle/src/boot/actual/schema.ts

@@ -1,4 +1,5 @@
 import { useStyles } from '@msinternal/botframework-webchat-styles/react';
+import { isOfType } from 'botframework-webchat-core/json-ld.js';
 import React, { memo, useCallback, useMemo, type FormEventHandler, type KeyboardEventHandler } from 'react';
 import { Extract, wrapWith } from 'react-wrap-with';
 import { useRefFrom } from 'use-ref-from';
@@ -57,7 +58,7 @@ function InternalActivityFeedback() {
 
   // Hide feedback form if feedback has already been submitted or it does not require UserReview.
   const isExpanded = useMemo(
-    () => !hasSubmitted && selectedAction?.result[0]?.['@type'] === 'UserReview',
+    () => !hasSubmitted && isOfType('UserReview', selectedAction?.result[0]),
     [hasSubmitted, selectedAction]
   );
 

packages/component/src/ActivityFeedback/ActivityFeedback.tsx

@@ -1,9 +1,10 @@
 import { validateProps } from '@msinternal/botframework-webchat-react-valibot';
 import { hooks } from 'botframework-webchat-api';
-import { orgSchemaActionSchema, orgSchemaVoteActionSchema } from 'botframework-webchat-core';
+import { orgSchemaActionSchema, orgSchemaVoteActionSchema } from 'botframework-webchat-core/org-schema.js';
 import React, { memo, useCallback, useMemo, useRef } from 'react';
 import { useRefFrom } from 'use-ref-from';
 import { literal, object, pipe, readonly, string, union, type InferInput } from 'valibot';
+import { isOfType } from 'botframework-webchat-core/json-ld.js';
 
 import { useListenToActivityFeedbackFocus } from '../providers/private/FocusPropagation';
 import useActivityFeedbackHooks from '../providers/useActivityFeedbackHooks';
@@ -35,11 +36,11 @@ function FeedbackVoteButton(props: FeedbackVoteButtonProps) {
   const actionRef = useRefFrom(action);
   const buttonRef = useRef<HTMLInputElement>(null);
   const direction = useMemo(() => {
-    if (action['@type'] === 'DislikeAction') {
+    if (isOfType('DislikeAction', action)) {
       return 'down';
-    } else if (action['@type'] === 'LikeAction') {
+    } else if (isOfType('LikeAction', action)) {
       return 'up';
-    } else if (action['@type'] === 'VoteAction') {
+    } else if (isOfType('VoteAction', action)) {
       if (action.actionOption[0] === 'downvote') {
         return 'down';
       } else if (action.actionOption[0] === 'upvote') {

packages/component/src/ActivityFeedback/private/FeedbackVoteButton.tsx

@@ -1,4 +1,8 @@
-import { orgSchemaUserReviewSchema, type OrgSchemaAction, type OrgSchemaThing } from 'botframework-webchat-core';
+import {
+  orgSchemaUserReviewSchema,
+  type OrgSchemaAction,
+  type OrgSchemaThing
+} from 'botframework-webchat-core/org-schema.js';
 import { safeParse } from 'valibot';
 
 export default function getDisclaimerFromActivity(action: OrgSchemaAction): string | undefined {

packages/component/src/ActivityFeedback/private/getDisclaimerFromReviewAction.ts

@@ -1,7 +1,10 @@
-import { type OrgSchemaAction } from 'botframework-webchat-core';
+import { type OrgSchemaAction } from 'botframework-webchat-core/org-schema.js';
+import { isOfType } from 'botframework-webchat-core/json-ld.js';
 
 export default function isActionRequireReview(
   action: OrgSchemaAction | undefined
-): action is OrgSchemaAction & { result: { '@type': 'UserReview' } } {
-  return action?.result[0]?.['@type'] === 'UserReview';
+): action is OrgSchemaAction & { result: { '@type': 'UserReview'[] } } {
+  const [firstResult] = action?.result ?? [];
+
+  return isOfType('UserReview', firstResult);
 }