feat(editor): add lossless bounded CSV table editing
This commit is contained in:
1 parent
bd80ff6a0c
commit
2d6ceac0d7
19 files changed
+520
-40
No files matched your search
@@ -35,8 +35,8 @@ jobs:
|
||||
[worker.oci]
|
||||
max-parallelism = 2
|
||||
|
||||
- name: Test release tooling and wallpaper palette
|
||||
run: node --test tools/ci/release-images.test.mjs static/js/home-palette-core.test.cjs
|
||||
- name: Test release tooling and browser logic
|
||||
run: node --test tools/ci/release-images.test.mjs static/js/home-palette-core.test.cjs static/js/csv-core.test.cjs
|
||||
|
||||
- name: Test
|
||||
uses: https://github.com/docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
|
||||
|
||||
@@ -342,6 +342,12 @@ window.PagesWikiEditor = {
|
||||
}),
|
||||
];
|
||||
|
||||
if (options.preserveLineEndings) {
|
||||
// Split only at LF, keeping any CR bytes in the document. This
|
||||
// preserves mixed LF/CRLF CSV sources instead of rewriting them.
|
||||
extensions.push(EditorState.lineSeparator.of("\n"));
|
||||
}
|
||||
|
||||
if (keymapName === "vim") {
|
||||
installVimCommands();
|
||||
extensions.push(vim());
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
- `+` は挿入・下書き、`文` は言語の編集・分岐、`↶` は旧リビジョンを作業バッファへ
|
||||
読み込む。復元は明示保存で新 Revision を追加し、旧 Revision を書き換えない。
|
||||
履歴は50件ずつ追加取得し、現在言語で絞り込む。分岐は翻訳生成ではなく本文のコピー。
|
||||
- 挿入は子ページ・表・画像キャプション・補足・コード・引用の6種の初期パレット。
|
||||
- 挿入は子ページ・表・画像キャプション・補足・コード・引用・CSV macroの初期パレット。
|
||||
画像 URL 等のプレースホルダーは編集が必要。ファイルピッカー、図形・外部 widget の
|
||||
パラメータ編集、プラグインによる挿入パーツ登録は既存の HTML editor 設計に残る。
|
||||
- touch/coarse pointer + hover 不可の端末ではデスクトップの Vim 設定を上書きせず、
|
||||
@@ -78,6 +78,8 @@
|
||||
|
||||
## 次段階の実装順序
|
||||
|
||||
CSVの表編集は既存保存・下書き・履歴の契約へ接続済みです。CSVはHTML変換と文字列自動マージを行わず、競合時は比較して採否を決めます。BOMと混在改行を保持するため、CSV初期値はHTMLのtextarea解析を通さず安全なJS文字列として渡し、CodeMirrorはLFのみで分割します。初期フォーカスの遅延処理も、表セルなどへ移ったフォーカスを奪いません。詳細な上限と残件は[表設計](extensions.md)を参照してください。
|
||||
|
||||
1. **E6a presence**:編集中リースの共有ストアと認可付き API、別端末を含む表示。
|
||||
管理者にだけ見える監視ではなく、同じ Page/language を編集できる参加者に限定する。
|
||||
2. **E6b realtime**:下記 CRDT 詳細設計・採用ライブラリ・同時変換ルールを確定した後に
|
||||
|
||||
@@ -48,9 +48,13 @@ IPアドレス管理(IPAM)、DNSゾーン/レコード管理、機器・
|
||||
|
||||
## CSV/表・スライド拡張(設計TODO)
|
||||
|
||||
初期CSV macroは実装済みです。`{{csv:/data/items.csv range=A1:H200 header=true}}` を認証済みProjectionで展開し、`rev=` で同じObjectのRevisionへ固定できます。現在のPath閲覧権限を毎回検査し、外部URL、匿名公開、asset指定、共有キャッシュ、CSV編集はこの段階に含めません。入力256 KiB・UTF-8、表示200行×32列、走査2,000行・100列、セル16 KiB、Projection当たり4種類のCSVまでに制限します。引用符・改行・BOMに対応し、セルはHTML escapeしてmacroや数式を実行しません。処理不能時は内容を漏らさない警告に置き換えます。Authoringでは元のmacroを保持します。
|
||||
初期CSV macroは実装済みです。`{{csv:/data/items.csv range=A1:H200 header=true}}` を認証済みProjectionで展開し、`rev=` で同じObjectのRevisionへ固定できます。現在のPath閲覧権限を毎回検査し、外部URL、匿名公開、asset指定、共有キャッシュはこの段階に含めません。入力256 KiB・UTF-8、表示200行×32列、走査2,000行・100列、セル16 KiB、Projection当たり4種類のCSVまでに制限します。引用符・改行・BOMに対応し、セルはHTML escapeしてmacroや数式を実行しません。処理不能時は内容を漏らさない警告に置き換えます。Authoringでは元のmacroを保持します。
|
||||
|
||||
CSVをPage本文へ複製せず、認可済みの別Documentをテーブルとして投影するmacroを用意します。候補構文は `{{csv:/data/items.csv range=A1:H200 header=true}}` とし、Path、Revision(またはasset hash)、列・行上限、表示モードを正規化してキャッシュキーに含めます。macroは表示時にboundedなProjectionを作るだけで、結果HTMLを正本へ逆流させません。CSV Editorは元Revisionを編集し、表投影とは別の操作・競合・権限として扱います。
|
||||
既存CSVの編集は `/e/-/{path}` の組み込みエディタで行います。デスクトップはソースと表を並べ、700px以下では表を全幅表示してソースへ切り替えます。セル編集、行・列追加/削除、20操作までの表のUndo/Redoに対応。表は200行・32列・セル16 KiB以内を25行ずつ描画し、先頭行を自動でヘッダ扱いしません。矩形でない行の欠落セルを勝手に保存せず、列追加時だけ明示的に空セルを補います。全体256 KiB・UTF-8以内を対象とし、超過・不正形式の表を部分編集可能にして保存することはありません。表上限を超えても全体上限内ならソースで編集できます。
|
||||
|
||||
CSV正本をHTMLへ変換せず、未変更fieldの引用符、BOM、混在LF/CRLFを保持します。セル内のHTML、macro、数式は実行しません。表編集も既存の下書き・認証切れ検出・言語別Revision CAS・履歴復元を使用し、他の保存と競合したCSVは文字列の自動マージをせず比較画面へ送ります。原文と編集済み表の両方を別正本として保存しません。DBスキーマ変更はありません。CSV新規作成ウィザード、TSV/文字コード変換、大容量表のwindow編集、複数セル貼付、列型/数式、ODSは残件です。
|
||||
|
||||
CSVをPage本文へ複製せず、認可済みの別Documentをテーブルとして投影します。共有キャッシュを将来追加する際は、Path、Revision(またはasset hash)、列・行上限、表示モードと権限を考慮します。macroは表示時にboundedなProjectionを作るだけで、結果HTMLを正本へ逆流させません。CSV Editorは元Revisionを編集し、表投影とは別の操作・競合・権限として扱います。
|
||||
|
||||
交換形式はRFC 4180互換CSV(UTF-8、CRLF、引用符・改行を含むfield、BOMの扱いを明示)を第一正本とします。複数シート、型、数式、結合セル、書式が必要な場合はODSを別アダプタ/Assetとして扱い、CSVへの不可逆変換を黙って行いません。行数、列数、セル長、総バイト、ネストmacroを制限し、malformed inputは安全なテキスト表示へfallbackします。
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ P0は認可・整合性・復旧の安全条件、P1は日常利用の回復性
|
||||
| SHARE-01 / P2 | 未実装:委譲share URL、期限/失効/監査、説明可能な権限総覧 | AUTH-01、PUB-01。login/adapter/federation資格情報と別目的、単一Page投影、caveat・依存物の失効を検証 | [公開](publication.md)、[Schutzaria](schutzaria.md) |
|
||||
| COLLAB-01 / P2 | 一部実装:Page等の変更購読、最近閲覧/編集、集約通知。コメント/反応/評価は未実装 | OUT-01。現在権限で再投影、private履歴のopt-in/保持。inline commentはRevision変更時の孤立・再接続を扱う | [拡張](extensions.md) |
|
||||
| BLOG-01 / P2 | 一部実装:安全なtDiary import、最近コメント、遠隔ブログ射影 | COLLAB-01、遠隔はFED-01。importは再開/重複抑止/dry-run。同一instance射影を再実装しない | [ブログ・日記](blog-diary.md) |
|
||||
| CSV-01 / P2 | viewerと有界CSV macroを実装。残件:CSV editor、匿名投影、asset指定、ODS境界 | 行列・セル・総量上限、Revision固定、権限、CSV引用/改行fixture。表示HTMLをCSV正本へ逆流させない | [表設計](extensions.md) |
|
||||
| CSV-01 / P2 | viewer・有界CSV macro・既存CSVの表編集を実装。残件:新規作成UI、大容量/複数セル編集、匿名投影、asset指定、ODS境界 | BOM/改行保持、25行描画、行列・セル・総量上限、Revision CAS、権限、競合確認/履歴復元fixture。表示HTMLをCSV正本へ逆流させない | [表設計](extensions.md) |
|
||||
| DIAGRAM-01 / P2 | 一部実装:nwdiag/Draw.io provider、slide preview/editor | RENDER-01。安全なSVG・include拒否・renderer版固定、ticket/CAS保存、print。既存Excalidraw/Krokiとは分ける | [Kunstzeal](kunstzeal.md) |
|
||||
| RECIPE-01 / P2 | 未実装:構造化レシピmetadataとPage投影の初期slice | 材料・数量・未知単位を保持、人数変更は派生値、Asset認可、版競合、出典・公開確認 | [料理レシピ](recipe-management.md) |
|
||||
|
||||
@@ -126,7 +126,7 @@ P0は認可・整合性・復旧の安全条件、P1は日常利用の回復性
|
||||
- **HOLD-01**:`/tasks/` 配下のメールWikiルーティング調査。利用者の棚上げ指定を維持。関連未コミットファイルを今回の実装・文書コミットへ混ぜない。
|
||||
- **HOLD-02**:vim.wasm runtime改善とnativeアプリ起動。既存設定UIは残すが、自動的に再開しない。
|
||||
- **HOLD-03**:全面WYSIWYG、E6 CRDT/OT共同編集。まずEDIT-01と認可/presence契約、保存量・オフライン・競合モデルを確定する。
|
||||
- **HOLD-04**:本番への反映。作業履歴/日次メールのv3/v4移行を含む同世代保全と隔離復元試験、容量確認、SMTP副作用照合が必要。古いbinaryを新schemaへ向ける切戻しは禁止。
|
||||
- **HOLD-04**:本番反映は実装と別ゲート。[v0.15.0までの配備](../../operations/releases/2026-11-08-v0.15.0.md)は完了。追加変更には同世代保全と隔離復元試験、容量確認、外部副作用照合が必要。古いbinaryを新schemaへ向ける切戻しは禁止。
|
||||
|
||||
## 実装と分けて管理する受入
|
||||
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"html"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
const csvEditorFixtureBody = "\ufeff\"name\",description\r\n日本語,\"a,b\r\nnext\"\r\n"
|
||||
|
||||
func TestCSVEditorRevisionAndBounds(t *testing.T) {
|
||||
s, token, domain, _ := editorFixture(t)
|
||||
object, err := s.store.CreatePageAtPathInDomain(domain, "/table.csv")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
first, err := s.store.SaveRevisionContent(object, []byte(csvEditorFixtureBody), "", "und", "text/csv; charset=utf-8", "table.csv")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, query := range []string{"", "?edittype=markdown", "?lang=und"} {
|
||||
w := configRequest(s, token, "GET", "/e/-/table.csv"+query, nil)
|
||||
if w.Code != 200 || !strings.Contains(w.Body.String(), `data-csv="true"`) || !strings.Contains(w.Body.String(), `value="code"`) || strings.Contains(w.Body.String(), `data-editor-action="markdown"`) {
|
||||
t.Fatalf("editor %d %s", w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
head, _ := s.store.GetRevisionForExactLanguage(object, "und")
|
||||
if head.UUID != first.UUID {
|
||||
t.Fatal("GET changed revision")
|
||||
}
|
||||
save := func(auth, base, body string) int {
|
||||
data, _ := json.Marshal(map[string]any{"object_uuid": object, "body": body, "lang": "und", "content_type": "text/csv; charset=utf-8", "filename": "table.csv", "base_revision_uuid": base})
|
||||
r := httptest.NewRequest("POST", "http://localhost/_/api/v1/revisions/save", bytes.NewReader(data))
|
||||
r.Header.Set("Authorization", "Bearer "+auth)
|
||||
r.Header.Set("Content-Type", "application/json")
|
||||
w := httptest.NewRecorder()
|
||||
s.withAuthorization(s.mux).ServeHTTP(w, r)
|
||||
return w.Code
|
||||
}
|
||||
changed := strings.Replace(csvEditorFixtureBody, "日本語", "更新", 1)
|
||||
if code := save(token, first.UUID, changed); code != 200 {
|
||||
t.Fatal("save", code)
|
||||
}
|
||||
if code := save(token, first.UUID, "stale"); code != 409 {
|
||||
t.Fatal("stale save", code)
|
||||
}
|
||||
head, _ = s.store.GetRevisionForExactLanguage(object, "und")
|
||||
if head.Body != changed || head.ContentType != "text/csv; charset=utf-8" || head.Filename != "table.csv" {
|
||||
t.Fatal("CSV altered")
|
||||
}
|
||||
state := configRequest(s, token, "GET", "/_/api/v1/editor/state?uuid="+object+"&lang=und&revision="+first.UUID, nil)
|
||||
var content struct {
|
||||
Body string
|
||||
Editable bool
|
||||
}
|
||||
if err = json.Unmarshal(state.Body.Bytes(), &content); err != nil || state.Code != 200 || !content.Editable || content.Body != csvEditorFixtureBody {
|
||||
t.Fatal("restore", state.Code, err)
|
||||
}
|
||||
reader, err := s.store.CreatePasswordAccount(domain, "csvreader", "a long test password", "Reader", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.SetPrincipalState(domain, reader.UUID, "readonly"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
denied, _ := s.store.CreateAuthSession(domain, reader.UUID)
|
||||
if code := save(denied, head.UUID, "forbidden"); code != 403 {
|
||||
t.Fatal("readonly save", code)
|
||||
}
|
||||
// Initial CSV is embedded as an escaped JS string to preserve CRLF. A
|
||||
// field must not terminate that script or become executable markup.
|
||||
if _, err = s.store.SaveRevisionContent(object, []byte("\"</script><script>alert(1)</script>\",value\r\n"), "", "und", "text/csv", "table.csv"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
escaped := configRequest(s, token, "GET", "/e/-/table.csv", nil)
|
||||
if escaped.Code != 200 || strings.Contains(escaped.Body.String(), "<script>alert(1)</script>") || !strings.Contains(escaped.Body.String(), `\u003c/script\u003e`) {
|
||||
t.Fatal("CSV script string was not escaped")
|
||||
}
|
||||
for _, input := range []struct {
|
||||
body []byte
|
||||
code int
|
||||
}{{[]byte(strings.Repeat("x", maxCSVMacroBytes+1)), 413}, {[]byte{0xff, 0xfe}, 415}, {[]byte("a,\x00"), 415}} {
|
||||
rev, e := s.store.SaveRevisionContent(object, input.body, "", "und", "text/csv", "table.csv")
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
w := configRequest(s, token, "GET", "/e/-/table.csv", nil)
|
||||
if w.Code != input.code {
|
||||
t.Fatalf("editor bounds %d wanted %d", w.Code, input.code)
|
||||
}
|
||||
w = configRequest(s, token, "GET", "/_/api/v1/editor/state?uuid="+object+"&lang=und&revision="+rev.UUID, nil)
|
||||
if w.Code != input.code {
|
||||
t.Fatalf("state bounds %d wanted %d", w.Code, input.code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCSVEditorChromium(t *testing.T) {
|
||||
if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" {
|
||||
t.Skip("opt-in Chromium")
|
||||
}
|
||||
for _, width := range []string{"1280", "390"} {
|
||||
t.Run(width, func(t *testing.T) {
|
||||
s, token, domain, _ := editorFixture(t)
|
||||
object, err := s.store.CreatePageAtPathInDomain(domain, "/table.csv")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = s.store.SaveRevisionContent(object, []byte(csvEditorFixtureBody), "", "und", "text/csv; charset=utf-8", "table.csv"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
script, err := os.ReadFile("internal/server/testdata/csv-editor.js")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
r.Host = "localhost"
|
||||
r.Header.Set("Authorization", "Bearer "+token)
|
||||
if r.URL.Path == "/e/-/table.csv" {
|
||||
rec := httptest.NewRecorder()
|
||||
s.withAuthorization(s.mux).ServeHTTP(rec, r)
|
||||
for k, v := range rec.Header() {
|
||||
w.Header()[k] = v
|
||||
}
|
||||
w.WriteHeader(rec.Code)
|
||||
_, policy, _ := strings.Cut(rec.Header().Get("Content-Security-Policy"), "'nonce-")
|
||||
nonce, _, _ := strings.Cut(policy, "'")
|
||||
w.Write([]byte(strings.Replace(rec.Body.String(), "</body>", `<script nonce="`+html.EscapeString(nonce)+`">`+string(script)+"</script></body>", 1)))
|
||||
return
|
||||
}
|
||||
s.withAuthorization(s.mux).ServeHTTP(w, r)
|
||||
}))
|
||||
defer server.Close()
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second)
|
||||
defer cancel()
|
||||
out, err := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/e/-/table.csv", t.TempDir(), "/tmp/pageswiki-csv-editor-"+width+".png", width, "850").CombinedOutput()
|
||||
if err != nil {
|
||||
t.Fatalf("browser: %v %s", err, out)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,8 @@ package server
|
||||
|
||||
func init() {
|
||||
for lang, entries := range map[string]map[string]string{
|
||||
"en": {"editor.tools": "Insert component / drafts", "editor.language": "Edit / fork language", "editor.restore": "Restore a revision into the editor"},
|
||||
"ja": {"editor.tools": "コンポーネント挿入・下書き", "editor.language": "言語の編集・分岐", "editor.restore": "過去のリビジョンをエディタに復元"},
|
||||
"en": {"editor.tools": "Insert component / drafts", "editor.language": "Edit / fork language", "editor.restore": "Restore a revision into the editor", "editor.csv_source": "CSV source", "editor.csv_table": "CSV table"},
|
||||
"ja": {"editor.tools": "コンポーネント挿入・下書き", "editor.language": "言語の編集・分岐", "editor.restore": "過去のリビジョンをエディタに復元", "editor.csv_source": "CSVソースを表示", "editor.csv_table": "CSVの表を表示"},
|
||||
} {
|
||||
for key, value := range entries {
|
||||
translations[lang][key] = value
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
|
||||
"pageswiki/internal/grammaratur"
|
||||
)
|
||||
@@ -73,7 +74,20 @@ func (s *Server) handleEditorState(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
out := map[string]any{"revision_uuid": rev.UUID, "head_revision_uuid": head, "lang": rev.Language, "content_type": rev.ContentType, "filename": rev.Filename, "principal_uuid": owner}
|
||||
if r.URL.Query().Get("metadata") != "1" {
|
||||
if rev.UUID != "" {
|
||||
csv := selectProjectionAdapter(contentDescriptor{MediaType: strings.ToLower(strings.TrimSpace(strings.Split(rev.ContentType, ";")[0])), Filename: rev.Filename}).Kind == "csv"
|
||||
if csv {
|
||||
size, e := s.store.DocumentSizeContext(r.Context(), rev.DocumentHash)
|
||||
if e != nil || size > maxCSVMacroBytes {
|
||||
http.Error(w, "CSV editor size limit exceeded", 413)
|
||||
return
|
||||
}
|
||||
window, e := s.store.ReadDocumentWindowContext(r.Context(), rev.DocumentHash, 0, maxCSVMacroBytes)
|
||||
if e != nil || window.Truncated || !utf8.Valid(window.Data) || strings.ContainsRune(string(window.Data), 0) {
|
||||
http.Error(w, "CSV source unavailable or not UTF-8", 415)
|
||||
return
|
||||
}
|
||||
rev.Body = string(window.Data)
|
||||
} else if rev.UUID != "" {
|
||||
rev, err = s.store.GetRevision(rev.UUID)
|
||||
}
|
||||
if err != nil {
|
||||
@@ -90,7 +104,7 @@ func (s *Server) handleEditorState(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
out["body"], out["markdown"] = rev.Body, markdown
|
||||
kind := revisionContentView(rev, "").Kind
|
||||
out["editable"] = rev.UUID == "" || kind == "html" || kind == "code"
|
||||
out["editable"] = rev.UUID == "" || kind == "html" || kind == "code" || (csv && utf8.ValidString(rev.Body) && !strings.ContainsRune(rev.Body, 0))
|
||||
}
|
||||
_ = json.NewEncoder(w).Encode(out)
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"path"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"pageswiki/internal/grammaratur"
|
||||
"pageswiki/internal/store"
|
||||
@@ -211,16 +212,43 @@ func (s *Server) handleSemanticEditor(
|
||||
}
|
||||
}
|
||||
|
||||
latest, err :=
|
||||
s.latestRevisionForRequest(
|
||||
r,
|
||||
objectUUID,
|
||||
)
|
||||
|
||||
body := ""
|
||||
// CSV editing needs the complete source, never the viewer's truncated window.
|
||||
// Check metadata before loading a potentially large document.
|
||||
metadata, metaErr := s.store.GetLatestRevisionMetadataForLanguagesContext(r.Context(), objectUUID, s.revisionLanguageCandidates(r))
|
||||
if lang := r.URL.Query().Get("lang"); lang != "" {
|
||||
latest, err = s.store.GetRevisionForExactLanguage(objectUUID, lang)
|
||||
metadata, metaErr = s.store.GetRevisionMetadataForExactLanguage(objectUUID, lang)
|
||||
}
|
||||
if metaErr != nil || metadata == nil {
|
||||
http.Error(w, "revision unavailable or invalid language", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
csvEditor := selectProjectionAdapter(contentDescriptor{MediaType: strings.ToLower(strings.TrimSpace(strings.Split(metadata.ContentType, ";")[0])), Filename: metadata.Filename}).Kind == "csv"
|
||||
if csvEditor {
|
||||
size, sizeErr := s.store.DocumentSizeContext(r.Context(), metadata.DocumentHash)
|
||||
if sizeErr != nil || size > maxCSVMacroBytes {
|
||||
http.Error(w, "CSV editor requires a complete document of at most 256 KiB", http.StatusRequestEntityTooLarge)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
var latest *store.Revision
|
||||
if csvEditor {
|
||||
// Load the immutable revision we checked; a concurrent new head is
|
||||
// handled by the normal save CAS, not by an unbounded second read.
|
||||
window, readErr := s.store.ReadDocumentWindowContext(r.Context(), metadata.DocumentHash, 0, maxCSVMacroBytes)
|
||||
if readErr != nil || window.Truncated {
|
||||
http.Error(w, "CSV source unavailable", http.StatusServiceUnavailable)
|
||||
return
|
||||
}
|
||||
latest = metadata
|
||||
latest.Body = string(window.Data)
|
||||
} else {
|
||||
latest, err = s.latestRevisionForRequest(r, objectUUID)
|
||||
if lang := r.URL.Query().Get("lang"); lang != "" {
|
||||
latest, err = s.store.GetRevisionForExactLanguage(objectUUID, lang)
|
||||
}
|
||||
}
|
||||
body := ""
|
||||
if err != nil {
|
||||
http.Error(w, "revision unavailable or invalid language", 400)
|
||||
return
|
||||
@@ -233,7 +261,13 @@ func (s *Server) handleSemanticEditor(
|
||||
if err == nil {
|
||||
if latest.UUID != "" {
|
||||
view := revisionContentView(latest, path)
|
||||
if view.Kind == "code" {
|
||||
if view.Kind == "csv" {
|
||||
if !csvEditor || !utf8.ValidString(latest.Body) || strings.ContainsRune(latest.Body, 0) || len(latest.Body) > maxCSVMacroBytes {
|
||||
http.Error(w, "CSV editor requires bounded UTF-8 text", http.StatusUnsupportedMediaType)
|
||||
return
|
||||
}
|
||||
editType = "code"
|
||||
} else if view.Kind == "code" {
|
||||
editType = "code"
|
||||
if strings.EqualFold(strings.TrimSpace(strings.Split(latest.ContentType, ";")[0]), "text/plain") {
|
||||
editType = "plain"
|
||||
@@ -294,6 +328,7 @@ func (s *Server) handleSemanticEditor(
|
||||
"BaseBody": baseBody,
|
||||
"BaseRevision": latest.UUID,
|
||||
"EditType": editType,
|
||||
"CSVEditor": csvEditor,
|
||||
"PageLanguage": latest.Language,
|
||||
"PageContentType": contentType,
|
||||
"PageFilename": filename,
|
||||
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
(async()=>{
|
||||
const assert=(ok,msg)=>{if(!ok)throw Error(msg)},delay=ms=>new Promise(r=>setTimeout(r,ms));
|
||||
const wait=async fn=>{for(let n=0;n<150;n++){if(fn())return;await delay(25)}throw Error('Timeout '+fn)};
|
||||
await wait(()=>window.PagesWikiCodeMirror&&document.querySelector('.csv-edit-scroll textarea'));
|
||||
const e=window.PagesEditor;setEditorPreviewVisible(true);e.paused=true;
|
||||
if(innerWidth<=700){assert(getComputedStyle(document.querySelector('.editor-pane')).display==='none','Mobile table is not full width');setEditorPreviewVisible(false);assert(getComputedStyle(document.querySelector('.editor-pane')).display!=='none','Mobile source inaccessible');setEditorPreviewVisible(true);}
|
||||
const original=e.text(),base=e.baseRevision;
|
||||
const cell=(r,c)=>document.querySelector(`.csv-edit-scroll textarea[data-row="${r}"][data-column="${c}"]`);
|
||||
const button=text=>[...document.querySelectorAll('.csv-edit-toolbar button')].find(b=>b.textContent===text);
|
||||
let input=cell(1,0);input.focus();input.value='新しい,名前';input.dispatchEvent(new Event('input',{bubbles:true}));
|
||||
await delay(400);assert(document.activeElement===input,'Table caret lost; connected='+input.isConnected+' active='+document.activeElement?.className);
|
||||
assert(e.text()==='\ufeff"name",description\r\n"新しい,名前","a,b\r\nnext"\r\n','Untouched CSV changed');
|
||||
e.persist();assert(localStorage.getItem(e.keyPrefix()+e.tab),'CSV draft missing');
|
||||
button('↶').click();assert(e.text()===original,'Undo not lossless');button('↷').click();
|
||||
assert(await e.saveNow(),'CSV save failed');assert(e.baseRevision!==base,'Revision unchanged');
|
||||
let state=await e.state();assert(state.body===e.text()&&state.content_type==='text/csv; charset=utf-8'&&state.editable,'CSV metadata changed');
|
||||
// Markup and formulas are text, never document nodes or evaluated values.
|
||||
e.paused=true;input=cell(1,0);input.value='<img src=x onerror=alert(1)>';input.dispatchEvent(new Event('input',{bubbles:true}));
|
||||
assert(!document.querySelector('.csv-edit-pane img'),'CSV injected markup');
|
||||
assert(await e.saveNow(),'Markup-as-data save failed');
|
||||
// A competing change is always reviewed, even on different CSV fields.
|
||||
const remoteBody=PagesCSV.edit(e.text(),'cell',0,1,'remote');
|
||||
const remote=await e.post('/_/api/v1/revisions/save',{object_uuid:e.value('object-uuid'),body:remoteBody,lang:'und',content_type:e.value('page-content-type'),filename:'table.csv',base_revision_uuid:e.baseRevision,editor_principal_uuid:e.owner});
|
||||
e.paused=true;e.setText(PagesCSV.edit(e.text(),'cell',1,0,'local'));
|
||||
assert(!await e.saveNow(),'Conflicting CSV silently saved');
|
||||
assert(document.querySelector('#editor-dialog textarea[readonly]'),'CSV conflict comparison missing');
|
||||
assert((await e.state()).revision_uuid===remote.revision_uuid,'Remote CSV overwritten');
|
||||
const merged=PagesCSV.edit(remoteBody,'cell',1,0,'local');
|
||||
const areas=document.querySelectorAll('#editor-dialog textarea');areas[areas.length-1].value=merged;
|
||||
document.querySelector('#editor-dialog footer button:last-child').click();await wait(()=>!document.querySelector('#editor-dialog'));
|
||||
assert(await e.saveNow(),'Reviewed CSV failed to save');
|
||||
// Restore stages the old CSV, retains MIME and creates a new revision on save.
|
||||
e.paused=true;await e.historyDialog();const history=document.querySelector('#editor-dialog select');history.value=base;
|
||||
document.querySelector('#editor-dialog footer button:last-child').click();await wait(()=>!document.querySelector('#editor-dialog'));
|
||||
assert(e.text()===original,'History did not restore exact CSV');assert(await e.saveNow(),'Restore save failed');
|
||||
// Source syntax errors do not cause a truncated table to be written back.
|
||||
e.paused=true;e.setText('"unfinished');await e.renderPreview();assert(!document.querySelector('.csv-edit-scroll'),'Malformed CSV table editable');assert(e.text()==='"unfinished','Malformed source lost');
|
||||
e.setText(original);await e.renderPreview();
|
||||
for(let i=0;i<27;i++)button('+↧').click();
|
||||
assert(PagesCSV.parse(e.text()).rows.length===29,'Row append failed');
|
||||
assert(document.querySelectorAll('.csv-edit-scroll tbody tr').length<=25,'Table was not paged');
|
||||
button('‹').click();assert(document.querySelectorAll('.csv-edit-scroll tbody tr').length===25,'Previous page missing');
|
||||
button('+→').click();assert(PagesCSV.parse(e.text()).rows[0].cells.length===3,'Column append failed');
|
||||
cell(1,1).focus();button('−→').click();assert(PagesCSV.parse(e.text()).rows[0].cells.length===2,'Column delete failed');
|
||||
button('↶').click();cell(1,1).focus();button('−↧').click();assert(PagesCSV.parse(e.text()).rows.length===28,'Row delete failed');
|
||||
button('↶').click();
|
||||
const css=getComputedStyle(document.querySelector('.csv-edit-toolbar'));assert(css.color!==css.backgroundColor,'Toolbar lacks contrast');
|
||||
clearTimeout(e.autosaveTimer);clearInterval(e.stateTimer);e.paused=true;
|
||||
document.body.dataset.vimReady='true';
|
||||
})().catch(error=>{const p=document.createElement('pre');p.id='error';p.textContent=error.stack;document.body.append(p)});
|
||||
@@ -109,6 +109,9 @@
|
||||
e.tools();
|
||||
const style=w.getComputedStyle(d.querySelector('#editor-dialog'));
|
||||
assert(style.color!==style.backgroundColor&&style.backgroundColor!=='rgba(0, 0, 0, 0)','Dialog not themed');
|
||||
const components=d.querySelector('#editor-dialog select');components.selectedIndex=components.options.length-1;
|
||||
d.querySelector('#editor-dialog footer button:nth-child(2)').click();await wait(()=>!d.querySelector('#editor-dialog'));
|
||||
assert(e.text().includes('{{csv:/data/table.csv')&&!e.text().includes('{=html}'),'CSV macro insertion was wrapped in protected HTML');
|
||||
document.body.dataset.vimReady='true';
|
||||
} catch(error) {const box=document.createElement('div');box.id='error';box.textContent=error.stack||error.message;document.body.prepend(box)}
|
||||
})();
|
||||
@@ -0,0 +1,17 @@
|
||||
.csv-edit-pane{padding:0!important;display:flex;flex-direction:column;min-width:0;min-height:0;overflow:hidden}
|
||||
.csv-edit-pane[hidden]{display:none!important}
|
||||
.csv-edit-toolbar{display:flex;flex-wrap:wrap;align-items:center;gap:.2rem;padding:.3rem;border-bottom:1px solid var(--border,#444);flex:none;background:var(--bg,#fff);color:var(--fg,#222)}
|
||||
.csv-edit-toolbar button{font:inherit;min-width:2rem;min-height:2rem;padding:.2rem .4rem;border:1px solid var(--border,#777);border-radius:.25rem;color:inherit;background:transparent;cursor:pointer}
|
||||
.csv-edit-toolbar button:disabled{opacity:.4;cursor:default}
|
||||
.csv-edit-toolbar svg{width:1.2rem;height:1.2rem;fill:none;stroke:currentColor;stroke-width:1.7;vertical-align:middle}
|
||||
.csv-edit-toolbar button:focus-visible,.csv-edit-scroll textarea:focus-visible{outline:2px solid var(--accent,#768ad7);outline-offset:-2px}
|
||||
.csv-edit-toolbar output{font-variant-numeric:tabular-nums;font-size:.8rem;white-space:nowrap}
|
||||
.csv-edit-toolbar span{font-size:.8rem}
|
||||
.csv-edit-scroll{overflow:auto;min-height:0;flex:1;overscroll-behavior:contain}
|
||||
.csv-edit-scroll table{border-collapse:separate;border-spacing:0;width:max-content;min-width:100%;font-size:.85rem}
|
||||
.csv-edit-scroll th,.csv-edit-scroll td{border-right:1px solid var(--border,#777);border-bottom:1px solid var(--border,#777);padding:0;vertical-align:top}
|
||||
.csv-edit-scroll th{padding:.2rem .4rem;font-weight:normal;font-variant-numeric:tabular-nums;background:var(--bg,#fff);color:var(--fg,#222)}
|
||||
.csv-edit-scroll thead th{position:sticky;top:0;z-index:1}
|
||||
.csv-edit-scroll textarea{display:block;width:11rem;min-width:6rem;max-width:30rem;min-height:2rem;margin:0;padding:.3rem;border:0;border-radius:0;font:inherit;line-height:1.4;color:inherit;background:transparent;resize:both;box-sizing:border-box}
|
||||
@media(max-width:600px){.csv-edit-toolbar button{min-width:2.75rem;min-height:2.75rem}.csv-edit-scroll textarea{min-height:2.75rem;font-size:16px}}
|
||||
@media(max-width:700px){.csv-editor .editor-grid:not(.preview-hidden){grid-template-columns:1fr!important}.csv-editor .editor-grid:not(.preview-hidden)>.editor-pane{display:none}}
|
||||
@@ -0,0 +1,58 @@
|
||||
(function(root) {
|
||||
'use strict';
|
||||
const limits={bytes:256*1024,rows:200,columns:32,cellBytes:16*1024};
|
||||
const bytes=s=>new TextEncoder().encode(s).length;
|
||||
function parse(source) {
|
||||
if(typeof source!=='string'||bytes(source)>limits.bytes||source.includes('\0'))throw Error('size');
|
||||
const bom=source.startsWith('\ufeff')?'\ufeff':'',rows=[];
|
||||
let i=bom.length,lineEnding='',cells=[];
|
||||
while(i<source.length||cells.length){
|
||||
const start=i;let value='';
|
||||
if(source[i]==='"'){
|
||||
i++;let closed=false;
|
||||
while(i<source.length){const c=source[i++];if(c==='"'){if(source[i]==='"'){value+='"';i++;}else{closed=true;break;}}else value+=c;}
|
||||
if(!closed||i<source.length&&![',','\r','\n'].includes(source[i]))throw Error('syntax');
|
||||
value=value.replace(/\r\n/g,'\n');
|
||||
}else{
|
||||
while(i<source.length&&![',','\r','\n'].includes(source[i])){if(source[i]==='"')throw Error('syntax');value+=source[i++];}
|
||||
}
|
||||
if(bytes(value)>limits.cellBytes||cells.length>=limits.columns)throw Error('size');
|
||||
cells.push({value,raw:source.slice(start,i),original:value});
|
||||
if(source[i]===','){i++;continue;}
|
||||
let end='';
|
||||
if(source[i]==='\r'){if(source[i+1]!=='\n')throw Error('syntax');end='\r\n';i+=2;}
|
||||
else if(source[i]==='\n'){end='\n';i++;}
|
||||
if(!lineEnding&&end)lineEnding=end;
|
||||
rows.push({cells,end});cells=[];if(rows.length>limits.rows)throw Error('size');
|
||||
}
|
||||
return {source,bom,lineEnding:lineEnding||'\r\n',rows};
|
||||
}
|
||||
function encode(value){return /[",\r\n]/.test(value)||/^\s/.test(value)?'"'+value.replace(/"/g,'""')+'"':value;}
|
||||
function serialize(model){
|
||||
const source=model.bom+model.rows.map(row=>{const record=row.cells.map(c=>c.value===c.original?c.raw:encode(c.value)).join(',');return record+(row.end||(!record?model.lineEnding:''));}).join('');
|
||||
parse(source);return source;
|
||||
}
|
||||
function edit(source,action,row=0,column=0,value=''){
|
||||
const m=parse(source),blank=()=>({value:'',raw:'',original:''});
|
||||
if(action==='cell'){
|
||||
if(!m.rows[row]?.cells[column]||typeof value!=='string')throw Error('cell');
|
||||
m.rows[row].cells[column].value=value;
|
||||
}else if(action==='add-row'){
|
||||
const last=m.rows.at(-1),cols=Math.max(1,...m.rows.map(r=>r.cells.length));
|
||||
if(last&&!last.end)last.end=m.lineEnding;
|
||||
// A newline is necessary to distinguish a blank final row from no row.
|
||||
m.rows.push({cells:Array.from({length:cols},blank),end:m.lineEnding});
|
||||
}else if(action==='add-column'){
|
||||
if(!m.rows.length)m.rows.push({cells:[blank()],end:m.lineEnding});
|
||||
const cols=Math.max(...m.rows.map(r=>r.cells.length));
|
||||
for(const r of m.rows){while(r.cells.length<cols)r.cells.push(blank());r.cells.push(blank());}
|
||||
}else if(action==='delete-row'){
|
||||
if(!m.rows[row])throw Error('row');m.rows.splice(row,1);
|
||||
}else if(action==='delete-column'){
|
||||
if(!m.rows.some(r=>r.cells[column]))throw Error('column');
|
||||
for(const r of m.rows){r.cells.splice(column,1);if(!r.cells.length)r.cells.push(blank());}
|
||||
}else throw Error('action');
|
||||
return serialize(m);
|
||||
}
|
||||
root.PagesCSV={parse,edit,serialize,limits};
|
||||
})(typeof window==='undefined'?globalThis:window);
|
||||
@@ -0,0 +1,31 @@
|
||||
const test=require('node:test'),assert=require('node:assert/strict');
|
||||
require('./csv-core.js');const csv=globalThis.PagesCSV;
|
||||
test('CSV parsing preserves untouched bytes and logical field values',()=>{
|
||||
for(const source of ['', '\ufeff', 'a', 'a,', '\n', '""', 'a\r\nb\n', '\ufeff"name",description\r\n日本語,"a,b\r\nnext"\r\n', '"a""b",=1+1\n'])assert.equal(csv.serialize(csv.parse(source)),source);
|
||||
const s='\ufeff"name",description\r\n日本語,"a,b\r\nnext"\r\n';
|
||||
assert.equal(csv.parse(s).rows[1].cells[1].value,'a,b\nnext');
|
||||
assert.equal(csv.edit(s,'cell',1,0,'新しい,名前'),'\ufeff"name",description\r\n"新しい,名前","a,b\r\nnext"\r\n');
|
||||
assert.equal(csv.edit(s,'cell',1,1,'a,b\nnext'),s);
|
||||
assert.equal(csv.edit('a','cell',0,0,''),'\r\n');
|
||||
});
|
||||
test('Row and column operations preserve fields; empty and ragged data are explicit',()=>{
|
||||
assert.equal(csv.edit('a,b\nc\n','add-column'),'a,b,\nc,,\n');
|
||||
assert.equal(csv.edit('a,b\nc\n','delete-column',0,1),'a\nc\n');
|
||||
assert.equal(csv.edit('a,b\r\n"c",d','delete-row',0),'"c",d');
|
||||
assert.equal(csv.edit('a,b','add-row'),'a,b\r\n,\r\n');
|
||||
assert.equal(csv.parse(csv.edit('','add-row')).rows.length,1);
|
||||
assert.equal(csv.edit('a\n','delete-row',0),'');
|
||||
});
|
||||
test('Malformed and excessive data fail without truncation',()=>{
|
||||
for(const source of ['"unfinished','a"b','"a"x','a\rb','a\0b','x'.repeat(256*1024+1),'x'.repeat(16385), 'a,'.repeat(32), 'a\n'.repeat(201)])assert.throws(()=>csv.parse(source));
|
||||
assert.throws(()=>csv.edit('a\n'.repeat(200),'add-row'));
|
||||
assert.throws(()=>csv.edit('a','cell',0,0,'x'.repeat(16385)));
|
||||
assert.throws(()=>csv.edit('a','cell',2,0,'bad'));
|
||||
});
|
||||
test('Quotes, HTML, formulas and newlines remain inert CSV data',()=>{
|
||||
for(const value of ['"','a,b','<img src=x onerror=alert(1)>','{{children}}','=SUM(A1:A9)',' leading','日本語\n次の行','a\r\nb']){
|
||||
const source=csv.edit('old,unchanged\r\n','cell',0,0,value);
|
||||
assert.equal(csv.parse(source).rows[0].cells[0].value,value.replace(/\r\n/g,'\n'));
|
||||
assert.ok(source.endsWith(',unchanged\r\n'));
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,81 @@
|
||||
(() => {
|
||||
'use strict';
|
||||
const views=new WeakMap(),pageSize=25;
|
||||
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;};
|
||||
class TableEditor {
|
||||
constructor(editor){this.editor=editor;this.page=0;this.selected=null;this.last=null;this.undo=[];this.redo=[];}
|
||||
t(en,ja){return this.editor.ja?ja:en;}
|
||||
render(text){
|
||||
if(this.last===text)return;
|
||||
this.last=text;this.selected=null;
|
||||
const pane=this.editor.preview;pane.classList.remove('code-preview');pane.classList.add('csv-edit-pane');pane.replaceChildren();
|
||||
try{this.model=PagesCSV.parse(text);}catch{
|
||||
const error=el('p',this.t('Table unavailable: check CSV syntax or limits (200 rows, 32 columns, 16 KiB per cell). Edit the source; no data was truncated.','表を表示できません。CSVの構文・上限(200行、32列、セル16 KiB)を確認してください。ソースで編集できます。データは切り捨てていません。'));
|
||||
error.role='status';pane.append(error);return;
|
||||
}
|
||||
const toolbar=el('div');toolbar.className='csv-edit-toolbar';
|
||||
const button=(icon,en,ja,fn)=>{const b=el('button',icon);b.type='button';b.title=b.ariaLabel=this.t(en,ja);b.onclick=fn;toolbar.append(b);return b;};
|
||||
const save=button('','Save','保存',async()=>{save.disabled=true;try{await this.editor.saveNow();}finally{save.disabled=false;}});
|
||||
save.innerHTML='<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M5 4h12l2 2v14H5zM8 4v6h8V4M8 20v-6h8v6"/></svg>';
|
||||
button('+↧','Add row','行を追加',()=>this.change('add-row'));
|
||||
button('+→','Add column','列を追加',()=>this.change('add-column'));
|
||||
this.deleteRow=button('−↧','Delete selected row','選択行を削除',()=>this.change('delete-row'));
|
||||
this.deleteColumn=button('−→','Delete selected column','選択列を削除',()=>this.change('delete-column'));
|
||||
this.deleteRow.disabled=this.deleteColumn.disabled=true;
|
||||
const undo=button('↶','Undo table edit','表の編集を元に戻す',()=>this.history(false));undo.disabled=!this.undo.length;
|
||||
const redo=button('↷','Redo table edit','表の編集をやり直す',()=>this.history(true));redo.disabled=!this.redo.length;
|
||||
this.undoButton=undo;this.redoButton=redo;
|
||||
this.page=Math.max(0,Math.min(this.page,Math.ceil(this.model.rows.length/pageSize)-1));
|
||||
const previous=button('‹','Previous rows','前の行',()=>{this.page--;this.last=null;this.render(this.editor.text());});previous.disabled=this.page===0;
|
||||
const first=this.page*pageSize,end=Math.min(first+pageSize,this.model.rows.length);
|
||||
this.position=el('output',this.model.rows.length?`${first+1}–${end} / ${this.model.rows.length}`:'0');toolbar.append(this.position);
|
||||
const next=button('›','Next rows','次の行',()=>{this.page++;this.last=null;this.render(this.editor.text());});next.disabled=end>=this.model.rows.length;
|
||||
this.message=el('span');this.message.role='status';toolbar.append(this.message);
|
||||
const saved=el('span',document.getElementById('editor-save-status')?.textContent||'');saved.dataset.csvSaveStatus='';saved.role='status';toolbar.append(saved);pane.append(toolbar);
|
||||
const scroll=el('div');scroll.className='csv-edit-scroll';const table=el('table');table.setAttribute('aria-label',this.t('CSV cells','CSVのセル'));
|
||||
const head=el('thead'),hr=el('tr');hr.append(el('th','#'));
|
||||
const width=Math.max(0,...this.model.rows.map(r=>r.cells.length));
|
||||
for(let c=0;c<width;c++){const th=el('th',String(c+1));th.scope='col';hr.append(th);}head.append(hr);table.append(head);
|
||||
const body=el('tbody');
|
||||
for(let r=first;r<end;r++){
|
||||
const tr=el('tr'),number=el('th',String(r+1));number.scope='row';tr.append(number);
|
||||
for(let c=0;c<width;c++){
|
||||
const td=el('td'),cell=this.model.rows[r].cells[c];
|
||||
if(cell){const input=el('textarea');input.value=cell.value;input.rows=cell.value.includes('\n')?3:1;input.spellcheck=false;input.dataset.row=r;input.dataset.column=c;input.ariaLabel=this.t(`Row ${r+1}, column ${c+1}`,`${r+1}行 ${c+1}列`);
|
||||
input.addEventListener('focus',()=>{this.selected=[r,c];this.deleteRow.disabled=this.deleteColumn.disabled=false;});
|
||||
input.addEventListener('input',()=>this.change('cell',r,c,input.value,input));td.append(input);
|
||||
}
|
||||
tr.append(td);
|
||||
}
|
||||
body.append(tr);
|
||||
}
|
||||
table.append(body);scroll.append(table);pane.append(scroll);
|
||||
}
|
||||
change(action,row=this.selected?.[0],column=this.selected?.[1],value,input){
|
||||
const source=this.editor.text();
|
||||
if(source!==this.last){this.last=null;this.render(source);return;}
|
||||
try{
|
||||
const next=PagesCSV.edit(source,action,row,column,value);if(next===source)return;
|
||||
this.undo.push({before:source,after:next});if(this.undo.length>20)this.undo.shift();this.redo=[];
|
||||
if(action==='cell'){
|
||||
// Keep the active textarea and its caret; delayed preview is a no-op.
|
||||
this.model=PagesCSV.parse(next);this.last=next;this.editor.setText(next);
|
||||
this.undoButton.disabled=false;this.redoButton.disabled=true;this.message.textContent='';
|
||||
}else{
|
||||
if(action==='add-row')this.page=Math.floor((PagesCSV.parse(next).rows.length-1)/pageSize);
|
||||
this.last=null;this.editor.setText(next);this.render(next);
|
||||
}
|
||||
}catch{
|
||||
if(input)input.value=this.model.rows[row].cells[column].value;
|
||||
this.message.textContent=this.t('Edit exceeds CSV limits. Source retained.','CSVの上限を超えます。元の内容を保持しました。');
|
||||
}
|
||||
}
|
||||
history(forward){
|
||||
const from=forward?this.redo:this.undo,to=forward?this.undo:this.redo;if(!from.length)return;
|
||||
const item=from.at(-1),current=this.editor.text();
|
||||
if(current!==(forward?item.before:item.after)){this.message.textContent=this.t('Source changed. Use source editor undo.','ソースが変更されています。ソース側の取り消しを使ってください。');return;}
|
||||
from.pop();to.push(item);const text=forward?item.after:item.before;this.last=null;this.editor.setText(text);this.render(text);
|
||||
}
|
||||
}
|
||||
window.PagesCSVEditor={render(editor,text){let view=views.get(editor);if(!view){view=new TableEditor(editor);views.set(editor,view);}view.render(text);}};
|
||||
})();
|
||||
+28
-10
@@ -6,8 +6,12 @@ window.PagesEditor = {
|
||||
this.mount = document.getElementById('editor-mount')
|
||||
if (!this.editor || !this.preview || !this.mount) return
|
||||
this.baseRevision = this.mount.dataset.baseRevision || ''
|
||||
this.baseBody = document.getElementById('editor-base')?.value || ''
|
||||
this.initialText = this.editor.value
|
||||
// HTML textarea parsing and CodeMirror's default input both normalize
|
||||
// CRLF. CSV receives an escaped JS string and uses LF-only splitting.
|
||||
this.csvInitialSource = this.mount.dataset.csv === 'true' ? window.PagesCSVSource : undefined
|
||||
delete window.PagesCSVSource
|
||||
this.baseBody = this.csvInitialSource ?? (document.getElementById('editor-base')?.value || '')
|
||||
this.initialText = this.csvInitialSource ?? this.editor.value
|
||||
this.owner = this.mount.dataset.owner || ''
|
||||
this.serial = 0
|
||||
this.paused = false
|
||||
@@ -65,17 +69,21 @@ window.PagesEditor = {
|
||||
exists:['指定言語には既に本文があります。編集として開いてください','This language already exists. Open it for editing'], history:['過去のリビジョンを復元','Restore a previous revision'],
|
||||
signin:['再ログイン(別タブ)','Sign in again (new tab)'], insert:['挿入','Insert'], invalid:['言語タグを確認してください','Check the language tag'], identity:['別アカウントに切り替わっています。元のアカウントで開き直してください','Account changed. Reopen using the original account'],
|
||||
incompatible:['ファイル形式が変更されています。下書きを退避して開き直してください','File type changed. Download your draft and reopen'], older:['さらに古い履歴','Older revisions'],
|
||||
csvlimit:['CSVは256 KiB以内で保存してください。下書きは保持しています','CSV must be at most 256 KiB. Your draft is retained'],
|
||||
children:['子ページ一覧','Children'], table:['表','Table'], figure:['画像とキャプション','Image + caption'], note:['補足','Note'], code:['コードブロック','Code block'], quote:['引用','Quote'],
|
||||
csv:['CSVの表を埋め込む','Embed CSV table'],
|
||||
protected:['Markdown で表せない HTML は {=html} ブロックに保持します。ブロック内も編集でき、保存・プレビュー時に HTML として扱います。','HTML not representable in Markdown is retained in editable {=html} blocks and rendered as HTML on save / preview.'],
|
||||
}
|
||||
return text[key]?.[this.ja ? 0 : 1] || key
|
||||
},
|
||||
value(id) { return document.getElementById(id)?.value || '' },
|
||||
format() {return this.value('edit-type')},
|
||||
text() {return window.PagesWikiCodeMirror?.state.doc.toString() ?? this.editor.value},
|
||||
text() {return window.PagesWikiCodeMirror?.state.doc.toString() ?? this.csvInitialSource ?? this.editor.value},
|
||||
status(key) {
|
||||
const status = document.getElementById('editor-save-status')
|
||||
if (status) {status.textContent = this.t(key); status.dataset.state = key}
|
||||
const csvStatus=this.preview?.querySelector('[data-csv-save-status]')
|
||||
if (csvStatus) csvStatus.textContent=this.t(key)
|
||||
},
|
||||
keyPrefix() {return 'pageswiki.draft.v1:'+JSON.stringify([this.mount.dataset.domain,this.owner,this.value('object-uuid'),this.value('page-language')||'und'])+':'},
|
||||
expireDrafts() {
|
||||
@@ -180,6 +188,7 @@ window.PagesEditor = {
|
||||
}
|
||||
},
|
||||
async canonical(text = this.text(), format = this.format()) {
|
||||
if (this.mount.dataset.csv === 'true' && (new TextEncoder().encode(text).length > 256*1024 || text.includes('\0'))) throw {kind:'csvlimit'}
|
||||
if (text === this.initialText && format === this.initialFormat) return this.baseBody
|
||||
if (format !== 'markdown') return text
|
||||
const data = await this.post('/_/api/v1/render/markdown',{markdown:text,authoring:true})
|
||||
@@ -192,6 +201,7 @@ window.PagesEditor = {
|
||||
const controller = new AbortController()
|
||||
this.previewController = controller
|
||||
const text = this.text()
|
||||
if (this.mount.dataset.csv === 'true' && window.PagesCSVEditor) {window.PagesCSVEditor.render(this,text); return}
|
||||
if (this.format() === 'code' || this.format() === 'plain') {this.preview.classList.add('code-preview'); this.preview.textContent=text; return}
|
||||
try {
|
||||
const data = await this.post('/_/api/v1/render/markdown',{
|
||||
@@ -270,7 +280,9 @@ window.PagesEditor = {
|
||||
this.dirty=false; this.paused=false; this.clearDraft(); this.status('saved'); return
|
||||
}
|
||||
if (serial !== this.serial) {this.status('remote'); this.persist(); return}
|
||||
const merged = PagesEditorCore.merge(this.baseBody,local,remote.body)
|
||||
// Text ranges do not describe CSV record boundaries. Review competing
|
||||
// table edits rather than silently combining rows/columns incorrectly.
|
||||
const merged = this.mount.dataset.csv === 'true' ? null : PagesEditorCore.merge(this.baseBody,local,remote.body)
|
||||
const apply = result => {
|
||||
this.baseRevision=remote.revision_uuid; this.baseBody=remote.body
|
||||
document.getElementById('page-filename').value=remote.filename||''
|
||||
@@ -301,12 +313,13 @@ window.PagesEditor = {
|
||||
const oldFormat = this.format()
|
||||
document.getElementById('edit-type').value=format
|
||||
const status=document.getElementById('editor-format-status')
|
||||
if (status) status.textContent=format
|
||||
if (status) status.textContent=this.mount.dataset.csv === 'true' ? 'CSV' : format
|
||||
this.editor.value=text
|
||||
if (this.mount.dataset.csv === 'true') this.csvInitialSource=text
|
||||
if (oldFormat !== format && window.PagesWikiCodeMirror) {
|
||||
window.PagesWikiCodeMirror.destroy()
|
||||
window.PagesWikiCodeMirror = window.PagesWikiEditor.create(this.mount,text,format,{
|
||||
keymap:this.mount.dataset.keymap,syntax:this.mount.dataset.syntax==='true',autocomplete:this.mount.dataset.autocomplete==='true',
|
||||
keymap:this.mount.dataset.keymap,syntax:this.mount.dataset.syntax==='true',autocomplete:this.mount.dataset.autocomplete==='true',preserveLineEndings:this.mount.dataset.csv==='true',
|
||||
})
|
||||
} else if (window.PagesWikiCodeMirror) {
|
||||
const cm=window.PagesWikiCodeMirror
|
||||
@@ -368,19 +381,24 @@ window.PagesEditor = {
|
||||
const {dialog,content,button}=this.dialog('tools')
|
||||
this.paragraph(content,this.t('privacy'))
|
||||
const select=document.createElement('select'); select.setAttribute('aria-label',this.t('insert'))
|
||||
this.paragraph(content,this.t('protected'))
|
||||
const csvFile=this.mount.dataset.csv==='true'
|
||||
if (!csvFile) this.paragraph(content,this.t('protected'))
|
||||
const parts=[['children','{{children}}'],['table','<table>\n<thead><tr><th>Column</th></tr></thead>\n<tbody><tr><td>Value</td></tr></tbody>\n</table>'],['figure','<figure><img src="/_/obj/sha256:HASH" alt="Description"><figcaption>Caption</figcaption></figure>'],['note','<aside class="note"><p>Note</p></aside>'],['code','<pre><code class="language-text">code</code></pre>'],['quote','<blockquote><p>Quote</p></blockquote>']]
|
||||
parts.push(['csv','{{csv:/data/table.csv range=A1:H200 header=true}}'])
|
||||
parts.forEach(([label],i) => {const option=document.createElement('option'); option.value=i; option.textContent=this.t(label); select.append(option)})
|
||||
content.append(select)
|
||||
select.hidden=csvFile
|
||||
const login=document.createElement('a'); login.href='/_/auth/login?return='+encodeURIComponent(location.pathname+location.search); login.target='_blank'; login.rel='noopener'; login.textContent=this.t('signin'); content.append(login)
|
||||
button('insert',() => {
|
||||
const insert=button('insert',() => {
|
||||
if (csvFile) return
|
||||
const part=parts[Number(select.value)]
|
||||
const source=this.format()==='markdown' && part[0]!=='children' ? '```{=html}\n'+part[1]+'\n```' : part[1]
|
||||
const source=this.format()==='markdown' && !['children','csv'].includes(part[0]) ? '```{=html}\n'+part[1]+'\n```' : part[1]
|
||||
const text='\n\n'+source+'\n\n'
|
||||
const cm=window.PagesWikiCodeMirror
|
||||
if (cm) cm.dispatch(cm.state.replaceSelection(text)); else this.setText(this.text()+text)
|
||||
dialog.close(); cm?.focus()
|
||||
})
|
||||
insert.hidden=csvFile
|
||||
button('export',() => this.download())
|
||||
button('discard',() => {
|
||||
this.clearDraft()
|
||||
@@ -429,7 +447,7 @@ window.PagesEditor = {
|
||||
const serial=this.serial
|
||||
const old=await this.state({revision:select.value})
|
||||
if (serial!==this.serial || this.saving) return
|
||||
if (!old.editable) throw {kind:'incompatible'}
|
||||
if (!old.editable || this.mount.dataset.csv === 'true' && (old.content_type||'').split(';')[0] !== this.value('page-content-type').split(';')[0]) throw {kind:'incompatible'}
|
||||
this.setText(this.format()==='markdown'?old.markdown:old.body)
|
||||
this.persist(); dialog.close()
|
||||
})
|
||||
|
||||
+3
@@ -38953,6 +38953,9 @@
|
||||
}
|
||||
})
|
||||
];
|
||||
if (options.preserveLineEndings) {
|
||||
extensions.push(EditorState.lineSeparator.of("\n"));
|
||||
}
|
||||
if (keymapName === "vim") {
|
||||
installVimCommands();
|
||||
extensions.push(vim());
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 3,
|
||||
"sources": ["../../../assets/editor/node_modules/@marijn/find-cluster-break/src/index.js", "../../../assets/editor/node_modules/@codemirror/state/dist/index.js", "../../../assets/editor/node_modules/style-mod/src/style-mod.js", "../../../assets/editor/node_modules/w3c-keyname/index.js", "../../../assets/editor/node_modules/@codemirror/view/dist/index.js", "../../../assets/editor/node_modules/@lezer/common/dist/index.js", "../../../assets/editor/node_modules/@lezer/highlight/dist/index.js", "../../../assets/editor/node_modules/@codemirror/language/dist/index.js", "../../../assets/editor/node_modules/@codemirror/commands/dist/index.js", "../../../assets/editor/node_modules/@codemirror/autocomplete/dist/index.js", "../../../assets/editor/node_modules/@lezer/lr/dist/index.js", "../../../assets/editor/node_modules/@lezer/html/dist/index.js", "../../../assets/editor/node_modules/@lezer/css/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-css/dist/index.js", "../../../assets/editor/node_modules/@lezer/javascript/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-javascript/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-html/dist/index.js", "../../../assets/editor/node_modules/@lezer/markdown/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-markdown/dist/index.js", "../../../assets/editor/node_modules/@lezer/python/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-python/dist/index.js", "../../../assets/editor/node_modules/@lezer/json/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-json/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-sql/dist/index.js", "../../../assets/editor/node_modules/@lezer/yaml/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-yaml/dist/index.js", "../../../assets/editor/node_modules/@lezer/go/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-go/dist/index.js", "../../../assets/editor/node_modules/@lezer/rust/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-rust/dist/index.js", "../../../assets/editor/node_modules/@lezer/java/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-java/dist/index.js", "../../../assets/editor/node_modules/@lezer/cpp/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-cpp/dist/index.js", "../../../assets/editor/node_modules/@codemirror/legacy-modes/mode/shell.js", "../../../assets/editor/node_modules/@codemirror/legacy-modes/mode/toml.js", "../../../assets/editor/node_modules/@codemirror/search/dist/index.js", "../../../assets/editor/node_modules/@replit/codemirror-vim/dist/index.js", "../../../assets/editor/src/editor.js"],
|
||||
"sourcesContent": ["// These are filled with ranges (rangeFrom[i] up to but not including\n// rangeTo[i]) of code points that count as extending characters.\nlet rangeFrom = [], rangeTo = []\n\n;(() => {\n // Compressed representation of the Grapheme_Cluster_Break=Extend\n // information from\n // http://www.unicode.org/Public/16.0.0/ucd/auxiliary/GraphemeBreakProperty.txt.\n // Each pair of elements represents a range, as an offet from the\n // previous range and a length. Numbers are in base-36, with the empty\n // string being a shorthand for 1.\n let numbers = \"lc,34,7n,7,7b,19,,,,2,,2,,,20,b,1c,l,g,,2t,7,2,6,2,2,,4,z,,u,r,2j,b,1m,9,9,,o,4,,9,,3,,5,17,3,3b,f,,w,1j,,,,4,8,4,,3,7,a,2,t,,1m,,,,2,4,8,,9,,a,2,q,,2,2,1l,,4,2,4,2,2,3,3,,u,2,3,,b,2,1l,,4,5,,2,4,,k,2,m,6,,,1m,,,2,,4,8,,7,3,a,2,u,,1n,,,,c,,9,,14,,3,,1l,3,5,3,,4,7,2,b,2,t,,1m,,2,,2,,3,,5,2,7,2,b,2,s,2,1l,2,,,2,4,8,,9,,a,2,t,,20,,4,,2,3,,,8,,29,,2,7,c,8,2q,,2,9,b,6,22,2,r,,,,,,1j,e,,5,,2,5,b,,10,9,,2u,4,,6,,2,2,2,p,2,4,3,g,4,d,,2,2,6,,f,,jj,3,qa,3,t,3,t,2,u,2,1s,2,,7,8,,2,b,9,,19,3,3b,2,y,,3a,3,4,2,9,,6,3,63,2,2,,1m,,,7,,,,,2,8,6,a,2,,1c,h,1r,4,1c,7,,,5,,14,9,c,2,w,4,2,2,,3,1k,,,2,3,,,3,1m,8,2,2,48,3,,d,,7,4,,6,,3,2,5i,1m,,5,ek,,5f,x,2da,3,3x,,2o,w,fe,6,2x,2,n9w,4,,a,w,2,28,2,7k,,3,,4,,p,2,5,,47,2,q,i,d,,12,8,p,b,1a,3,1c,,2,4,2,2,13,,1v,6,2,2,2,2,c,,8,,1b,,1f,,,3,2,2,5,2,,,16,2,8,,6m,,2,,4,,fn4,,kh,g,g,g,a6,2,gt,,6a,,45,5,1ae,3,,2,5,4,14,3,4,,4l,2,fx,4,ar,2,49,b,4w,,1i,f,1k,3,1d,4,2,2,1x,3,10,5,,8,1q,,c,2,1g,9,a,4,2,,2n,3,2,,,2,6,,4g,,3,8,l,2,1l,2,,,,,m,,e,7,3,5,5f,8,2,3,,,n,,29,,2,6,,,2,,,2,,2,6j,,2,4,6,2,,2,r,2,2d,8,2,,,2,2y,,,,2,6,,,2t,3,2,4,,5,77,9,,2,6t,,a,2,,,4,,40,4,2,2,4,,w,a,14,6,2,4,8,,9,6,2,3,1a,d,,2,ba,7,,6,,,2a,m,2,7,,2,,2,3e,6,3,,,2,,7,,,20,2,3,,,,9n,2,f0b,5,1n,7,t4,,1r,4,29,,f5k,2,43q,,,3,4,5,8,8,2,7,u,4,44,3,1iz,1j,4,1e,8,,e,,m,5,,f,11s,7,,h,2,7,,2,,5,79,7,c5,4,15s,7,31,7,240,5,gx7k,2o,3k,6o\".split(\",\").map(s => s ? parseInt(s, 36) : 1)\n for (let i = 0, n = 0; i < numbers.length; i++)\n (i % 2 ? rangeTo : rangeFrom).push(n = n + numbers[i])\n})()\n\nexport function isExtendingChar(code) {\n if (code < 768) return false\n for (let from = 0, to = rangeFrom.length;;) {\n let mid = (from + to) >> 1\n if (code < rangeFrom[mid]) to = mid\n else if (code >= rangeTo[mid]) from = mid + 1\n else return true\n if (from == to) return false\n }\n}\n\nfunction isRegionalIndicator(code) {\n return code >= 0x1F1E6 && code <= 0x1F1FF\n}\n\nfunction check(code) {\n for (let i = 0; i < rangeFrom.length; i++) {\n if (rangeTo[i] > code) return rangeFrom[i] <= code\n }\n return false\n}\n\nconst ZWJ = 0x200d\n\nexport function findClusterBreak(str, pos, forward = true, includeExtending = true) {\n return (forward ? nextClusterBreak : prevClusterBreak)(str, pos, includeExtending)\n}\n\nfunction nextClusterBreak(str, pos, includeExtending) {\n if (pos == str.length) return pos\n // If pos is in the middle of a surrogate pair, move to its start\n if (pos && surrogateLow(str.charCodeAt(pos)) && surrogateHigh(str.charCodeAt(pos - 1))) pos--\n let prev = codePointAt(str, pos)\n pos += codePointSize(prev)\n while (pos < str.length) {\n let next = codePointAt(str, pos)\n if (prev == ZWJ || next == ZWJ || includeExtending && isExtendingChar(next)) {\n pos += codePointSize(next)\n prev = next\n } else if (isRegionalIndicator(next)) {\n let countBefore = 0, i = pos - 2\n while (i >= 0 && isRegionalIndicator(codePointAt(str, i))) { countBefore++; i -= 2 }\n if (countBefore % 2 == 0) break\n else pos += 2\n } else {\n break\n }\n }\n return pos\n}\n\nfunction prevClusterBreak(str, pos, includeExtending) {\n while (pos > 0) {\n let found = nextClusterBreak(str, pos - 2, includeExtending)\n if (found < pos) return found\n pos--\n }\n return 0\n}\n\nfunction codePointAt(str, pos) {\n let code0 = str.charCodeAt(pos)\n if (!surrogateHigh(code0) || pos + 1 == str.length) return code0\n let code1 = str.charCodeAt(pos + 1)\n if (!surrogateLow(code1)) return code0\n return ((code0 - 0xd800) << 10) + (code1 - 0xdc00) + 0x10000\n}\n\nfunction surrogateLow(ch) { return ch >= 0xDC00 && ch < 0xE000 }\nfunction surrogateHigh(ch) { return ch >= 0xD800 && ch < 0xDC00 }\nfunction codePointSize(code) { return code < 0x10000 ? 1 : 2 }\n", "import { findClusterBreak as findClusterBreak$1 } from '@marijn/find-cluster-break';\n\n/**\nThe data structure for documents. @nonabstract\n*/\nclass Text {\n /**\n Get the line description around the given position.\n */\n lineAt(pos) {\n if (pos < 0 || pos > this.length)\n throw new RangeError(`Invalid position ${pos} in document of length ${this.length}`);\n return this.lineInner(pos, false, 1, 0);\n }\n /**\n Get the description for the given (1-based) line number.\n */\n line(n) {\n if (n < 1 || n > this.lines)\n throw new RangeError(`Invalid line number ${n}Line truncated
|
||||
"mappings": "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 truncated
|
||||
"sourcesContent": ["// These are filled with ranges (rangeFrom[i] up to but not including\n// rangeTo[i]) of code points that count as extending characters.\nlet rangeFrom = [], rangeTo = []\n\n;(() => {\n // Compressed representation of the Grapheme_Cluster_Break=Extend\n // information from\n // http://www.unicode.org/Public/16.0.0/ucd/auxiliary/GraphemeBreakProperty.txt.\n // Each pair of elements represents a range, as an offet from the\n // previous range and a length. Numbers are in base-36, with the empty\n // string being a shorthand for 1.\n let numbers = \"lc,34,7n,7,7b,19,,,,2,,2,,,20,b,1c,l,g,,2t,7,2,6,2,2,,4,z,,u,r,2j,b,1m,9,9,,o,4,,9,,3,,5,17,3,3b,f,,w,1j,,,,4,8,4,,3,7,a,2,t,,1m,,,,2,4,8,,9,,a,2,q,,2,2,1l,,4,2,4,2,2,3,3,,u,2,3,,b,2,1l,,4,5,,2,4,,k,2,m,6,,,1m,,,2,,4,8,,7,3,a,2,u,,1n,,,,c,,9,,14,,3,,1l,3,5,3,,4,7,2,b,2,t,,1m,,2,,2,,3,,5,2,7,2,b,2,s,2,1l,2,,,2,4,8,,9,,a,2,t,,20,,4,,2,3,,,8,,29,,2,7,c,8,2q,,2,9,b,6,22,2,r,,,,,,1j,e,,5,,2,5,b,,10,9,,2u,4,,6,,2,2,2,p,2,4,3,g,4,d,,2,2,6,,f,,jj,3,qa,3,t,3,t,2,u,2,1s,2,,7,8,,2,b,9,,19,3,3b,2,y,,3a,3,4,2,9,,6,3,63,2,2,,1m,,,7,,,,,2,8,6,a,2,,1c,h,1r,4,1c,7,,,5,,14,9,c,2,w,4,2,2,,3,1k,,,2,3,,,3,1m,8,2,2,48,3,,d,,7,4,,6,,3,2,5i,1m,,5,ek,,5f,x,2da,3,3x,,2o,w,fe,6,2x,2,n9w,4,,a,w,2,28,2,7k,,3,,4,,p,2,5,,47,2,q,i,d,,12,8,p,b,1a,3,1c,,2,4,2,2,13,,1v,6,2,2,2,2,c,,8,,1b,,1f,,,3,2,2,5,2,,,16,2,8,,6m,,2,,4,,fn4,,kh,g,g,g,a6,2,gt,,6a,,45,5,1ae,3,,2,5,4,14,3,4,,4l,2,fx,4,ar,2,49,b,4w,,1i,f,1k,3,1d,4,2,2,1x,3,10,5,,8,1q,,c,2,1g,9,a,4,2,,2n,3,2,,,2,6,,4g,,3,8,l,2,1l,2,,,,,m,,e,7,3,5,5f,8,2,3,,,n,,29,,2,6,,,2,,,2,,2,6j,,2,4,6,2,,2,r,2,2d,8,2,,,2,2y,,,,2,6,,,2t,3,2,4,,5,77,9,,2,6t,,a,2,,,4,,40,4,2,2,4,,w,a,14,6,2,4,8,,9,6,2,3,1a,d,,2,ba,7,,6,,,2a,m,2,7,,2,,2,3e,6,3,,,2,,7,,,20,2,3,,,,9n,2,f0b,5,1n,7,t4,,1r,4,29,,f5k,2,43q,,,3,4,5,8,8,2,7,u,4,44,3,1iz,1j,4,1e,8,,e,,m,5,,f,11s,7,,h,2,7,,2,,5,79,7,c5,4,15s,7,31,7,240,5,gx7k,2o,3k,6o\".split(\",\").map(s => s ? parseInt(s, 36) : 1)\n for (let i = 0, n = 0; i < numbers.length; i++)\n (i % 2 ? rangeTo : rangeFrom).push(n = n + numbers[i])\n})()\n\nexport function isExtendingChar(code) {\n if (code < 768) return false\n for (let from = 0, to = rangeFrom.length;;) {\n let mid = (from + to) >> 1\n if (code < rangeFrom[mid]) to = mid\n else if (code >= rangeTo[mid]) from = mid + 1\n else return true\n if (from == to) return false\n }\n}\n\nfunction isRegionalIndicator(code) {\n return code >= 0x1F1E6 && code <= 0x1F1FF\n}\n\nfunction check(code) {\n for (let i = 0; i < rangeFrom.length; i++) {\n if (rangeTo[i] > code) return rangeFrom[i] <= code\n }\n return false\n}\n\nconst ZWJ = 0x200d\n\nexport function findClusterBreak(str, pos, forward = true, includeExtending = true) {\n return (forward ? nextClusterBreak : prevClusterBreak)(str, pos, includeExtending)\n}\n\nfunction nextClusterBreak(str, pos, includeExtending) {\n if (pos == str.length) return pos\n // If pos is in the middle of a surrogate pair, move to its start\n if (pos && surrogateLow(str.charCodeAt(pos)) && surrogateHigh(str.charCodeAt(pos - 1))) pos--\n let prev = codePointAt(str, pos)\n pos += codePointSize(prev)\n while (pos < str.length) {\n let next = codePointAt(str, pos)\n if (prev == ZWJ || next == ZWJ || includeExtending && isExtendingChar(next)) {\n pos += codePointSize(next)\n prev = next\n } else if (isRegionalIndicator(next)) {\n let countBefore = 0, i = pos - 2\n while (i >= 0 && isRegionalIndicator(codePointAt(str, i))) { countBefore++; i -= 2 }\n if (countBefore % 2 == 0) break\n else pos += 2\n } else {\n break\n }\n }\n return pos\n}\n\nfunction prevClusterBreak(str, pos, includeExtending) {\n while (pos > 0) {\n let found = nextClusterBreak(str, pos - 2, includeExtending)\n if (found < pos) return found\n pos--\n }\n return 0\n}\n\nfunction codePointAt(str, pos) {\n let code0 = str.charCodeAt(pos)\n if (!surrogateHigh(code0) || pos + 1 == str.length) return code0\n let code1 = str.charCodeAt(pos + 1)\n if (!surrogateLow(code1)) return code0\n return ((code0 - 0xd800) << 10) + (code1 - 0xdc00) + 0x10000\n}\n\nfunction surrogateLow(ch) { return ch >= 0xDC00 && ch < 0xE000 }\nfunction surrogateHigh(ch) { return ch >= 0xD800 && ch < 0xDC00 }\nfunction codePointSize(code) { return code < 0x10000 ? 1 : 2 }\n", "import { findClusterBreak as findClusterBreak$1 } from '@marijn/find-cluster-break';\n\n/**\nThe data structure for documents. @nonabstract\n*/\nclass Text {\n /**\n Get the line description around the given position.\n */\n lineAt(pos) {\n if (pos < 0 || pos > this.length)\n throw new RangeError(`Invalid position ${pos} in document of length ${this.length}`);\n return this.lineInner(pos, false, 1, 0);\n }\n /**\n Get the description for the given (1-based) line number.\n */\n line(n) {\n if (n < 1 || n > this.lines)\n throw new RangeError(`Invalid line number ${n}Line truncated
|
||||
"mappings": "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 truncated
|
||||
"names": ["Text", "a", "string", "top", "number", "findClusterBreak", "surrogateLow", "surrogateHigh", "codePointAt", "codePointSize", "MapMode", "json", "doc", "process", "insert", "i", "values", "compare", "config", "_a", "id", "prec", "content", "base", "scrollIntoView", "CharCategory", "require", "name", "defaults", "cur", "spec", "a", "id", "doc", "name", "ie", "name", "a", "BlockType", "off", "elt", "doc", "cur", "top", "rect", "Direction", "replace", "type", "isNum", "_a", "findClusterBreak", "values", "t", "id", "pos", "flatten", "Text", "dist", "cache", "blockWrappers", "marks", "tile", "decorations", "from", "to", "offset", "textHeight", "i", "content", "child", "scrollIntoView", "base", "handlers", "observers", "insert", "event", "data", "_b", "QueryType", "DecorationComparator", "gap", "key", "view", "config", "shift", "meta", "command", "codePointAt", "codePointSize", "cmd", "a", "t", "_a", "i", "values", "_a", "_b", "config", "t", "space", "top", "elt", "top", "values", "config", "gutter", "cur", "gutters", "asArray", "marker", "elt", "a", "event", "number", "marks", "Range", "config", "parser", "bracketed", "name", "id", "types", "IterMode", "data", "_a", "mounted", "cur", "cache", "nodeSet", "children", "positions", "node", "buffer", "contextHash", "length", "lookAhead", "base", "pair", "nodeSize", "nodeStart", "from", "to", "off", "string", "done", "inner", "r", "pos", "a", "name", "base", "t", "a", "sameArray", "config", "tags", "cur", "hasChild", "rangeFrom", "rangeTo", "name", "values", "data", "parser", "name", "top", "base", "_a", "doc", "stringStart", "parser", "_a", "language", "name", "a", "values", "cur", "base", "lineEnd", "space", "closing", "cur", "lineEnd", "a", "_a", "from", "to", "a", "values", "config", "baseTheme$1", "baseTheme$1", "values", "from", "to", "baseTheme", "decorations", "config", "cur", "matching", "bracket", "pos", "string", "indentUnit", "_a", "parser", "data", "line", "indentation", "off", "eol", "rangeEnd", "id", "name", "t", "config", "data", "tokens", "comment", "indent", "empty", "isAdjacent", "a", "config", "json", "command", "_a", "_b", "json", "none", "a", "isAdjacent", "t", "_f", "config", "bracket", "space", "matching", "cur", "findClusterBreak", "findClusterBreak", "nextChar", "lineEnd", "Text", "findClusterBreak", "dist", "indent", "insert", "Text", "changes", "cur", "space", "types", "words", "score", "_a", "codePointAt", "codePointSize", "a", "space", "config", "content", "off", "applyCompletion", "options", "id", "scrollIntoView", "name", "compare", "cur", "none", "noAttrs", "baseTheme", "indent", "pos", "m", "snippet", "Text", "inputHandler", "insert", "codePointSize", "codePointAt", "tokens", "bracket", "doc", "config", "content", "baseTheme", "score", "_a", "parser", "base", "count", "top", "off", "i", "Type", "data", "id", "readToken", "dialect", "FragmentCursor", "nodeSet", "Parse", "a", "tokens", "insert", "name", "config", "t", "prec", "values", "name", "getAttrs", "tags", "id", "attrs", "dash", "id", "callee", "parser", "name", "tags", "identifier", "doc", "_a", "callee", "cur", "node", "parser", "newline", "space", "slash", "question", "bracketL", "spec_identifier", "parser", "id", "doc", "top", "node", "name", "parser", "_a", "name", "config", "doc", "android", "base", "empty", "insert", "a", "elementName", "doc", "name", "identifier", "elt", "_a", "base", "config", "cur", "dialect", "autoCloseTags", "selfClosers", "_b", "to", "insert", "hash", "nodeSet", "Type", "content", "Line", "indent", "elt", "space", "count", "marks", "base", "empty", "off", "parser", "FragmentCursor", "eol", "none", "top", "rangeEnd", "t", "config", "nodeTypes", "name", "id", "rm", "spec", "a", "conc", "Element", "comment", "cur", "node", "m", "next", "parser", "heading", "doc", "number", "cur", "node", "content", "space", "config", "insert", "changes", "empty", "_a", "newline", "space", "hash", "dot", "backslash", "isHex", "spaces", "Context", "indent", "topIndent", "off", "spec_identifier", "parser", "cache", "ScopeNodes", "defID", "id", "gatherCompletions", "_a", "_b", "getScope", "doc", "top", "node", "name", "Identifier", "dontComplete", "localCompletionSource", "snippets", "base", "parser", "parser", "parser", "LineComment", "BlockComment", "String$1", "Number", "Bool", "ParenL", "BraceL", "BracketL", "Punctuation", "Identifier", "Type", "isAlpha", "keywords", "types", "defaults", "dialect", "_a", "cur", "doc", "id", "name", "top", "empty", "keyword", "parser", "language", "config", "eof", "Tag", "BracketL", "BraceL", "Context", "findColumn", "indentation", "indent", "off", "newlines", "parser", "parser", "identifier", "String", "Number", "newline", "carriageReturn", "space", "tab", "slash", "semicolon", "spec_identifier", "parser", "snippets", "cache", "ScopeNodes", "cur", "gatherCompletions", "getScope", "doc", "top", "node", "name", "Identifier", "dontComplete", "localCompletionSource", "parser", "kwCompletion", "keywords", "Dot", "count", "spec_idLine truncated
|
||||
}
|
||||
@@ -22,13 +22,14 @@
|
||||
|
||||
<link rel="stylesheet" href="/static/css/theme/base.css">
|
||||
<link rel="stylesheet" href="/static/css/content-viewer.css">
|
||||
{{ if .CSVEditor }}<link rel="stylesheet" href="/static/css/csv-editor.css?v=1">{{ end }}
|
||||
<link rel="stylesheet" href="{{ .ThemeCSS }}">
|
||||
<script defer src="/static/js/content-viewer.js?v=macro-projection-1"></script>
|
||||
|
||||
|
||||
<script
|
||||
type="module"
|
||||
src="/static/vendor/codemirror/editor.bundle.js?v=command-ux-1"
|
||||
src="/static/vendor/codemirror/editor.bundle.js?v=csv-edit-1"
|
||||
></script>
|
||||
|
||||
|
||||
@@ -39,7 +40,7 @@
|
||||
|
||||
</head>
|
||||
|
||||
<body class="mode-editor">
|
||||
<body class="mode-editor{{ if .CSVEditor }} csv-editor{{ end }}">
|
||||
|
||||
<header class="topbar">
|
||||
|
||||
@@ -165,8 +166,8 @@
|
||||
aria-pressed="true"
|
||||
aria-label="{{ T "editor.hide_preview" }}"
|
||||
title="{{ T "editor.hide_preview" }}"
|
||||
data-hide-label="{{ T "editor.hide_preview" }}"
|
||||
data-show-label="{{ T "editor.show_preview" }}"
|
||||
data-hide-label="{{ if .CSVEditor }}{{ T "editor.csv_source" }}{{ else }}{{ T "editor.hide_preview" }}{{ end }}"
|
||||
data-show-label="{{ if .CSVEditor }}{{ T "editor.csv_table" }}{{ else }}{{ T "editor.show_preview" }}{{ end }}"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true">
|
||||
<rect x="3" y="4" width="18" height="16" rx="2"/>
|
||||
@@ -204,6 +205,7 @@
|
||||
data-base-revision="{{ .BaseRevision }}"
|
||||
data-domain="{{ .Context.Domain.UUID }}"
|
||||
data-owner="{{ if .AuthUser }}{{ .AuthUser.UUID }}{{ end }}"
|
||||
data-csv="{{ .CSVEditor }}"
|
||||
></div>
|
||||
|
||||
<div
|
||||
@@ -215,7 +217,7 @@
|
||||
MODE
|
||||
</span>
|
||||
<span id="editor-format-status">
|
||||
{{ .EditType }}
|
||||
{{ if .CSVEditor }}CSV{{ else }}{{ .EditType }}{{ end }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -272,7 +274,8 @@ Ln 1, Col 1
|
||||
</main>
|
||||
|
||||
<script src="/static/js/editor-core.js?v=priority-ux-1"></script>
|
||||
<script src="/static/js/editor.js?v=priority-ux-1"></script>
|
||||
{{ if .CSVEditor }}<script>window.PagesCSVSource = {{ .Body }};</script><script src="/static/js/csv-core.js?v=1"></script><script src="/static/js/csv-editor.js?v=1"></script>{{ end }}
|
||||
<script src="/static/js/editor.js?v=csv-edit-1"></script>
|
||||
<script src="/static/js/path-actions.js"></script>
|
||||
|
||||
|
||||
@@ -295,12 +298,13 @@ window.addEventListener(
|
||||
const cm =
|
||||
window.PagesWikiEditor.create(
|
||||
mount,
|
||||
textarea.value,
|
||||
window.PagesEditor?.text() ?? textarea.value,
|
||||
"{{ .EditType }}",
|
||||
{
|
||||
keymap: mount.dataset.keymap,
|
||||
syntax: mount.dataset.syntax === "true",
|
||||
autocomplete: mount.dataset.autocomplete === "true",
|
||||
preserveLineEndings: mount.dataset.csv === "true",
|
||||
}
|
||||
)
|
||||
|
||||
@@ -308,7 +312,11 @@ window.addEventListener(
|
||||
cm
|
||||
|
||||
cm.focus()
|
||||
setTimeout(() => cm.focus(), 0)
|
||||
setTimeout(() => {
|
||||
// Do not steal focus from a table cell or toolbar clicked while
|
||||
// the editor was initializing.
|
||||
if (document.activeElement === document.body || mount.contains(document.activeElement)) cm.focus()
|
||||
}, 0)
|
||||
|
||||
window.PagesWikiGetEditorText =
|
||||
() => window.PagesWikiCodeMirror.state.doc.toString()
|
||||
|
||||
Reference in new issue
Block a user