Skip to content

全体をリファクタリング #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chvmvd wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

全体をリファクタリング #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
473 changes: 308 additions & 165 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"type": "module",
"scripts": {
"build:packages": "npm run build --workspace=packages/sentence-structure-data && npm run build --workspace=packages/sentence-structure-tree && npm run build --workspace=packages/sentence-structure-diagram-configurations && npm run build --workspace=packages/sentence-structure-diagram-tree && npm run build --workspace=packages/sentence-structure-diagram-data && npm run build --workspace=packages/sentence-structure-diagram-svg",
"build:packages": "npm run build --workspace=packages/sentence-structure-data && npm run build --workspace=packages/sentence-structure-diagram-notation && npm run build --workspace=packages/sentence-structure-diagram && npm run build --workspace=packages/sentence-structure-data-from-stanza",
"build": "npm run build:packages && npm run build --workspace=packages/evaluation && npm run build --workspace=packages/backend && npm run build --workspace=packages/frontend",
"format": "prettier --write .",
"format:check": "prettier --check .",
Expand All @@ -13,14 +13,12 @@
"prettier": "^3.7.4"
},
"workspaces": [
"packages/sentence-structure-data",
"packages/sentence-structure-diagram-notation",
"packages/sentence-structure-diagram",
"packages/sentence-structure-data-from-stanza",
"packages/backend",
"packages/frontend",
"packages/sentence-structure-data",
"packages/sentence-structure-diagram-data",
"packages/sentence-structure-diagram-svg",
"packages/evaluation",
"packages/sentence-structure-diagram-configurations",
"packages/sentence-structure-tree",
"packages/sentence-structure-diagram-tree"
"packages/evaluation"
]
}
4 changes: 2 additions & 2 deletions packages/evaluation/calculate-metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ function isSameRange(range1: Range, range2: Range): boolean {
range1.startWordIndex === range2.startWordIndex &&
range1.endWordIndex === range2.endWordIndex &&
range1.type === range2.type &&
(range1.type === "relation" ||
(range2.type !== "relation" &&
(range1.type === "modification-element" ||
(range2.type !== "modification-element" &&
range1.sentenceElementName === range2.sentenceElementName))
);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
"@sentence-structure-diagram-app/backend": "^0.1.0",
"@sentence-structure-diagram-app/sentence-structure-data": "^0.1.0",
"@sentence-structure-diagram-app/sentence-structure-diagram-data": "^0.1.0",
"@sentence-structure-diagram-app/sentence-structure-diagram-notation": "^0.1.0",
"@sentence-structure-diagram-app/sentence-structure-diagram-svg": "^0.1.0",
"@tanstack/react-query": "^5.90.12",
"@trpc/client": "^11.7.2",
"@trpc/tanstack-react-query": "^11.7.2",
"react": "^19.2.0",
"react-dom": "^19.2.0"
"react-dom": "^19.2.0",
"vite-plugin-static-copy": "^3.2.0"
},
"devDependencies": {
"@eslint/js": "^9.39.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/src/pages/components/SentenceStructureEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export default function SentenceStructureEditor() {
? sentenceElementRangeTypeToAllowedSentenceElementNameOptionsMap[
activeRange.type
]
: activeRange.kind === "sentence-structure"
: activeRange.kind === "sentence-constituent"
? sentenceStructureRangeTypeToAllowedSentenceElementNameOptionsMap[
activeRange.type
]
Expand Down Expand Up @@ -527,8 +527,8 @@ export default function SentenceStructureEditor() {
{
(
{
"coordinating conjunction": "等位接続詞",
"correlative conjunction": "相関接続詞",
coordinator: "等位接続詞",
correlative: "相関接続詞",
conjunct: "並列要素",
} satisfies Record<
CoordinationChildType,
Expand Down
45 changes: 19 additions & 26 deletions packages/frontend/src/pages/contexts/InteractionStateProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
findRangeByStartAndEndWordIndex,
updateSentenceElementName,
type CoordinationChildType,
type RangeType,
type SentenceElementName,
type SentenceElementRangeType,
type SentenceStructureData,
Expand All @@ -40,7 +39,6 @@ type InteractionState =
}
| {
type: "range-selected";
rangeType: RangeType;
rangeId: string;
}
| {
Expand Down Expand Up @@ -227,7 +225,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: matchedRange.type,
rangeId: matchedRange.id,
},
sentenceStructureData,
Expand Down Expand Up @@ -322,8 +319,8 @@ function interactionStateReducer(
sentenceStructureData,
};
default: {
const _exhaustiveCheck: never = interactionState;
return _exhaustiveCheck;
interactionState satisfies never;
throw new Error("Unreachable");
}
}
case "MOUSE_DOWN_ON_WORD":
Expand Down Expand Up @@ -380,8 +377,8 @@ function interactionStateReducer(
sentenceStructureData,
};
default: {
const _exhaustiveCheck: never = interactionState;
return _exhaustiveCheck;
interactionState satisfies never;
throw new Error("Unreachable");
}
}
case "MOUSE_ENTER_ON_WORD":
Expand Down Expand Up @@ -447,8 +444,8 @@ function interactionStateReducer(
sentenceStructureData,
};
default: {
const _exhaustiveCheck: never = interactionState;
return _exhaustiveCheck;
interactionState satisfies never;
throw new Error("Unreachable");
}
}
case "MOUSE_UP_ON_WORD":
Expand Down Expand Up @@ -478,7 +475,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: matchedRange.type,
rangeId: matchedRange.id,
},
sentenceStructureData,
Expand Down Expand Up @@ -573,8 +569,8 @@ function interactionStateReducer(
sentenceStructureData,
};
default: {
const _exhaustiveCheck: never = interactionState;
return _exhaustiveCheck;
interactionState satisfies never;
throw new Error("Unreachable");
}
}
case "CREATE_SENTENCE_ELEMENT_RANGE": {
Expand All @@ -590,7 +586,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: action.payload.rangeType,
rangeId: result.data.rangeId,
},
sentenceStructureData: result.data.newSentenceStructureData,
Expand All @@ -612,7 +607,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: action.payload.rangeType,
rangeId: result.data.rangeId,
},
sentenceStructureData: result.data.newSentenceStructureData,
Expand All @@ -631,7 +625,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: matchedRange.type,
rangeId: action.payload.rangeId,
},
sentenceStructureData,
Expand All @@ -643,12 +636,13 @@ function interactionStateReducer(
return {
success: true,
interactionState,
sentenceStructureData: updateSentenceElementName<
typeof interactionState.rangeType
>(sentenceStructureData, {
rangeId: interactionState.rangeId,
sentenceElementName: action.payload.sentenceElementName,
}),
sentenceStructureData: updateSentenceElementName(
sentenceStructureData,
{
rangeId: interactionState.rangeId,
sentenceElementName: action.payload.sentenceElementName,
},
),
};
case "DELETE_RANGE":
if (interactionState.type !== "range-selected")
Expand Down Expand Up @@ -702,7 +696,6 @@ function interactionStateReducer(
success: true,
interactionState: {
type: "range-selected",
rangeType: fromRange.type,
rangeId: fromRange.id,
},
sentenceStructureData,
Expand Down Expand Up @@ -773,8 +766,8 @@ function interactionStateReducer(
};
}
default: {
const _exhaustiveCheck: never = interactionState;
return _exhaustiveCheck;
interactionState satisfies never;
throw new Error("Unreachable");
}
}
case "CREATE_COORDINATION_CHILD":
Expand Down Expand Up @@ -851,8 +844,8 @@ function interactionStateReducer(
}),
};
default: {
const _exhaustiveCheck: never = action;
return _exhaustiveCheck;
action satisfies never;
throw new Error("Unreachable");
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions packages/frontend/src/pages/utils/measure-text-width.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@ export function measureTextWidth(text: string): number {
const metrics = context.measureText(text);
return metrics.width;
}

export function measureTextDescent(text: string): number {
const canvas = document.createElement("canvas");
const context = canvas.getContext("2d");
if (!context) return 0;
context.font = "16px system-ui";

const metrics = context.measureText(text);
return metrics.actualBoundingBoxDescent;
}
46 changes: 45 additions & 1 deletion packages/frontend/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,52 @@
import { dirname, join } from "path";
import { fileURLToPath } from "url";
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import { viteStaticCopy } from "vite-plugin-static-copy";

const PYODIDE_EXCLUDE = [
"!**/*.{md,html}",
"!**/*.d.ts",
"!**/*.whl",
"!**/node_modules",
];

function viteStaticCopyPyodide() {
const pyodideDir = dirname(fileURLToPath(import.meta.resolve("pyodide")));
return viteStaticCopy({
targets: [
{
src: [join(pyodideDir, "*")].concat(PYODIDE_EXCLUDE),
dest: "assets",
},
],
});
}

function viteStaticCopySentenceStructureDataParserWheels() {
const sentenceStructureDataParserWheelsDir = dirname(
fileURLToPath(
import.meta
.resolve("@sentence-structure-diagram-app/sentence-structure-data-parser/browser"),
),
);
return viteStaticCopy({
targets: [
{
src: [join(sentenceStructureDataParserWheelsDir, "wheels/*")],
dest: "assets",
},
],
});
}

// https://vite.dev/config/
export default defineConfig({
plugins: [react()],
plugins: [
react(),
viteStaticCopyPyodide(),
viteStaticCopySentenceStructureDataParserWheels(),
],
optimizeDeps: { exclude: ["pyodide"] },
base: process.env.BASE_URL || "/",
});
0 ...ructure-diagram-configurations/.gitignore → ...nce-structure-data-from-stanza/.gitignore
View file
Open in desktop
File renamed without changes.
Loading
Loading