@kubohiroya/turbowarp-plus-editor-git 0.11.0 → 0.12.1

package/README.ja.md

@@ -16,6 +16,8 @@ Node.js 26 で `npm ci` と `npm test` を実行します。Vite でライブラ
 
 ## Smart HTTP アダプター
 
+`test/smart-http-fixture.js` は、`git-http-backend` を IPv4 のループバックで動かす検証用のフィクスチャです。Node.js の標準モジュールだけを使い、利用側のブラウザーテストが同じ版を使えるよう配布物に含めます。
+
 `@kubohiroya/turbowarp-plus-editor-git/smart-http` の `createGitSmartHttp` に、Git 設定から選んだ GitHub の HTTPS リモート、信頼済みの接続先（`mode` と `proxyOrigin`）、現在のプロキシセッションか `null` を返す関数を渡します。auth パッケージの `GitAuthProvider` を使えます。Git パッケージは必要なセッションの型だけを構造的に参照するため、読み取り専用パネルとアダプターは auth パッケージと独立してインストールできます。
 
 ```ts

package/README.md

@@ -16,6 +16,8 @@ The panel structure and local Git approach were informed by [duff](https://githu
 
 ## Smart HTTP adapter
 
+`test/smart-http-fixture.js` runs `git-http-backend` on the IPv4 loopback for tests. It uses only Node.js built-in modules and ships in the package so browser tests of a host use the fixture of the same version.
+
 Import `createGitSmartHttp` from `@kubohiroya/turbowarp-plus-editor-git/smart-http`. Pass the selected GitHub HTTPS remote from Git config, a trusted connection (`mode` and `proxyOrigin`), and a function that returns the current proxy session or `null`. A `GitAuthProvider` from the auth package satisfies this contract. The Git package uses the session fields structurally, so the read-only panel and the adapter can be installed independently of the auth package.
 
 ```ts

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as gitHubRepositoryFromOrigin, c as projectPropertyLabel, g as useCostumeImage, h as useAssetImage, i as createGitHubPullRequests, l as ProjectSourceComparison, n as createScratchBlocksDiffLocator, r as PullRequestError, s as organizeProjectChanges, t as createScratchBlocksDiffRenderer, u as ProjectSourceReview, y as parseProjectSource } from "./scratch-block-diff-renderer-CgAGfmAc.js";
+import { _ as useCostumeImage, a as gitHubRepositoryFromOrigin, b as parseProjectSource, g as useAssetImage, i as createGitHubPullRequests, l as organizeProjectChanges, n as createScratchBlocksDiffLocator, o as ProjectSourceComparison, r as PullRequestError, s as ProjectSourceReview, t as createScratchBlocksDiffRenderer, u as projectPropertyLabel } from "./scratch-block-diff-renderer-e_drVlHE.js";
 import { n as init_objectSpread2, r as __commonJSMin, t as _objectSpread2$1 } from "./objectSpread2-Dkd68nJH.js";
 import { i as createReadOnlyFs, r as GitPanelError, t as openRepository } from "./repository-CtvWYPQ8.js";
 import * as m from "react";
@@ -3557,6 +3557,8 @@ function GitPanel({ vm, document, host, controller }) {
 	const alive = useRef(true);
 	const opening = useRef(false);
 	const dialog = useRef(null);
+	const shownRef = useRef(false);
+	const deferred = useRef(false);
 	const reviewing = useRef(review);
 	reviewing.current = review;
 	const handled = useRef(null);
@@ -3582,6 +3584,11 @@ function GitPanel({ vm, document, host, controller }) {
 		} catch (error) {
 			if (epoch.current !== ticket) return;
 			const code = error instanceof GitPanelError ? error.code : "failed";
+			if (automatic && code === "changed") {
+				handled.current = null;
+				setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, { busy: false }));
+				return;
+			}
 			const message = labels[code] || labels.failed;
 			setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, {
 				error: automatic && previous.error ? previous.error : message,
@@ -3590,6 +3597,7 @@ function GitPanel({ vm, document, host, controller }) {
 			}));
 		} finally {
 			running.current = false;
+			if (epoch.current !== ticket && !refreshPending.current && alive.current) setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, { busy: false }));
 			if (automatic) {
 				background.current = null;
 				settle();
@@ -3632,20 +3640,29 @@ function GitPanel({ vm, document, host, controller }) {
 	};
 	controller.refresh = async (automatic = false) => {
 		if (!alive.current || !current.current.repository) return;
+		if (!shownRef.current) {
+			deferred.current = true;
+			return;
+		}
 		if (running.current) {
 			if (!automatic) refreshPending.current = true;
 			return;
 		}
 		await run(async () => {
 			const { repository, project } = current.current;
-			const snapshot = await repository.read(project !== null && project !== void 0 ? project : "");
-			return {
-				snapshot,
-				changes: snapshot.changes,
-				selected: null,
-				diff: null,
-				commit: null
-			};
+			for (let attempt = 1;; attempt++) try {
+				const snapshot = await repository.read(project !== null && project !== void 0 ? project : "");
+				return {
+					snapshot,
+					changes: snapshot.changes,
+					selected: null,
+					diff: null,
+					commit: null
+				};
+			} catch (error) {
+				if (!(error instanceof GitPanelError && error.code === "changed") || attempt >= 5) throw error;
+				await new Promise((resolve) => setTimeout(resolve, 200 * attempt));
+			}
 		}, automatic);
 	};
 	useEffect(() => {
@@ -3662,7 +3679,7 @@ function GitPanel({ vm, document, host, controller }) {
 					selected: null,
 					diff: null,
 					commit: null,
-					busy: false
+					busy: running.current
 				}));
 				queueMicrotask(() => void controller.refresh());
 			}
@@ -3675,6 +3692,13 @@ function GitPanel({ vm, document, host, controller }) {
 			unsubscribe === null || unsubscribe === void 0 || unsubscribe();
 		};
 	}, [host]);
+	useEffect(() => {
+		shownRef.current = shown;
+		if (shown && deferred.current) {
+			deferred.current = false;
+			controller.refresh();
+		}
+	}, [shown]);
 	useEffect(() => {
 		const repository = state.repository;
 		if (!shown || !repository) return;
@@ -3683,7 +3707,8 @@ function GitPanel({ vm, document, host, controller }) {
 		let checking = false;
 		const check = async () => {
 			const { snapshot } = current.current;
-			if (stopped || checking || running.current || document.visibilityState === "hidden" || !snapshot || current.current.repository !== repository) return;
+			const hidden = !dialog.current || !dialog.current.getClientRects().length;
+			if (stopped || checking || running.current || document.visibilityState === "hidden" || hidden || !snapshot || current.current.repository !== repository) return;
 			checking = true;
 			try {
 				const probe = await repository.probe(snapshot.scope);
@@ -3978,6 +4003,7 @@ function GitPanel({ vm, document, host, controller }) {
 	}) : /* @__PURE__ */ React.createElement("p", null, labels.select))));
 	if (slot) return createPortal(/* @__PURE__ */ React.createElement("div", {
 		className: "twgit-panel twgit-panel-tab",
+		ref: dialog,
 		role: "region",
 		"aria-label": labels.title
 	}, content), slot.element);

package/dist/project-source-diff.d.ts

@@ -9,6 +9,8 @@ export { createScratchBlocksDiffLocator } from './block-diff-location.js';
 export type { ProjectBlockLocation, ProjectBlockLocator, ScratchBlockLocationWorkspace } from './block-diff-location.js';
 export type { BlockPart } from './project-source-patch.js';
 export { createProjectSourceDiff } from './project-source-patch.js';
+export { compareProjectForReview } from './project-source-review-model.js';
+export type { ScriptChangeKind, ScriptReview, ScriptReviewSide, ScriptSummaryItem, TargetReview } from './project-source-review-model.js';
 export { currentCostume } from './project-assets.js';
 export { assetFileName, organizeProjectChanges, projectPropertyLabel } from './project-change-model.js';
 export type { ChangedFile, OrganizeProjectChangesInput, ProjectChangeList, ProjectChangeStatus, ProjectElementChange, ProjectElementKind, ProjectTargetChanges } from './project-change-model.js';

package/dist/project-source-diff.js

@@ -1,4 +1,4 @@
-import { _ as compareProjectBlocks, a as gitHubRepositoryFromOrigin, b as readProjectSourceDiff, c as projectPropertyLabel, d as BlockPreview, f as createPreviewSync, i as createGitHubPullRequests, l as ProjectSourceComparison, m as currentCostume, n as createScratchBlocksDiffLocator, o as assetFileName, p as usePreviewSync, s as organizeProjectChanges, t as createScratchBlocksDiffRenderer, u as ProjectSourceReview, v as createProjectSourceDiff } from "./scratch-block-diff-renderer-CgAGfmAc.js";
+import { a as gitHubRepositoryFromOrigin, c as assetFileName, d as compareProjectForReview, f as BlockPreview, h as currentCostume, i as createGitHubPullRequests, l as organizeProjectChanges, m as usePreviewSync, n as createScratchBlocksDiffLocator, o as ProjectSourceComparison, p as createPreviewSync, s as ProjectSourceReview, t as createScratchBlocksDiffRenderer, u as projectPropertyLabel, v as compareProjectBlocks, x as readProjectSourceDiff, y as createProjectSourceDiff } from "./scratch-block-diff-renderer-e_drVlHE.js";
 import { n as init_objectSpread2, t as _objectSpread2 } from "./objectSpread2-Dkd68nJH.js";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 // src/project-source-diff.tsx
@@ -169,4 +169,4 @@ function ProjectSourceBlockDiff({ patch, beforeSource, renderBlock, locateBlock,
 		})
 	}, labels.more));
 }
-export { ProjectSourceBlockDiff, ProjectSourceComparison, ProjectSourceReview, assetFileName, createGitHubPullRequests, createPreviewSync, createProjectSourceDiff, createScratchBlocksDiffLocator, createScratchBlocksDiffRenderer, currentCostume, gitHubRepositoryFromOrigin, organizeProjectChanges, projectPropertyLabel };
+export { ProjectSourceBlockDiff, ProjectSourceComparison, ProjectSourceReview, assetFileName, compareProjectForReview, createGitHubPullRequests, createPreviewSync, createProjectSourceDiff, createScratchBlocksDiffLocator, createScratchBlocksDiffRenderer, currentCostume, gitHubRepositoryFromOrigin, organizeProjectChanges, projectPropertyLabel };

package/dist/project-source-review-model.d.ts

@@ -3,14 +3,49 @@ import type { ScriptBlockMark } from './scratch-block-diff-renderer.js';
 export interface ScriptReviewSide extends BlockSide {
     marks: ScriptBlockMark[];
 }
+/**
+ * What happened to one script. `moved` means only positions changed, `reordered` only how blocks connect;
+ * neither changes what the script does.
+ */
+export type ScriptChangeKind = 'added' | 'removed' | 'updated' | 'reorganized' | 'moved' | 'reordered';
+/** One phrase of a script's summary, in the order shown. The view words it in the reader's language. */
+export type ScriptSummaryItem = {
+    kind: 'hatReplaced';
+    before: string;
+    after: string;
+} | {
+    kind: 'wrapped';
+    opcode: string;
+} | {
+    kind: 'branchAdded';
+    opcode: string;
+} | {
+    kind: 'valueChanged';
+    opcode: string;
+    name: string;
+} | {
+    kind: 'blocksAdded';
+    count: number;
+} | {
+    kind: 'blocksRemoved';
+    count: number;
+} | {
+    kind: 'reordered';
+} | {
+    kind: 'moved';
+};
 export interface ScriptReview {
     id: string;
     before: ScriptReviewSide[];
     after: ScriptReviewSide[];
+    kind: ScriptChangeKind;
+    summary: ScriptSummaryItem[];
 }
 export interface TargetReview {
     name: string;
     isStage: boolean;
+    /** Added or removed as a whole, or changed. Added and removed targets list no properties. */
+    status: 'added' | 'removed' | 'updated';
     /** The stage or sprite in each version, absent where it does not exist. */
     before?: ProjectTarget;
     after?: ProjectTarget;

package/dist/review-words.d.ts

@@ -0,0 +1,6 @@
+import type { ScriptSummaryItem } from './project-source-review-model.js';
+export declare function hatName(opcode: string, locale: string): string | undefined;
+/** One phrase per summary item, in the reader's language. */
+export declare function summaryPhrase(item: ScriptSummaryItem, locale: string): string;
+/** The colours of the previews, said once at the top of a review. */
+export declare const legend: (locale: string) => readonly [readonly ["added", "緑の縁: 追加したブロック"], readonly ["removed", "赤の縁: 削除したブロック"], readonly ["updated", "紫の縁: 中身を変えたブロック"], readonly ["part", "オレンジの枠: 値を変えた欄"]] | readonly [readonly ["added", "Green outline: added block"], readonly ["removed", "Red outline: removed block"], readonly ["updated", "Purple outline: block with changed contents"], readonly ["part", "Orange frame: changed value"]];