バグなどを修正

packages/frontend/src/pages/components/ExportDialog.tsx

@@ -466,11 +466,11 @@ export default function ExportDialog({ isOpen, onClose }: ExportDialogProps) {
           <Divider sx={{ my: 2 }} />
           <Stack gap={2}>
             <Typography variant="subtitle1" component="div">
-              レイアウト方式
+              配置方式
             </Typography>
             <Stack direction="row" gap={1}>
               <FormControl>
-                <InputLabel>レイアウト方式</InputLabel>
+                <InputLabel>配置方式</InputLabel>
                 <Select
                   value={configurations.layoutMode}
                   onChange={(e) =>
@@ -479,7 +479,7 @@ export default function ExportDialog({ isOpen, onClose }: ExportDialogProps) {
                       layoutMode: e.target.value,
                     })
                   }
-                  label="レイアウト方式"
+                  label="配置方式"
                 >
                   <MenuItem value="linear">横並び表示</MenuItem>
                   <MenuItem value="structured">構造化表示</MenuItem>

packages/frontend/src/pages/components/SentenceStructureDiagramAnnotator.tsx

@@ -255,7 +255,7 @@ export default function SentenceStructureDiagramAnnotator(
             </text>
           ),
       )}
-      {/* 矢印 */}
+      {/* 修飾 */}
       {props.sentenceStructureDiagramData.relations.map((relation) => (
         <path
           key={relation.relationId}

packages/frontend/src/pages/components/SentenceStructureEditor.tsx

@@ -302,7 +302,7 @@ export default function SentenceStructureEditor() {
                           }
                         }}
                       >
-                        矢印
+                        修飾
                       </Button>
                       <Divider orientation="vertical" flexItem />
                       <Button
@@ -345,7 +345,7 @@ export default function SentenceStructureEditor() {
                       }}
                       onMouseUp={(e) => e.stopPropagation()}
                     >
-                      {(activeRange.kind === "sentence-element"
+                      {(activeRange.kind === "core-sentence-element"
                         ? sentenceElementRangeTypeToAllowedSentenceElementNameOptionsMap[
                             activeRange.type
                           ]
@@ -378,7 +378,7 @@ export default function SentenceStructureEditor() {
                           }
                         }}
                       >
-                        矢印
+                        修飾
                       </Button>
                       <Divider orientation="vertical" flexItem />
                       <Button
@@ -407,7 +407,7 @@ export default function SentenceStructureEditor() {
                   );
                 })()}
 
-              {/* 矢印の作成のキャンセル */}
+              {/* 修飾の作成のキャンセル */}
               {(interactionState.type === "relation-idle" ||
                 interactionState.type === "relation-selecting") &&
                 (() => {
@@ -443,7 +443,7 @@ export default function SentenceStructureEditor() {
                   );
                 })()}
 
-              {/* 矢印の削除 */}
+              {/* 修飾の削除 */}
               {interactionState.type === "relation-selected" &&
                 (() => {
                   const activeRelation = findRelationById(
@@ -484,7 +484,7 @@ export default function SentenceStructureEditor() {
                         }}
                         color="error"
                       >
-                        矢印を削除
+                        修飾を削除
                       </Button>
                     </Paper>
                   );

packages/sentence-structure-data/format.ts

@@ -91,7 +91,7 @@ export const simplifiedSentenceStructureDataToSentenceStructureData = z.codec(
                   )!,
                 )
               ? {
-                  kind: "sentence-element",
+                  kind: "core-sentence-element",
                   type: simplifiedSentenceElementRangeTypeToSentenceElementRangeTypeMap.get(
                     range.type as any,
                   )!,
@@ -178,7 +178,7 @@ export const simplifiedSentenceStructureDataToSentenceStructureData = z.codec(
               }
             : {
                 type:
-                  range.kind === "sentence-element"
+                  range.kind === "core-sentence-element"
                     ? sentenceElementRangeTypeToSimplifiedSentenceElementRangeTypeMap.get(
                         range.type,
                       )!

packages/sentence-structure-data/operations.ts

@@ -167,7 +167,7 @@ export function createSentenceElementRange(
     ranges: [
       ...sentenceStructureData.ranges,
       {
-        kind: "sentence-element",
+        kind: "core-sentence-element",
         type: input.type,
         id: rangeId,
         startWordIndex: input.startWordIndex,
@@ -248,53 +248,6 @@ export function createSentenceStructureRange(
   throw newSentenceStructureData.error;
 }
 
-export function _createRelationRange(
-  sentenceStructureData: SentenceStructureData,
-  input: {
-    startWordIndex: number;
-    endWordIndex: number;
-  },
-): Result<{
-  newSentenceStructureData: SentenceStructureData;
-  rangeId: string;
-}> {
-  const rangeId = crypto.randomUUID();
-  const newSentenceStructureData = SentenceStructureDataSchema.safeParse({
-    ...sentenceStructureData,
-    ranges: [
-      ...sentenceStructureData.ranges,
-      {
-        kind: "relation",
-        type: "relation",
-        id: rangeId,
-        startWordIndex: input.startWordIndex,
-        endWordIndex: input.endWordIndex,
-      },
-    ],
-  } satisfies SentenceStructureData);
-
-  if (newSentenceStructureData.success) {
-    return {
-      success: true,
-      data: {
-        newSentenceStructureData: newSentenceStructureData.data,
-        rangeId,
-      },
-    };
-  }
-  const errorMessage =
-    newSentenceStructureData.error.issues.find(
-      (issue) => issue.code === "custom",
-    )?.message ?? null;
-  if (errorMessage) {
-    return {
-      success: false,
-      message: errorMessage,
-    };
-  }
-  throw newSentenceStructureData.error;
-}
-
 export function findRangeById(
   sentenceStructureData: SentenceStructureData,
   input: { rangeId: string },
@@ -366,10 +319,10 @@ export function createRelation(
     toRange: { startWordIndex: number; endWordIndex: number };
   },
 ): Result<{ newSentenceStructureData: SentenceStructureData }> {
-  const fromRangeResult: Result<{
+  const fromRangeResult: {
     newSentenceStructureData: SentenceStructureData;
     rangeId: string;
-  }> = (() => {
+  } = (() => {
     const existingFromRange = findRangeByStartAndEndWordIndex(
       sentenceStructureData,
       {
@@ -379,74 +332,99 @@ export function createRelation(
     );
     if (existingFromRange) {
       return {
-        success: true,
-        data: {
-          newSentenceStructureData: sentenceStructureData,
-          rangeId: existingFromRange.id,
-        },
+        newSentenceStructureData: sentenceStructureData,
+        rangeId: existingFromRange.id,
       };
     }
-    return _createRelationRange(sentenceStructureData, {
-      startWordIndex: input.fromRange.startWordIndex,
-      endWordIndex: input.fromRange.endWordIndex,
-    });
-  })();
-  if (!fromRangeResult.success) {
+
+    const rangeId = crypto.randomUUID();
+    const newSentenceStructureData: SentenceStructureData = {
+      ...sentenceStructureData,
+      ranges: [
+        ...sentenceStructureData.ranges,
+        {
+          kind: "relation",
+          type: "relation",
+          id: rangeId,
+          startWordIndex: input.fromRange.startWordIndex,
+          endWordIndex: input.fromRange.endWordIndex,
+        },
+      ],
+    };
     return {
-      success: false,
-      message: fromRangeResult.message,
+      newSentenceStructureData,
+      rangeId,
     };
-  }
+  })();
 
-  const toRangeResult: Result<{
+  const toRangeResult: {
     newSentenceStructureData: SentenceStructureData;
     rangeId: string;
-  }> = (() => {
+  } = (() => {
     const existingToRange = findRangeByStartAndEndWordIndex(
-      fromRangeResult.data.newSentenceStructureData,
+      fromRangeResult.newSentenceStructureData,
       {
         startWordIndex: input.toRange.startWordIndex,
         endWordIndex: input.toRange.endWordIndex,
       },
     );
     if (existingToRange) {
       return {
-        success: true,
-        data: {
-          newSentenceStructureData:
-            fromRangeResult.data.newSentenceStructureData,
-          rangeId: existingToRange.id,
-        },
+        newSentenceStructureData: fromRangeResult.newSentenceStructureData,
+        rangeId: existingToRange.id,
       };
     }
-    return _createRelationRange(fromRangeResult.data.newSentenceStructureData, {
-      startWordIndex: input.toRange.startWordIndex,
-      endWordIndex: input.toRange.endWordIndex,
-    });
+
+    const rangeId = crypto.randomUUID();
+    const newSentenceStructureData: SentenceStructureData = {
+      ...fromRangeResult.newSentenceStructureData,
+      ranges: [
+        ...fromRangeResult.newSentenceStructureData.ranges,
+        {
+          kind: "relation",
+          type: "relation",
+          id: rangeId,
+          startWordIndex: input.toRange.startWordIndex,
+          endWordIndex: input.toRange.endWordIndex,
+        },
+      ],
+    };
+    return {
+      newSentenceStructureData,
+      rangeId,
+    };
   })();
-  if (!toRangeResult.success) {
+
+  const newSentenceStructureData = SentenceStructureDataSchema.safeParse({
+    ...toRangeResult.newSentenceStructureData,
+    relations: [
+      ...toRangeResult.newSentenceStructureData.relations,
+      {
+        id: crypto.randomUUID(),
+        fromRangeId: fromRangeResult.rangeId,
+        toRangeId: toRangeResult.rangeId,
+      },
+    ],
+  } satisfies SentenceStructureData);
+  if (newSentenceStructureData.success) {
+    return {
+      success: true,
+      data: {
+        newSentenceStructureData: newSentenceStructureData.data,
+      },
+    };
+  }
+  const errorMessage =
+    newSentenceStructureData.error.issues.find(
+      (issue) => issue.code === "custom",
+    )?.message ?? null;
+  if (errorMessage) {
     return {
       success: false,
-      message: toRangeResult.message,
+      message: errorMessage,
     };
   }
-
-  return {
-    success: true,
-    data: {
-      newSentenceStructureData: SentenceStructureDataSchema.parse({
-        ...toRangeResult.data.newSentenceStructureData,
-        relations: [
-          ...toRangeResult.data.newSentenceStructureData.relations,
-          {
-            id: crypto.randomUUID(),
-            fromRangeId: fromRangeResult.data.rangeId,
-            toRangeId: toRangeResult.data.rangeId,
-          },
-        ],
-      } satisfies SentenceStructureData),
-    },
-  };
+  throw newSentenceStructureData.error;
 }
 
 export function findRelationById(
@@ -466,6 +444,15 @@ export function deleteRelation(
 ): SentenceStructureData {
   return SentenceStructureDataSchema.parse({
     ...sentenceStructureData,
+    ranges: sentenceStructureData.ranges.filter(
+      (range) =>
+        range.kind !== "relation" ||
+        sentenceStructureData.relations.some(
+          (relation) =>
+            relation.fromRangeId !== range.id &&
+            relation.toRangeId !== range.id,
+        ),
+    ),
     relations: sentenceStructureData.relations.filter(
       (relation) => relation.id !== input.relationId,
     ),

packages/sentence-structure-data/schema.ts

@@ -45,7 +45,7 @@ const RangeSchema = z.union([
     (sentenceElementRangeTypeOption) =>
       ({
         "core-sentence-element": z.object({
-          kind: z.literal("sentence-element"),
+          kind: z.literal("core-sentence-element"),
           type: z.literal("core-sentence-element"),
           id: z.uuid(),
           startWordIndex: z.int().nonnegative(),
@@ -108,7 +108,7 @@ const RangeSchema = z.union([
       })[sentenceStructureRangeTypeOption],
   ),
   z.object({
-    kind: z.literal(relationRangeTypeOption),
+    kind: z.literal("relation"),
     type: z.literal("relation"),
     id: z.uuid(),
     startWordIndex: z.int().nonnegative(),

packages/sentence-structure-diagram-data/generate.ts

@@ -104,7 +104,7 @@ export function convertSentenceStructureDataToSentenceStructureDiagramData(
               ]
             : null,
           position:
-            range.kind === "sentence-element"
+            range.kind === "core-sentence-element"
               ? resolvedConfigurations.sentenceElementPosition.determineSentenceElementRangeSentenceElementPosition(
                   rangePosition,
                 )

packages/sentence-structure-diagram-data/resolve-configurations.ts

@@ -81,7 +81,7 @@ function determineSentenceElementPosition(
       };
     case "bottom-left":
       return {
-        x: rangePosition[0]!.start - 4,
+        x: rangePosition[0]!.start + 6,
         y: rangePosition[0]!.bottom + 8,
       };
   }

packages/sentence-structure-diagram-svg/SentenceStructureDiagram.tsx

@@ -117,7 +117,7 @@ export default function SentenceStructureDiagram(
             </text>
           ),
       )}
-      {/* 矢印 */}
+      {/* 修飾 */}
       {sentenceStructureDiagramData.relations.map((relation) => (
         <path
           key={relation.relationId}

packages/sentence-structure-diagram-tree/constants.ts

@@ -1,4 +1,5 @@
 export const lineHeight = 16;
 export const lineSpacing = 48;
 export const wordSpacing = 32;
+export const indentSpacing = 32;
 export const padding = 48;