Parsers

apps/spa/components/entities/EntityStrong.tsx

@@ -1,16 +1,18 @@
 import type { FC } from 'react';
 import type { Strong } from '../../interpreter/entities';
+import { EntityEmphasis } from './EntityEmphasis';
 
 interface Props {
   source: string;
   entity: Strong;
 }
 
-export const EntityStrong: FC<Props> = ({
-  source,
-  entity: {
-    child: { start, len },
-  },
-}) => {
-  return <strong className="EntityStrong">{source.substring(start, start + len)}</strong>;
+export const EntityStrong: FC<Props> = ({ source, entity: { child } }) => {
+  const content =
+    child.type === 'Text' ? (
+      source.substring(child.start, child.start + child.len)
+    ) : (
+      <EntityEmphasis source={source} entity={child} />
+    );
+  return <strong className="EntityStrong">{content}</strong>;
 };

apps/spa/interpreter/entities.ts

@@ -38,7 +38,7 @@ export interface CodeBlock extends BaseEntity {
 
 export interface Strong extends BaseEntity {
   type: 'Strong';
-  child: Text;
+  child: Text | Emphasis;
 }
 
 export interface Emphasis extends BaseEntity {

apps/spa/interpreter/parser.ts

@@ -232,6 +232,29 @@ const strong: P<Entity> = regex(STRONG_REGEX).then(([match, { text, rest }]) =>
   return [entity, { text, rest }];
 });
 
+const STRONG_EM_REGEX = /^\*\*\*(.+?)\*\*\*/;
+
+const strongEmphasis: P<Entity> = regex(STRONG_EM_REGEX).then(([match, { text, rest }]) => {
+  const [entire, content = ''] = match;
+  const entity: Strong = {
+    type: 'Strong',
+    start: text.length,
+    len: entire.length,
+    child: {
+      type: 'Emphasis',
+      start: text.length,
+      len: entire.length,
+      child: {
+        type: 'Text',
+        start: text.length + entire.indexOf(content),
+        len: content.length,
+      },
+    },
+  };
+  text += entire;
+  return [entity, { text, rest }];
+});
+
 const URL_REGEX = /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*)/;
 
 const autoUrl: P<Entity> = regex(URL_REGEX).then(([match, { text, rest }]) => {
@@ -610,7 +633,7 @@ const exprNodeToEntity =
 
 const ROLL_COMMAND = /^[.。]r\s*/;
 
-const entity = choice<Entity>([codeBlock, code, strong, emphasis, link, autoUrl, expression, span]);
+const entity = choice<Entity>([codeBlock, code, strongEmphasis, strong, emphasis, link, autoUrl, expression, span]);
 
 const message: P<Entity[]> = many(entity).map((entityList) => entityList.reduce(mergeTextEntitiesReducer, []));
 
@@ -622,7 +645,18 @@ const rollCommand: P<Entity[]> = new P((state, env) => {
     }
     return exprNodeToEntity(state)(result);
   });
-  const entity = choice<Entity>([codeBlock, code, strong, emphasis, link, autoUrl, expression, exprEntity, span]);
+  const entity = choice<Entity>([
+    codeBlock,
+    code,
+    strongEmphasis,
+    strong,
+    emphasis,
+    link,
+    autoUrl,
+    expression,
+    exprEntity,
+    span,
+  ]);
   const message = many(entity).map((entityList) => entityList.reduce(mergeTextEntitiesReducer, []));
   return message.run(state, env);
 });